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
..
antlr/com/sk89q/worldedit/antlr	Fix exponent parsing, remove impossible (?) case	2020-03-02 19:18:00 -05:00
java	Merge branch '1.15' into 1.16	2020-07-01 12:47:04 +01:00
resources	Cherry-pick WNA, minor changes. 1.16 VERY WIP	2020-06-29 22:05:41 -04:00