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

This commit is contained in:
Heidesommer 2026-05-08 15:51:22 -04:00
commit 52c93e8b76
7 changed files with 24 additions and 11 deletions

View file

@ -12,7 +12,7 @@
tradition_fishermen tradition_fishermen
} }
name_list = name_list_finnish name_list = name_list_NEOW_finnish
coa_gfx = { balto_finnic_group_coa_gfx western_coa_gfx } coa_gfx = { balto_finnic_group_coa_gfx western_coa_gfx }
building_gfx = { western_building_gfx } building_gfx = { western_building_gfx }
@ -72,7 +72,7 @@ karelian = {
tradition_swords_for_hire tradition_swords_for_hire
} }
name_list = name_list_karelian name_list = name_list_NEOW_finnish
coa_gfx = { balto_finnic_group_coa_gfx western_coa_gfx } coa_gfx = { balto_finnic_group_coa_gfx western_coa_gfx }
building_gfx = { western_building_gfx } building_gfx = { western_building_gfx }

View file

@ -201,7 +201,7 @@ charlesanthony_male = { Carlos_spc_Ant_o_act_n }
charlesedward_male = { Carl-Edvard } charlesedward_male = { Carl-Edvard }
charlesfrederick_male = { Carlfriedrich Karl-Friedrich } charlesfrederick_male = { Carlfriedrich Karl-Friedrich }
charleshenry_male = { Carle-Enri Karlheinz Karl-Heinz } charleshenry_male = { Carle-Enri Karlheinz Karl-Heinz }
charlesjohn_male = { Karl-Hans Karl-Johan } charlesjohn_male = { Carl-Johan Karl-Hans Karl-Johan }
charleslouis_male = { Karl-Ludwig } charleslouis_male = { Karl-Ludwig }
charlesxavier_male = { Carlos_spc_Chabier } charlesxavier_male = { Carlos_spc_Chabier }
charya_male = { Chah_pst__i_hat_yya Charya Charyuh Cherryuh } charya_male = { Chah_pst__i_hat_yya Charya Charyuh Cherryuh }

View file

@ -197,10 +197,10 @@ name_list_NEOW_finnish = {
Rea Reetta Regina Rita Rosa Rea Reetta Regina Rita Rosa
Saana Saija Saimi Salla Salme Sara Senja Siiri Sirkka Sirkka-Liisa Saana Saija Saimi Salla Salme Sara Senja Siiri Sirkka Sirkka-Liisa
Tia Tiia Tuire Tuuli Tia Tiia Tuire Tuuli
Vappu Venla Vieno Vilma Virve Vuokko Vappu Venla Vieno Viivi Vilma Virve Vuokko
} }
1 = { 1 = {
Ada Adalmiina Anitra Anna-Sofia Anni-Kristiina Axa Ada Adalmiina Alviina Anitra Anna-Sofia Anni-Kristiina Axa
Eija-Elina Eleonora Eva-Lisa Eija-Elina Eleonora Eva-Lisa
Hannaleena Helen Hannaleena Helen
Inari Inari

View file

@ -259,7 +259,7 @@
_O_uml_rjan _O_uml_rjan
Aage Alarik Algot Alvin Arnold Aage Alarik Algot Alvin Arnold
Bengt-Urban Bernhard Brivio Bure Bengt-Urban Bernhard Brivio Bure
Carl-Axel Carl-Edvard Carl-Einar Casper Claes-Anders Claes-Bertil Carl-Axel Carl-Edvard Carl-Einar Carl-Johan Casper Claes-Anders Claes-Bertil
Edmund Edvard Elliot Elver Evald Eyvor Edmund Edvard Elliot Elver Evald Eyvor
Fillip Frankie Fillip Frankie
Gehn_a_uml_ll_name Gideon Gordon Gunde Gustav-Adolf Guttorm Gehn_a_uml_ll_name Gideon Gordon Gunde Gustav-Adolf Guttorm

View file

@ -2161,7 +2161,7 @@ e_germany = {
} }
b_gorlitz = { # Görlitz b_gorlitz = { # Görlitz
province = 3163 province = 3136
color = { 240 115 75 } color = { 240 115 75 }
cultural_names = { cultural_names = {
@ -2178,16 +2178,27 @@ e_germany = {
name_list_NEOW_slovak = cn_z_a_act_padn_e_act__zhorelec name_list_NEOW_slovak = cn_z_a_act_padn_e_act__zhorelec
} }
} }
b_weisswasser = { b_weisswasser = { # Żagań
province = 3066 province = 3066
color = { 240 115 75 } color = { 240 115 75 }
cultural_names = {
name_list_NEOW_low_saxon = cn_sagan
name_list_NEOW_bavarian = cn_sagan
name_list_NEOW_swabian = cn_sagan
name_list_NEOW_palatine = cn_sagan
name_list_NEOW_rhinelander = cn_sagan
name_list_NEOW_brandenburger = cn_sagan
name_list_NEOW_sorbian = cn__z_crn_aha_n_act_
name_list_NEOW_czech = cn_zah_a_act__n_crn_
}
} }
b_lobau = { b_lobau = {
province = 2980 province = 2980
color = { 215 160 130 } color = { 215 160 130 }
} }
b_boxburg = { b_boxburg = {
province = 3136 province = 3070
color = { 215 160 130 } color = { 215 160 130 }
} }
b_zittau = { b_zittau = {

View file

@ -927,7 +927,7 @@
} }
##d_upper_lusatia ##d_upper_lusatia
###c_gorlitz ###c_gorlitz
3070 = { 3136 = {
culture = sorbian culture = sorbian
religion = roman_catholic religion = roman_catholic
holding = castle_holding holding = castle_holding
@ -946,7 +946,7 @@
religion = volksmarchen religion = volksmarchen
} }
} }
3136 = { 3070 = {
holding = none holding = none
} }
4135 = { 4135 = {

View file

@ -11170,4 +11170,6 @@
Bure:0 "Bure" Bure:0 "Bure"
Perttu:0 "Perttu" Perttu:0 "Perttu"
Saija:0 "Saija" Saija:0 "Saija"
Alviina:0 "Alviina"
Viivi:0 "Viivi"