Still Mistakes. not very fun.
Merge branch 'Developer' of https://github.com/ironhammer354/SteamTech into Developer

Conflicts:
	src/main/java/com/ironhammer354/steamtech/items/ModItems.java
	src/main/java/com/ironhammer354/steamtech/items/tools/ESword.java
	src/main/java/com/ironhammer354/steamtech/items/tools/Hammer.java
	src/main/java/com/ironhammer354/steamtech/lib/Strings.java