use nicos codestyle :D

I hope this breaks everything
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/net/ocine/minefluence/renderer/blocks/MachineBlockRenderer.java