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

N3OW/history/characters/NEOW_e_germania.txt

@@ -70,8 +70,10 @@ germany0006 = {
 	}
 }
 
-germany0007 = {
-	name = "Olaf"
+germany0007 = { # Astrid Abend
+	name = "Astrid"
+	female=yes
+	mother=rosemarie_i_of_swabia
 	dynasty = abend_dynasty
 	religion = "lutheran"
 	culture = swabian
@@ -80,7 +82,7 @@ germany0007 = {
 	trait = diligent
 	trait = arrogant
 
-	2515.1.1 = {
+	2533.9.24 = {
     	birth = yes
 	}
 	2600.1.1 = {
@@ -2463,7 +2465,7 @@ franz_i_of_swabia={
 	name="Franz"
 	dynasty=weissbronner_dynasty #Weissbronner
 	culture=swabian
-	religion=roman_catholic
+	religion=lutheran
 	trait=education_diplomacy_3
 	trait=lifestyle_gardener
 	trait=compassionate
@@ -2479,7 +2481,7 @@ eiges_vii_of_swabia={
 	name="Eiges"
 	dynasty=weissbronner_dynasty #Weissbronner
 	culture=swabian
-	religion=roman_catholic
+	religion=lutheran
 	father=franz_i_of_swabia
 	mother=lydia_wendlenger_2
 	2445.6.13={birth=yes}
@@ -2489,7 +2491,7 @@ gotthilf_i_of_swabia={
 	name="Gotthilf"
 	dynasty=weissbronner_dynasty #Weissbronner
 	culture=swabian
-	religion=roman_catholic
+	religion=lutheran
 	father=eiges_vii_of_swabia
 	mother=marta_hastenteufel
 	trait=education_stewardship_3
@@ -2504,19 +2506,30 @@ franz_weissbronner={
 	name="Franz"
 	dynasty=weissbronner_dynasty #Weissbronner
 	culture=swabian
-	religion=roman_catholic
+	religion=lutheran
 	father=gotthilf_i_of_swabia
 	trait=twin
 	2483.8.24={birth=yes}
 	2507.2.22={add_spouse=helene_coudenhove}
 	2521.2.16={death=yes}
 }
+rosemarie_i_of_swabia={
+	name="Rosemarie"
+	female=yes
+	dynasty=weissbronner_dynasty #Weissbronner
+	culture=swabian
+	religion=lutheran
+	father=franz_weissbronner
+	mother=helene_coudenhove
+	2507.6.8={birth=yes}
+	2554.10.31={death=yes}
+}
 isabella_weissbronner={
 	name="Isabella"
 	female=yes
 	dynasty=weissbronner_dynasty #Weissbronner
 	culture=swabian
-	religion=roman_catholic
+	religion=lutheran
 	father=franz_weissbronner
 	mother=helene_coudenhove
 	2509.5.25={birth=yes}
@@ -2526,7 +2539,7 @@ eberhard_i_of_swabia={
 	name="Eberhard"
 	dynasty=weissbronner_dynasty #Weissbronner
 	culture=swabian
-	religion=roman_catholic
+	religion=lutheran
 	father=franz_weissbronner
 	mother=helene_coudenhove
 	2512.10.13={birth=yes}
@@ -2536,10 +2549,10 @@ markus_i_of_swabia={
 	name="Markus"
 	dynasty=weissbronner_dynasty #Weissbronner
 	culture=swabian
-	religion=roman_catholic
+	religion=lutheran
 	father=eberhard_i_of_swabia
 	2535.6.10={birth=yes}
-	2554.5.15={death=yes}
+	2549.5.15={death=yes}
 }
 josef_i_of_ulm={
 	name="Josef"

N3OW/history/titles/k_swabia.txt

@@ -25,7 +25,8 @@ k_swabia={
 2474.1.20={holder=gotthilf_i_of_swabia}
 2500.11.30={holder=eberhard_i_of_swabia}
 2544.6.13={holder=markus_i_of_swabia}
-2554.5.15 = {holder=germany0007} #Olaf Abend
+2549.5.15 = {holder=rosemarie_i_of_swabia}
+2554.10.31 = {holder=germany0007} #Astrid Abend
 2555.1.1 = { change_development_level = 7 }
 }
 
@@ -56,7 +57,8 @@ d_wurttemberg={
 2474.1.20={holder=gotthilf_i_of_swabia}
 2500.11.30={holder=eberhard_i_of_swabia}
 2544.6.13={holder=markus_i_of_swabia}
-2554.5.15 = {holder=germany0007} #Olaf Abend
+2549.5.15 = {holder=rosemarie_i_of_swabia}
+2554.10.31 = {holder=germany0007} #Astrid Abend
 }
 
 c_stuttgart = {
@@ -86,13 +88,12 @@ c_stuttgart = {
 2474.1.20={holder=gotthilf_i_of_swabia}
 2500.11.30={holder=eberhard_i_of_swabia}
 2544.6.13={holder=markus_i_of_swabia}
-	2554.5.15 = {
-		holder = germany0007 #Olaf Abend
-	}
+2549.5.15 = {holder=rosemarie_i_of_swabia}
+2554.10.31 = {holder=germany0007} #Astrid Abend
 2555.1.1 = { change_development_level = 12 }
 }
 
-c_heilbronn={
+c_heilbronn = {
 2156.7.21={holder=hannes_i_of_swabia}
 2167.2.24={holder=joschua_i_of_swabia}
 2185.2.17={holder=joschua_ii_of_swabia}
@@ -101,18 +102,27 @@ c_heilbronn={
 2234.7.18={holder=joschua_iii_of_swabia}
 2245.7.18={holder=ulrich_i_of_swabia}
 2270.10.31={holder=eiges_i_of_swabia}
-2294.3.12={holder=gerhard_ii_of_heilbronn}
-2306.6.4={holder=wilhelm_i_of_heilbronn}
-2319.10.2={holder=burkhard_i_of_swabia}
-2330.10.30={holder=stefan_i_of_heilbronn}
-2388.4.17={holder=stefan_ii_of_heilbronn}
-2388.10.13={holder=matthias_i_of_heilbronn}
-2413.12.28={holder=arnulf_i_of_heilbronn}
-2431.9.19={holder=siegfried_i_of_heilbronn}
-2495.8.28={holder=bertel_i_of_heilbronn}
-2507.12.13={holder=theo_i_of_heilbronn}
-2549.9.16={holder=hansmartin_i_of_heilbronn}
-2554.1.1={liege=k_swabia}
+2294.3.12={holder=eiges_ii_of_swabia}
+2310.5.20={holder=daniel_i_of_swabia}
+2330.10.30={holder=burkhard_i_of_swabia}
+2330.11.6={holder=heinrich_i_of_swabia}
+2331.10.31={holder=lienhardt_i_of_swabia}
+2371.12.27={holder=jakob_i_of_swabia}
+2392.7.17={holder=martin_i_of_swabia}
+2400.3.24={holder=eiges_iii_of_swabia}
+2410.9.19={holder=eiges_v_of_swabia}
+2412.9.20={holder=eiges_vi_of_swabia}
+2420.1.8={holder=simon_i_of_swabia}
+2438.2.4={holder=burkhard_iii_of_swabia}
+2440.5.20={holder=0}
+2443.7.20={holder=franz_i_of_swabia}
+2462.10.18={holder=eiges_vii_of_swabia}
+2474.1.20={holder=gotthilf_i_of_swabia}
+2500.11.30={holder=eberhard_i_of_swabia}
+2544.6.13={holder=markus_i_of_swabia}
+2549.5.15 = {holder=rosemarie_i_of_swabia}
+2554.10.31 = {holder=germany0007} #Astrid Abend
+2555.1.1 = { change_development_level = 12 }
 }
 
 c_hohenlohe = {
@@ -233,8 +243,11 @@ c_karlsruhe={
 }
 
 c_heidelberg={
-2346.9.19={holder=franz_i_of_karlsruhe}
-2407.11.26={holder=burkhard_iii_of_swabia}
+2311.9.4={holder=konstantin_i_of_kraichgau}
+2338.1.8={holder=simon_i_of_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_karlsruhe}
 2495.4.9={holder=edwin_i_of_karlsruhe}
 2495.7.6={holder=wigulaus_i_of_karlsruhe}
@@ -250,14 +263,25 @@ c_mosbach = {
 }
 
 c_kraichgau={
-2311.9.4={holder=konstantin_i_of_kraichgau}
-2338.1.8={holder=simon_i_of_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_karlsruhe}
-2495.7.6={holder=wigulaus_i_of_karlsruhe}
-2534.12.11={holder=erwin_i_of_karlsruhe}
+2156.7.21={holder=hannes_i_of_swabia}
+2167.2.24={holder=joschua_i_of_swabia}
+2185.2.17={holder=joschua_ii_of_swabia}
+2191.12.28={holder=philipp_i_of_swabia}
+2209.1.29={holder=gerhard_i_of_swabia}
+2234.7.18={holder=joschua_iii_of_swabia}
+2245.7.18={holder=ulrich_i_of_swabia}
+2270.10.31={holder=eiges_i_of_swabia}
+2294.3.12={holder=gerhard_ii_of_heilbronn}
+2306.6.4={holder=wilhelm_i_of_heilbronn}
+2319.10.2={holder=burkhard_i_of_swabia}
+2330.10.30={holder=stefan_i_of_heilbronn}
+2388.4.17={holder=stefan_ii_of_heilbronn}
+2388.10.13={holder=matthias_i_of_heilbronn}
+2413.12.28={holder=arnulf_i_of_heilbronn}
+2431.9.19={holder=siegfried_i_of_heilbronn}
+2495.8.28={holder=bertel_i_of_heilbronn}
+2507.12.13={holder=theo_i_of_heilbronn}
+2549.9.16={holder=hansmartin_i_of_heilbronn}
 2554.1.1={liege=k_swabia}
 }
 
@@ -278,6 +302,6 @@ c_schwarzwald={
 
 c_konstanz = {
 	2554.1.1 = {
-		holder = germany0007 #Olaf Abend
+		holder = germany0007 #Astrid Abend
 	}
 }

N3OW/localization/english/titles_cultural_names_l_english.yml

@@ -36,6 +36,7 @@
  cn_brhombycsddon:0 "Brhombycsddon"
  cn_brombexddon:0 "Brombexddon"
  cn_brombicsddon:0 "Brombicsddon"
+ cn_brombycsddon:0 "Brombycsddon"
  cn_brombyksddon:0 "Brombyksddon"
  cn_eaistendd:0 "Eaistendd"
  cn_eastyndd:0 "Eastyndd"