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
..
metadata	Switch to Gradle. Use git log --follow for history.	2014-11-14 11:27:39 -08:00
BaseBlock.java	Merge remote-tracking branch 'refs/remotes/sk89q/master'	2018-08-15 14:02:51 +10:00
BaseItem.java	Copy paste/merge FAWE classes to this WorldEdit fork	2018-08-13 00:03:07 +10:00
BaseItemStack.java	Fixed a few more errors, and added legacy support to the item parser.	2018-08-04 11:43:41 +10:00
BlockMaterial.java	Merge remote-tracking branch 'refs/remotes/sk89q/master'	2018-08-16 20:06:27 +10:00
Blocks.java	Cleanup the bukkit implementation, and update to the 1.13 release items/blocks.	2018-08-04 11:43:41 +10:00
BlockType.java	Fixed some bugs and cleanup some code.	2018-08-13 22:18:12 +10:00
ClothColor.java	Copy paste/merge FAWE classes to this WorldEdit fork	2018-08-13 00:03:07 +10:00
TileEntityBlock.java	Switch to Gradle. Use git log --follow for history.	2014-11-14 11:27:39 -08:00