Conflicts:
	com/mraof/minestuck/item/EnumBladeType.java
	com/mraof/minestuck/item/EnumCaneType.java
	com/mraof/minestuck/item/EnumClubType.java
	com/mraof/minestuck/item/EnumHammerType.java
	com/mraof/minestuck/item/EnumSickleType.java
	com/mraof/minestuck/item/EnumSporkType.java
	com/mraof/minestuck/item/ItemBlade.java
	com/mraof/minestuck/item/ItemBlockLayered.java
	com/mraof/minestuck/item/ItemCane.java
	com/mraof/minestuck/item/ItemChessTile.java
	com/mraof/minestuck/item/ItemClub.java
	com/mraof/minestuck/item/ItemComputerOff.java
	com/mraof/minestuck/item/ItemHammer.java
	com/mraof/minestuck/item/ItemMachine.java
	com/mraof/minestuck/item/ItemSickle.java
	com/mraof/minestuck/item/ItemSpork.java
	com/mraof/minestuck/item/ItemStorageBlock.java
	com/mraof/minestuck/item/ItemWeapon.java
	com/mraof/minestuck/item/block/ItemBlockLayered.java
	com/mraof/minestuck/item/block/ItemChessTile.java
	com/mraof/minestuck/item/block/ItemComputerOff.java
	com/mraof/minestuck/item/block/ItemMachine.java
	com/mraof/minestuck/item/block/ItemStorageBlock.java
	com/mraof/minestuck/item/weapon/EnumBladeType.java
	com/mraof/minestuck/item/weapon/EnumCaneType.java
	com/mraof/minestuck/item/weapon/EnumClubType.java
	com/mraof/minestuck/item/weapon/EnumHammerType.java
	com/mraof/minestuck/item/weapon/EnumSickleType.java
	com/mraof/minestuck/item/weapon/EnumSporkType.java
	com/mraof/minestuck/item/weapon/ItemBlade.java
	com/mraof/minestuck/item/weapon/ItemCane.java
	com/mraof/minestuck/item/weapon/ItemClub.java
	com/mraof/minestuck/item/weapon/ItemHammer.java
	com/mraof/minestuck/item/weapon/ItemSickle.java
	com/mraof/minestuck/item/weapon/ItemSpork.java
	com/mraof/minestuck/item/weapon/ItemWeapon.java
	src/com/mraof/minestuck/editmode/SburbEditController.java
	src/com/mraof/minestuck/editmode/SburbEditManager.java
	src/com/mraof/minestuck/item/EnumBladeType.java
	src/com/mraof/minestuck/item/EnumCaneType.java
	src/com/mraof/minestuck/item/EnumClubType.java
	src/com/mraof/minestuck/item/EnumHammerType.java
	src/com/mraof/minestuck/item/EnumSickleType.java
	src/com/mraof/minestuck/item/EnumSporkType.java
	src/com/mraof/minestuck/item/ItemBlade.java
	src/com/mraof/minestuck/item/ItemBlockLayered.java
	src/com/mraof/minestuck/item/ItemCane.java
	src/com/mraof/minestuck/item/ItemCardBlank.java
	src/com/mraof/minestuck/item/ItemChessTile.java
	src/com/mraof/minestuck/item/ItemClub.java
	src/com/mraof/minestuck/item/ItemComputerOff.java
	src/com/mraof/minestuck/item/ItemHammer.java
	src/com/mraof/minestuck/item/ItemMachine.java
	src/com/mraof/minestuck/item/ItemSickle.java
	src/com/mraof/minestuck/item/ItemSpork.java
	src/com/mraof/minestuck/item/ItemStorageBlock.java
	src/com/mraof/minestuck/item/ItemWeapon.java