working on ItemRing
Merge branch 'master' of https://github.com/sor1n/Modjam-Mod

Conflicts:
	common/darkknight/jewelrycraft/block/BlockMolder.java
	common/darkknight/jewelrycraft/item/ItemRing.java