mirror of
https://github.com/plexusorg/Plex-FAWE.git
synced 2024-12-22 17:27:38 +00:00
Merge remote-tracking branch 'origin/1.15' into 1.15
# Conflicts: # worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/SelectionWand.java # worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlatformManager.java
This commit is contained in:
commit
c6eefa250e