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:
MattBDev 2020-04-27 19:04:52 -04:00
commit c6eefa250e

Diff Content Not Available