Bug fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/minestrapteam/mcore/block/MCBlockPane.java