no message
Merge branch 'master' of https://github.com/BStramke/NetherStuffs

Conflicts:
	mcp/src/minecraft/bstramke/NetherStuffs/NetherStuffs.java