Merge branch 'development' into stable (a8293102) · Commits · ziqian zhang / Grasscutter

Commit a8293102 authored 3 years ago by

Melledy Committed by GitHub 3 years ago

Browse files

Merge branch 'development' into stable

parents 304b9cb8 ecf7a81a

Branches main

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/emu/grasscutter/data/excels/CodexWeaponData.java 29 additions, 0 deletions

...ain/java/emu/grasscutter/data/excels/CodexWeaponData.java
src/main/java/emu/grasscutter/data/excels/CombineData.java 83 additions, 0 deletions

src/main/java/emu/grasscutter/data/excels/CombineData.java
src/main/java/emu/grasscutter/data/excels/DailyDungeonData.java 17 additions, 17 deletions

...in/java/emu/grasscutter/data/excels/DailyDungeonData.java
src/main/java/emu/grasscutter/data/excels/DungeonData.java 11 additions, 11 deletions

src/main/java/emu/grasscutter/data/excels/DungeonData.java
src/main/java/emu/grasscutter/data/excels/EnvAnimalGatherConfigData.java 40 additions, 0 deletions

...mu/grasscutter/data/excels/EnvAnimalGatherConfigData.java
src/main/java/emu/grasscutter/data/excels/EquipAffixData.java 16 additions, 16 deletions

...main/java/emu/grasscutter/data/excels/EquipAffixData.java
src/main/java/emu/grasscutter/data/excels/FetterCharacterCardData.java 24 additions, 24 deletions

.../emu/grasscutter/data/excels/FetterCharacterCardData.java
src/main/java/emu/grasscutter/data/excels/FetterData.java 32 additions, 32 deletions

src/main/java/emu/grasscutter/data/excels/FetterData.java
src/main/java/emu/grasscutter/data/excels/GadgetData.java 19 additions, 19 deletions

src/main/java/emu/grasscutter/data/excels/GadgetData.java
src/main/java/emu/grasscutter/data/excels/ItemData.java 267 additions, 0 deletions

src/main/java/emu/grasscutter/data/excels/ItemData.java
src/main/java/emu/grasscutter/data/excels/MonsterCurveData.java 8 additions, 8 deletions

...in/java/emu/grasscutter/data/excels/MonsterCurveData.java
src/main/java/emu/grasscutter/data/excels/MonsterData.java 63 additions, 61 deletions

src/main/java/emu/grasscutter/data/excels/MonsterData.java
src/main/java/emu/grasscutter/data/excels/MonsterDescribeData.java 11 additions, 11 deletions

...java/emu/grasscutter/data/excels/MonsterDescribeData.java
src/main/java/emu/grasscutter/data/excels/NpcData.java 25 additions, 25 deletions

src/main/java/emu/grasscutter/data/excels/NpcData.java
src/main/java/emu/grasscutter/data/excels/PlayerLevelData.java 10 additions, 10 deletions

...ain/java/emu/grasscutter/data/excels/PlayerLevelData.java
src/main/java/emu/grasscutter/data/excels/ProudSkillData.java 31 additions, 31 deletions

...main/java/emu/grasscutter/data/excels/ProudSkillData.java
src/main/java/emu/grasscutter/data/excels/QuestData.java 126 additions, 0 deletions

src/main/java/emu/grasscutter/data/excels/QuestData.java
src/main/java/emu/grasscutter/data/excels/ReliquaryAffixData.java 20 additions, 22 deletions

.../java/emu/grasscutter/data/excels/ReliquaryAffixData.java
src/main/java/emu/grasscutter/data/excels/ReliquaryLevelData.java 14 additions, 14 deletions

.../java/emu/grasscutter/data/excels/ReliquaryLevelData.java
src/main/java/emu/grasscutter/data/excels/ReliquaryMainPropData.java 11 additions, 17 deletions

...va/emu/grasscutter/data/excels/ReliquaryMainPropData.java

with 857 additions and 318 deletions

Please register or to comment