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

Dieser Commit ist enthalten in:

MattBDev

2020-04-27 19:04:52 -04:00

Ursprung b13dea19c5 b1ea736eb2

Commit c6eefa250e

Merge remote-tracking branch 'origin/1.15' into 1.15

Keine Diff-Daten verfügbar