Fixing stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/net/CoTX/Thib0704/AlchemicalXP/References/ModItems.java