Added rarity flag to ore gen
Merge branch 'mc151' of https://github.com/CyanideX/NCM into mc151

Conflicts:
	ncm_common/nanocircuit/world/core/WorldGenOre.java