Merge branch 'next-version-dev' of https://forgejo.damimani-alex.org/damimani/N3OW into next-version-dev

This commit is contained in:
JulesFlammenkueche 2026-09-13 23:17:54 +02:00
commit 0df993d933
7 changed files with 196 additions and 164 deletions

View file

@ -612,15 +612,6 @@ e_caucasia = {
color = { 40 185 195 }
}
}
c_talish = {
color = { 0 125 75 }
b_talish = {
province = 4534
color = { 0 125 75 }
}
}
c_naxcivan = {
color = { 180 90 95 }

View file

@ -36,7 +36,15 @@ e_persia = {
color = { 5 170 170 }
capital = c_gilan
c_talish = {
color = { 0 125 75 }
b_talish = {
province = 4534
color = { 0 125 75 }
}
}
c_gilan = {
color = { 15 180 165 }
@ -56,49 +64,6 @@ e_persia = {
color = { 10 175 165 }
}
}
c_zanjan = {
color = { 0 135 175 }
b_zanjan = {
province = 4325
color = { 0 135 175 }
}
b_afshar = {
province = 4326
color = { 0 135 175 }
}
b_suhravard = {
province = 4327
color = { 0 135 175 }
}
b_abhar = {
province = 4324
color = { 40 165 135 }
}
}
c_qazwin = {
color = { 40 165 135 }
b_qazvin = {
province = 4323
color = { 40 165 135 }
}
b_alamut = {
province = 4006
color = { 40 165 135 }
}
b_qasran = {
province = 4322
color = { 40 80 180 }
}
}
}
d_tabaristan = {
@ -902,6 +867,49 @@ e_persia = {
color = { 125 110 255 }
}
}
c_zanjan = {
color = { 0 135 175 }
b_zanjan = {
province = 4325
color = { 0 135 175 }
}
b_afshar = {
province = 4326
color = { 0 135 175 }
}
b_suhravard = {
province = 4327
color = { 0 135 175 }
}
b_abhar = {
province = 4324
color = { 40 165 135 }
}
}
c_qazwin = {
color = { 40 165 135 }
b_qazvin = {
province = 4323
color = { 40 165 135 }
}
b_alamut = {
province = 4006
color = { 40 165 135 }
}
b_qasran = {
province = 4322
color = { 40 80 180 }
}
}
}
d_fars = {
@ -1291,7 +1299,7 @@ e_persia = {
k_makran = {
color = { 25 105 85 }
capital = c_sibi # Bannajbur
capital = c_kalat # Bannajbur
d_makran = {
color = { 30 100 80 }
@ -1329,31 +1337,25 @@ e_persia = {
}
c_sibi = {
color = { 200 145 18 }
b_mastang = {
province = 4511
color = { 200 145 18 }
}
b_sibi = {
province = 4513
color = { 200 145 18 }
}
b_kohlu = {
province = 4518
color = { 152 185 96 }
}
b_pul = {
province = 4497
b_mekhtar = {
province = 4519
color = { 200 145 18 }
color = { 152 185 96 }
}
b_asfanjay = {
province = 4510
b_zhob = {
province = 4520
color = { 200 145 18 }
}
b_shal = {
province = 4512
color = { 200 145 18 }
color = { 152 185 96 }
}
}
c_kiz = {
@ -1372,27 +1374,36 @@ e_persia = {
}
c_kalat = {
color = { 152 185 96 }
b_qiqan = {
province = 4488
b_loralai = {
province = 4517
color = { 152 185 96 }
color = { 5 105 65 }
}
b_kohlu = {
province = 4518
b_qusdar = {
province = 4479
color = { 152 185 96 }
color = { 5 105 65 }
}
b_mekhtar = {
province = 4519
b_wad = {
province = 4478
color = { 152 185 96 }
color = { 5 105 65 }
}
b_zhob = {
province = 4520
b_budin = {
province = 4480
color = { 152 185 96 }
color = { 5 105 65 }
}
b_gajor = {
province = 4481
color = { 5 105 65 }
}
b_qandabil = {
province = 4487
color = { 5 105 65 }
}
}
c_khawr = {
color = { 25 95 65 }
@ -1425,36 +1436,30 @@ e_persia = {
}
c_turan = {
color = { 5 105 65 }
b_shal = {
province = 4512
b_qusdar = {
province = 4479
color = { 200 145 18 }
}
b_mastang = {
province = 4511
color = { 5 105 65 }
color = { 200 145 18 }
}
b_wad = {
province = 4478
b_pul = {
province = 4497
color = { 5 105 65 }
color = { 200 145 18 }
}
b_budin = {
province = 4480
b_asfanjay = {
province = 4510
color = { 5 105 65 }
color = { 200 145 18 }
}
b_gajor = {
province = 4481
b_loralai = {
province = 4517
color = { 5 105 65 }
}
b_qandabil = {
province = 4487
color = { 5 105 65 }
}
b_qiqan = {
province = 4488
color = { 5 105 65 }
color = { 152 185 96 }
}
}
}

View file

@ -1233,6 +1233,11 @@ e_mashriq = {
color = { 60 210 150 }
}
b_shaqlabadh = {
province = 4775
color = { 40 190 130 }
}
}
c_kurdistan = {
color = { 40 190 130 }
@ -1247,11 +1252,6 @@ e_mashriq = {
color = { 40 190 130 }
}
b_shaqlabadh = {
province = 4775
color = { 40 190 130 }
}
b_bamardani = {
province = 4776