Update
Update
Merge branch 'master' of https://github.com/Electrodynamics/Exoskeleton

Conflicts:
	src/main/java/com/exo/items/EXOItems.java
	src/main/java/com/exo/items/misc/ItemIngot.java
	src/main/java/com/exo/lib/EXOSessionData.java
	src/main/java/com/exo/lib/helpers/RotationHelper.java
	src/main/resources/assets/exo/lang/en_US.properties