Merge branch 'main' of https://gitlab.com/new-era-team/N3OW

N3OW/common/coat_of_arms/coat_of_arms/01_landed_titles.txt

@@ -1289,16 +1289,6 @@ c_braunschweig = {
 		instance = { position = { 0.5 0.5 } scale = { 0.95 0.95 }  }
 	}
 }
-c_breisgau = {
-	pattern = "pattern_solid.dds"
-	color1 = "yellow"
-	colored_emblem = {
-		texture = "ce_eagle.dds"
-		color1 = "red"
-		color2 = "red"
-		color3 = "white"
-	}
-}
 c_breifne = {
 	pattern = "pattern_solid.dds"
 	color1 = "yellow"
@@ -6480,15 +6470,6 @@ d_western_isles = {
 
 }
 
-d_baden = {
-	pattern = "pattern_solid.dds"
-	color1 = "yellow"
-	color2 = "red"
-	colored_emblem = {
-		texture = "ce_ordinary_bend_dexter_5.dds"
-		color1 = "red"
-	}
-}
 k_bengal = {
 	pattern = "pattern_solid.dds"
 	color1 = "green"
@@ -19990,18 +19971,6 @@ c_osnabruck = {
 	}
 }
 
-c_baden = {
-	pattern = "pattern_solid.dds"
-	color1 = "yellow"
-	color2 = "red"
-	colored_emblem = {
-		texture = "ce_ordinary_bend_dexter_5.dds"
-		color1 = "red"
-		color2 = "red"
-		instance = { position = { 0.5 0.5 } scale = { 1.0 1.0 }  }
-	}
-}
-
 c_lobdaburg = {
 	pattern = "pattern_solid.dds"
 	color1 = "red"
@@ -20371,44 +20340,6 @@ c_grunningen = {
 	}
 }
 
-c_wurttemberg = {
-	pattern = "pattern_solid.dds"
-	color1 = "yellow"
-	color2 = "black"
-	colored_emblem = {
-		texture = "ce_antler.dds"
-		color1 = "black"
-		color2 = "black"
-		instance = { position = { 0.5 0.690 } scale = { 0.8 0.8 }  }
-		instance = { position = { 0.5 0.430 } scale = { 0.8 0.8 }  }
-		instance = { position = { 0.5 0.170 } scale = { 0.8 0.8 }  }
-	}
-}
-
-c_zollern = {
-	pattern = "pattern_solid.dds"
-	color1 = "white"
-	color2 = "black"
-	colored_emblem = {
-		texture = "ce_quarterly.dds"
-		color1 = "white"
-		color2 = "black"
-		instance = { position = { 0.5 0.5 } scale = { 1.0 1.0 }  }
-	}
-}
-
-c_ulm = {
-	pattern = "pattern_solid.dds"
-	color1 = "white"
-	color2 = "black"
-	colored_emblem = {
-		texture = "ce_block_02.dds"
-		color1 = "black"
-		color2 = "black"
-		instance = { position = { 0.5 0.156 } scale = { 1.0 0.312 }  }
-	}
-}
-
 c_hohenberg = {
 	pattern = "pattern_solid.dds"
 	color1 = "red"
@@ -20696,18 +20627,6 @@ c_burgau = {
 	}
 }
 
-c_ravensburg = {
-	pattern = "pattern_solid.dds"
-	color1 = "white"
-	color2 = "blue"
-	colored_emblem = {
-		texture = "ce_castle.dds"
-		color1 = "blue"
-		color2 = "white"
-		instance = { position = { 0.5 0.45 } scale = { 0.9 0.9 }	}
-	}
-}
-
 c_kempten = {
 	pattern = "pattern_solid.dds"
 	color1 = "red"
@@ -20972,20 +20891,6 @@ c_marburg = {
 	}
 }
 
-c_hohenlohe = {
-	pattern = "pattern_solid.dds"
-	color1 = "white"
-	color2 = "black"
-	colored_emblem = {
-		texture = "ce_lion_passant_small.dds" # lions passant corwardly
-		color1 = "black"
-		color2 = "black"
-		color3 = "white"
-		instance = { position = { 0.5 0.32 } scale = { 0.9 0.9 }  }
-		instance = { position = { 0.5 0.62 } scale = { 0.9 0.9 }  }
-	}
-}
-
 c_furstenberg = {
 	pattern = "pattern_solid.dds"
 	color1 = "yellow"
@@ -23616,20 +23521,6 @@ c_geisenhausen = {
 	}
 }
 
-c_durne = {
-	pattern = "pattern_solid.dds"
-	color1 = "blue"
-	color2 = "white"
-	colored_emblem = {
-		texture = "ce_cinquefoil_01.dds"
-		color1 = "white"
-		color2 = "white"
-		instance = { position = { 0.315 0.30 } scale = { 0.48 0.48 }  }
-		instance = { position = { 0.685 0.30 } scale = { 0.48 0.48 }  }
-		instance = { position = { 0.5 0.64 } scale = { 0.48 0.48 }  }
-	}
-}
-
 c_ditmarschen = {
 	pattern = "pattern_solid.dds"
 	color1 = "red"

N3OW/common/coat_of_arms/coat_of_arms/NEOW_landed_titles.txt

@@ -364,34 +364,6 @@ k_schleswig_holstein={
 
 	}
 
-}
-k_swabia={
-	custom=yes
-	pattern="pattern_solid.dds"
-	color1=yellow
-	color2=white
-	color3=blue
-	colored_emblem={
-		color1=black
-		texture="ce_lion_passant.dds"
-		instance={
-			position={ 0.500000 0.800000 }
-			scale={ 0.800000 0.333000 }
-		}
-
-		instance={
-			scale={ 0.800000 0.333000 }
-			depth=1.010000
-		}
-
-		instance={
-			position={ 0.500000 0.200000 }
-			scale={ 0.800000 0.333000 }
-			depth=2.010000
-		}
-
-	}
-
 }
 k_saxony_proper={
 	custom=yes

N3OW/common/coat_of_arms/coat_of_arms/germany.txt

@@ -2237,12 +2237,12 @@ c_bautzen={
 }
 d_anhalt={
 	pattern="pattern_horizontal_split_01.dds"
-	color1="yellow"
+	color1=yellow
-	color2="white"
+	color2=white
 	colored_emblem={
 		texture="ce_horizontal_stripes_03.dds"
-		color1="yellow"
+		color1=yellow
-		color2="black"
+		color2=black
 		instance={position={0.5 0.25}scale={1 0.5}}
 	}
 	colored_emblem={
@@ -2398,3 +2398,361 @@ c_merseburg={
 		instance={position={0.25 0.25} scale={0.5 0.5}}
 	}
 }
+k_swabia={
+	pattern="pattern_solid.dds"
+	color1=yellow
+	color2=white
+	color3=blue
+	colored_emblem={
+		color1=black
+		texture="ce_lion_passant.dds"
+		instance={position={0.5 0.8} scale={0.8 0.333}}
+		instance={scale={0.8 0.333}}
+		instance={position={0.5 0.2} scale={0.8 0.333}}
+	}
+}
+d_wurttemberg={
+	pattern="pattern_solid.dds"
+	color1=yellow
+	color2=black
+	colored_emblem={
+		texture="ce_antler.dds"
+		color1=black
+		color2=black
+		instance={position={0.5 0.69} scale={0.8 0.8}}
+		instance={position={0.5 0.43} scale={0.8 0.8}}
+		instance={position={0.5 0.17} scale={0.8 0.8}}
+	}
+}
+c_stuttgart={
+	pattern="pattern_solid.dds"
+	color1=yellow
+	color2=black
+	colored_emblem={
+		color1=black
+		color3=yellow
+		texture="ce_horse_rampant.dds"
+		instance={scale={0.875 0.875}}
+	}
+}
+c_heilbronn={
+	pattern="pattern_shield_03_small.dds"
+	color1=yellow
+	color2=white
+	colored_emblem={
+		color1=black
+		color2=red
+		color3=yellow
+		mask={1}
+		texture="ce_eagle.dds"
+	}
+	colored_emblem={
+		color1=red
+		texture="ce_block_02.dds"
+		mask={2}
+		instance={position={0.5 0.3} scale={1 0.15}}
+	}
+	colored_emblem={
+		color1=blue
+		texture="ce_block_02.dds"
+		mask={2}
+		instance={position={0.5 0.55} scale={1 0.15}}
+	}
+}
+c_hohenlohe={
+	pattern="pattern_solid.dds"
+	color1=white
+	color2=black
+	colored_emblem={
+		color1=yellow
+		color2=yellow_light
+		texture="ce_crown_head.dds"
+		instance={position={0.324 0.14} scale={0.145 0.145}}
+		instance={position={0.324 0.47} scale={0.145 0.145}}
+	}
+	colored_emblem={
+		color1=black
+		color2=red
+		color3=yellow
+		texture="ce_leopard_passant_guardant.dds"
+		instance={position={0.5 0.26} scale={0.935 0.935}}
+		instance={position={0.5 0.59} scale={0.935 0.935}}
+	}
+}
+d_tubingen={
+	pattern="pattern_solid.dds"
+	color1=yellow
+	color2=red
+	colored_emblem={
+		color1=red
+		texture="ce_gonfanon.dds"
+	}
+}
+c_sigmaringen={
+	pattern="pattern_solid.dds"
+	color1=red
+	color2=yellow
+	colored_emblem={
+		color1=yellow
+		color2=yellow
+		color3=red
+		texture="ce_stag.dds"
+		instance={position={0.5 0.56} scale={0.75 0.75}}
+	}
+	colored_emblem={
+		color1=yellow
+		texture="ce_star_06.dds"
+		instance={position={0.24 0.18} scale={0.295 0.295} rotation=90}
+	}
+}
+c_zollern={
+	pattern="pattern_solid.dds"
+	color1=white
+	color2=black
+	colored_emblem={
+		texture="ce_quarterly.dds"
+		color1=white
+		color2=black
+		instance={ position={0.5 0.5} scale={1 1}}
+	}
+}
+c_tubingen={
+	pattern="pattern_solid.dds"
+	color1=white
+	color2=red
+	colored_emblem={
+		color1=black
+		color2=red
+		texture="ce_gotland_banner.dds"
+		instance={scale={-1.75 1.75} rotation=328 position={0.6 0.85}}
+	}
+}
+c_ravensburg={
+	pattern="pattern_solid.dds"
+	color1=blue
+	color2=yellow
+	colored_emblem={
+		color1=yellow
+		color2=red
+		texture="ce_lion_rampant.dds"
+	}
+}
+c_ulm={
+	pattern="pattern_horizontal_split_01.dds"
+	color1=black
+	color2=white
+}
+d_baden={
+	pattern="pattern_solid.dds"
+	color1=yellow
+	color2=red
+	colored_emblem={
+		texture="ce_ordinary_bend_dexter_5.dds"
+		color1=red
+	}
+}
+c_karlsruhe={
+	pattern="pattern_solid.dds"
+	color1=red
+	color2=yellow
+	colored_emblem={
+		color1=yellow
+		color2=white
+		texture="ce_diagonal_stripes_02_dual.dds"
+	}
+	colored_emblem={
+		color1=black
+		texture="ce_letter_f.dds"
+		instance={position={0.175 0.175} scale={0.225 0.225} rotation=45}
+	}
+	colored_emblem={
+		color1=black
+		texture="ce_letter_i.dds"
+		instance={position={0.25 0.25} scale={0.225 0.225} rotation=45}
+		instance={position={0.55 0.55} scale={0.225 0.225} rotation=45}
+	}
+	colored_emblem={
+		color1=black
+		texture="ce_letter_d.dds"
+		instance={position={0.325 0.325} scale={0.225 0.225} rotation=45}
+	}
+	colored_emblem={
+		color1=black
+		texture="ce_letter_e.dds"
+		instance={position={0.4 0.4} scale={0.225 0.225} rotation=45}
+	}
+	colored_emblem={
+		color1=black
+		texture="ce_letter_l.dds"
+		instance={position={0.475 0.475} scale={0.225 0.225} rotation=45}
+	}
+	colored_emblem={
+		color1=black
+		texture="ce_letter_t.dds"
+		instance={position={0.625 0.625} scale={0.225 0.225} rotation=45}
+	}
+	colored_emblem={
+		color1=black
+		texture="ce_letter_a.dds"
+		instance={position={0.7 0.7} scale={0.225 0.225} rotation=45}
+	}
+	colored_emblem={
+		color1=black
+		texture="ce_letter_s.dds"
+		instance={position={0.775 0.775} scale={0.225 0.225} rotation=45}
+	}
+}
+c_heidelberg={
+	pattern="pattern_solid.dds"
+	color1=black
+	color2=green
+	colored_emblem={
+		color1=green
+		texture="ce_mount.dds"
+		instance={position={0.5 0.7}}
+	}
+	colored_emblem={
+		color1=yellow
+		color2=red
+		color3=black
+		texture="ce_lion_rampant_crown.dds"
+	}
+}
+c_mosbach={
+	pattern="pattern_solid.dds"
+	color1=yellow
+	color2=black
+	colored_emblem={
+		color1=black
+		color2=red
+		color3=white
+		texture="ce_eagle.dds"
+	}
+	colored_emblem={
+		color1=white
+		color2=white
+		texture="ce_shield_02.dds"
+		instance={position={0.5 0.465} scale={0.333 0.333}}
+	}
+	colored_emblem={
+		color1=black
+		texture="ce_letter_o.dds"
+		instance={position={0.5 0.385} scale={0.195 0.195}}
+	}
+	colored_emblem={
+		color1=black
+		texture="ce_letter_m.dds"
+		instance={position={0.5 0.515} scale={0.195 0.195}}
+	}
+}
+c_kraichgau={
+	pattern="pattern_vertical_split_01.dds"
+	color1=yellow
+	color2=red
+	colored_emblem={
+		color1=red
+		texture="ce_mena_bend.dds"
+		instance={position={0.25 0.5} scale={0.5 1}}
+	}
+	colored_emblem={
+		color1=white
+		color2=blue
+		texture="ce_per_fess.dds"
+		instance={position={0.75 0.5} scale={0.5 0.5}}
+	}
+	colored_emblem={
+		color1=yellow
+		texture="ce_block_02.dds"
+		instance={position={0.75 1} scale={0.5 0.5}}
+	}
+}
+d_freiburg={
+	pattern="pattern_horizontal_stripes_01.dds"
+	color1=red
+	color2=white
+	colored_emblem={
+		color1=yellow
+		texture="ce_block_02.dds"
+		instance={position={0.75 0.5} scale={0.5 1}}
+	}
+	colored_emblem={
+		color1=red
+		texture="ce_mena_bend.dds"
+		instance={position={0.75 0.5} scale={0.5 1}}
+	}
+	colored_emblem={
+		color1=black
+		color2=black
+		texture="ce_shield_02.dds"
+		instance={scale={0.52 0.52}}
+	}
+	colored_emblem={
+		color1=yellow
+		color2=yellow
+		texture="ce_shield_02.dds"
+		instance={scale={0.5 0.5}}
+	}
+	colored_emblem={
+		color1=black
+		color2=black
+		color3=white
+		texture="ce_eagle.dds"
+		instance={scale={0.535 0.535}}
+	}
+}
+c_breisgau={
+	pattern="pattern_cross_01.dds"
+	color1=white
+	color2=red
+}
+c_schwarzwald={
+	pattern="pattern_vertical_split_01.dds"
+	color1=white
+	color2=blue
+	colored_emblem={
+		color1=red
+		color2=yellow
+		color3=white
+		texture="ce_eagle.dds"
+		instance={position={0.3 0.225} scale={-0.43 0.43}}
+	}
+	colored_emblem={
+		color1=white
+		color2=yellow
+		texture="ce_swan.dds"
+		instance={position={0.69 0.255} scale={0.415 0.415}}
+	}
+	colored_emblem={
+		color1=blue
+		texture="ce_waves_04.dds"
+		instance={scale={1 0.75}}
+		instance={scale={1 0.75} position={1 0.395}}
+		instance={scale={1 0.75} position={1 0.44}}
+	}
+	colored_emblem={
+		color1=blue
+		texture="NEOW_ce_wave_single.dds"
+	}
+	colored_emblem={
+		color1=white
+		mask={2}
+		texture="ce_waves_04.dds"
+		instance={scale={1 0.75}}
+	}
+	colored_emblem={
+		color1=white
+		mask={2}
+		texture="NEOW_ce_wave_single.dds"
+	}
+}
+c_konstanz={
+	pattern="pattern_horizontal_split_02.dds"
+	color1=white
+	color2=red
+	colored_emblem={
+		color1=black
+		texture="ce_cross_large.dds"
+		mask={1}
+		instance={position={0.5 0.6} scale={1 0.8}}
+	}
+}

N3OW/common/culture/name_equivalency/00_NEOW_female_names.txt

@@ -1,14 +1,14 @@
 adela_female = { Ad_e_grv_lo }
-adelaide_female = { Azala_i_uml_s Aziliz Azylis }
+adelaide_female = { Adelheid Azala_i_uml_s Aziliz Azylis Elke }
 adriana_female = { Adriano }
-agato_female = { Agato }
+agato_female = { Agathe Agato }
-agnes_female = { Agn_e_grv_s In_e_grv_s Oanell }
+agnes_female = { Agn_e_grv_s Agnes In_e_grv_s Oanell }
 albana_female = { Aubano }
 alberta_female = { Albertino_female }
-alexandra_female = { Alessandrino_female Alessandro_female Sandra Sandrine Sandrino_female }
+alexandra_female = { Alessandrino_female Alessandro_female Alexandra Sandra Sandrine Sandrino_female }
 alexia_female = { Alessio_female }
 alice_female = { Alis }
-alina_female = { Alino }
+alina_female = { Alina Alino }
 alfonsa_female = { Anfounsino }
 amanda_female = { Amandino }
 amata_female = { Aimado }
@@ -19,14 +19,16 @@ anastasia_female = { Anastasi_e_act_ }
 andrea_female = { Andrea Andriveto }
 angela_female = { Aela Aelia Aelig Ang_e_grv_lo_female }
 angelica_female = { Angelico_female }
-anna_female = { Ana Ana_i_uml_s Aneto Anna Annaig Annick Ano Naig }
+anna_female = { Ana Ana_i_uml_s Aneto Anita Anja Anna Annaig Annette Annick Ano Naig }
 annaclara_female = { Ano-Claro }
+annaeleonora_female = { Hannelore }
 annalaura_female = { Ano-Lauro }
 annalisa_female = { Ano-Liso }
-annamaria_female = { Anna-Vari Ano-Mar_i_grv_o }
+annamaria_female = { Anna-Vari Annemarie Ano-Mar_i_grv_o }
 annasophia_female = { Ano-Souf_i_grv_o }
-antonia_female = { Antouneto T_o_grv_nio_female Tounieto }
+antonia_female = { Antonia Antouneto T_o_grv_nio_female Tounieto }
 arlette_female = { Arleto }
+astrid_female = { Astrid }
 auda_female = { Aude }
 audrey_female = { Audr_e_act_ }
 augusta_female = { Agustino_female }
@@ -36,33 +38,35 @@ apollonia_female = { Poul_o_grv_nio }
 april_female = { Abri_e_act_u }
 asma_female = { Asma }
 baptista_female = { Batistino }
-barbara_female = { Barbo_female }
+barbara_female = { Barbara Barbo_female }
+beata_female = { Beate }
 beatrice_female = { Beatris }
 benedicta_female = { Benedito_female }
 berengaria_female = { Berenguiero }
 berenice_female = { Bereni_c_ced_o }
 bernarda_female = { Bernadeto Bernadette Bernado }
-bertha_female = { Berto_female }
+bertha_female = { Berta Berto_female }
 bertranda_female = { Bertrando }
 blanche_female = { Blanco_female }
-bridget_female = { Brec_pst_hed Bregido }
+bridget_female = { Brec_pst_hed Bregido Brigitte }
 bushra_female = { Bouchra }
 camilla_female = { Camiho }
 carla_female = { Carleno_female Carole Carolo_female }
 carmen_female = { Carmen }
 carolina_female = { Caroline Caroulino }
 cassandra_female = { Cassandro }
-catherine_female = { Catarino Karine Katell }
+catherine_female = { Catarino Karin Karine Katell Katharina }
-cecilia_female = { Cecilo }
+cecilia_female = { Cecilo Silke }
 celestina_female = { Celestino_female Celesto_female }
 celia_female = { Celi_a_grv_ }
 celine_female = { C_e_act_line Celino }
 charlotte_female = { Charloto }
 chloe_female = { Clou_e_grv_ }
+christa_female = { Christa }
 christelle_female = { Kristell }
-christina_female = { Christiane Crestino Kristen Kristin Kristina }
+christina_female = { Christiane Christina Christine Crestino Kristen Kristin Kristina }
 claire_female = { Clarisso Claro_female Klara Sklaerenn }
-claudia_female = { Glaudeto Glaudino Glaudo_female Klaoda Klaodina }
+claudia_female = { Claudia Glaudeto Glaudino Glaudo_female Klaoda Klaodina }
 clementia_female = { Clem_e_grv_nci Clementino_female }
 clotilda_female = { Cloutido }
 colette_female = { Colette Coul_e_grv_to }
@@ -78,23 +82,24 @@ denise_female = { Daniso Deneza }
 diana_female = { Diano }
 dominica_female = { Dominique_female Doumenico_female }
 dorothy_female = { Dourout_e_grv_io }
-edith_female = { Edito }
+edith_female = { Edith Edito }
 eleanor_female = { A_e_act_nor Eliounor Leounoro }
 eliana_female = { Eliano }
 elisa_female = { Eliso Liza }
-elizabeth_female = { Bab_e_grv_u_female Eisab_e_grv_u Elesbed Liz }
+elizabeth_female = { Bab_e_grv_u_female Bettina Eisab_e_grv_u Elesbed Elisabeth Ilse Liz }
 elodie_female = { _E_act_lodie Eloud_i_grv_o }
 elsa_female = { Els_a_grv_ }
 emeline_female = { Emelino }
 emerald_female = { Esmeraudo }
 emily_female = { _E_act_milie Emil_i_grv_o_female Emiliano_female }
 emma_female = { Em_a_grv_ }
-emmanuella_female = { Emanuelo_female Emmanuelle Manuello }
+emmanuella_female = { Emanuelo_female Emmanuelle Manuela Manuello }
+erika_female = { Erika }
 ernesta_female = { Ernestino }
 esther_female = { Est_e_grv_r }
 eugenia_female = { _E_act_ug_e_grv_nio }
 eulalia_female = { _E_act_ul_a_grv_lio }
-eva_female = { _E_grv_vo }
+eva_female = { _E_grv_vo Eva }
 evelyn_female = { Evelino }
 fabiana_female = { Fabiano_female Fabienne }
 farah_female = { Farah }
@@ -115,31 +120,36 @@ floriana_female = { Flouriano }
 france_female = { Fran_c_ced_o_female }
 frances_female = { Chichoueso Fra_n_tld_seza Franceso Francino Soazig Soizic Soizick }
 frederica_female = { Frederico_female }
-gabriela_female = { Gabrielo_female }
+gabriela_female = { Gabriele Gabrielo_female }
 gael_female = { Ga_e_grv_lo Ga_e_uml_lle }
 genevieve_female = { Genevivo Gineto }
 georgia_female = { Jourgeto }
 geralda_female = { Geraldino_female }
 germana_female = { Germano_female }
-gertrude_female = { Gertrudo }
+gertrude_female = { Gerda Gertrud Gertrudo }
 ghislaine_female = { Guisl_e_grv_no }
 gilberta_female = { Giliberto_female }
-gisela_female = { Gis_e_grv_lo }
+gisela_female = { Gis_e_grv_lo Gisela }
 gwen_female = { Gwen Gwenn }
 gwendolyn_female = { Gwendoline }
 hajar_female = { Hajer }
 halima_female = { Halima }
 hanan_female = { Hanane }
+hedwig_female = { Hedwig }
 helen_female = { Elen Elena Eleno H_e_act_l_e_grv_ne Lena }
-henrietta_female = { Enrieto }
+helga_female = { Helga }
+henrietta_female = { Enrieto Heike }
 hermine_female = { Hermine }
+hildegard_female = { Hildegard }
 hind_female = { Henda Hind }
 honorina_female = { Enora Ounourino }
 hortensia_female = { Ourt_e_grv_nsi }
 huguette_female = { Ugueto }
 hurriya_female = { Houria Hourya }
 ida_female = { Ido }
-ingrid_female = { Ingrido }
+inga_female = { Inge }
+ingeborg_female = { Ingeborg }
+ingrid_female = { Ingrid Ingrido }
 irene_female = { Ireno_female }
 irma_female = { Irm_a_grv_ }
 isabella_female = { Eisabello Izabel }
@@ -149,14 +159,14 @@ jade_female = { Jade }
 jahan_female = { Jihane }
 jennifer_female = { Gueni_e_grv_vro }
 jessica_female = { Jessic_a_grv_ }
-joan_female = { Chanig Janed Janedig Janeto_female Jano_female Jeannick Yanna }
+joan_female = { Chanig Janed Janedig Janeto_female Jano_female Jeannick Johanna Yanna }
 joanamaria_female = { Jano-Mar_i_grv_o }
 jocelyn_female = { Joucelino_female }
 joelle_female = { Jo_e_uml_lle Jouelo_female }
 josepha_female = { J_o_act_usefino }
 josette_female = { Jouseto_female }
 josiane_female = { Josiane Jousiano }
-judith_female = { Judit }
+judith_female = { Judit Jutta }
 julia_female = { J_u_grv_li_female Julie }
 juliana_female = { Juliano_female }
 juliet_female = { Julieto }
@@ -187,8 +197,8 @@ maela_female = { Ma_e_uml_lie Ma_e_uml_lig Maela Maelenn Maeli }
 magdalena_female = { Madalen Madaleno Magali }
 malika_female = { Malika }
 marcella_female = { Marcelino_female Marcello_female }
-margaret_female = { Gaid Margarido Margot Marjour_i_grv_o Megano }
+margaret_female = { Gaid Margarete Margarido Margot Marjour_i_grv_o Megano Rita }
-maria_female = { Manoun Mar_i_grv_o_female Mari Maria Mariama Marioun Mariso_female Myriam }
+maria_female = { Manoun Mar_i_grv_o_female Mari Maria Mariama Marion Marioun Mariso_female Myriam }
 mariaangel_female = { Mar_i_grv_o-Ange }
 mariaanna_female = { Mar_i_grv_o-Ano Mariannick Marie-Annick Maryannick }
 mariaantonia_female = { Mar_i_grv_o-Antouneto }
@@ -206,7 +216,7 @@ mariajoseph_female = { Mar_i_grv_o-J_o_act_us_e_grv_ Mari-Jozeb }
 marialaura_female = { Mar_i_grv_o-Lauro }
 marialouisa_female = { Malou Mar_i_grv_o-Louiso Mari-Loeiza }
 mariamagdalena_female = { Mar_i_grv_o-Madaleno }
-marianne_female = { Mariana Mariano_female }
+marianne_female = { Mariana Marianne Mariano_female }
 marianoela_female = { Mar_i_grv_o-Nouelo }
 mariaodila_female = { Mar_i_grv_o-Oudilo }
 mariapaula_female = { Mar_i_grv_o-Paulo }
@@ -218,14 +228,14 @@ marilyn_female = { Maril_e_grv_no_female }
 marina_female = { Marina Marino_female }
 marlene_female = { Marl_e_grv_no }
 martha_female = { Marto_female }
-martina_female = { Martine Martino_female }
+martina_female = { Martina Martine Martino_female }
 mauricia_female = { Mauriceto_female }
 melania_female = { M_e_act_lanie Melan_i_grv_o }
 melinda_female = { M_e_act_linda }
 melissa_female = { Melisso }
-michelle_female = { Micheleto_female Michelle Michello_female Mikaela }
+michelle_female = { Michaela Micheleto_female Michelle Michello_female Mikaela }
 mireille_female = { Mir_e_grv_io Mireille }
-monica_female = { Monique Mounico_female }
+monica_female = { Monika Monique Mounico_female }
 morgana_female = { Morgana Mourgano }
 muriel_female = { Murielo }
 nadezhda_female = { Nad_e_grv_jo Nadine }
@@ -247,7 +257,7 @@ ophelia_female = { Ouf_e_act_l_i_grv_o }
 pascala_female = { Pascale Pascaleto Pascalo_female }
 patricia_female = { Patricia Patricio_female }
 paula_female = { Paola Pauleto_female Paulino_female Paulo_female }
-petra_female = { Peireto Peirounello Peirouno }
+petra_female = { Peireto Peirounello Peirouno Petra }
 philippa_female = { Felipino }
 philomena_female = { Filoumeno }
 quitteria_female = { Quit_e_grv_ri }
@@ -255,16 +265,16 @@ rachel_female = { Rach_e_grv_l }
 ramona_female = { Ramoundo_female }
 rashida_female = { Rachida }
 rayhan_female = { Rayhana }
-regina_female = { R_e_grv_ino Regino_female }
+regina_female = { R_e_grv_ino Regina Regino_female }
-renata_female = { Renato_female }
+renata_female = { Renate Renato_female }
 rolanda_female = { Roulando_female }
 romana_female = { Roumano_female }
-rosa_female = { Roso_female Rousado Rousino Rozenn }
+rosa_female = { Rosa Roso_female Rousado Rousino Rozenn }
 rosalia_female = { Rousal_i_grv_o }
 rosalyn_female = { Rousselino }
-rosamaria_female = { Roso-Mar_i_grv_o }
+rosamaria_female = { Rosemarie Roso-Mar_i_grv_o }
-ruth_female = { Rut }
+ruth_female = { Rut Ruth }
-sabina_female = { Sabino_female }
+sabina_female = { Sabine Sabino_female }
 sabrina_female = { Sabrina Sabrino_female }
 safia_female = { Safia Saphia }
 samantha_female = { Samanto }
@@ -277,17 +287,20 @@ shaykha_female = { Cheikha }
 shirin_female = { Shirine }
 sibylla_female = { Sibilo_female }
 sidonia_female = { Sidoun_i_grv_o }
-simona_female = { Simouno_female }
+sigrid_female = { Sigrid }
+simona_female = { Simone Simouno_female }
 solange_female = { Solen Solenn Soulanjo }
 solene_female = { Soul_e_grv_no }
-sophia_female = { Sophia Sofia Sonia Sophie Souf_i_grv_o }
+sophia_female = { Sophia Sofia Sonia Sonja Sophie Souf_i_grv_o }
 stella_female = { Estelle Estello Steren Sterenn }
 stephanie_female = { Esteveneto Fan_i_grv_ St_e_act_phanie }
 suad_female = { Souad }
-susan_female = { Susano_female Susoun Suzana }
+susan_female = { Susanne Susano_female Susoun Suzana }
-sylvia_female = { Silv_i_grv_o_female Sylvie }
+sylvia_female = { Silv_i_grv_o_female Sylvia Sylvie }
+tatiana_female = { Tanja }
 theresa_female = { Ter_e_grv_so }
-ursula_female = { Oursulo }
+ulrika_female = { Ulrike }
+ursula_female = { Oursulo Ursula }
 valentina_female = { Valentino_female }
 valeria_female = { Val_e_act_rie Valiero_female }
 vanessa_female = { Vanesso_female }

N3OW/common/culture/name_equivalency/00_NEOW_male_names.txt

@@ -133,6 +133,7 @@ fawzi_male = { Faouzi }
 felician_male = { Felician }
 felix_male = { F_e_act_lix F_e_grv_lis Felix }
 ferdinand_male = { Ferdinand Fernand }
+fidel_male = { Fidelis }
 firmin_male = { Fermin }
 flavian_male = { Flavian }
 florent_male = { Flour_e_grv_ns }
@@ -145,7 +146,7 @@ gabriel_male = { Gabri_e_act_u Gabriel }
 gael_male = { Ga_e_grv_l Ga_e_uml_l Gael }
 gaetan_male = { Gastoun }
 geoffrey_male = { Gaufre Jaufret Gottfried }
-george_male = { Georg J_o_grv_rgi J_u_uml_rgen Jord Jorj }
+george_male = { Georg J_o_grv_rgi J_u_uml_rgen Jord Jorj Schorsch }
 gerald_male = { Giraud }
 gerard_male = { Gerhard Girard }
 german_male = { German }
@@ -155,6 +156,7 @@ giles_male = { Gile Jil Jili }
 graham_male = { Graham }
 gregory_male = { Greg_o_grv_ri }
 gunther_male = { G_u_uml_nter G_u_uml_nther }
+guntram_male = { Guntram }
 gustav_male = { Gust_a_grv_vi Gustav }
 guy_male = { Gui Guido Guy }
 gwenael_male = { Gu_e_act_na_e_uml_l Gwena_e_uml_l Gwenn-A_e_uml_l }
@@ -185,6 +187,7 @@ hussein_male = { Hocine Houssen }
 hyacinth_male = { Jacint }
 hywel_male = { Hoel Howel }
 idris_male = { Driss Idriss }
+ignatius_male = { Ignaz }
 irenaeus_male = { Ireni_e_act_u }
 ismail_male = { Isma_e_uml_l Isma_i_uml_l }
 izzuddin_male = { Azzedine }
@@ -207,7 +210,7 @@ johnclaudius_male = { Jan-Gl_a_grv_udi Yann-Glaod }
 johnfrancis_male = { Jan-Franc_e_act_s Yann-Fa_n_tld_ch }
 johngeorge_male = { Hansgeorg }
 johnjames_male = { Jan-Jaque Yann-Jakez }
-johnlouis_male = { Jan-Lou_i_uml_s Yann-Loeiz }
+johnlouis_male = { Hansludwig Jan-Lou_i_uml_s Yann-Loeiz }
 johnluke_male = { Jan-Lu Yann-Luk }
 johnmark_male = { Jan-Marc Yann-Vark }
 johnmartin_male = { Hansmartin }
@@ -224,10 +227,13 @@ jonathan_male = { Jounatan }
 jordan_male = { Jourdan }
 joseph_male = { J_o_act_us_e_grv_ Job_Joseph Josef Jozeb Youssef }
 josephmary_male = { Jozeb-Mari }
+joshua_male = { Joschua }
+jost_male = { Jost }
 judicael_male = { Judica_e_uml_l Judikael }
 jules_male = { J_u_grv_li Julius }
 julian_male = { Julian Juluan }
 justin_male = { Justin }
+justus_male = { Justus }
 kamil_male = { Camel Kamel }
 karim_male = { Karim }
 kevin_male = { K_e_act_vin Quevin }
@@ -236,12 +242,12 @@ khalifa_male = { Halifa }
 khalil_male = { Khalil }
 kosmas_male = { Cosme }
 kylian_male = { Kilian Kilyan Kylian Kyliann Kyllian }
-lambert_male = { Lambert }
+lambert_male = { Lambert Lamprecht }
 latif_male = { Latuf }
 lawrence_male = { Laora_n_tld_s Laur_e_grv_ns Lorenz }
 lenaig_male = { L_e_act_na_i_uml_c Lenaig }
 leo_male = { Leon Leoun }
-leonard_male = { Lienard }
+leonard_male = { Lienard Lienhardt }
 leopold_male = { Leopold Leoupold }
 lionel_male = { Lionel Liounel }
 lothar_male = { Clotaire Lothar }
@@ -322,6 +328,7 @@ reinhard_male = { Reinhard }
 remigius_male = { Roumi_e_act_ }
 renatus_male = { Reini_e_act_ Ren_e_act_ }
 reza_male = { Reda }
+reuben_male = { Ruben }
 riad_male = { Riad Riadh }
 richard_male = { Ricard Richard Richarzh }
 ridwan_male = { Redouane }
@@ -340,6 +347,7 @@ samir_male = { Samir }
 samuel_male = { Samu_e_grv_l }
 sebastian_male = { Bastian Sebastian }
 sergius_male = { S_e_grv_rgi Serj }
+severinus_male = { Severin }
 shamsuddin_male = { Chems-Eddine }
 shaykh_male = { Cheikh }
 siegfried_male = { Siegfried }
@@ -349,6 +357,7 @@ stanislaus_male = { Estanislau }
 stephen_male = { _E_act_tienne Est_e_grv_ve Estefan Stefan Stephan Steven }
 sufyan_male = { Seufyann Sofian Sofiane Soufian }
 sylvain_male = { S_e_act_uvan Sylvain }
+sylvius_male = { Silvius }
 talal_male = { Talal }
 tanguy_male = { Tangi Tanguy }
 tariq_male = { Tarek Tareq Tarik }
@@ -357,8 +366,9 @@ theo_male = { Theo }
 theobald_male = { Tepot Tibaud }
 theodore_male = { Teoudor Theodor }
 theodoric_male = { Dieter Dietrich Terris Thierry }
-theophilus_male = { Teoufile }
+theophilus_male = { Teoufile Theophil }
 thomas_male = { Thomas Tomaz Toumas }
+tiberius_male = { Tiberius }
 timothy_male = { Timouti_e_act_u }
 tobias_male = { Tobias }
 tristan_male = { Tristan Trystan }
@@ -370,7 +380,7 @@ valerius_male = { Val_e_grv_ri }
 victor_male = { Viktor Vitour }
 vincent_male = { Vinc_e_grv_ns Visant }
 walid_male = { Walid }
-walter_male = { Gauchi_e_act_ Walter }
+walter_male = { Gauchi_e_act_ Walter Walther }
 wilfried_male = { Wilfried }
 william_male = { Lomig Guih_e_grv_n Guih_e_grv_ume Gwilherm Gwillam Wilhelm }
 wissam_male = { Wissam Wissem }
@@ -379,3 +389,4 @@ yassin_male = { Yacine Yassin Yassine }
 yves_male = { Eozen Erwan Erwann Ives Ivo Youen Youenn Youn Yves Yvon Yvonig Yvonnick }
 zachary_male = { Zacar_i_grv_o Zachary }
 zaynuddin_male = { Zin_e_act_dine }
+zeno_male = { Zeno }

N3OW/common/culture/name_lists/NEOW_central_germanic.txt

@@ -639,16 +639,16 @@ name_list_NEOW_swabian = {
 			Bertel 
 			Camill Casimir 
 			Diethelm 
-			Eiges Elias Ermin 
+			Eiges Elias 
 			Ferfried Fidelis 
 			Gangolf Giselher Gundolf Guntram 
 			Hansludwig Harro Helferich 
-			Ignaz Immo 
+			Ignaz 
 			Joschua Jost Justus 
 			Lamprecht Lienhardt Ludger 
 			Ruben 
 			Schorsch Severin Silvius 
-			Tanit Thadd_a_uml_us Theophil Theopont Tiberius 
+			Thadd_a_uml_us Theophil Theopont Tiberius 
 			Ventur Volkwein 
 			Walther Wolfhard 
 			Zeno 

N3OW/common/landed_titles/germany.txt

@@ -2028,16 +2028,16 @@ e_germany = {
     k_swabia = {
         color = { 128 9 27 }
 
-        capital = c_wurttemberg
+        capital = c_stuttgart
-		d_stuttgart = {
+		d_wurttemberg = {
 			color = { 111  162  128 }
 
-			capital = c_wurttemberg #wurttemberg
+			capital = c_stuttgart
 
-			c_wurttemberg = {
+			c_stuttgart = {
 				color = { 111  162  128 }
 
-				b_wurttemberg = {
+				b_stuttgart = {
 					province = 2748
 
 					color = { 111  162  128 }
@@ -2194,50 +2194,55 @@ e_germany = {
 				}
 			}
 		}	
-		d_karlsruhe = {
+		d_baden = {
-			color = { 120  160  70 }
+			color = { 120 160 70 }
 		
-			capital = c_baden #Baden
+			capital = c_karlsruhe #Karlsruhe
 		
-			c_baden = {
+			c_karlsruhe = {
-				color = { 120  160  70 }
+				color = { 120 160 70 }
 				b_karlsruhe = {
 					province = 9775
 
-					color = { 120  160  70 }
+					color = { 120 160 70 }
 				}
 				b_baden = {
 					province = 2746
 
-					color = { 120  160  70 }
+					color = { 120 160 70 }
 				}
 				b_hockenheim = {
 					province = 2744
 
-					color = { 120  160  70 }
+					color = { 120 160 70 }
 				}
+			}
+			
+			c_heidelberg = {
+				color = { 100 130 50 }
+				
 				b_heidelberg = {
 					province = 2733
 
-					color = { 120  160  70 }
+					color = { 100 130 50 }
 				}
 				b_weinheim = {
 					province = 2735
 
-					color = { 120  160  70 }
+					color = { 100 130 50 }
 				}
 			}
 
-			c_durne = {
+			c_mosbach = {
 				color = { 145 155 145 }
 
-				b_durne = {
+				b_mosbach = {
-					province = 2739
+					province = 2738
 
 					color = { 145 155 145 }
 				}
-				b_mosbach = {
+				b_walldurn = {
-					province = 2738
+					province = 2739
 
 					color = { 145 155 145 }
 				}
@@ -2266,7 +2271,7 @@ e_germany = {
 		d_freiburg = {
 			color = { 90 110 90 }		
 		
-			capital = c_baden #Baden
+			capital = c_breisgau #Freiburg
 					
 			c_breisgau = {
 				color = { 90 110 90 }	

N3OW/common/province_terrain/01_province_properties.txt

@@ -3157,10 +3157,6 @@
 2742 ={
 	winter_severity_bias = 0.45
 }
-# b_weinheim 
-2735 ={
-	winter_severity_bias = 0.45
-}
 #b_darmundestat 
 ## c_worms 
 # b_worms 
@@ -3176,14 +3172,6 @@
 2732 ={
 	winter_severity_bias = 0.45
 }
-# b_hockenheim 
-2744 ={
-	winter_severity_bias = 0.45
-}
-# b_heidelberg 
-2733 ={
-	winter_severity_bias = 0.45
-}
 # b_weissenburg 
 2724 ={
 	winter_severity_bias = 0.45
@@ -3205,15 +3193,15 @@
 2772 ={
 	winter_severity_bias = 0.45
 }
-## c_durne 
+## c_mosbach 
-# b_durne 
-2739 ={
-	winter_severity_bias = 0.45
-}
 # b_mosbach 
 2738 ={
 	winter_severity_bias = 0.45
 }
+# b_walldurn 
+2739 ={
+	winter_severity_bias = 0.45
+}
 # b_wertheim 
 2868 ={
 	winter_severity_bias = 0.45
@@ -3542,8 +3530,8 @@
 2761 ={
 	winter_severity_bias = 0.50
 }
-## c_wurttemberg 
+## c_stuttgart 
-# b_wurttemberg 
+# b_stuttgart 
 2748 ={
 	winter_severity_bias = 0.50
 }
@@ -3555,11 +3543,28 @@
 2771 ={
 	winter_severity_bias = 0.50
 }
-## c_baden 
+## c_karlsruhe 
+# b_karlsruhe
+9775 = {
+	winter_severity_bias = 0.50
+}
 # b_baden 
 2746 ={
 	winter_severity_bias = 0.50
 }
+# b_hockenheim 
+2744 ={
+	winter_severity_bias = 0.45
+}
+## c_heidelberg
+# b_heidelberg 
+2733 ={
+	winter_severity_bias = 0.45
+}
+# b_weinheim 
+2735 ={
+	winter_severity_bias = 0.45
+}
 # b_sulz 
 2755 ={
 	winter_severity_bias = 0.50
@@ -44437,9 +44442,6 @@
 9774 = {
 	winter_severity_bias = 0.70
 }
-9775 = {
-	winter_severity_bias = 0.70
-}
 9776 = {
 	winter_severity_bias = 0.20
 }

N3OW/history/characters/NEOW_e_germania.txt

@@ -2513,7 +2513,7 @@ jurgen_i_of_ravensburg={
 }
 
 ###Hastenteufel dynasty
-jochem_i_of_baden={
+jochem_i_of_karlsruhe={
 	name="Jochem"
 	dynasty_house=house_hastenteufel #Hastenteufel
 	culture=swabian
@@ -2529,7 +2529,7 @@ marta_hastenteufel={
 	dynasty_house=house_hastenteufel #Hastenteufel
 	culture=swabian
 	religion=teutonic
-	father=jochem_i_of_baden
+	father=jochem_i_of_karlsruhe
 	2441.5.16={birth=yes}
 	2462.6.13={add_spouse=eiges_vii_of_swabia}
 	2493.2.8={death=yes}
@@ -2539,11 +2539,11 @@ herbert_hastenteufel={
 	dynasty_house=house_hastenteufel #Hastenteufel
 	culture=swabian
 	religion=teutonic
-	father=jochem_i_of_baden
+	father=jochem_i_of_karlsruhe
 	2447.3.25={birth=yes}
 	2474.12.11={death=yes}
 }
-edwin_i_of_baden={
+edwin_i_of_karlsruhe={
 	name="Edwin"
 	dynasty_house=house_hastenteufel #Hastenteufel
 	culture=swabian
@@ -2552,21 +2552,21 @@ edwin_i_of_baden={
 	2466.6.16={birth=yes}
 	2495.7.6={death=yes}
 }
-wigulaus_i_of_baden={
+wigulaus_i_of_karlsruhe={
 	name="Wigul_a_uml_us"
 	dynasty_house=house_hastenteufel #Hastenteufel
 	culture=swabian
 	religion=teutonic
-	father=edwin_i_of_baden
+	father=edwin_i_of_karlsruhe
 	2487.11.23={birth=yes}
 	2534.12.11={death=yes}
 }
-erwin_i_of_baden={
+erwin_i_of_karlsruhe={
 	name="Erwin"
 	dynasty_house=house_hastenteufel #Hastenteufel
 	culture=swabian
 	religion=teutonic
-	father=wigulaus_i_of_baden
+	father=wigulaus_i_of_karlsruhe
 	trait=education_stewardship_3
 	trait=diligent
 	trait=zealous
@@ -3029,7 +3029,7 @@ volker_bruderle={
 	culture=palatine
 	religion=teutonic
 	2387.4.9={birth=yes}
-	2440.5.20={death={death_reason=death_duel killer=jochem_i_of_baden}}
+	2440.5.20={death={death_reason=death_duel killer=jochem_i_of_karlsruhe}}
 }
 vera_bruderle={
 	name="Vera"

N3OW/history/provinces/e_germany.txt

@@ -1243,27 +1243,27 @@
 	holding = none
 }
 ###c_bautzen
-3141 = {
+3032 = {
-	culture = saxon
+	culture = sorbian
-	religion = heimwehler
+	religion = roman_catholic
 	holding = tribal_holding
 }
+3141 = {
+	holding = none
+}
 3033 = {
 	holding = none
 }
-3032 = {
-	holding = none
-}
 ###c_meissen
-3035 = {
+3027 = {
 	holding = tribal_holding
 	culture = saxon
 	religion = heimwehler
 }
-3034 = {
+3035 = {
 	holding = none
 }
-3027 = {
+3034 = {
 	holding = none
 }
 ###c_erzgebirg
@@ -1468,8 +1468,8 @@
 }
 
 #k_swabia
-##d_stuttgart
+##d_wurttemberg
-###c_wurttemberg
+###c_stuttgart
 2748 = {
 	culture = swabian
 	religion = lutheran
@@ -1578,10 +1578,10 @@
 2774 = {
 	holding = none
 }
-##d_karlsruhe
+##d_baden
-###c_baden
+###c_karlsruhe
 9775 = {
-	culture = palatine
+	culture = swabian
 	religion = teutonic
 	holding = castle_holding
 }
@@ -1591,19 +1591,22 @@
 2744 = {
 	holding = city_holding
 }
+###c_heidelberg
 2733 = {
-	holding = church_holding
+	culture = palatine
+	religion = teutonic
+	holding = castle_holding
 }
 2735 = {
 	holding = city_holding
 }
-###c_durne
+###c_mosbach
-2739 = {
+2738 = {
 	culture = swabian
 	religion = einblicker
 	holding = tribal_holding
 }
-2738 = {
+2739 = {
 	holding = none
 }
 2868 = {

N3OW/history/titles/k_swabia.txt

@@ -28,7 +28,7 @@ k_swabia={
 2554.5.15 = {holder=germany0007} #Olaf Abend
 }
 
-d_stuttgart={
+d_wurttemberg={
 2156.7.21={holder=hannes_i_of_swabia}
 2167.2.24={holder=joschua_i_of_swabia}
 2185.2.17={holder=joschua_ii_of_swabia}
@@ -58,7 +58,7 @@ d_stuttgart={
 2554.5.15 = {holder=germany0007} #Olaf Abend
 }
 
-c_wurttemberg = {
+c_stuttgart = {
 2156.7.21={holder=hannes_i_of_swabia}
 2167.2.24={holder=joschua_i_of_swabia}
 2185.2.17={holder=joschua_ii_of_swabia}
@@ -212,25 +212,35 @@ c_ulm={
 2538.1.26={holder=ferdinand_i_of_swabia}
 }
 
-d_karlsruhe={
+d_baden={
-2443.7.20={holder=jochem_i_of_baden}
+2443.7.20={holder=jochem_i_of_karlsruhe}
-2495.4.9={holder=edwin_i_of_baden}
+2495.4.9={holder=edwin_i_of_karlsruhe}
-2495.7.6={holder=wigulaus_i_of_baden}
+2495.7.6={holder=wigulaus_i_of_karlsruhe}
-2534.12.11={holder=erwin_i_of_baden}
+2534.12.11={holder=erwin_i_of_karlsruhe}
 2554.1.1={liege=k_swabia}
 }
 
-c_baden={
+c_karlsruhe={
 2346.9.19={holder=franz_i_of_karlsruhe}
 2407.11.26={holder=burkhard_iii_of_swabia}
-2440.5.20={holder=jochem_i_of_baden}
+2440.5.20={holder=jochem_i_of_karlsruhe}
-2495.4.9={holder=edwin_i_of_baden}
+2495.4.9={holder=edwin_i_of_karlsruhe}
-2495.7.6={holder=wigulaus_i_of_baden}
+2495.7.6={holder=wigulaus_i_of_karlsruhe}
-2534.12.11={holder=erwin_i_of_baden}
+2534.12.11={holder=erwin_i_of_karlsruhe}
 2554.1.1={liege=k_swabia}
 }
 
-c_durne = {
+c_heidelberg={
+2346.9.19={holder=franz_i_of_karlsruhe}
+2407.11.26={holder=burkhard_iii_of_swabia}
+2440.5.20={holder=jochem_i_of_karlsruhe}
+2495.4.9={holder=edwin_i_of_karlsruhe}
+2495.7.6={holder=wigulaus_i_of_karlsruhe}
+2534.12.11={holder=erwin_i_of_karlsruhe}
+2554.1.1={liege=k_swabia}
+}
+
+c_mosbach = {
 	2554.1.1 = {
 		holder = germany0050 #Willi Makserbunner
 		liege = d_east_franconia
@@ -243,9 +253,9 @@ c_kraichgau={
 2340.1.27={holder=heinrich_i_of_kraichgau}
 2399.5.27={holder=simon_i_of_swabia}
 2427.2.4={holder=burkhard_iii_of_swabia}
-2440.5.20={holder=jochem_i_of_baden}
+2440.5.20={holder=jochem_i_of_karlsruhe}
-2495.7.6={holder=wigulaus_i_of_baden}
+2495.7.6={holder=wigulaus_i_of_karlsruhe}
-2534.12.11={holder=erwin_i_of_baden}
+2534.12.11={holder=erwin_i_of_karlsruhe}
 2554.1.1={liege=k_swabia}
 }
 

N3OW/localization/english/names/NEOW_character_names_l_english.yml

@@ -1559,3 +1559,97 @@
  Diethelm:0 "Diethelm"
  Eiges:0 "Eiges"
  Elias:0 "Elias"
+ Ferfried:0 "Ferfried"
+ Fidelis:0 "Fidelis"
+ Gangolf:0 "Gangolf"
+ Giselher:0 "Giselher"
+ Gundolf:0 "Gundolf"
+ Guntram:0 "Guntram"
+ Hansludwig:0 "Hansludwig"
+ Harro:0 "Harro"
+ Helferich:0 "Helferich"
+ Ignaz:0 "Ignaz"
+ Joschua:0 "Joschua"
+ Jost:0 "Jost"
+ Justus:0 "Justus"
+ Lamprecht:0 "Lamprecht"
+ Lienhardt:0 "Lienhardt"
+ Ludger:0 "Ludger"
+ Ruben:0 "Ruben"
+ Schorsch:0 "Schorsch"
+ Severin:0 "Severin"
+ Silvius:0 "Silvius"
+ Theophil:0 "Theophil"
+ Theopont:0 "Theopont"
+ Tiberius:0 "Tiberius"
+ Ventur:0 "Ventur"
+ Volkwein:0 "Volkwein"
+ Walther:0 "Walther"
+ Wolfhard:0 "Wolfhard"
+ Zeno:0 "Zeno"
+ Alexandra:0 "Alexandra"
+ Anita:0 "Anita"
+ Anja:0 "Anja"
+ Annette:0 "Annette"
+ Barbara:0 "Barbara"
+ Beate:0 "Beate"
+ Bettina:0 "Bettina"
+ Brigitte:0 "Brigitte"
+ Christa:0 "Christa"
+ Christina:0 "Christina"
+ Christine:0 "Christine"
+ Claudia:0 "Claudia"
+ Doris:0 "Doris"
+ Edith:0 "Edith"
+ Elisabeth:0 "Elisabeth"
+ Elke:0 "Elke"
+ Erika:0 "Erika"
+ Eva:0 "Eva"
+ Gabriele:0 "Gabriele"
+ Gerda:0 "Gerda"
+ Gertrud:0 "Gertrud"
+ Gisela:0 "Gisela"
+ Hannelore:0 "Hannelore"
+ Hedwig:0 "Hedwig"
+ Heike:0 "Heike"
+ Helga:0 "Helga"
+ Hildegard:0 "Hildegard"
+ Ilse:0 "Ilse"
+ Inge:0 "Inge"
+ Ingeborg:0 "Ingeborg"
+ Ingrid:0 "Ingrid"
+ Johanna:0 "Johanna"
+ Jutta:0 "Jutta"
+ Karin:0 "Karin"
+ Katharina:0 "Katharina"
+ Manuela:0 "Manuela"
+ Margarete:0 "Margarete"
+ Marianne:0 "Marianne"
+ Marion:0 "Marion"
+ Martina:0 "Martina"
+ Michaela:0 "Michaela"
+ Monika:0 "Monika"
+ Petra:0 "Petra"
+ Regina:0 "Regina"
+ Renate:0 "Renate"
+ Rosemarie:0 "Rosemarie"
+ Ruth:0 "Ruth"
+ Sabine:0 "Sabine"
+ Sigrid:0 "Sigrid"
+ Silke:0 "Silke"
+ Simone:0 "Simone"
+ Sonja:0 "Sonja"
+ Susanne:0 "Susanne"
+ Sylvia:0 "Sylvia"
+ Tanja:0 "Tanja"
+ Ulrike:0 "Ulrike"
+ Ursula:0 "Ursula"
+ Waltraud:0 "Waltraud"
+ Adelheid:0 "Adelheid"
+ Agathe:0 "Agathe"
+ Agnes:0 "Agnes"
+ Alina:0 "Alina"
+ Annemarie:0 "Annemarie"
+ Antonia:0 "Antonia"
+ Astrid:0 "Astrid"
+ Berta:0 "Berta"

N3OW/localization/english/titles_l_english.yml

@@ -3101,7 +3101,6 @@
  b_durkheim:0 "Dürkheim"
  b_durlach:0 "Durlach"
  b_durmberg:0 "Dürmberg"
- b_durne:0 "Dürn"
  b_durness:0 "Durness"
  b_durrah:0 "Durrah"
  b_durrow:0 "Durrow"
@@ -9628,7 +9627,6 @@
  b_stsymeon:0 "Saint Symeon"
  b_stubing:0 "Stübing"
  b_stupovi:0 "Stupovi"
- b_stuttgart:0 "Stuttgart"
  b_stveit:0 "Sankt Veith"
  b_suada:0 "Suada"
  b_suadigil:0 "Suádigil"
@@ -11106,7 +11104,6 @@
  b_wulei:0 "Wulei"
  b_wulfsdorf:0 "Wulfsdorf"
  b_wunsdorf:1 "Wunstorf"
- b_wurttemberg:1 "Stuttgart"
  b_wurzburg:0 "Würzburg"
  b_wutanzili:0 "Wutanzili"
  b_wycombe:0 "Wycombe"
@@ -11753,8 +11750,6 @@
  c_badajoz_adj:0 "Badajozian"
  c_badakhshan:0 "Badakhshan"
  c_badakhshan_adj:0 "Badakhshani"
- c_baden:0 "Baden"
- c_baden_adj:0 "Badenian"
  c_badghis:0 "Badghis"
  c_badghis_adj:0 "Badghisan"
  c_baduspan:0 "Baduspan"
@@ -12359,8 +12354,6 @@
  c_duqm_adj:0 "Duqmian"
  c_durham:0 "Durham"
  c_durham_adj:0 "Durhamian"
- c_durne:0 "Dürn"
- c_durne_adj:0 "Durner"
  c_dvaraka:0 "Dvaraka"
  c_dvaraka_adj:0 "Dvarakan"
  c_dwarasamudra:0 "Dwarasamudra"
@@ -14935,8 +14928,6 @@
  c_worms_adj:0 "Wormsian"
  c_wschowska:0 "Wschowa"
  c_wschowska_adj:0 "Wschowan"
- c_wurttemberg:0 "Württemberg"
- c_wurttemberg_adj:0 "Württembergian"
  c_wurzburg:0 "Würzburg"
  c_wurzburg_adj:0 "Würzburgian"
  c_westmeath:0 "Westmeath"
@@ -15129,8 +15120,6 @@
  d_badajoz:0 "Extremadura"
  d_badajoz_adj:0 "Extremaduran"
  d_badakhshan:0 "Badakhshan"
- d_baden:0 "Baden"
- d_baden_adj:0 "Badenian"
  d_baghdad:0 "Baghdad"
  d_baghdad_adj:0 "Baghdadian"
  d_balearic:0 "Balearic"
@@ -24683,21 +24672,6 @@
  d_bundesreich:0 "Bundesreich" 
  d_bundesreich_adj:0 "Bundesreicher"
 
- d_freiburg:0 "Freiburg" 
- d_freiburg_adj:0 "Freiburger" 
- d_tubingen:0 "Tubingen" 
- d_tubingen_adj:0 "Tubingener" 
- d_karlsruhe:0 "Karlsruhe" 
- d_karlsruhe_adj:0 "Karlsruher" 
- d_stuttgart:0 "Stuttgart" 
- d_stuttgart_adj:0 "Stuttgarter" 
- c_schwarzwald:0 "Schwarzwald" 
- c_schwarzwald_adj:0 "Schwarzwalder" 
- b_lorrach:0 "Lorrach" 
- b_villingen_schwenningen:0 "Vellingen-Schwenningen" 
- b_waldshut:0 "Waldshut" 
- b_tuttlingen:0 "Tuttlingen" 
-
  ###NEOW Scandinavian Titles
  c_buskerud:0 "Buskerud"
  c_buskerud_adj:0 "Buskerudian"
@@ -25056,6 +25030,34 @@
  c_ravensburg_adj:0 "Ravensburger"
  c_kraichgau:0 "Kraichgau"
  c_kraichgau_adj:0 "Kraichgauer"
+ d_wurttemberg:0 "Württemberg"
+ d_wurttemberg_adj:0 "Württemberger"
+ b_stuttgart:0 "Stuttgart"
+ c_stuttgart:0 "Stuttgart"
+ c_stuttgart_adj:0 "Stuttgarter"
+ c_heilbronn:0 "Heilbronn"
+ c_heilbronn_adj:0 "Heilbronner"
+ d_tubingen:0 "Tübingen"
+ d_tubingen_adj:0 "Tübinger"
+ c_sigmaringen:0 "Sigmaringen"
+ c_sigmaringen_adj:0 "Sigmaringer"
+ c_heidelberg:0 "Heidelberg"
+ c_heidelberg_adj:0 "Heidelberger"
+ c_karlsruhe:0 "Karlsruhe"
+ c_karlsruhe_adj:0 "Karlsruher"
+ d_baden:0 "Baden"
+ d_baden_adj:0 "Badener"
+ d_freiburg:0 "Freiburg" 
+ d_freiburg_adj:0 "Freiburger" 
+ c_schwarzwald:0 "Schwarzwald" 
+ c_schwarzwald_adj:0 "Schwarzwalder" 
+ b_lorrach:0 "Lorrach" 
+ b_villingen_schwenningen:0 "Villingen-Schwenningen" 
+ b_waldshut:0 "Waldshut" 
+ b_tuttlingen:0 "Tuttlingen" 
+ c_mosbach:0 "Mosbach" 
+ c_mosbach_adj:0 "Mosbacher" 
+ b_walldurn:0 "Walldürn" 
  
  ##Britania
  d_channel_islands:0 "Channel Islands"

N3OW/map_data/definition.csv

@@ -2737,7 +2737,7 @@
 2736;44;114;68;BESENSHEIM;x
 2737;86;117;196;ERBACH;x
 2738;128;120;69;MOSBACH;x
-2739;170;123;197;DURNE;x
+2739;170;123;197;WALLDÜRN;x
 2740;2;126;70;PERSIAN IMPASSABLE;x
 2741;44;129;198;RUSSELSHEIM;x
 2742;86;132;71;SELIGENSTADT;x
@@ -2746,7 +2746,7 @@
 2745;2;141;200;VAIHINGEN;x
 2746;44;144;73;BADEN;x
 2747;86;147;201;CALW;x
-2748;128;150;74;WIRTEMBERG;x
+2748;128;150;74;STUTTGART;x
 2749;170;153;202;TUBINGEN;x
 2750;2;156;75;SANKT BLASIEN;x
 2751;44;159;203;FREIBURG;x