Merge branch worldgen from https://github.com/CouleeApps/Craft

Conflicts:
	world.c