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

common/culture/cultures/NEOW_goidelic.txt

@@ -90,6 +90,37 @@ irish = { #Éireannach Bhocht
 	clothing_gfx = { northern_clothing_gfx }
 	unit_gfx = { western_unit_gfx }
 	
+	ethnicities = {
+		5 = caucasian_blond
+		30 = caucasian_ginger
+		35 = caucasian_brown_hair
+		30 = caucasian_dark_hair
+	}
+}
+
+manx = {
+	color = { 60 125 55 }
+	
+	ethos = ethos_stoic
+	heritage = heritage_goidelic
+	language = language_goidelic
+	martial_custom = martial_custom_equal
+	head_determination = head_determination_domain
+		
+	traditions = {
+		tradition_seafaring
+		tradition_castle_keepers
+		tradition_maritime_mercantilism
+		tradition_fishermen
+	}
+	
+	name_list = name_list_NEOW_scottish
+	
+	coa_gfx = { irish_coa_gfx western_coa_gfx }
+	building_gfx = { western_building_gfx }
+	clothing_gfx = { northern_clothing_gfx }
+	unit_gfx = { western_unit_gfx }
+	
 	ethnicities = {
 		5 = caucasian_blond
 		30 = caucasian_ginger

common/culture/cultures/NEOW_scottish.txt

@@ -30,37 +30,6 @@
 	}
 }
 
-manx = {
-	color = { 60 125 55 }
-	
-	ethos = ethos_stoic
-	heritage = heritage_goidelic
-	language = language_goidelic
-	martial_custom = martial_custom_equal
-	head_determination = head_determination_domain
-		
-	traditions = {
-		tradition_seafaring
-		tradition_castle_keepers
-		tradition_maritime_mercantilism
-		tradition_fishermen
-	}
-	
-	name_list = name_list_NEOW_scottish
-	
-	coa_gfx = { irish_coa_gfx western_coa_gfx }
-	building_gfx = { western_building_gfx }
-	clothing_gfx = { northern_clothing_gfx }
-	unit_gfx = { western_unit_gfx }
-	
-	ethnicities = {
-		5 = caucasian_blond
-		30 = caucasian_ginger
-		35 = caucasian_brown_hair
-		30 = caucasian_dark_hair
-	}
-}
-
 scottish = {
 	color = { 45 81 153 }