Jesse Boyd 6ebdc00fba Merge remote-tracking branch 'refs/remotes/sk89q/master' ... # Conflicts: # worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBlockRegistry.java # worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java # worldedit-core/src/main/java/com/sk89q/worldedit/blocks/BlockMaterial.java # worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/FloatingTreeRemover.java # worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/LongRangeBuildTool.java # worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/RecursivePickaxe.java # worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/brush/GravityBrush.java # worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/AbstractPlayerActor.java # worldedit-core/src/main/java/com/sk89q/worldedit/extent/inventory/BlockBagExtent.java # worldedit-core/src/main/java/com/sk89q/worldedit/util/TargetBlock.java # worldedit-core/src/main/java/com/sk89q/worldedit/world/chunk/OldChunk.java # worldedit-core/src/main/java/com/sk89q/worldedit/world/registry/PassthroughBlockMaterial.java		2018-08-16 20:06:27 +10:00
..
src	Merge remote-tracking branch 'refs/remotes/sk89q/master'	2018-08-16 20:06:27 +10:00
build.gradle	Create pom	2018-08-14 20:41:52 +10:00