block cleanup
Merge branch 'master' of https://github.com/MintyMint/Armory

Conflicts:
	src/main/java/armory/core/SmithingFurnaceRecipes.java