made stuff imba
Merge branch 'master' of https://github.com/rangermattos/syrupcraft

Conflicts:
	src/main/resources/mcmod.info
Merge branch 'master' of https://github.com/rangermattos/syrupcraft