Merge branch 'development' into more-events
# Conflicts: # src/main/java/emu/grasscutter/command/commands/TeleportAllCommand.java # src/main/java/emu/grasscutter/game/entity/EntityAvatar.java # src/main/java/emu/grasscutter/game/entity/GameEntity.java # src/main/java/emu/grasscutter/game/managers/mapmark/MapMarksManager.java
Please register or sign in to comment