Renaming everything AGAIN, generatorType System
Merge branch 'master' of https://github.com/BetterWorldGeneration/BetterWorldGeneration4