Merge origin/development into plugin-system

This commit is contained in:
KingRainbow44
2022-04-23 00:55:31 -04:00
Unverified
parent 15da839503
commit 3ba8c42b42
30 changed files with 373 additions and 134 deletions
@@ -3,10 +3,12 @@ package emu.grasscutter.game;
import java.util.ArrayList;
import java.util.List;
import dev.morphia.annotations.Entity;
import emu.grasscutter.GenshinConstants;
import emu.grasscutter.Grasscutter;
import emu.grasscutter.game.avatar.GenshinAvatar;
@Entity
public class TeamInfo {
private String name;
private List<Integer> avatars;