loup99 / WtWSMS

A Migrational Era Mod for CK2
https://forum.paradoxplaza.com/forum/index.php?forums/when-the-world-stopped-making-sense-mod.876/
Other
45 stars 33 forks source link

Fixes to previous PRs #425

Closed Symmachus closed 4 years ago

loup99 commented 5 years ago

Could you resolve the conflicts with master or do you intend on continuing work?

Symmachus commented 5 years ago

Could you resolve the conflicts with master or do you intend on continuing work?

I resolved conflicts

IhateTrains commented 5 years ago

I think you've changed the encoding in WTWSMS/common/cultures/00_cultures.txt. The rest of anglicization removal seems fine, good job 👍

Symmachus commented 5 years ago

I think you've changed the encoding in WTWSMS/common/cultures/00_cultures.txt. The rest of anglicization removal seems fine, good job

I don't think so. The fill is still encoded in ANSI.

loup99 commented 5 years ago

I think you've changed the encoding in WTWSMS/common/cultures/00_cultures.txt. The rest of anglicization removal seems fine, good job

I don't think so. The fill is still encoded in ANSI.

There is some problem, I would advice that you redownload that file through master and add your changes on top of that.

loup99 commented 5 years ago

Tell us when the culture file issue can be resolved, so that we can continue with reviewing and then merging.

Symmachus commented 5 years ago

Now i think that encoding of the culture files has been finally fixed.

loup99 commented 5 years ago

Now i think that encoding of the culture files has been finally fixed.

Yes, the file is no longer mentioned as modified!