modified:   mod plan thing.txt
	renamed:    src/nedhyett/elementalcraft/turret/EnumTurretStage.java -> src/nedhyett/elementalcraft/block/turret/EnumTurretStage.java
	modified:   src/nedhyett/elementalcraft/block/turret/TileTurret.java
	renamed:    src/nedhyett/elementalcraft/turret/TurretBehaviourRegistry.java -> src/nedhyett/elementalcraft/block/turret/TurretBehaviourRegistry.java
	renamed:    src/nedhyett/elementalcraft/turret/TurretUpgrade.java -> src/nedhyett/elementalcraft/block/turret/TurretUpgrade.java
	renamed:    src/nedhyett/elementalcraft/turret/logic/TurretLogicCloseCreeper.java -> src/nedhyett/elementalcraft/block/turret/logic/TurretLogicCloseCreeper.java
	renamed:    src/nedhyett/elementalcraft/turret/logic/TurretLogicExplosive.java -> src/nedhyett/elementalcraft/block/turret/logic/TurretLogicExplosive.java
	renamed:    src/nedhyett/elementalcraft/turret/logic/TurretLogicFireArrows.java -> src/nedhyett/elementalcraft/block/turret/logic/TurretLogicFireArrows.java
	renamed:    src/nedhyett/elementalcraft/turret/logic/TurretLogicNoTargetPlayers.java -> src/nedhyett/elementalcraft/block/turret/logic/TurretLogicNoTargetPlayers.java
	renamed:    src/nedhyett/elementalcraft/turret/logic/TurretLogicRange.java -> src/nedhyett/elementalcraft/block/turret/logic/TurretLogicRange.java
	renamed:    src/nedhyett/elementalcraft/turret/logic/TurretLogicRange2.java -> src/nedhyett/elementalcraft/block/turret/logic/TurretLogicRange2.java
	renamed:    src/nedhyett/elementalcraft/turret/logic/TurretLogicRange3.java -> src/nedhyett/elementalcraft/block/turret/logic/TurretLogicRange3.java
	renamed:    src/nedhyett/elementalcraft/turret/logic/TurretLogicSpeed.java -> src/nedhyett/elementalcraft/block/turret/logic/TurretLogicSpeed.java
	renamed:    src/nedhyett/elementalcraft/turret/logic/TurretLogicSpeed2.java -> src/nedhyett/elementalcraft/block/turret/logic/TurretLogicSpeed2.java
	renamed:    src/nedhyett/elementalcraft/turret/logic/TurretLogicSpeed3.java -> src/nedhyett/elementalcraft/block/turret/logic/TurretLogicSpeed3.java
	renamed:    src/nedhyett/elementalcraft/turret/logic/TurretLogicStun.java -> src/nedhyett/elementalcraft/block/turret/logic/TurretLogicStun.java
	renamed:    src/nedhyett/elementalcraft/turret/logic/TurretLogicTargetOnlyPlayers.java -> src/nedhyett/elementalcraft/block/turret/logic/TurretLogicTargetOnlyPlayers.java
	modified:   src/nedhyett/elementalcraft/core/ElementalCraft.java
	modified:   src/nedhyett/elementalcraft/core/ElementalCraftBlocks.java
	modified:   src/nedhyett/elementalcraft/core/ElementalCraftEntities.java
	modified:   src/nedhyett/elementalcraft/core/ElementalCraftItems.java
	modified:   src/nedhyett/elementalcraft/core/ElementalCraftRecipes.java
	modified:   src/nedhyett/elementalcraft/items/ElementalCraftItem.java
Merge branch 'master' of https://github.com/nedhyett/ElementalCraft

Conflicts:
	src/nedhyett/elementalcraft/core/ElementalCraftEntities.java
	src/nedhyett/elementalcraft/core/ElementalCraftRecipes.java