Merged
Merge branch 'master' of
https://github.com/Jacky2611/AlchemisticArts.git

Conflicts:
	src/main/java/net/alchemisticarts/mod/AlchemisticArts.java