From 375946b3671b28cdcb9d29fd894d427c2a549a56 Mon Sep 17 00:00:00 2001
From: lilylindstrand <lily@hepno.dev>
Date: Fri, 27 Sep 2024 18:50:58 +0200
Subject: [PATCH] Merge oopsie

---
 common/countries/colors.txt                  |  6 +++++
 common/countries/flanders.txt                |  6 +++++
 common/country_tags/01_countries.txt         |  7 +++++-
 history/countries/FLA - flanders.txt         | 25 ++++++++++++++++++++
 history/states/677-State_677.txt             |  4 ++--
 history/states/705-State_705.txt             |  4 ++--
 localisation/english/countries_l_english.yml |  8 +++++++
 7 files changed, 55 insertions(+), 5 deletions(-)
 create mode 100644 common/countries/flanders.txt
 create mode 100644 history/countries/FLA - flanders.txt

diff --git a/common/countries/colors.txt b/common/countries/colors.txt
index 2d066fd..807fedf 100644
--- a/common/countries/colors.txt
+++ b/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
 }
\ No newline at end of file
diff --git a/common/countries/flanders.txt b/common/countries/flanders.txt
new file mode 100644
index 0000000..f2c9f80
--- /dev/null
+++ b/common/countries/flanders.txt
@@ -0,0 +1,6 @@
+#flanders
+
+graphical_culture = western_european_gfx
+graphical_culture_2d = western_european_2d
+
+color = { 190 170 0 }
\ No newline at end of file
diff --git a/common/country_tags/01_countries.txt b/common/country_tags/01_countries.txt
index ba0fa22..bdf6c32 100644
--- a/common/country_tags/01_countries.txt
+++ b/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"
\ No newline at end of file
+OST = "countries/Ostarruthian Empire.txt"
+=======
+GCT = "countries/Günther Cult.txt"
+FLA = "countries/flanders.txt"
+>>>>>>> Stashed changes
diff --git a/history/countries/FLA - flanders.txt b/history/countries/FLA - flanders.txt
new file mode 100644
index 0000000..059d6c2
--- /dev/null
+++ b/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 = {
+	#
+	}
+}
\ No newline at end of file
diff --git a/history/states/677-State_677.txt b/history/states/677-State_677.txt
index 661a987..dd51aba 100644
--- a/history/states/677-State_677.txt
+++ b/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
 	}
 }
diff --git a/history/states/705-State_705.txt b/history/states/705-State_705.txt
index 234c625..ea263a0 100644
--- a/history/states/705-State_705.txt
+++ b/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
 	}
 }
diff --git a/localisation/english/countries_l_english.yml b/localisation/english/countries_l_english.yml
index 8f719f5..9ade43e 100644
--- a/localisation/english/countries_l_english.yml
+++ b/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