Merge origin/development into plugin-system

This commit is contained in:
KingRainbow44
2022-04-23 00:55:31 -04:00
parent 9b2e4e3fa9
commit ec6a54ebd7
36 changed files with 4102 additions and 138 deletions

View File

@@ -9,7 +9,7 @@ import emu.grasscutter.net.proto.FriendBriefOuterClass.FriendBrief;
import emu.grasscutter.net.proto.FriendOnlineStateOuterClass.FriendOnlineState;
import emu.grasscutter.net.proto.HeadImageOuterClass.HeadImage;
@Entity(value = "friendships", noClassnameStored = true)
@Entity(value = "friendships", useDiscriminator = false)
public class Friendship {
@Id private ObjectId id;