From 19adf522368c25db33f6181f707ffb7da30e8da3 Mon Sep 17 00:00:00 2001
From: xenohedron <xenohedron@users.noreply.github.com>
Date: Sun, 2 Jul 2023 21:10:17 -0400
Subject: [PATCH] List pride flags together below country flags

---
 .../util/gui/countryBox/CountryComboBox.java  |  33 +++++++++---------
 .../resources/flags/{tran.png => trans.png}   | Bin
 2 files changed, 17 insertions(+), 16 deletions(-)
 rename Mage.Client/src/main/resources/flags/{tran.png => trans.png} (100%)

diff --git a/Mage.Client/src/main/java/mage/client/util/gui/countryBox/CountryComboBox.java b/Mage.Client/src/main/java/mage/client/util/gui/countryBox/CountryComboBox.java
index 5043434ecad..b8e4e126af3 100644
--- a/Mage.Client/src/main/java/mage/client/util/gui/countryBox/CountryComboBox.java
+++ b/Mage.Client/src/main/java/mage/client/util/gui/countryBox/CountryComboBox.java
@@ -16,10 +16,7 @@ public class CountryComboBox extends JComboBox {
 
     public static final String[][] countryList = {
         {"Afghanistan", "af"},
-        {"Agender","agender"},
         {"Åland Islands", "ax"},
-        {"Aromantic" , "aro"},
-        {"Asexual", "asexual"},
         {"Albania", "al"},
         {"Algeria", "dz"},
         {"American Samoa", "as"},
@@ -45,7 +42,6 @@ public class CountryComboBox extends JComboBox {
         {"Benin", "bj"},
         {"Bermuda", "bm"},
         {"Bhutan", "bt"},
-        {"Bisexual","bisexual"},
         {"Bolivia, Plurinational State of", "bo"},
         {"Bosnia and Herzegovina", "ba"},
         {"Botswana", "bw"},
@@ -61,7 +57,6 @@ public class CountryComboBox extends JComboBox {
         {"Cameroon", "cm"},
         {"Canada", "ca"},
         {"Catalonia", "catalonia"},
-        {"Catgender", "catgender"},
         {"Cayman Islands", "ky"},
         {"Central African Republic", "cf"},
         {"Chad", "td"},
@@ -81,7 +76,6 @@ public class CountryComboBox extends JComboBox {
         {"Cyprus", "cy"},
         {"Czech Republic", "cz"},
         {"Denmark", "dk"},
-        {"Demisexual","demi"},
         {"Djibouti", "dj"},
         {"Dominica", "dm"},
         {"Dominican Republic", "do"},
@@ -104,9 +98,6 @@ public class CountryComboBox extends JComboBox {
         {"French Southern Territories", "tf"},
         {"Gabon", "ga"},
         {"Gambia", "gm"},
-        {"Gay","gay"},
-        {"Genderfluid","genderfluid"},
-        {"Genderqueer","genderqueer"},
         {"Georgia", "ge"},
         {"Germany", "de"},
         {"Ghana", "gh"},
@@ -129,7 +120,6 @@ public class CountryComboBox extends JComboBox {
         {"Iceland", "is"},
         {"India", "in"},
         {"Indonesia", "id"},
-        {"Innersex","inner"},
         {"Iran, Islamic Republic of", "ir"},
         {"Iraq", "iq"},
         {"Ireland", "ie"},
@@ -148,9 +138,7 @@ public class CountryComboBox extends JComboBox {
         {"Lao People's Democratic Republic", "la"},
         {"Latvia", "lv"},
         {"Lebanon", "lb"},
-        {"Lesbian","lesbian"},
         {"Lesotho", "ls"},
-        {"LGBT","lgbt"},
         {"Liberia", "lr"},
         {"Libya", "ly"},
         {"Liechtenstein", "li"},
@@ -189,7 +177,6 @@ public class CountryComboBox extends JComboBox {
         {"Niger", "ne"},
         {"Nigeria", "ng"},
         {"Niue", "nu"},
-        {"Non Binary","nb"},
         {"Norfolk Island", "nf"},
         {"Northern Mariana Islands", "mp"},
         {"Norway", "no"},
@@ -198,7 +185,6 @@ public class CountryComboBox extends JComboBox {
         {"Palau", "pw"},
         {"Palestine, State of", "ps"},
         {"Panama", "pa"},
-        {"Pansexual","pan"},
         {"Papua New Guinea", "pg"},
         {"Paraguay", "py"},
         {"Peru", "pe"},
@@ -250,7 +236,6 @@ public class CountryComboBox extends JComboBox {
         {"Togo", "tg"},
         {"Tokelau", "tk"},
         {"Tonga", "to"},
-        {"Transgender","tran"},
         {"Trinidad and Tobago", "tt"},
         {"Tunisia", "tn"},
         {"Turkey", "tr"},
@@ -276,7 +261,23 @@ public class CountryComboBox extends JComboBox {
         {"Western Sahara", "eh"},
         {"Yemen", "ye"},
         {"Zambia", "zm"},
-        {"Zimbabwe", "zw"},};
+        {"Zimbabwe", "zw"},
+        {"Agender", "agender"},
+        {"Aromantic", "aro"},
+        {"Asexual", "asexual"},
+        {"Bisexual", "bisexual"},
+        {"Catgender", "catgender"},
+        {"Demisexual", "demi"},
+        {"Gay", "gay"},
+        {"Genderfluid", "genderfluid"},
+        {"Genderqueer", "genderqueer"},
+        {"Innersex", "inner"},
+        {"Lesbian", "lesbian"},
+        {"LGBT", "lgbt"},
+        {"Nonbinary", "nb"},
+        {"Pansexual", "pan"},
+        {"Transgender", "trans"},
+    };
 
     @SuppressWarnings("unchecked")
     public CountryComboBox() {
diff --git a/Mage.Client/src/main/resources/flags/tran.png b/Mage.Client/src/main/resources/flags/trans.png
similarity index 100%
rename from Mage.Client/src/main/resources/flags/tran.png
rename to Mage.Client/src/main/resources/flags/trans.png