Hannah/Years-Gone-By
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge oopsie

Browse source
This commit is contained in:
lilylindstrand 2024-09-27 18:50:58 +02:00
commit 375946b367
7 changed files with 55 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
common/countries/colors.txt
View file

@ -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
}

6
common/countries/flanders.txt Normal file
View file

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

7
common/country_tags/01_countries.txt
View file

@ -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