Merge branch 'development' into api
# Conflicts: # src/main/java/emu/grasscutter/plugin/api/ServerHook.java
Showing
- src/main/java/emu/grasscutter/game/inventory/Inventory.java 75 additions, 51 deletionssrc/main/java/emu/grasscutter/game/inventory/Inventory.java
- src/main/java/emu/grasscutter/game/inventory/InventoryTab.java 3 additions, 3 deletions...ain/java/emu/grasscutter/game/inventory/InventoryTab.java
- src/main/java/emu/grasscutter/game/inventory/MaterialInventoryTab.java 4 additions, 4 deletions.../emu/grasscutter/game/inventory/MaterialInventoryTab.java
- src/main/java/emu/grasscutter/game/mail/Mail.java 96 additions, 0 deletionssrc/main/java/emu/grasscutter/game/mail/Mail.java
- src/main/java/emu/grasscutter/game/managers/ChatManager.java 10 additions, 10 deletionssrc/main/java/emu/grasscutter/game/managers/ChatManager.java
- src/main/java/emu/grasscutter/game/managers/InventoryManager.java 85 additions, 80 deletions.../java/emu/grasscutter/game/managers/InventoryManager.java
- src/main/java/emu/grasscutter/game/managers/MultiplayerManager.java 19 additions, 18 deletions...ava/emu/grasscutter/game/managers/MultiplayerManager.java
- src/main/java/emu/grasscutter/game/player/InvokeHandler.java 14 additions, 20 deletionssrc/main/java/emu/grasscutter/game/player/InvokeHandler.java
- src/main/java/emu/grasscutter/game/player/Player.java 234 additions, 57 deletionssrc/main/java/emu/grasscutter/game/player/Player.java
- src/main/java/emu/grasscutter/game/player/TeamInfo.java 5 additions, 5 deletionssrc/main/java/emu/grasscutter/game/player/TeamInfo.java
- src/main/java/emu/grasscutter/game/player/TeamManager.java 22 additions, 21 deletionssrc/main/java/emu/grasscutter/game/player/TeamManager.java
- src/main/java/emu/grasscutter/game/shop/ShopInfo.java 148 additions, 0 deletionssrc/main/java/emu/grasscutter/game/shop/ShopInfo.java
- src/main/java/emu/grasscutter/game/shop/ShopLimit.java 25 additions, 0 deletionssrc/main/java/emu/grasscutter/game/shop/ShopLimit.java
- src/main/java/emu/grasscutter/game/shop/ShopManager.java 35 additions, 1 deletionsrc/main/java/emu/grasscutter/game/shop/ShopManager.java
- src/main/java/emu/grasscutter/game/shop/ShopTable.java 25 additions, 0 deletionssrc/main/java/emu/grasscutter/game/shop/ShopTable.java
- src/main/java/emu/grasscutter/game/world/Scene.java 70 additions, 72 deletionssrc/main/java/emu/grasscutter/game/world/Scene.java
- src/main/java/emu/grasscutter/game/world/World.java 45 additions, 44 deletionssrc/main/java/emu/grasscutter/game/world/World.java
- src/main/java/emu/grasscutter/net/packet/BasePacket.java 5 additions, 5 deletionssrc/main/java/emu/grasscutter/net/packet/BasePacket.java
- src/main/java/emu/grasscutter/net/packet/PacketOpcodes.java 1 addition, 2 deletionssrc/main/java/emu/grasscutter/net/packet/PacketOpcodes.java
- src/main/java/emu/grasscutter/net/packet/Retcode.java 0 additions, 6 deletionssrc/main/java/emu/grasscutter/net/packet/Retcode.java
Please register or sign in to comment