Ideas
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/net/specialattack/modjam/CommonProxy.java
	src/main/java/net/specialattack/modjam/creativetab/ModJamCreativeTab.java