new ores and new textures for portal
morw stuff
clean up
fix
try to get github working
Merge branch 'master' of https://github.com/CodedModding/Transcraft

Conflicts:
	common/mark123mark/mods/transcraft/loaders/RegisterBlocks.java
new stuff