Jesse Boyd a67441bbff Merge remote-tracking branch 'refs/remotes/sk89q/master' ... # Conflicts: # worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java # worldedit-core/src/main/java/com/sk89q/worldedit/blocks/BaseBlock.java # worldedit-core/src/main/java/com/sk89q/worldedit/world/NullWorld.java		2018-08-15 14:02:51 +10:00
..
com	Merge remote-tracking branch 'refs/remotes/sk89q/master'	2018-08-15 14:02:51 +10:00
net/jpountz	Copy paste/merge FAWE classes to this WorldEdit fork	2018-08-13 00:03:07 +10:00