search

Azurency / CQUI_Community-Edition

Civilization 6 mod - UI enhancements, reduce clicks and manage your empire faster!
MIT License
399 stars 98 forks source link

Merge Expansion2 branch into master #420

Closed alexeyOnGitHub closed 4 years ago

alexeyOnGitHub commented 4 years ago

I have tried "expansion2" branch with the current Civ 6 version. looks good. given that the current code in "master" branch won't work with the latest Civ 6 anyway, I see no harm in merging "expansion2" branch into "master" at this point, even if it may potentially benefit from some additional cleanup later. let's merge this to "master", cut a release and push it to Steam Workshop?

alexeyOnGitHub commented 4 years ago

@Azurency hey Antoine, can you please merge this?

lionel42 commented 4 years ago

@Azurency hey Antoine, can you please merge this?

New release (21. May) of the game has broken a lot of the mod's functionality. It would not be effective to merge it now.

alexeyOnGitHub commented 4 years ago

the old version (in master) was totally broken for a long time, so merging would not harm. and the longer we keep a branch open (with the pending PR), the harder it would be for other developers to propose additional changes, that would probably need to be based on the changes in this branch. so not merging this will most likely make it ever harder for people to submit fixes for the new Frontier-related issues. keeping multiple branches with complex relations between them is just not viable for this project.

alexeyOnGitHub commented 4 years ago

I forked this repo and merged the PR here: https://github.com/civfanatics/CQUI_Community-Edition