Push
Merge branch 'master' of https://github.com/gman5500/GloriumCraft-src

Conflicts:
	src/main/java/net/gloriumcraft/mod/GloriumCraft.java
	src/main/java/net/gloriumcraft/mod/render/RenderBomb.java
	src/main/resources/assets/gloriumcraft/lang/en_US.lang
	src/main/resources/assets/gloriumcraft/textures/blocks/Thumbs.db