added lookslikediamondium
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/mod/badores/BadOres.java
	src/main/java/mod/badores/items/ItemBOIngot.java
	src/main/resources/assets/badores/lang/en_US.lang