moved stuff around

Signed-off-by: makidelille <makidelille@hotmail.fr>
Merge branch 'master' of https://github.com/makidelille/DeadCraft

Conflicts:
	common/mak/dc/DeadCraft.java
	common/mak/dc/blocks/BlockEnderPearlBlock.java
	common/mak/dc/client/IInventoryRenderer.java
	common/mak/dc/client/gui/GuiDeadCraftBlockMain.java
	common/mak/dc/client/gui/GuiEggSpawner.java
	common/mak/dc/client/gui/GuiEnderConverter.java
	common/mak/dc/client/gui/GuiGodBottler.java
	common/mak/dc/client/gui/GuiHandler.java
	common/mak/dc/client/gui/container/ContainerDeadCraft.java
	common/mak/dc/client/gui/container/ContainerEggSpawner.java
	common/mak/dc/client/gui/container/ContainerEnderConverter.java
	common/mak/dc/client/gui/container/ContainerGodBottler.java
	common/mak/dc/client/gui/container/slot/SlotEggSpawner.java
	common/mak/dc/client/gui/container/slot/SlotGodBottler.java
	common/mak/dc/client/gui/util/GuiCustom.java
	common/mak/dc/client/gui/util/GuiDrawHelper.java
	common/mak/dc/client/gui/util/GuiRectangle.java
	common/mak/dc/client/gui/util/GuiSlider.java
	common/mak/dc/client/gui/util/TabGui.java
	common/mak/dc/client/model/ModelGodBottler.java
	common/mak/dc/client/model/ModelGodCan.java
	common/mak/dc/client/model/ModelMindController.java
	common/mak/dc/client/render/TESRInventoryRenderer.java
	common/mak/dc/client/render/block/SpecialRenderTileEntityEnderConverter.java
	common/mak/dc/client/render/block/SpecialRenderTileEntityGodBottler.java
	common/mak/dc/client/render/item/RendererItemGodCan.java
	common/mak/dc/client/render/item/RendererItemMindController.java
	common/mak/dc/common/blocks/BlockEnderPearlBlock.java
	src/mak/dc/client/gui/util/GuiSwitch.java
	src/mak/dc/common/blocks/BlockEnderPearlBlock.java