Workspace-format
Merge branch 'master' of https://github.com/SoBiohazardous/Minestrappolation-Recode

Conflicts:
	build.gradle

	src/main/java/com/minestrappolation_core/itemblocks/MCItemBlockStone2.java