Merge branch 'development' into stable

a8293102 · Melledy · GitHub · 304b9cb8 · ecf7a81a · a8293102
Commit a8293102 authored Jun 07, 2022 by Melledy Committed by GitHub Jun 07, 2022
--- a/src/main/java/emu/grasscutter/data/def/ReliquarySetData.java
+++ b/src/main/java/emu/grasscutter/data/def/ReliquarySetData.java
--- a/src/main/java/emu/grasscutter/data/def/RewardData.java
+++ b/src/main/java/emu/grasscutter/data/def/RewardData.java
--- a/src/main/java/emu/grasscutter/data/def/RewardPreviewData.java
+++ b/src/main/java/emu/grasscutter/data/def/RewardPreviewData.java
--- a/src/main/java/emu/grasscutter/data/def/SceneData.java
+++ b/src/main/java/emu/grasscutter/data/def/SceneData.java
--- a/src/main/java/emu/grasscutter/data/def/ShopGoodsData.java
+++ b/src/main/java/emu/grasscutter/data/def/ShopGoodsData.java
--- a/src/main/java/emu/grasscutter/data/def/TowerFloorData.java
+++ b/src/main/java/emu/grasscutter/data/def/TowerFloorData.java
--- a/src/main/java/emu/grasscutter/data/def/TowerLevelData.java
+++ b/src/main/java/emu/grasscutter/data/def/TowerLevelData.java
--- a/src/main/java/emu/grasscutter/data/excels/TowerScheduleData.java
+++ b/src/main/java/emu/grasscutter/data/excels/TowerScheduleData.java
--- a/src/main/java/emu/grasscutter/data/def/WeaponCurveData.java
+++ b/src/main/java/emu/grasscutter/data/def/WeaponCurveData.java
--- a/src/main/java/emu/grasscutter/data/def/WeaponLevelData.java
+++ b/src/main/java/emu/grasscutter/data/def/WeaponLevelData.java
--- a/src/main/java/emu/grasscutter/data/def/WeaponPromoteData.java
+++ b/src/main/java/emu/grasscutter/data/def/WeaponPromoteData.java
--- a/src/main/java/emu/grasscutter/data/def/WorldLevelData.java
+++ b/src/main/java/emu/grasscutter/data/def/WorldLevelData.java
--- a/src/main/java/emu/grasscutter/database/DatabaseHelper.java
+++ b/src/main/java/emu/grasscutter/database/DatabaseHelper.java
--- a/src/main/java/emu/grasscutter/database/DatabaseManager.java
+++ b/src/main/java/emu/grasscutter/database/DatabaseManager.java
--- a/src/main/java/emu/grasscutter/game/Account.java
+++ b/src/main/java/emu/grasscutter/game/Account.java
--- a/src/main/java/emu/grasscutter/game/ability/AbilityManager.java
+++ b/src/main/java/emu/grasscutter/game/ability/AbilityManager.java
--- a/src/main/java/emu/grasscutter/game/avatar/Avatar.java
+++ b/src/main/java/emu/grasscutter/game/avatar/Avatar.java
--- a/src/main/java/emu/grasscutter/game/avatar/AvatarStorage.java
+++ b/src/main/java/emu/grasscutter/game/avatar/AvatarStorage.java
--- a/src/main/java/emu/grasscutter/game/combine/CombineManger.java
+++ b/src/main/java/emu/grasscutter/game/combine/CombineManger.java
--- a/src/main/java/emu/grasscutter/game/combine/CombineResult.java
+++ b/src/main/java/emu/grasscutter/game/combine/CombineResult.java