Moddified Register Structures
Merge
Merge branch 'master' of https://github.com/chingo247/SettlerCraft

Conflicts:
	SettlerCraft/src/main/java/com/settlercraft/main/SettlerCraft.java