Merge branch 'Build78Fixed' into UpgradeToMC1.7.2

Conflicts:
	TFC_Shared/src/TFC/TileEntities/TileEntityPottery.java
	src/main/java/TFC/Blocks/Devices/BlockBlastFurnace.java
	src/main/java/TFC/Blocks/Devices/BlockEarlyBloomery.java
	src/main/java/TFC/Blocks/Devices/BlockPottery.java
	src/main/java/TFC/Containers/ContainerBlastFurnace.java
	src/main/java/TFC/Core/Player/FoodStatsTFC.java
	src/main/java/TFC/Handlers/CraftingHandler.java
	src/main/java/TFC/Handlers/EntityLivingHandler.java
	src/main/java/TFC/Items/Tools/ItemFirestarter.java
	src/main/java/TFC/TileEntities/TileEntityAnvil.java
Merge branch 'Build78Fixed' into UpgradeToMC1.7.2

Conflicts:
	TFC API/TFC/API/Constant/TFCItemID.java
	TFC_Shared/src/TFC/Blocks/BlockFarmland.java
	TFC_Shared/src/TFC/TFCItems.java
	src/main/java/TFC/Blocks/BlockCrop.java
	src/main/java/TFC/Handlers/Client/FarmlandHighlightHandler.java
	src/main/java/TFC/Render/Blocks/RenderCrop.java
Merge branch 'Build78Fixed' into UpgradeToMC1.7.2

Conflicts:
	TFC Resources/assets/terrafirmacraft/textures/items/egg.png
	TFC Resources/assets/terrafirmacraft/textures/items/food/egg.png
	TFC_Shared/src/TFC/Blocks/Terrain/BlockOre2.java
	TFC_Shared/src/TFC/Blocks/Terrain/BlockOre3.java
	TFC_Shared/src/TFC/Core/TFC_Achievements.java
	TFC_Shared/src/TFC/Items/Tools/ItemCustomBucketMilk.java
	TFC_Shared/src/TFC/TFCItems.java
	TFC_Shared/src/TFC/WorldGen/Generators/WorldGenOre.java
	src/main/java/TFC/Blocks/Terrain/BlockOre.java
	src/main/java/TFC/Blocks/Vanilla/BlockCustomTallGrass.java
	src/main/java/TFC/Containers/ContainerAnvil.java
	src/main/java/TFC/Containers/ContainerPlayerTFC.java
	src/main/java/TFC/Core/TFC_Core.java
	src/main/java/TFC/Entities/Mobs/EntityCowTFC.java
	src/main/java/TFC/Food/ItemEgg.java
	src/main/java/TFC/GUI/GuiCalendar.java
	src/main/java/TFC/Items/ItemBlocks/ItemFoodBlock.java
	src/main/java/TFC/Items/Tools/ItemCustomAxe.java
	src/main/java/TFC/Items/Tools/ItemHammer.java
	src/main/java/TFC/Items/Tools/ItemWeapon.java
	src/main/java/TFC/Render/Blocks/RenderOre.java
	src/main/java/TFC/TerraFirmaCraft.java
	src/main/java/TFC/TileEntities/TENestBox.java
	src/main/java/TFC/WorldGen/Generators/WorldGenFissure.java
	src/main/java/TFC/WorldGen/Generators/WorldGenMinable.java
	src/main/java/TFC/WorldGen/Generators/WorldGenSoilPits.java
	src/main/java/TFC/WorldGen/TFCChunkProviderGenerate.java
	src/main/resources/assets/terrafirmacraft/textures/items/egg.png
Merge branch 'Build78Fixed' into UpgradeToMC1.7.2

Conflicts:
	TFC_Shared/src/TFC/Food/ItemRawFood.java
	src/main/java/TFC/Core/TFC_ItemHeat.java
Merge branch 'master' into UpgradeToMC1.7.2

Conflicts:
	TFC_Shared/src/TFC/Blocks/BlockStalactite.java
	TFC_Shared/src/TFC/Entities/Mobs/EntityZombieTFC.java
	TFC_Shared/src/TFC/TFCItems.java
	TFC_Shared/src/TFC/WorldGen/Generators/WorldGenCaveDecor.java
	src/main/java/TFC/Blocks/Devices/BlockPottery.java
	src/main/java/TFC/Blocks/Flora/BlockLogNatural.java
	src/main/java/TFC/Blocks/Terrain/BlockDirt.java
	src/main/java/TFC/Blocks/Terrain/BlockGrass.java
	src/main/java/TFC/Containers/ContainerPlayerTFC.java
	src/main/java/TFC/Core/Recipes.java
	src/main/java/TFC/Core/TFC_Core.java
	src/main/java/TFC/Core/TFC_ItemHeat.java
	src/main/java/TFC/Entities/Mobs/EntityPheasantTFC.java
	src/main/java/TFC/Food/ItemEgg.java
	src/main/java/TFC/GUI/GuiContainerTFC.java
	src/main/java/TFC/GUI/GuiInventoryTFC.java
	src/main/java/TFC/Handlers/CraftingHandler.java
	src/main/java/TFC/Handlers/EntityDamageHandler.java
	src/main/java/TFC/Render/TESR/TESRSeaWeed.java
	src/main/java/TFC/TerraFirmaCraft.java
	src/main/java/TFC/TileEntities/TileEntityQuern.java
	src/main/java/TFC/WorldGen/Generators/Trees/WorldGenDouglasFir.java
	src/main/java/TFC/WorldGen/TFCChunkProviderGenerate.java
Merge branch 'master' into UpgradeToMC1.7.2
Merge branch 'master' into UpgradeToMC1.7.2

Conflicts:
	TFC_Shared/src/TFC/Containers/ContainerSkills.java
	TFC_Shared/src/TFC/Core/Player/PlayerTracker.java
	TFC_Shared/src/TFC/TFCItems.java
	src/main/java/TFC/Core/Recipes.java
	src/main/java/TFC/Food/ItemMeal.java
	src/main/java/TFC/Handlers/Client/RenderOverlayHandler.java
	src/main/java/TFC/Handlers/EntityLivingHandler.java
	src/main/java/TFC/Items/Tools/ItemGoldPan.java
	src/main/java/TFC/Items/Tools/ItemHammer.java
	src/main/java/TFC/TileEntities/TileEntityFoodPrep.java
	src/main/java/TFC/TileEntities/TileEntityQuern.java
	src/main/java/TFC/WorldGen/Generators/WorldGenGrowCrops.java
Merge branch 'master' into UpgradeToMC1.7.2

Conflicts:
	TFC_Shared/src/TFC/Blocks/Flora/BlockFruitWood.java
	TFC_Shared/src/TFC/TFCBlocks.java
	src/main/java/TFC/Blocks/Vanilla/BlockCustomSnow.java
	src/main/java/TFC/Items/ItemFruitTreeSapling.java
	src/main/java/TFC/WorldGen/Generators/WorldGenLooseRocks.java
Merge branch 'master' into UpgradeToMC1.7.2

Conflicts:
	src/main/java/TFC/Core/Recipes.java
	src/main/java/TFC/GUI/GuiCalendar.java
	src/main/java/TFC/GUI/GuiHealth.java
	src/main/java/TFC/GUI/GuiSkills.java
	src/main/java/TFC/Items/ItemFruitTreeSapling.java
	src/main/java/TFC/TileEntities/TileEntityBarrel.java
	src/main/java/TFC/TileEntities/TileEntityQuern.java
Moving away from replacing vanilla blocks.

Worldgen uses only TFC blocks now.
Fixing a lot of derps i made... i need more sleep :/
Merge branch 'master' into UpgradeToMC1.7.2

Conflicts:
	src/main/java/TFC/Blocks/Terrain/BlockFreshWaterFlowing.java
	src/main/java/TFC/Blocks/Vanilla/BlockCustomFlowing.java
	src/main/java/TFC/Blocks/Vanilla/BlockCustomLiquid.java
	src/main/java/TFC/Containers/ContainerAnvil.java
	src/main/java/TFC/Containers/ContainerForge.java
	src/main/java/TFC/Core/TFC_Core.java
	src/main/java/TFC/Handlers/FoodCraftingHandler.java
	src/main/java/TFC/Items/Tools/ItemGoldPan.java
	src/main/java/TFC/TileEntities/TileEntityFoodPrep.java
	src/main/java/TFC/WorldGen/TFCProvider.java
Merge branch 'master' into UpgradeToMC1.7.2
Added item registering and fixed all double names,

also fixed stone item tools & heads icon registering.
Merge branch 'master' into UpgradeToMC1.7.2

Conflicts:
	src/main/java/TFC/Blocks/Terrain/BlockFreshWaterFlowing.java
	src/main/java/TFC/Blocks/Vanilla/BlockCustomFlowing.java
	src/main/java/TFC/Blocks/Vanilla/BlockCustomLiquid.java
	src/main/java/TFC/Containers/ContainerAnvil.java
	src/main/java/TFC/Containers/ContainerForge.java
	src/main/java/TFC/Core/TFC_Core.java
	src/main/java/TFC/Handlers/FoodCraftingHandler.java
	src/main/java/TFC/Items/Tools/ItemGoldPan.java
	src/main/java/TFC/TileEntities/TileEntityFoodPrep.java
	src/main/java/TFC/WorldGen/TFCProvider.java
Fixed the InvisibleTexture registering,

also the rest of the items are getting registered now.
Merge branch 'master' into UpgradeToMC1.7.2

Conflicts:
	src/main/java/TFC/CommonProxy.java
	src/main/java/TFC/Core/Recipes.java
	src/main/java/TFC/Entities/Mobs/EntityChickenTFC.java
	src/main/java/TFC/Handlers/CraftingHandler.java
	src/main/java/TFC/Items/ItemFertilizer.java
	src/main/java/TFC/Items/ItemMetalSheet.java
	src/main/java/TFC/Items/ItemOre.java
	src/main/java/TFC/Render/RenderPlayerTFC.java
	src/main/java/TFC/TileEntities/TileEntityChestTFC.java
Added a new block Crops and did some code cleanup
Merge branch 'master' into UpgradeToMC1.7.2

Conflicts:
	TFC_Shared/src/TFC/Core/TFC_Achievements.java
	src/main/java/TFC/ClientProxy.java
	src/main/java/TFC/CommonProxy.java
	src/main/java/TFC/Handlers/EntityLivingHandler.java
	src/main/java/TFC/TerraFirmaCraft.java
Added new LilyPad block & item, vanilla waterlily is not being replaced anymore
I forgot to add a method to the LilyPad block