Merge remote-tracking branch 'origin/development' into tower
Showing
- src/main/java/emu/grasscutter/command/commands/SetWorldLevelCommand.java 1 addition, 1 deletion...mu/grasscutter/command/commands/SetWorldLevelCommand.java
- src/main/java/emu/grasscutter/command/commands/SpawnCommand.java 4 additions, 4 deletions...n/java/emu/grasscutter/command/commands/SpawnCommand.java
- src/main/java/emu/grasscutter/command/commands/TalentCommand.java 2 additions, 2 deletions.../java/emu/grasscutter/command/commands/TalentCommand.java
- src/main/java/emu/grasscutter/command/commands/TeleportAllCommand.java 1 addition, 1 deletion.../emu/grasscutter/command/commands/TeleportAllCommand.java
- src/main/java/emu/grasscutter/command/commands/TeleportCommand.java 1 addition, 1 deletion...ava/emu/grasscutter/command/commands/TeleportCommand.java
- src/main/java/emu/grasscutter/command/commands/UnlockTowerCommand.java 2 additions, 2 deletions.../emu/grasscutter/command/commands/UnlockTowerCommand.java
- src/main/java/emu/grasscutter/command/commands/WeatherCommand.java 1 addition, 1 deletion...java/emu/grasscutter/command/commands/WeatherCommand.java
- src/main/java/emu/grasscutter/game/Account.java 35 additions, 4 deletionssrc/main/java/emu/grasscutter/game/Account.java
- src/main/java/emu/grasscutter/game/managers/StaminaManager/StaminaManager.java 59 additions, 57 deletions...sscutter/game/managers/StaminaManager/StaminaManager.java
- src/main/java/emu/grasscutter/scripts/service/ScriptMonsterTideService.java 3 additions, 0 deletions...grasscutter/scripts/service/ScriptMonsterTideService.java
- src/main/resources/languages/en-US.json 7 additions, 0 deletionssrc/main/resources/languages/en-US.json
- src/main/resources/languages/pl-PL.json 8 additions, 1 deletionsrc/main/resources/languages/pl-PL.json
- src/main/resources/languages/zh-CN.json 9 additions, 2 deletionssrc/main/resources/languages/zh-CN.json
- src/main/resources/languages/zh-TW.json 9 additions, 2 deletionssrc/main/resources/languages/zh-TW.json
Please register or sign in to comment