Plex-FAWE/worldedit-bukkit
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
..
src Merge branch '1.15' into 1.16 2020-07-01 12:47:04 +01:00
build.gradle.kts 1.16.1 Prep work 2020-06-25 20:29:09 -04:00