Merge remote-tracking branch 'origin/development' into development
Showing
- README_zh-CN.md 2 additions, 2 deletionsREADME_zh-CN.md
- README_zh-TW.md 2 additions, 2 deletionsREADME_zh-TW.md
- build.gradle 1 addition, 1 deletionbuild.gradle
- plugin-schema.json 59 additions, 45 deletionsplugin-schema.json
- src/main/java/emu/grasscutter/Grasscutter.java 344 additions, 341 deletionssrc/main/java/emu/grasscutter/Grasscutter.java
- src/main/java/emu/grasscutter/command/CommandMap.java 37 additions, 22 deletionssrc/main/java/emu/grasscutter/command/CommandMap.java
- src/main/java/emu/grasscutter/command/commands/CoopCommand.java 1 addition, 1 deletion...in/java/emu/grasscutter/command/commands/CoopCommand.java
- src/main/java/emu/grasscutter/command/commands/WeatherCommand.java 24 additions, 27 deletions...java/emu/grasscutter/command/commands/WeatherCommand.java
- src/main/java/emu/grasscutter/data/DataLoader.java 14 additions, 14 deletionssrc/main/java/emu/grasscutter/data/DataLoader.java
- src/main/java/emu/grasscutter/data/GameData.java 6 additions, 0 deletionssrc/main/java/emu/grasscutter/data/GameData.java
- src/main/java/emu/grasscutter/data/excels/WeatherData.java 26 additions, 0 deletionssrc/main/java/emu/grasscutter/data/excels/WeatherData.java
- src/main/java/emu/grasscutter/game/player/Player.java 84 additions, 31 deletionssrc/main/java/emu/grasscutter/game/player/Player.java
- src/main/java/emu/grasscutter/game/props/ClimateType.java 10 additions, 1 deletionsrc/main/java/emu/grasscutter/game/props/ClimateType.java
- src/main/java/emu/grasscutter/game/world/Scene.java 0 additions, 19 deletionssrc/main/java/emu/grasscutter/game/world/Scene.java
- src/main/java/emu/grasscutter/plugin/PluginConfig.java 2 additions, 0 deletionssrc/main/java/emu/grasscutter/plugin/PluginConfig.java
- src/main/java/emu/grasscutter/plugin/PluginManager.java 171 additions, 49 deletionssrc/main/java/emu/grasscutter/plugin/PluginManager.java
- src/main/java/emu/grasscutter/server/event/EventHandler.java 3 additions, 2 deletionssrc/main/java/emu/grasscutter/server/event/EventHandler.java
- src/main/java/emu/grasscutter/server/packet/send/PacketSceneAreaWeatherNotify.java 2 additions, 2 deletions...tter/server/packet/send/PacketSceneAreaWeatherNotify.java
- src/main/resources/languages/en-US.json 12 additions, 15 deletionssrc/main/resources/languages/en-US.json
- src/main/resources/languages/fr-FR.json 6 additions, 8 deletionssrc/main/resources/languages/fr-FR.json
Please register or sign in to comment