Sand and Farmland now use stone name in texture name.
Fixed swapped dirt textures.
Recolored some dirt and farmland textures.
Merge branch 'Build78Fixed' into UpgradeToMC1.7.2

Conflicts:
	TFC Resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland Andesite.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland Chalk.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland Chert.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland Claystone.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland Conglomerate.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland Dacite.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland Diorite.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland Dolomite.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland Gabbro.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland Gneiss.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland Granite.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland Limestone.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland Marble.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland Phyllite.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland Quartzite.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland Rock Salt.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland Schist.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland Slate.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland0.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland1.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland10.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland11.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland13.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland14.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland15.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland16.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland17.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland18.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland19.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland2.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland20.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland4.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland5.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland6.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland7.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland8.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/sand/Sand Andesite.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/sand/Sand Basalt.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/sand/Sand Chalk.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/sand/Sand Chert.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/sand/Sand Claystone.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/sand/Sand Conglomerate.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/sand/Sand Dacite.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/sand/Sand Dolomite.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/sand/Sand Gneiss.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/sand/Sand Limestone.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/sand/Sand Marble.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/sand/Sand Phyllite.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/sand/Sand Quartzite.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/sand/Sand Rhyolite.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/sand/Sand Rock Salt.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/sand/Sand Schist.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/sand/Sand Shale.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/sand/Sand Slate.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/sand/Sand10.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/sand/Sand11.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/sand/Sand12.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/sand/Sand13.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/sand/Sand14.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/sand/Sand15.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/sand/Sand16.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/sand/Sand17.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/sand/Sand18.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/sand/Sand19.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/sand/Sand20.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/sand/Sand3.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/sand/Sand4.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/sand/Sand5.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/sand/Sand6.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/sand/Sand7.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/sand/Sand8.png
	TFC Resources/assets/terrafirmacraft/textures/blocks/sand/Sand9.png
	TFC_Shared/src/TFC/Blocks/BlockFarmland.java
	TFC_Shared/src/TFC/Blocks/Terrain/BlockSand.java
	TFC_Shared/src/TFC/Items/ItemBlocks/ItemSand.java
	TFC_Shared/src/TFC/TFCBlocks.java
	src/main/java/TFC/Blocks/Terrain/BlockSand2.java
	src/main/resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland0.png
	src/main/resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland1.png
	src/main/resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland10.png
	src/main/resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland11.png
	src/main/resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland12.png
	src/main/resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland13.png
	src/main/resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland14.png
	src/main/resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland15.png
	src/main/resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland16.png
	src/main/resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland17.png
	src/main/resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland18.png
	src/main/resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland19.png
	src/main/resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland2.png
	src/main/resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland20.png
	src/main/resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland3.png
	src/main/resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland4.png
	src/main/resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland5.png
	src/main/resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland6.png
	src/main/resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland7.png
	src/main/resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland8.png
	src/main/resources/assets/terrafirmacraft/textures/blocks/farmland/Farmland9.png
	src/main/resources/assets/terrafirmacraft/textures/blocks/sand/Sand0.png
	src/main/resources/assets/terrafirmacraft/textures/blocks/sand/Sand1.png
	src/main/resources/assets/terrafirmacraft/textures/blocks/sand/Sand10.png
	src/main/resources/assets/terrafirmacraft/textures/blocks/sand/Sand11.png
	src/main/resources/assets/terrafirmacraft/textures/blocks/sand/Sand12.png
	src/main/resources/assets/terrafirmacraft/textures/blocks/sand/Sand13.png
	src/main/resources/assets/terrafirmacraft/textures/blocks/sand/Sand14.png
	src/main/resources/assets/terrafirmacraft/textures/blocks/sand/Sand15.png
	src/main/resources/assets/terrafirmacraft/textures/blocks/sand/Sand16.png
	src/main/resources/assets/terrafirmacraft/textures/blocks/sand/Sand17.png
	src/main/resources/assets/terrafirmacraft/textures/blocks/sand/Sand18.png
	src/main/resources/assets/terrafirmacraft/textures/blocks/sand/Sand19.png
	src/main/resources/assets/terrafirmacraft/textures/blocks/sand/Sand2.png
	src/main/resources/assets/terrafirmacraft/textures/blocks/sand/Sand20.png
	src/main/resources/assets/terrafirmacraft/textures/blocks/sand/Sand3.png
	src/main/resources/assets/terrafirmacraft/textures/blocks/sand/Sand4.png
	src/main/resources/assets/terrafirmacraft/textures/blocks/sand/Sand5.png
	src/main/resources/assets/terrafirmacraft/textures/blocks/sand/Sand6.png
	src/main/resources/assets/terrafirmacraft/textures/blocks/sand/Sand7.png
	src/main/resources/assets/terrafirmacraft/textures/blocks/sand/Sand8.png
	src/main/resources/assets/terrafirmacraft/textures/blocks/sand/Sand9.png