Merge branch 'development' into java-16
Showing
- src/main/java/emu/grasscutter/data/def/FetterData.java 24 additions, 0 deletionssrc/main/java/emu/grasscutter/data/def/FetterData.java
- src/main/java/emu/grasscutter/database/DatabaseHelper.java 1 addition, 1 deletionsrc/main/java/emu/grasscutter/database/DatabaseHelper.java
- src/main/java/emu/grasscutter/database/DatabaseManager.java 38 additions, 0 deletionssrc/main/java/emu/grasscutter/database/DatabaseManager.java
- src/main/java/emu/grasscutter/game/Account.java 14 additions, 11 deletionssrc/main/java/emu/grasscutter/game/Account.java
- src/main/java/emu/grasscutter/game/GenshinPlayer.java 34 additions, 14 deletionssrc/main/java/emu/grasscutter/game/GenshinPlayer.java
- src/main/java/emu/grasscutter/game/GenshinScene.java 10 additions, 1 deletionsrc/main/java/emu/grasscutter/game/GenshinScene.java
- src/main/java/emu/grasscutter/game/TeamInfo.java 3 additions, 3 deletionssrc/main/java/emu/grasscutter/game/TeamInfo.java
- src/main/java/emu/grasscutter/game/TeamManager.java 2 additions, 2 deletionssrc/main/java/emu/grasscutter/game/TeamManager.java
- src/main/java/emu/grasscutter/game/World.java 9 additions, 21 deletionssrc/main/java/emu/grasscutter/game/World.java
- src/main/java/emu/grasscutter/game/avatar/GenshinAvatar.java 65 additions, 18 deletionssrc/main/java/emu/grasscutter/game/avatar/GenshinAvatar.java
- src/main/java/emu/grasscutter/game/entity/EntityAvatar.java 2 additions, 2 deletionssrc/main/java/emu/grasscutter/game/entity/EntityAvatar.java
- src/main/java/emu/grasscutter/game/friends/FriendsList.java 1 addition, 1 deletionsrc/main/java/emu/grasscutter/game/friends/FriendsList.java
- src/main/java/emu/grasscutter/game/friends/Friendship.java 1 addition, 1 deletionsrc/main/java/emu/grasscutter/game/friends/Friendship.java
- src/main/java/emu/grasscutter/game/friends/PlayerProfile.java 5 additions, 4 deletions...main/java/emu/grasscutter/game/friends/PlayerProfile.java
- src/main/java/emu/grasscutter/game/gacha/GachaBanner.java 1 addition, 1 deletionsrc/main/java/emu/grasscutter/game/gacha/GachaBanner.java
- src/main/java/emu/grasscutter/game/gacha/GachaManager.java 1 addition, 2 deletionssrc/main/java/emu/grasscutter/game/gacha/GachaManager.java
- src/main/java/emu/grasscutter/game/inventory/Inventory.java 4 additions, 4 deletionssrc/main/java/emu/grasscutter/game/inventory/Inventory.java
- src/main/java/emu/grasscutter/game/managers/InventoryManager.java 7 additions, 21 deletions.../java/emu/grasscutter/game/managers/InventoryManager.java
- src/main/java/emu/grasscutter/game/props/FetterState.java 42 additions, 0 deletionssrc/main/java/emu/grasscutter/game/props/FetterState.java
- src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java 222 additions, 200 deletions.../java/emu/grasscutter/server/dispatch/DispatchServer.java
Please register or sign in to comment