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

common/landed_titles/benelux.txt

@@ -486,75 +486,6 @@ e_benelux = {
 			}
 		}
 		
-		d_upper_lorraine = { # Upper Lotharingia
-			color = { 90 90 125 }
-
-			capital = c_trier #Trier
-
-			cultural_names = {
-				name_list_french = cn_upper_lorraine
-				name_list_norman = cn_upper_lorraine
-			}
-
-			c_nancy = {
-				color = { 65 65 100 }
-
-				b_nancy = {
-					province = 2709
-
-					color = { 65 65 100 }
-				}
-				b_epinal = {
-					province = 2078
-
-					color = { 65 65 100 }
-				}
-				b_blankenberg = { #L<>nstadt
-					province = 2713
-
-					color = { 65 65 100 }
-				}
-			}
-			c_metz = {
-				color = { 85 85 140 }
-
-				b_metz = {
-					province = 2708
-
-					color = { 85 85 140 }
-				}
-				b_saarburg = {
-					province = 2698
-
-					color = { 85 85 140 }
-				}
-				b_forbach = {
-					province = 2705
-
-					color = { 85 85 140 }
-				}
-				b_faulquemont = {
-					province = 2711
-
-					color = { 85 85 140 }
-				}
-			}
-			c_puttlingen = {
-				color = { 80 80 115 }
-
-				b_puttlingen = {
-					province = 2710
-
-					color = { 80 80 115 }
-				}
-				b_finstigen = { #Finstingen
-					province = 2712
-
-					color = { 80 80 115 }
-				}
-			}
-		}
-
 		d_bar = {
 			color = { 24 95 226 }
 
@@ -578,6 +509,11 @@ e_benelux = {
 
 					color = { 24 95 226 }
 				}
+				b_vaucouleurs = {
+					province = 2387
+
+					color = { 15 80 220 }
+				}
 			}
 			c_briey = {
 				color = { 53 132 226 }
@@ -593,21 +529,6 @@ e_benelux = {
 					color = { 53 132 226 }
 				}
 			}
-
-			c_vaucouleurs = {
-				color = { 15 80 220 }
-
-				b_vaucouleurs = {
-					province = 2387
-
-					color = { 15 80 220 }
-				}
-				b_toul = {
-					province = 2079
-
-					color = { 15 80 220 }
-				}
-			}
 			c_neufchateau = {
 				color = { 75 75 125 }
 
@@ -621,6 +542,54 @@ e_benelux = {
 
 					color = { 75 75 125 }
 				}
+				b_epinal = {
+					province = 2078
+
+					color = { 65 65 100 }
+				}
+			}
+			c_nancy = {
+				color = { 65 65 100 }
+
+				b_nancy = {
+					province = 2709
+
+					color = { 65 65 100 }
+				}
+				b_blankenberg = { #L<>nstadt
+					province = 2713
+
+					color = { 65 65 100 }
+				}
+				b_toul = {
+					province = 2079
+
+					color = { 15 80 220 }
+				}
+			}
+			c_metz = {
+				color = { 85 85 140 }
+
+				b_metz = {
+					province = 2708
+
+					color = { 85 85 140 }
+				}
+				b_saarburg = {
+					province = 2698
+
+					color = { 85 85 140 }
+				}
+				b_faulquemont = {
+					province = 2711
+
+					color = { 85 85 140 }
+				}
+				b_finstigen = { #Finstingen
+					province = 2712
+
+					color = { 80 80 115 }
+				}
 			}
 		}
 	}

common/landed_titles/france.txt

@@ -1039,7 +1039,7 @@ e_france = {
 
 					color = { 40 85 145 }
 				}
-				b_chaumont = {
+				b_chatillon_sur_seine = {
 					province = 2381
 
 					color = { 40 85 145 }

common/landed_titles/germany.txt

@@ -1352,16 +1352,11 @@ e_germany = {
 		}
     }
 
+
     k_rhineland = {
         color = { 17 178 17 }
 
         capital = c_mainz
-	}
-	k_alsace = { 
-		color = { 205 205 230 }
-
-		capital = c_strassburg #Strassburg
-		
 		d_alsace = {
 			color = { 205 205 230 }
 
@@ -1380,15 +1375,10 @@ e_germany = {
 
 					color = { 205 205 230 }
 				}
-				b_lichtberg = {
+				b_weissenburg = {
-					province = 2723
+					province = 2724
 
-					color = { 205 205 230 }
+					color = { 145 145 160 }
-				}
-				b_bitsch = {
-					province = 2725
-
-					color = { 90 90 110 }
 				}
 			}
 			c_colmar = {
@@ -1424,13 +1414,26 @@ e_germany = {
 					color = { 215 200 215 }
 				}
 			}
+			c_puttlingen = {
+				color = { 80 80 115 }
+
+				b_puttlingen = {
+					province = 2710
+
+					color = { 80 80 115 }
+				}
+				b_lichtberg = {
+					province = 2723
+
+					color = { 205 205 230 }
+				}
+				b_bitsch = {
+					province = 2725
+
+					color = { 90 90 110 }
+				}
+			}
 		}
-	}
-    k_koln = {
-		color = { 150 145 180 }
-
-		capital = c_cologne # Cologne
-
 		d_lower_lorraine = { # Koln
 			color = { 150 145 180 }
 
@@ -1523,11 +1526,6 @@ e_germany = {
 				}
 			}
 		}
-	}
-	k_trier = {
-		color = { 255 255 255 }
-		
-		capital = c_trier
         d_trier = {
             color = { 255 255 255 }
 
@@ -1593,14 +1591,13 @@ e_germany = {
 
 					color = { 145 140 153 }
 				}
+				b_forbach = {
+					province = 2705
+
+					color = { 85 85 140 }
+				}
 			}
         }
-	}
-	k_mainz = {
-		color = { 195 20 30 }
-
-        capital = c_mainz
-	
         d_mainz = {
             color = { 195 20 30 }
 
@@ -1685,11 +1682,6 @@ e_germany = {
 
 					color = { 145 145 160 }
 				}
-				b_weissenburg = {
-					province = 2724
-
-					color = { 145 145 160 }
-				}
 				b_pirmasens = {
 					province = 2730
 
@@ -1728,6 +1720,31 @@ e_germany = {
         }
     }
 
+	k_mainz = {
+		color = { 195 20 30 }
+
+        capital = c_mainz
+	
+	}
+	k_trier = {
+		color = { 255 255 255 }
+		
+		capital = c_trier
+	}
+	k_alsace = { 
+		color = { 205 205 230 }
+
+		capital = c_strassburg #Strassburg
+		
+	}
+    k_koln = {
+		color = { 150 145 180 }
+
+		capital = c_cologne # Cologne
+
+	}
+
+
     k_saxony_proper = {
         color = { 229 201 22 }