mirror of
https://github.com/Grasscutters/Grasscutter.git
synced 2025-12-22 03:45:10 +01:00
# 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