tterrags commit plus others
Merge branch 'master' of https://github.com/GioSerpo/giomod

Conflicts:
	giomod/GioMod.java
	giomod/gui/CraftingManagerCoinPress.java
	giomod/gui/CraftingManagerMoneyPrinter.java
	giomod/items/ModItem.java
	giomod/items/ModItemBase.java