adding things for world geneation
additions, WIP
Merge branch 'dev1'
pushing changes
Merge branch 'master' of https://github.com/Periodicraft-Dev/Periodicraft-Minecraft-Mod

Conflicts:
	periodicraft/Periodicraft.java