simple stuff, fixes to world gen
small changes
Merge branch 'master' of https://github.com/Periodicraft-Dev/Periodicraft-Minecraft-Mod

Conflicts:
	periodicraft/Periodicraft.java