bcwadsworth Changes
Merge remote-tracking branch 'origin/Block-Registry---New' into Block-Registry---New

Conflicts:
	src/main/java/teamUnknown/immersion/core/blocks/BlockGemOre.java
	src/main/java/teamUnknown/immersion/core/blocks/BlockOre.java