Added ore blocks
Merge branch 'master' of https://github.com/nedhyett/ElementalCraft

Conflicts:
	resources/assets/elementalcraft/textures/items/aluminium_ingot.png
	resources/assets/elementalcraft/textures/items/chromium_ingot.png
	resources/assets/elementalcraft/textures/items/cobalt_ingot.png
	resources/assets/elementalcraft/textures/items/copper_ingot.png
	resources/assets/elementalcraft/textures/items/francium_ingot.png
	resources/assets/elementalcraft/textures/items/platinum_ingot.png
	resources/assets/elementalcraft/textures/items/plutonium_ingot.png
	resources/assets/elementalcraft/textures/items/silicone_ingot.png
	resources/assets/elementalcraft/textures/items/silver_ingot.png
	resources/assets/elementalcraft/textures/items/titanium_ingot.png
	resources/assets/elementalcraft/textures/items/tungsten_ingot.png
	resources/assets/elementalcraft/textures/items/zinc_ingot.png
Merge branch 'master' of https://github.com/nedhyett/ElementalCraft