Merge branch 'development' into java-16
Showing
- .github/workflows/build.yml 24 additions, 0 deletions.github/workflows/build.yml
- .gitignore 4 additions, 3 deletions.gitignore
- README.md 18 additions, 14 deletionsREADME.md
- data/Banners.json 2 additions, 2 deletionsdata/Banners.json
- proxy.py 11 additions, 2 deletionsproxy.py
- proxy_config.py 3 additions, 1 deletionproxy_config.py
- src/main/java/emu/grasscutter/Config.java 59 additions, 32 deletionssrc/main/java/emu/grasscutter/Config.java
- src/main/java/emu/grasscutter/Grasscutter.java 29 additions, 7 deletionssrc/main/java/emu/grasscutter/Grasscutter.java
- src/main/java/emu/grasscutter/command/commands/AccountCommand.java 1 addition, 1 deletion...java/emu/grasscutter/command/commands/AccountCommand.java
- src/main/java/emu/grasscutter/command/commands/ChangeSceneCommand.java 8 additions, 2 deletions.../emu/grasscutter/command/commands/ChangeSceneCommand.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/HealCommand.java 36 additions, 0 deletions...in/java/emu/grasscutter/command/commands/HealCommand.java
- src/main/java/emu/grasscutter/command/commands/KickCommand.java 1 addition, 1 deletion...in/java/emu/grasscutter/command/commands/KickCommand.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/command/commands/SetStatsCommand.java 6 additions, 1 deletion...ava/emu/grasscutter/command/commands/SetStatsCommand.java
- src/main/java/emu/grasscutter/command/commands/TalentCommand.java 107 additions, 0 deletions.../java/emu/grasscutter/command/commands/TalentCommand.java
- src/main/java/emu/grasscutter/command/commands/WeatherCommand.java 7 additions, 5 deletions...java/emu/grasscutter/command/commands/WeatherCommand.java
- src/main/java/emu/grasscutter/data/GenshinData.java 19 additions, 0 deletionssrc/main/java/emu/grasscutter/data/GenshinData.java
- src/main/java/emu/grasscutter/data/ResourceLoader.java 7 additions, 1 deletionsrc/main/java/emu/grasscutter/data/ResourceLoader.java
- src/main/java/emu/grasscutter/data/def/AvatarData.java 9 additions, 0 deletionssrc/main/java/emu/grasscutter/data/def/AvatarData.java
Please register or sign in to comment