Merge oopsie

common/countries/colors.txt

@@ -135,6 +135,7 @@ GCT = {
 	color_ui = rgb { 21 31 102 }
 }
 
+<<<<<<< Updated upstream
 LSA = {
 	color = rgb { 232 212 192 }
 	color_ui = rgb { 232 212 192 }
@@ -473,4 +474,9 @@ MOS = {
 OST = {
 	color = rgb { 100 100 100 }
 	color_ui = rgb { 100 100 100 }
+=======
+FLA = {
+	color = rgb { 190 170 0 }
+	color_ui = rgb { 190 170 0 }
+>>>>>>> Stashed changes
 }

common/countries/flanders.txt

@@ -0,0 +1,6 @@
+#flanders
+
+graphical_culture = western_european_gfx
+graphical_culture_2d = western_european_2d
+
+color = { 190 170 0 }

common/country_tags/01_countries.txt

@@ -19,6 +19,7 @@ FAL = "countries/Falandia.txt"
 SVL = "countries/Sarvundland.txt"
 TTR = "countries/TallRepublic.txt"
 GTL = "countries/Gaestertland.txt"
+<<<<<<< Updated upstream
 GCT = "countries/Gunther Cult.txt"
 LSA = "countries/Linguisatia.txt"
 VTR = "countries/Vasterreich.txt"
@@ -87,4 +88,8 @@ LIN = "countries/Litgarten.txt"
 AUU = "countries/Auvurgen.txt"
 ILL = "countries/Illria.txt"
 MOS = "countries/Moskva.txt"
-OST = "countries/Ostarruthian Empire.txt"
+OST = "countries/Ostarruthian Empire.txt"
+=======
+GCT = "countries/Günther Cult.txt"
+FLA = "countries/flanders.txt"
+>>>>>>> Stashed changes

history/countries/FLA - flanders.txt

@@ -0,0 +1,25 @@
+## capital = 
+
+set_politics = {
+	ruling_party = neutrality
+	last_election = "1935.6.1"
+	election_frequency = 12
+	elections_allowed = yes
+}
+
+set_popularities = {
+	democratic = 15
+	fascism = 2
+	communism = 3
+	neutrality = 80
+}
+
+create_country_leader = {
+	name = "Generic Generico"
+	desc = ""
+	picture = ""
+	ideology = despotism
+	traits = {
+	#
+	}
+}

history/states/677-State_677.txt

@@ -8,7 +8,7 @@ state={
         manpower=1000
         state_category = rural
 	history={
-		add_core_of = ABC
-		owner = ABC
+		add_core_of = FLA
+		owner = FLA
 	}
 }

history/states/705-State_705.txt

@@ -8,7 +8,7 @@ state={
         manpower=1000
         state_category = rural
 	history={
-		add_core_of = ABC
-		owner = ABC
+		add_core_of = FLA
+		owner = FLA
 	}
 }

localisation/english/countries_l_english.yml

@@ -1139,3 +1139,11 @@ AUU_communism_DEF:0 "Auvurgen"
 AUU_fascism:0 "Auvurgen"
 AUU_fascism_DEF:0 "Auvurgen"
 
+<<<<<<< Updated upstream
+=======
+ GCT_neutrality:0 "Günther Cult"
+ GCT_neutrality_DEF:0 "The cult of Günther"
+
+ FLA_neutrality:0 "flanders"
+ FLA_neutrality_DEF:0 "The Kingdom of Flanders"
+>>>>>>> Stashed changes