Misc Fixes/textures
Merge branch 'master' of https://github.com/SoBiohazardous/Minestrappolation-Recode

Conflicts:
	src/main/java/com/minestrappolation/lib/MItems.java