Skip to content

Commit

Permalink
Merge pull request #431 from hmlendea/ck3cmh
Browse files Browse the repository at this point in the history
Updated to the latest version of `CK3CMH`
  • Loading branch information
hmlendea authored Mar 16, 2024
2 parents deb56bb + 3321d07 commit 32f408f
Show file tree
Hide file tree
Showing 4 changed files with 3,264 additions and 5,896 deletions.
19 changes: 19 additions & 0 deletions locations.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49069,6 +49069,7 @@
<GameIds>
<GameId game="CK2">e_bulgaria</GameId> <!-- Bulgaria -->
<GameId game="CK3CE">e_bulgarian_empire</GameId> <!-- Bulgarian Empire -->
<GameId game="CK3CMH">e_bulgarian_empire</GameId> <!-- Bulgarian Empire -->
<GameId game="CK3MBP">e_bulgaria</GameId> <!-- Bulgarian Empire -->
</GameIds>
<FallbackLocations>
Expand Down Expand Up @@ -71584,6 +71585,8 @@
<GameId game="CK3CE">d_cumbria</GameId> <!-- Cumbria -->
<GameId game="CK3CE">k_cumbria</GameId> <!-- Cumbria -->
<GameId game="CK3CMH">c_cumberland</GameId> <!-- Cumberland -->
<GameId game="CK3CMH">d_cumbria</GameId> <!-- Cumbria -->
<GameId game="CK3CMH">k_cumbria</GameId> <!-- Cumbria -->
<GameId game="CK3IBL">c_cumberland</GameId> <!-- Cumberland -->
<GameId game="CK3MBP">c_cumberland</GameId> <!-- Cumberland -->
<GameId game="CK3SoW">c_cumberland</GameId> <!-- Cumberland -->
Expand Down Expand Up @@ -85131,6 +85134,7 @@
<GameId game="CK3CE">k_fake_egypt</GameId> <!-- Ptolemaic Kingdom -->
<GameId game="CK3ATHA">e_egypt</GameId> <!-- Aígyptos -->
<GameId game="CK3CMH">k_egypt</GameId> <!-- Egypt -->
<GameId game="CK3CMH">k_fake_egypt</GameId> <!-- Ptolemaic Kingdom -->
<GameId game="CK3IBL">k_egypt</GameId> <!-- Egypt -->
<GameId game="CK3MBP">k_egypt</GameId> <!-- Egypt -->
<GameId game="CK3MBP">e_egypt</GameId> <!-- Egypt -->
Expand Down Expand Up @@ -95235,6 +95239,7 @@
<GameId game="CK2HIP">k_franconia_otto</GameId> <!-- Franconia -->
<GameId game="CK2TWK">k_franconia</GameId> <!-- Franconia -->
<GameId game="CK3CE">k_grand_franconia</GameId> <!-- Franconia -->
<GameId game="CK3CMH">k_grand_franconia</GameId> <!-- Franconia -->
<GameId game="CK3MBP">d_franconia</GameId> <!-- Franconia -->
<GameId game="HOI4" type="State">54</GameId> <!-- Franken -->
<GameId game="HOI4MDM" type="State">964</GameId> <!-- Franken -->
Expand Down Expand Up @@ -114621,6 +114626,7 @@
<GameId game="CK3CE">c_hereford</GameId> <!-- Herefordshire -->
<GameId game="CK3CE">d_ergyng</GameId> <!-- Ergyng -->
<GameId game="CK3CMH">c_hereford</GameId> <!-- Herefordshire -->
<GameId game="CK3CMH">d_ergyng</GameId> <!-- Ergyng -->
<GameId game="CK3IBL">c_hereford</GameId> <!-- Herefordshire -->
<GameId game="CK3MBP">c_hereford</GameId> <!-- Herefordshire -->
<GameId game="CK3SoW">c_hereford</GameId> <!-- Herefordshire -->
Expand Down Expand Up @@ -120366,6 +120372,7 @@
<GameId game="CK3ATHA">k_illyris</GameId> <!-- Illyrís -->
<GameId game="CK3ATHA">e_illyria</GameId> <!-- Illyria -->
<GameId game="CK3CE">k_illyria</GameId> <!-- Illyria -->
<GameId game="CK3CMH">k_illyria</GameId> <!-- Illyria -->
<GameId game="CK3TFE">d_dalmatia</GameId> <!-- Illyria -->
<GameId game="CK3TFE">k_illyricum</GameId>
<GameId game="CK3TFE">e_illyria_pirate</GameId> <!-- Pirate Empire of Illyria -->
Expand Down Expand Up @@ -137687,6 +137694,7 @@
<GameId game="CK3CE">d_khorezm</GameId> <!-- Khwarezm -->
<GameId game="CK3CE">k_khwarazm</GameId> <!-- Khwarazm -->
<GameId game="CK3CMH">d_khorezm</GameId> <!-- Khorezm -->
<GameId game="CK3CMH">k_khwarazm</GameId> <!-- Khwarazm -->
<GameId game="CK3IBL">d_khorezm</GameId> <!-- Khorezm -->
<GameId game="CK3MBP">d_khorezm</GameId> <!-- Khorezm -->
<GameId game="CK3MBP">k_khwarezmia</GameId> <!-- Khorezm -->
Expand Down Expand Up @@ -196402,6 +196410,7 @@
<GameId game="CK3CE">d_oman</GameId> <!-- Oman -->
<GameId game="CK3CE">k_oman</GameId> <!-- Oman -->
<GameId game="CK3CMH">d_oman</GameId> <!-- Oman -->
<GameId game="CK3CMH">k_oman</GameId> <!-- Oman -->
<GameId game="CK3IBL">d_oman</GameId> <!-- Oman -->
<GameId game="CK3MBP">d_oman</GameId> <!-- Oman -->
<GameId game="CK3MBP">k_oman</GameId> <!-- Oman -->
Expand Down Expand Up @@ -238152,6 +238161,7 @@
<GameId game="CK3CE">k_grand_saxony</GameId> <!-- Saxony -->
<GameId game="CK3CE">k_saxony</GameId> <!-- Saxony -->
<GameId game="CK3CMH">k_saxony</GameId> <!-- Saxony -->
<GameId game="CK3CMH">k_grand_saxony</GameId> <!-- Saxony -->
<GameId game="CK3IBL">k_saxony</GameId> <!-- Saxony -->
<GameId game="CK3MBP">d_saxony</GameId> <!-- Saxony -->
<GameId game="CK3MBP">k_saxony</GameId> <!-- Saxony -->
Expand Down Expand Up @@ -243930,6 +243940,7 @@
<GameId game="CK3CMH">b_shirvan</GameId> <!-- Maskut -->
<GameId game="CK3CMH">c_shirvan</GameId> <!-- Shirvan -->
<GameId game="CK3CMH">d_shirvan</GameId> <!-- Shirvan -->
<GameId game="CK3CMH">k_shirvan</GameId> <!-- Shirvan -->
<GameId game="CK3IBL">b_shirvan</GameId> <!-- Maskut -->
<GameId game="CK3IBL">c_shirvan</GameId> <!-- Shirvan -->
<GameId game="CK3IBL">d_shirvan</GameId> <!-- Shirvan -->
Expand Down Expand Up @@ -257157,6 +257168,7 @@
<GameId game="CK3CE">d_swabia</GameId> <!-- Swabia -->
<GameId game="CK3CE">k_grand_swabia</GameId> <!-- Swabia -->
<GameId game="CK3CMH">d_swabia</GameId> <!-- Swabia -->
<GameId game="CK3CMH">k_grand_swabia</GameId> <!-- Swabia -->
<GameId game="CK3IBL">d_swabia</GameId> <!-- Swabia -->
<GameId game="CK3MBP">d_swabia</GameId> <!-- Swabia -->
<GameId game="CK3MBP">k_schwaben</GameId> <!-- Swabia -->
Expand Down Expand Up @@ -272309,6 +272321,7 @@
<WikidataId>Q200173</WikidataId>
<GameIds>
<GameId game="CK3CE">e_transcaucasia</GameId> <!-- Transcaucasia -->
<GameId game="CK3CMH">e_transcaucasia</GameId> <!-- Transcaucasia -->
</GameIds>
<Names>
<Name language="Catalan" value="Transcaucàsia" />
Expand Down Expand Up @@ -285217,6 +285230,7 @@
<GameId game="CK3CE">d_szekesfehervar</GameId> <!-- Besprim -->
<GameId game="CK3CMH">b_veszprem</GameId> <!-- Veszprém -->
<GameId game="CK3CMH">c_veszprem</GameId> <!-- Veszprém -->
<GameId game="CK3CMH">d_szekesfehervar</GameId> <!-- Besprim -->
<GameId game="CK3IBL">b_veszprem</GameId> <!-- Veszprém -->
<GameId game="CK3IBL">c_veszprem</GameId> <!-- Veszprém -->
<GameId game="CK3MBP">b_veszprem</GameId> <!-- Veszprém -->
Expand Down Expand Up @@ -318256,6 +318270,7 @@
<Id>balaton</Id>
<GameIds>
<GameId game="CK3CE">k_balaton</GameId> <!-- Balaton -->
<GameId game="CK3CMH">k_balaton</GameId> <!-- Balaton -->
</GameIds>
<Names>
<Name language="Czech_Medieval" value="Blatno" />
Expand Down Expand Up @@ -452178,6 +452193,7 @@
<Id>luticia</Id>
<GameIds>
<GameId game="CK3CE">k_wendia</GameId> <!-- Luticia -->
<GameId game="CK3CMH">k_wendia</GameId> <!-- Luticia -->
<GameId game="CK3MBP">d_lutici</GameId> <!-- Luticians -->
<GameId game="CK3MBP">k_lutici</GameId> <!-- Luticians -->
</GameIds>
Expand Down Expand Up @@ -490869,6 +490885,7 @@
<GameIds>
<GameId game="CK2">b_talysh</GameId> <!-- Talysh -->
<GameId game="CK3CE">d_talysh</GameId> <!-- Talysh -->
<GameId game="CK3CMH">d_talysh</GameId> <!-- Talysh -->
</GameIds>
</LocationEntity>
<LocationEntity>
Expand Down Expand Up @@ -498919,6 +498936,7 @@
<GameIds>
<GameId game="CK2">k_avaria</GameId> <!-- Avaria -->
<GameId game="CK3CE">e_avar_khaganate</GameId> <!-- The Avar Khaganate -->
<GameId game="CK3CMH">e_avar_khaganate</GameId> <!-- The Avar Khaganate -->
</GameIds>
</LocationEntity>
<LocationEntity>
Expand Down Expand Up @@ -528885,6 +528903,7 @@
<Id>adharistan</Id>
<GameIds>
<GameId game="CK3CE">k_adharistan</GameId> <!-- Adharestan -->
<GameId game="CK3CMH">k_adharistan</GameId> <!-- Adharestan -->
</GameIds>
</LocationEntity>
<LocationEntity>
Expand Down
2 changes: 1 addition & 1 deletion scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ build-edition \

build-edition \
"cmh-more-cultural-names" "Community Mods for Historicity - More Cultural Names" \
"CK3CMH" "1.8.*" \
"CK3CMH" "1.12.*" \
--landed-titles "${VANILLA_FILES_DIR}/ck3cmh_landed_titles.txt" --landed-titles-name "873_MoreCulturalNames.txt"

build-edition \
Expand Down
2 changes: 1 addition & 1 deletion scripts/update-vanilla-files.sh
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ update-vanilla-files \
"${CK3_LANDED_TITLES_DIR}"/*.txt
update-vanilla-files \
"${CK3CMH_VANILLA_LANDED_TITLES_FILE}" \
"${CK3AP_LANDED_TITLES_DIR}"/*.txt \
"${CK3IBL_LANDED_TITLES_DIR}"/*.txt \
"${CK3CE_LANDED_TITLES_DIR}"/*.txt \
"${CK3RICE_LANDED_TITLES_DIR}"/*.txt
update-vanilla-file \
"${CK3IBL_DIR}/common/landed_titles/00_landed_titles.txt" \
Expand Down
Loading

0 comments on commit 32f408f

Please sign in to comment.