From 7212ab3a1afe56a5ae0654811d8ce535cf1e24c6 Mon Sep 17 00:00:00 2001
From: clayton <me@clayton.cc>
Date: Fri, 12 Jun 2020 23:48:30 -0700
Subject: [PATCH 1/4] Add new beatmap genres and languages

---
 osu.Game/Overlays/BeatmapListing/SearchGenre.cs    |  6 +++++-
 osu.Game/Overlays/BeatmapListing/SearchLanguage.cs | 12 +++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapListing/SearchGenre.cs b/osu.Game/Overlays/BeatmapListing/SearchGenre.cs
index b12bba6249..de437fac3e 100644
--- a/osu.Game/Overlays/BeatmapListing/SearchGenre.cs
+++ b/osu.Game/Overlays/BeatmapListing/SearchGenre.cs
@@ -20,6 +20,10 @@ namespace osu.Game.Overlays.BeatmapListing
 
         [Description("Hip Hop")]
         HipHop = 9,
-        Electronic = 10
+        Electronic = 10,
+        Metal = 11,
+        Classical = 12,
+        Folk = 13,
+        Jazz = 14
     }
 }
diff --git a/osu.Game/Overlays/BeatmapListing/SearchLanguage.cs b/osu.Game/Overlays/BeatmapListing/SearchLanguage.cs
index dac7e4f1a2..ef7576344a 100644
--- a/osu.Game/Overlays/BeatmapListing/SearchLanguage.cs
+++ b/osu.Game/Overlays/BeatmapListing/SearchLanguage.cs
@@ -11,7 +11,7 @@ namespace osu.Game.Overlays.BeatmapListing
         [Order(0)]
         Any,
 
-        [Order(11)]
+        [Order(13)]
         Other,
 
         [Order(1)]
@@ -23,7 +23,7 @@ namespace osu.Game.Overlays.BeatmapListing
         [Order(2)]
         Chinese,
 
-        [Order(10)]
+        [Order(12)]
         Instrumental,
 
         [Order(7)]
@@ -42,6 +42,12 @@ namespace osu.Game.Overlays.BeatmapListing
         Spanish,
 
         [Order(5)]
-        Italian
+        Italian,
+
+        [Order(10)]
+        Russian,
+
+        [Order(11)]
+        Polish
     }
 }

From 7bc70e644a56a76b9d2be063262e6de378853bc3 Mon Sep 17 00:00:00 2001
From: clayton <me@clayton.cc>
Date: Sat, 13 Jun 2020 00:20:34 -0700
Subject: [PATCH 2/4] Add Unspecified language

---
 osu.Game/Overlays/BeatmapListing/SearchLanguage.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Overlays/BeatmapListing/SearchLanguage.cs b/osu.Game/Overlays/BeatmapListing/SearchLanguage.cs
index ef7576344a..43f16059e9 100644
--- a/osu.Game/Overlays/BeatmapListing/SearchLanguage.cs
+++ b/osu.Game/Overlays/BeatmapListing/SearchLanguage.cs
@@ -48,6 +48,9 @@ namespace osu.Game.Overlays.BeatmapListing
         Russian,
 
         [Order(11)]
-        Polish
+        Polish,
+
+        [Order(14)]
+        Unspecified
     }
 }

From f4b57933c347b99eb4f6238f6dbb9729fae51176 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 15 Jun 2020 08:54:34 +0000
Subject: [PATCH 3/4] Bump Microsoft.Build.Traversal from 2.0.48 to 2.0.50

Bumps [Microsoft.Build.Traversal](https://github.com/Microsoft/MSBuildSdks) from 2.0.48 to 2.0.50.
- [Release notes](https://github.com/Microsoft/MSBuildSdks/releases)
- [Changelog](https://github.com/microsoft/MSBuildSdks/blob/master/RELEASE.md)
- [Commits](https://github.com/Microsoft/MSBuildSdks/compare/Microsoft.Build.Traversal.2.0.48...Microsoft.Build.Traversal.2.0.50)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 global.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/global.json b/global.json
index bdb90eb0e9..9aa5b6192b 100644
--- a/global.json
+++ b/global.json
@@ -5,6 +5,6 @@
     "version": "3.1.100"
   },
   "msbuild-sdks": {
-    "Microsoft.Build.Traversal": "2.0.48"
+    "Microsoft.Build.Traversal": "2.0.50"
   }
 }
\ No newline at end of file

From ad5bd1f0c00ae10c0c857759e38b1f588d2f4b45 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Mon, 15 Jun 2020 18:45:50 +0900
Subject: [PATCH 4/4] Update in line with other/unspecified switch

See https://github.com/ppy/osu-web/commit/289f0f0a209f1f840270db07794a7bfd52439db1.
---
 osu.Game/Overlays/BeatmapListing/SearchLanguage.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Overlays/BeatmapListing/SearchLanguage.cs b/osu.Game/Overlays/BeatmapListing/SearchLanguage.cs
index 43f16059e9..eee5d8f7e1 100644
--- a/osu.Game/Overlays/BeatmapListing/SearchLanguage.cs
+++ b/osu.Game/Overlays/BeatmapListing/SearchLanguage.cs
@@ -11,8 +11,8 @@ namespace osu.Game.Overlays.BeatmapListing
         [Order(0)]
         Any,
 
-        [Order(13)]
-        Other,
+        [Order(14)]
+        Unspecified,
 
         [Order(1)]
         English,
@@ -50,7 +50,7 @@ namespace osu.Game.Overlays.BeatmapListing
         [Order(11)]
         Polish,
 
-        [Order(14)]
-        Unspecified
+        [Order(13)]
+        Other
     }
 }