More items and ore generation added.
Merge branch 'master' of https://github.com/GreenNekoHaunt/Terracraft

Conflicts:
	ModCreativeTabs.java
	ModEnumToolMaterial.java
	ModItems/ModItem.java
	Terracraft.java