More ores
Merge branch 'ores'

Conflicts:
	src/main/java/com/bearbear2k/crystalconst/block/BlockManager.java
Fixing conflicts