Merge remote-tracking branch 'origin/development' into development
Showing
- src/main/java/emu/grasscutter/game/battlepass/BattlePassReward.java 52 additions, 0 deletions...ava/emu/grasscutter/game/battlepass/BattlePassReward.java
- src/main/java/emu/grasscutter/game/dungeons/challenge/DungeonChallenge.java 3 additions, 0 deletions...grasscutter/game/dungeons/challenge/DungeonChallenge.java
- src/main/java/emu/grasscutter/game/entity/EntityMonster.java 3 additions, 0 deletionssrc/main/java/emu/grasscutter/game/entity/EntityMonster.java
- src/main/java/emu/grasscutter/game/gacha/GachaManager.java 5 additions, 1 deletionsrc/main/java/emu/grasscutter/game/gacha/GachaManager.java
- src/main/java/emu/grasscutter/game/inventory/GameItem.java 93 additions, 177 deletionssrc/main/java/emu/grasscutter/game/inventory/GameItem.java
- src/main/java/emu/grasscutter/game/inventory/Inventory.java 103 additions, 89 deletionssrc/main/java/emu/grasscutter/game/inventory/Inventory.java
- src/main/java/emu/grasscutter/game/managers/InventoryManager.java 2 additions, 8 deletions.../java/emu/grasscutter/game/managers/InventoryManager.java
- src/main/java/emu/grasscutter/game/managers/ResinManager.java 5 additions, 5 deletions...main/java/emu/grasscutter/game/managers/ResinManager.java
- src/main/java/emu/grasscutter/game/managers/SotSManager.java 1 addition, 2 deletionssrc/main/java/emu/grasscutter/game/managers/SotSManager.java
- src/main/java/emu/grasscutter/game/managers/energy/EnergyManager.java 5 additions, 0 deletions...a/emu/grasscutter/game/managers/energy/EnergyManager.java
- src/main/java/emu/grasscutter/game/managers/forging/ForgingManager.java 20 additions, 4 deletions...emu/grasscutter/game/managers/forging/ForgingManager.java
- src/main/java/emu/grasscutter/game/managers/stamina/StaminaManager.java 3 additions, 6 deletions...emu/grasscutter/game/managers/stamina/StaminaManager.java
- src/main/java/emu/grasscutter/game/player/Player.java 126 additions, 140 deletionssrc/main/java/emu/grasscutter/game/player/Player.java
- src/main/java/emu/grasscutter/game/props/BattlePassMissionRefreshType.java 18 additions, 0 deletions.../grasscutter/game/props/BattlePassMissionRefreshType.java
- src/main/java/emu/grasscutter/game/props/BattlePassMissionStatus.java 26 additions, 0 deletions...a/emu/grasscutter/game/props/BattlePassMissionStatus.java
- src/main/java/emu/grasscutter/game/props/FightProperty.java 67 additions, 0 deletionssrc/main/java/emu/grasscutter/game/props/FightProperty.java
- src/main/java/emu/grasscutter/game/props/PlayerProperty.java 58 additions, 24 deletionssrc/main/java/emu/grasscutter/game/props/PlayerProperty.java
- src/main/java/emu/grasscutter/game/props/WatcherTriggerType.java 337 additions, 0 deletions...n/java/emu/grasscutter/game/props/WatcherTriggerType.java
- src/main/java/emu/grasscutter/game/tower/TowerScheduleManager.java 7 additions, 0 deletions...java/emu/grasscutter/game/tower/TowerScheduleManager.java
- src/main/java/emu/grasscutter/server/game/GameServer.java 23 additions, 60 deletionssrc/main/java/emu/grasscutter/server/game/GameServer.java
Please register or sign in to comment