Cool - thx! (Didn't know Winmerge could also be used to compare files for errors...) BTW, the CvSolarSystem "changes" (look like sloppy typos to me) might also be responible for the failure to create a MOO2Civ map/scenario, maybe.

Does anyone have ideas for what Emancipation should do? I removed the unhappiness penalty for other civs because I think it's too unbalancing, but now it does nothing except allow partisans (which don't always occur, for some reason; in fact, none of my tests have had it show up). Incidentially, now all the AI's gravitate toward caste system.
I find the vanilla civics in a space mod rather silly. if anything you should replace them with the final frontir ones, just adjusted for the changed unit classes, till you make something more trekki like.
Never mind all that civ testing, I just ran civchecker and I think I found the problem. The art define tag for the Borg Colony Ship was changed when the animations were added to the units and I didn't realize it so my unit art styles were out of date.
I also discovered the real cause of the python errors. CvAdvisorUtils.py was changed in the patch. I updated my file and it now works fine. Sorry for the chaos. Things should be returning to normal now.