Rennomage
Merge branch 'master' of https://github.com/Smeagolworms4/CastleDefenders

Conflicts:
	src/minecraft/mods/castledefender/common/CastleDefenderTabs.java
	src/minecraft/mods/castledefender/common/CastleDefendersTabs.java
	src/minecraft/mods/castledefender/common/ClientProxyCastleDefender.java
	src/minecraft/mods/castledefender/common/ClientProxyCastleDefenders.java
	src/minecraft/mods/castledefender/common/CommonProxyCastleDefenders.java
	src/minecraft/mods/castledefender/common/ModCastleDefender.java
	src/minecraft/mods/castledefender/common/ModCastleDefenders.java
	src/minecraft/mods/castledefender/common/RenderCastleDefender.java
	src/minecraft/mods/castledefender/common/RenderCastleDefenders.java
	src/minecraft/mods/castledefender/common/blocks/BlockCastleDefender.java
	src/minecraft/mods/castledefender/common/blocks/BlockCastleDefenders.java
	src/minecraft/mods/castledefenders/common/CastleDefendersTabs.java
	src/minecraft/mods/castledefenders/common/ClientProxyCastleDefenders.java
	src/minecraft/mods/castledefenders/common/ModCastleDefenders.java
	src/minecraft/mods/castledefenders/common/RenderCastleDefenders.java
	src/minecraft/mods/castledefenders/common/blocks/BlockCastleDefenders.java
	src/minecraft/mods/castledefenders/common/entities/EntityDefender.java
	src/minecraft/mods/castledefenders/common/entities/EntityKnight.java
	src/minecraft/mods/castledefenders/common/items/ItemMedallion.java