Merge branch 'development' into api
# Conflicts: # src/main/java/emu/grasscutter/plugin/api/ServerHook.java
Showing
- .github/workflows/build.yml 2 additions, 1 deletion.github/workflows/build.yml
- .gitignore 4 additions, 3 deletions.gitignore
- .gitmodules 0 additions, 3 deletions.gitmodules
- Grasscutter-Protos 0 additions, 1 deletionGrasscutter-Protos
- README.md 21 additions, 21 deletionsREADME.md
- README_zh-CN.md 1 addition, 1 deletionREADME_zh-CN.md
- build.gradle 73 additions, 2 deletionsbuild.gradle
- data/Drop.json 14 additions, 0 deletionsdata/Drop.json
- data/Shop.json 54 additions, 0 deletionsdata/Shop.json
- src/main/java/emu/grasscutter/GameConstants.java 1 addition, 1 deletionsrc/main/java/emu/grasscutter/GameConstants.java
- src/main/java/emu/grasscutter/command/Command.java 2 additions, 0 deletionssrc/main/java/emu/grasscutter/command/Command.java
- src/main/java/emu/grasscutter/command/CommandHandler.java 3 additions, 3 deletionssrc/main/java/emu/grasscutter/command/CommandHandler.java
- src/main/java/emu/grasscutter/command/CommandMap.java 16 additions, 8 deletionssrc/main/java/emu/grasscutter/command/CommandMap.java
- src/main/java/emu/grasscutter/command/commands/AccountCommand.java 2 additions, 2 deletions...java/emu/grasscutter/command/commands/AccountCommand.java
- src/main/java/emu/grasscutter/command/commands/BroadcastCommand.java 3 additions, 3 deletions...va/emu/grasscutter/command/commands/BroadcastCommand.java
- src/main/java/emu/grasscutter/command/commands/ChangeSceneCommand.java 2 additions, 2 deletions.../emu/grasscutter/command/commands/ChangeSceneCommand.java
- src/main/java/emu/grasscutter/command/commands/ClearCommand.java 4 additions, 4 deletions...n/java/emu/grasscutter/command/commands/ClearCommand.java
- src/main/java/emu/grasscutter/command/commands/DropCommand.java 4 additions, 4 deletions...in/java/emu/grasscutter/command/commands/DropCommand.java
- src/main/java/emu/grasscutter/command/commands/GiveAllCommand.java 189 additions, 0 deletions...java/emu/grasscutter/command/commands/GiveAllCommand.java
- src/main/java/emu/grasscutter/command/commands/GiveCharCommand.java 7 additions, 7 deletions...ava/emu/grasscutter/command/commands/GiveCharCommand.java
Please register or sign in to comment