From 4b926791b58344f6018941ac6463849bc742bdb5 Mon Sep 17 00:00:00 2001
From: Gagah Pangeran Rosfatiputra <git@gagahpangeran.com>
Date: Wed, 16 Jun 2021 21:13:01 +0700
Subject: [PATCH 1/3] add inter font

---
 osu.Game/OsuGameBase.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index 9c3adba342..abf8fbc4fb 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -195,6 +195,15 @@ namespace osu.Game
             AddFont(Resources, @"Fonts/Torus-SemiBold");
             AddFont(Resources, @"Fonts/Torus-Bold");
 
+            AddFont(Resources, @"Fonts/Inter-Regular");
+            AddFont(Resources, @"Fonts/Inter-RegularItalic");
+            AddFont(Resources, @"Fonts/Inter-Light");
+            AddFont(Resources, @"Fonts/Inter-LightItalic");
+            AddFont(Resources, @"Fonts/Inter-SemiBold");
+            AddFont(Resources, @"Fonts/Inter-SemiBoldItalic");
+            AddFont(Resources, @"Fonts/Inter-Bold");
+            AddFont(Resources, @"Fonts/Inter-BoldItalic");
+
             AddFont(Resources, @"Fonts/Noto-Basic");
             AddFont(Resources, @"Fonts/Noto-Hangul");
             AddFont(Resources, @"Fonts/Noto-CJK-Basic");

From 5cf2ac78fcc1790b2556d11336c10496c7a94da8 Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Fri, 18 Jun 2021 15:40:35 +0900
Subject: [PATCH 2/3] Adjust font namespaces

---
 osu.Game/OsuGameBase.cs | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs
index abf8fbc4fb..05a53452f7 100644
--- a/osu.Game/OsuGameBase.cs
+++ b/osu.Game/OsuGameBase.cs
@@ -190,29 +190,29 @@ namespace osu.Game
 
             AddFont(Resources, @"Fonts/osuFont");
 
-            AddFont(Resources, @"Fonts/Torus-Regular");
-            AddFont(Resources, @"Fonts/Torus-Light");
-            AddFont(Resources, @"Fonts/Torus-SemiBold");
-            AddFont(Resources, @"Fonts/Torus-Bold");
+            AddFont(Resources, @"Fonts/Torus/Torus-Regular");
+            AddFont(Resources, @"Fonts/Torus/Torus-Light");
+            AddFont(Resources, @"Fonts/Torus/Torus-SemiBold");
+            AddFont(Resources, @"Fonts/Torus/Torus-Bold");
 
-            AddFont(Resources, @"Fonts/Inter-Regular");
-            AddFont(Resources, @"Fonts/Inter-RegularItalic");
-            AddFont(Resources, @"Fonts/Inter-Light");
-            AddFont(Resources, @"Fonts/Inter-LightItalic");
-            AddFont(Resources, @"Fonts/Inter-SemiBold");
-            AddFont(Resources, @"Fonts/Inter-SemiBoldItalic");
-            AddFont(Resources, @"Fonts/Inter-Bold");
-            AddFont(Resources, @"Fonts/Inter-BoldItalic");
+            AddFont(Resources, @"Fonts/Inter/Inter-Regular");
+            AddFont(Resources, @"Fonts/Inter/Inter-RegularItalic");
+            AddFont(Resources, @"Fonts/Inter/Inter-Light");
+            AddFont(Resources, @"Fonts/Inter/Inter-LightItalic");
+            AddFont(Resources, @"Fonts/Inter/Inter-SemiBold");
+            AddFont(Resources, @"Fonts/Inter/Inter-SemiBoldItalic");
+            AddFont(Resources, @"Fonts/Inter/Inter-Bold");
+            AddFont(Resources, @"Fonts/Inter/Inter-BoldItalic");
 
-            AddFont(Resources, @"Fonts/Noto-Basic");
-            AddFont(Resources, @"Fonts/Noto-Hangul");
-            AddFont(Resources, @"Fonts/Noto-CJK-Basic");
-            AddFont(Resources, @"Fonts/Noto-CJK-Compatibility");
-            AddFont(Resources, @"Fonts/Noto-Thai");
+            AddFont(Resources, @"Fonts/Noto/Noto-Basic");
+            AddFont(Resources, @"Fonts/Noto/Noto-Hangul");
+            AddFont(Resources, @"Fonts/Noto/Noto-CJK-Basic");
+            AddFont(Resources, @"Fonts/Noto/Noto-CJK-Compatibility");
+            AddFont(Resources, @"Fonts/Noto/Noto-Thai");
 
-            AddFont(Resources, @"Fonts/Venera-Light");
-            AddFont(Resources, @"Fonts/Venera-Bold");
-            AddFont(Resources, @"Fonts/Venera-Black");
+            AddFont(Resources, @"Fonts/Venera/Venera-Light");
+            AddFont(Resources, @"Fonts/Venera/Venera-Bold");
+            AddFont(Resources, @"Fonts/Venera/Venera-Black");
 
             Audio.Samples.PlaybackConcurrency = SAMPLE_CONCURRENCY;
 

From 1ec03bf6fac74b678a543849c90062808c73b181 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Fri, 18 Jun 2021 22:25:24 +0900
Subject: [PATCH 3/3] Update resources

---
 osu.Android.props        | 2 +-
 osu.Game/osu.Game.csproj | 2 +-
 osu.iOS.props            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Android.props b/osu.Android.props
index 490e43b5e6..54469eec43 100644
--- a/osu.Android.props
+++ b/osu.Android.props
@@ -51,7 +51,7 @@
     <Reference Include="Java.Interop" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.614.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.618.0" />
     <PackageReference Include="ppy.osu.Framework.Android" Version="2021.614.0" />
   </ItemGroup>
 </Project>
diff --git a/osu.Game/osu.Game.csproj b/osu.Game/osu.Game.csproj
index 8eeaad1127..560e5e2493 100644
--- a/osu.Game/osu.Game.csproj
+++ b/osu.Game/osu.Game.csproj
@@ -35,7 +35,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="ppy.osu.Framework" Version="2021.614.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.614.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.618.0" />
     <PackageReference Include="Sentry" Version="3.4.0" />
     <PackageReference Include="SharpCompress" Version="0.28.2" />
     <PackageReference Include="NUnit" Version="3.13.2" />
diff --git a/osu.iOS.props b/osu.iOS.props
index db442238ce..7b3033db9c 100644
--- a/osu.iOS.props
+++ b/osu.iOS.props
@@ -71,7 +71,7 @@
   </ItemGroup>
   <ItemGroup Label="Package References">
     <PackageReference Include="ppy.osu.Framework.iOS" Version="2021.614.0" />
-    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.614.0" />
+    <PackageReference Include="ppy.osu.Game.Resources" Version="2021.618.0" />
   </ItemGroup>
   <!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
   <PropertyGroup>