Merge branch 'master' of https://github.com/HaxfracroarX/Auramcraft

Conflicts:
	src/main/resources/assets/auramcraft/textures/gui/infusion/Infusion
Table GUI.png
gui
Merge branch 'master' of https://github.com/HaxfracroarX/Auramcraft