Merge branch 'development' into restart-command
Showing
- .gitmodules 3 additions, 0 deletions.gitmodules
- Grasscutter-Protos 1 addition, 0 deletionsGrasscutter-Protos
- data/Banners.json 12 additions, 27 deletionsdata/Banners.json
- proxy.py 5 additions, 8 deletionsproxy.py
- run.bat 0 additions, 7 deletionsrun.bat
- src/main/java/emu/grasscutter/commands/Command.java 5 additions, 3 deletionssrc/main/java/emu/grasscutter/commands/Command.java
- src/main/java/emu/grasscutter/commands/CommandMap.java 4 additions, 3 deletionssrc/main/java/emu/grasscutter/commands/CommandMap.java
- src/main/java/emu/grasscutter/commands/PlayerCommands.java 1 addition, 1 deletionsrc/main/java/emu/grasscutter/commands/PlayerCommands.java
- src/main/java/emu/grasscutter/commands/ServerCommands.java 154 additions, 37 deletionssrc/main/java/emu/grasscutter/commands/ServerCommands.java
- src/main/java/emu/grasscutter/data/ResourceLoader.java 1 addition, 1 deletionsrc/main/java/emu/grasscutter/data/ResourceLoader.java
- src/main/java/emu/grasscutter/game/Account.java 4 additions, 0 deletionssrc/main/java/emu/grasscutter/game/Account.java
- src/main/java/emu/grasscutter/game/managers/InventoryManager.java 7 additions, 1 deletion.../java/emu/grasscutter/game/managers/InventoryManager.java
- src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java 4 additions, 0 deletions.../java/emu/grasscutter/server/dispatch/DispatchServer.java
- src/main/java/emu/grasscutter/server/packet/send/PacketPlayerEnterSceneNotify.java 1 addition, 0 deletions...tter/server/packet/send/PacketPlayerEnterSceneNotify.java
- src/main/java/emu/grasscutter/tools/Tools.java 2 additions, 1 deletionsrc/main/java/emu/grasscutter/tools/Tools.java
Please register or sign in to comment