dordsor21 3b19738ea0 Merge branch '1.15' into 1.16 ... # Conflicts: # worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/adapter/mc1_16_1/BukkitGetBlocks_1_16_1.java # worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/AsyncWorld.java # worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/wrapper/state/AsyncDataContainer.java		2020-07-01 12:47:04 +01:00
..
legacy/java/com/sk89q/worldedit/blocks	Upstream Merge	2020-01-10 22:32:12 -05:00
main	Merge branch '1.15' into 1.16	2020-07-01 12:47:04 +01:00
test	Revert "Revert matt's changes"	2020-06-13 14:41:36 -04:00