Merge branch 'main' of https://gitlab.com/new-era-team/N3OW
This commit is contained in:
commit
74f1ce95f2
15 changed files with 671 additions and 2796 deletions
|
|
@ -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"
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1243,27 +1243,27 @@
|
|||
holding = none
|
||||
}
|
||||
###c_bautzen
|
||||
3141 = {
|
||||
culture = saxon
|
||||
religion = heimwehler
|
||||
3032 = {
|
||||
culture = sorbian
|
||||
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
|
||||
###c_wurttemberg
|
||||
##d_wurttemberg
|
||||
###c_stuttgart
|
||||
2748 = {
|
||||
culture = swabian
|
||||
religion = lutheran
|
||||
|
|
@ -1578,10 +1578,10 @@
|
|||
2774 = {
|
||||
holding = none
|
||||
}
|
||||
##d_karlsruhe
|
||||
###c_baden
|
||||
##d_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
|
||||
2739 = {
|
||||
###c_mosbach
|
||||
2738 = {
|
||||
culture = swabian
|
||||
religion = einblicker
|
||||
holding = tribal_holding
|
||||
}
|
||||
2738 = {
|
||||
2739 = {
|
||||
holding = none
|
||||
}
|
||||
2868 = {
|
||||
|
|
|
|||
|
|
@ -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={
|
||||
2443.7.20={holder=jochem_i_of_baden}
|
||||
2495.4.9={holder=edwin_i_of_baden}
|
||||
2495.7.6={holder=wigulaus_i_of_baden}
|
||||
2534.12.11={holder=erwin_i_of_baden}
|
||||
d_baden={
|
||||
2443.7.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_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}
|
||||
2495.4.9={holder=edwin_i_of_baden}
|
||||
2495.7.6={holder=wigulaus_i_of_baden}
|
||||
2534.12.11={holder=erwin_i_of_baden}
|
||||
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_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}
|
||||
2495.7.6={holder=wigulaus_i_of_baden}
|
||||
2534.12.11={holder=erwin_i_of_baden}
|
||||
2440.5.20={holder=jochem_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}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue