Merge remote-tracking branch 'upstream/development' into development
Showing
- README.md 5 additions, 1 deletionREADME.md
- proxy.py 8 additions, 1 deletionproxy.py
- proxy_config.py 3 additions, 1 deletionproxy_config.py
- src/main/java/emu/grasscutter/Config.java 5 additions, 7 deletionssrc/main/java/emu/grasscutter/Config.java
- src/main/java/emu/grasscutter/command/commands/GiveCommand.java 3 additions, 2 deletions...in/java/emu/grasscutter/command/commands/GiveCommand.java
- src/main/java/emu/grasscutter/command/commands/ListCommand.java 33 additions, 0 deletions...in/java/emu/grasscutter/command/commands/ListCommand.java
- src/main/java/emu/grasscutter/server/dispatch/DispatchServer.java 128 additions, 156 deletions.../java/emu/grasscutter/server/dispatch/DispatchServer.java
- src/main/java/emu/grasscutter/server/dispatch/json/ComboTokenReqJson.java 1 addition, 1 deletion...u/grasscutter/server/dispatch/json/ComboTokenReqJson.java
- src/main/java/emu/grasscutter/server/dispatch/json/ComboTokenResJson.java 1 addition, 1 deletion...u/grasscutter/server/dispatch/json/ComboTokenResJson.java
- src/main/java/emu/grasscutter/server/dispatch/json/LoginResultJson.java 2 additions, 2 deletions...emu/grasscutter/server/dispatch/json/LoginResultJson.java
- src/main/java/emu/grasscutter/server/packet/send/PacketSceneUnlockInfoNotify.java 1 addition, 1 deletion...utter/server/packet/send/PacketSceneUnlockInfoNotify.java
Please register or sign in to comment