Something went wrong, if "git rebase master" does not resolve, it may be easier to cherry-pick to a clean branch (could probably clean it up with reflog, but that may be tricky).I rebased the code.
e.g. (what I typically do)
Code: Select all
git branch -m scripting-supply-ships old_supply-ships git checkout master git checkout -b scripting-suppy-ships git cherry-pick 2a63ea2 8195371 8b7f24a ec726d2 git push ---force --set-upstream origin scripting-supply-ships
cherry-pick should do fine, the new branch should base off of master.Splitting out the population center change
The meter clamp for industry on resource centers is a minimum of 0.0f....where industry is below zero...
I'd say it is a safe assumption that industry will not be negative, without tracking it down further.
To help decide, you might count the existing playable species by planet type (and maybe even weight each species by how often you play them)....not decided on what kind of planets...
Edit: Rough pass on existing species