Kiln Bakery #1
Merge remote-tracking branch 'origin/Nolan'

Conflicts:
	NeoCraft_common/MMC/neocraft/block/NCblock.java
	NeoCraft_common/MMC/neocraft/registry/BlockRegistry.java