Merge branch 'development' into development
Showing
- src/main/java/emu/grasscutter/command/commands/WeatherCommand.java 7 additions, 6 deletions...java/emu/grasscutter/command/commands/WeatherCommand.java
- src/main/java/emu/grasscutter/data/ResourceLoader.java 10 additions, 8 deletionssrc/main/java/emu/grasscutter/data/ResourceLoader.java
- src/main/java/emu/grasscutter/game/dungeons/BasicDungeonSettleListener.java 14 additions, 0 deletions...grasscutter/game/dungeons/BasicDungeonSettleListener.java
- src/main/java/emu/grasscutter/game/dungeons/DungeonChallenge.java 5 additions, 14 deletions.../java/emu/grasscutter/game/dungeons/DungeonChallenge.java
- src/main/java/emu/grasscutter/game/dungeons/DungeonManager.java 26 additions, 3 deletions...in/java/emu/grasscutter/game/dungeons/DungeonManager.java
- src/main/java/emu/grasscutter/game/dungeons/DungeonSettleListener.java 7 additions, 0 deletions.../emu/grasscutter/game/dungeons/DungeonSettleListener.java
- src/main/java/emu/grasscutter/game/dungeons/TowerDungeonSettleListener.java 24 additions, 0 deletions...grasscutter/game/dungeons/TowerDungeonSettleListener.java
- src/main/java/emu/grasscutter/game/expedition/ExpeditionInfo.java 44 additions, 0 deletions.../java/emu/grasscutter/game/expedition/ExpeditionInfo.java
- src/main/java/emu/grasscutter/game/expedition/ExpeditionManager.java 46 additions, 0 deletions...va/emu/grasscutter/game/expedition/ExpeditionManager.java
- src/main/java/emu/grasscutter/game/expedition/ExpeditionRewardData.java 18 additions, 0 deletions...emu/grasscutter/game/expedition/ExpeditionRewardData.java
- src/main/java/emu/grasscutter/game/expedition/ExpeditionRewardDataList.java 15 additions, 0 deletions...grasscutter/game/expedition/ExpeditionRewardDataList.java
- src/main/java/emu/grasscutter/game/expedition/ExpeditionRewardInfo.java 16 additions, 0 deletions...emu/grasscutter/game/expedition/ExpeditionRewardInfo.java
- src/main/java/emu/grasscutter/game/managers/MovementManager/MovementManager.java 20 additions, 10 deletions...cutter/game/managers/MovementManager/MovementManager.java
- src/main/java/emu/grasscutter/game/managers/SotSManager/SotSManager.java 55 additions, 27 deletions...mu/grasscutter/game/managers/SotSManager/SotSManager.java
- src/main/java/emu/grasscutter/game/player/Player.java 48 additions, 0 deletionssrc/main/java/emu/grasscutter/game/player/Player.java
- src/main/java/emu/grasscutter/game/shop/ShopManager.java 3 additions, 9 deletionssrc/main/java/emu/grasscutter/game/shop/ShopManager.java
- src/main/java/emu/grasscutter/game/tower/TowerManager.java 69 additions, 9 deletionssrc/main/java/emu/grasscutter/game/tower/TowerManager.java
- src/main/java/emu/grasscutter/game/world/Scene.java 13 additions, 4 deletionssrc/main/java/emu/grasscutter/game/world/Scene.java
- src/main/java/emu/grasscutter/languages/CNLanguage.java 0 additions, 289 deletionssrc/main/java/emu/grasscutter/languages/CNLanguage.java
- src/main/java/emu/grasscutter/languages/Language.java 0 additions, 300 deletionssrc/main/java/emu/grasscutter/languages/Language.java
Please register or sign in to comment