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

history/provinces/e_germany.txt

@@ -85,7 +85,7 @@
 	religion = roman_catholic
 }
 3140 = {
-	culture = polabian
+	culture = sorbian
 	religion = chernobozhye
 	holding = tribal_holding
 	929.1.1 = {
@@ -219,7 +219,7 @@
 }
 ###c_spreewald
 3180 = {
-	culture = polabian
+	culture = sorbian
 	religion = chernobozhye
 	holding = tribal_holding
 	1000.1.1 = {
@@ -234,7 +234,7 @@
 	holding = none
 }
 3175 = {
-	culture = polabian
+	culture = sorbian
 	religion = chernobozhye
 	holding = none
 	1000.1.1 = {
@@ -394,7 +394,7 @@
 }
 ###c_wendland
 2895 = {
-	culture = polabian
+	culture = sorbian
 	religion = volksmarchen
 	holding = castle_holding
 	1120.1.1 = {
@@ -478,7 +478,7 @@
 }
 ###c_stendal
 2900 = {
-	culture = polabian
+	culture = sorbian
 	religion = volksmarchen
 	holding = castle_holding
 	1120.1.1 = {
@@ -876,7 +876,7 @@
 }
 ###c_erzgebirg
 3012 = {
-	culture = polabian
+	culture = sorbian
 	religion = chernobozhye
 	holding = tribal_holding
 	1170.1.1 = {
@@ -909,7 +909,7 @@
 	holding = tribal_holding
 }
 3025 = {
-	culture = polabian
+	culture = sorbian
 	religion = chernobozhye
 	holding = tribal_holding
 	1150.1.1 = {
@@ -939,7 +939,7 @@
 	holding = none
 }
 2980 = {
-	culture = polabian
+	culture = sorbian
 	religion = chernobozhye
 	holding = tribal_holding
 	990.1.1 = {
@@ -980,7 +980,7 @@
 	holding = none
 }
 3024 = {
-	culture = polabian
+	culture = sorbian
 	religion = chernobozhye
 	holding = none
 }
@@ -1011,7 +1011,7 @@
 }
 ###c_merseburg
 2935 = {
-	culture = polabian
+	culture = sorbian
 	religion = volksmarchen
 	holding = none
 	1120.1.1 = {
@@ -1027,7 +1027,7 @@
 	holding = none
 }
 3020 = {
-	culture = polabian
+	culture = sorbian
 	religion = chernobozhye
 	holding = none
 	1150.1.1 = {
@@ -1844,7 +1844,7 @@
 }
 ###c_weimar
 3005 = {
-	culture = polabian
+	culture = sorbian
 	religion = volksmarchen
 	holding = tribal_holding
 	1120.1.1 = {
@@ -1865,7 +1865,7 @@
 	religion = einblicker
 }
 3003 = {
-	culture = polabian
+	culture = sorbian
 	religion = volksmarchen
 	holding = none
 	1120.1.1 = {

history/provinces/e_makedon.txt

@@ -457,7 +457,7 @@
 	holding = castle_holding
 }
 3787 = {	#Servia
-	holding = churhc_holding
+	holding = church_holding
 	culture = NEOW_pindusian
 	religion = megalocratic	
 }

history/provinces/e_scandinavia.txt

@@ -1046,7 +1046,7 @@
 ##d_holstein
 ###c_kiel
 2801 = {
-	culture = polabian
+	culture = sorbian
 	religion = chernobozhye
 	holding = tribal_holding
 	950.1.1 = {
@@ -1071,7 +1071,7 @@
 }
 ###c_lubeck
 2804 = {
-	culture = polabian
+	culture = sorbian
 	religion = chernobozhye
 	holding = tribal_holding
 	950.1.1 = {

history/provinces/e_volga-ural.txt

@@ -613,7 +613,6 @@
 	holding = none
 }
 
-<<<<<<< Updated upstream
 ###c_tuluchezeva
 5374 = {	#Tuluchezeva
 	culture = NEOW_cossack
@@ -1321,9 +1320,7 @@
 	#Small settlement , mostly placeholder
 	holding = none
 }
-=======
 
->>>>>>> Stashed changes
 
 
 

history/provinces/e_zapadoslavia.txt

@@ -930,7 +930,7 @@
 }
 4155 = {	# Třebíč
 	holding = none
-}	holding = castle_holding
+}
 
 ###c_prerov/Zlín 
 4159 = {	# Zlín
@@ -1163,7 +1163,7 @@
 	#Presence of settlements dating to the Arpad era
 }
 3804 = {	#Kecskemet
-	holding = castle
+	holding = castle_holding
 	culture = hungarian
 	religion = nepmese
 	#Small villages in XIIIth