Oh, I wanted to ask you, can I merge your mod with mine? I like all the stuff you did with culture etc
Sure, though assuming you're only messing with new planet entities and the GalaxyScenarioDef file, you could actually use the mods together already, it would just disable the random encounters feature of the mod (and perhaps cause some string errors). If you want those in I mainly just changed/added some planet templates, though I had to edit the default templates for a couple of planets too. If you just used my mod's GalaxyScenarioDef file as a base instead of Vanilla's it shouldn't be any extra work.
If you want to completely integrate my mod with yours, just make sure you put "Contains the Enhanced 4X mod by GoaFan77" in the credits. The other, more flexible option would to put that modified GalaxyScenarioDef/string/entity.manifest files as a compatibility patch, which would allow people to choose whether they want to add my mod with yours or not. It would also make it easier to update, as you only need to worry about those 3 files, and we might be able to set it up that either of use could update the compatibility patch for when we need to release a new version.