Corn work
Merge branch 'master' of https://github.com/alix-the-alicorn/Carbon-Mod

Conflicts:
	common/com/jmanpenilla/carbonmod/block/ModBlock.java