Jesse Boyd 76a55b7712 Merge remote-tracking branch 'refs/remotes/sk89q/master' ... # Conflicts: # worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitAdapter.java # worldedit-core/src/main/java/com/sk89q/util/yaml/YAMLProcessor.java # worldedit-core/src/main/java/com/sk89q/worldedit/blocks/BlockType.java # worldedit-core/src/main/java/com/sk89q/worldedit/command/ToolCommands.java # worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/BlockReplacer.java # worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/LongRangeBuildTool.java # worldedit-core/src/main/java/com/sk89q/worldedit/extent/reorder/MultiStageReorder.java # worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockType.java # worldedit-core/src/main/java/com/sk89q/worldedit/world/item/ItemType.java		2018-08-14 01:36:00 +10:00
..
src	Merge remote-tracking branch 'refs/remotes/sk89q/master'	2018-08-14 01:36:00 +10:00
build.gradle	Change output jar name	2018-08-13 03:38:20 +10:00