Merge branch 'master' into master

hmlendea · Mar 16, 2024 · b08f4aa · b08f4aa
2 parents c9808bd + 32f408f
commit b08f4aa
Show file tree

Hide file tree

Showing 10 changed files with 3,624 additions and 6,097 deletions.
diff --git a/locations.xml b/locations.xml
diff --git a/scripts/build.sh b/scripts/build.sh
@@ -98,7 +98,7 @@ build-edition \
 
 build-edition \
     "more-cultural-names" "More Cultural Names" \
-    "CK3" "1.11.*" \
+    "CK3" "1.12.*" \
     --landed-titles "${VANILLA_FILES_DIR}/ck3_landed_titles.txt" --landed-titles-name "999_MoreCulturalNames.txt"
 
 build-edition \
@@ -113,12 +113,12 @@ build-edition \
 
 build-edition \
     "ce-more-cultural-names" "Culture Expanded - More Cultural Names" \
-    "CK3CE" "1.11.*" \
+    "CK3CE" "1.12.*" \
     --landed-titles "${VANILLA_FILES_DIR}/ck3ce_landed_titles.txt" --landed-titles-name "873_MoreCulturalNames.txt"
 
 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 \
@@ -128,7 +128,7 @@ build-edition \
 
 build-edition \
     "mbp-more-cultural-names" "More Bookmarks+ - More Cultural Names" \
-    "CK3MBP" "1.11.*" \
+    "CK3MBP" "1.12.*" \
     --landed-titles "${VANILLA_FILES_DIR}/ck3mbp_landed_titles.txt" --landed-titles-name "873_MoreCulturalNames.txt"
 
 build-edition \
@@ -148,11 +148,11 @@ build-edition \
 
 build-edition \
     "more-cultural-names" "More Cultural Names" \
-    "HOI4" "1.13.*"
+    "HOI4" "1.14.*"
 
 build-edition \
     "mdm-more-cultural-names" "Millennium Dawn: More Cultural Names" \
-    "HOI4MDM" "1.13.*" \
+    "HOI4MDM" "1.14.*" \
     --dependency "Millennium Dawn: A Modern Day Mod"
 
 build-edition \

diff --git a/scripts/update-vanilla-files.sh b/scripts/update-vanilla-files.sh
@@ -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" \