GitHub Fix #2
Merge branch 'master' of https://github.com/scott181182/NeoCraft

Conflicts:
	NeoCraft_common/MMC/neocraft/recipe/RecipeRegistry.java