2.7 Merge (2915b14c) · Commits · ziqian zhang / Grasscutter · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

G

Grasscutter
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Releases
- Package Registry
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

ziqian zhang
Grasscutter
Commits
2915b14c

There was an error fetching the commit references. Please try again later.

Commit 2915b14c authored 3 years ago by

Melledy

Downloads
- Patches
- Plain Diff

2.7 Merge

parent 30c7bb94

Changes 11

Show whitespace changes

Inline Side-by-side

Showing

src/main/java/emu/grasscutter/data/binout/SceneNpcBornData.java 1 addition, 1 deletion

...in/java/emu/grasscutter/data/binout/SceneNpcBornData.java
src/main/java/emu/grasscutter/data/binout/SceneNpcBornEntry.java 14 additions, 1 deletion

...n/java/emu/grasscutter/data/binout/SceneNpcBornEntry.java
src/main/java/emu/grasscutter/data/excels/GatherData.java 15 additions, 15 deletions

src/main/java/emu/grasscutter/data/excels/GatherData.java
src/main/java/emu/grasscutter/data/excels/InvestigationMonsterData.java 9 additions, 9 deletions

...emu/grasscutter/data/excels/InvestigationMonsterData.java
src/main/java/emu/grasscutter/game/dungeons/challenge/DungeonChallenge.java 1 addition, 1 deletion

...grasscutter/game/dungeons/challenge/DungeonChallenge.java
src/main/java/emu/grasscutter/game/entity/EntityNPC.java 1 addition, 1 deletion

src/main/java/emu/grasscutter/game/entity/EntityNPC.java
src/main/java/emu/grasscutter/game/entity/gadget/GadgetChest.java 5 additions, 6 deletions

.../java/emu/grasscutter/game/entity/gadget/GadgetChest.java
src/main/java/emu/grasscutter/game/entity/gadget/GadgetGatherPoint.java 1 addition, 1 deletion

...emu/grasscutter/game/entity/gadget/GadgetGatherPoint.java
src/main/java/emu/grasscutter/game/entity/gadget/GadgetRewardStatue.java 1 addition, 1 deletion

...mu/grasscutter/game/entity/gadget/GadgetRewardStatue.java
src/main/java/emu/grasscutter/game/world/WorldDataManager.java 1 addition, 1 deletion

...ain/java/emu/grasscutter/game/world/WorldDataManager.java
src/main/java/emu/grasscutter/scripts/SceneScriptManager.java 5 additions, 5 deletions

...main/java/emu/grasscutter/scripts/SceneScriptManager.java

with 54 additions and 42 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment