Merge branch 'development' into unstable-quests

Browse Source

# Conflicts:
#	src/generated/main/java/emu/grasscutter/net/proto/ScenePointUnlockNotifyOuterClass.java
#	src/main/java/emu/grasscutter/game/dungeons/DungeonSystem.java
#	src/main/java/emu/grasscutter/server/packet/recv/HandlerCombatInvocationsNotify.java
#	src/main/java/emu/grasscutter/server/packet/recv/HandlerDungeonEntryInfoReq.java

...

This commit is contained in:

KingRainbow44

2023-04-18 15:36:29 -04:00

parent 0dd41f9350 8c6b166a42

commit 361620de6d

5 changed files with 1321 additions and 1590 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2900

src/generated/main/java/emu/grasscutter/net/proto/ScenePointUnlockNotifyOuterClass.java

File diff suppressed because it is too large Load Diff