diff --git a/Client.Main/MGContent/bin/DesktopGL/Content/Arial.xnb b/Client.Main/MGContent/bin/DesktopGL/Content/Arial.xnb
new file mode 100644
index 00000000..e5c08c7b
Binary files /dev/null and b/Client.Main/MGContent/bin/DesktopGL/Content/Arial.xnb differ
diff --git a/Client.Main/MGContent/bin/DesktopGL/Content/Background.xnb b/Client.Main/MGContent/bin/DesktopGL/Content/Background.xnb
new file mode 100644
index 00000000..cb79b54f
Binary files /dev/null and b/Client.Main/MGContent/bin/DesktopGL/Content/Background.xnb differ
diff --git a/Client.Main/MGContent/bin/DesktopGL/Content/Bubbles.xnb b/Client.Main/MGContent/bin/DesktopGL/Content/Bubbles.xnb
new file mode 100644
index 00000000..ddff31b3
Binary files /dev/null and b/Client.Main/MGContent/bin/DesktopGL/Content/Bubbles.xnb differ
diff --git a/Client.Main/MGContent/bin/DesktopGL/Content/NotoKR.xnb b/Client.Main/MGContent/bin/DesktopGL/Content/NotoKR.xnb
new file mode 100644
index 00000000..87fd6b0c
Binary files /dev/null and b/Client.Main/MGContent/bin/DesktopGL/Content/NotoKR.xnb differ
diff --git a/Client.Main/MGContent/bin/DesktopGL/Content/WaterSplashParticle.xnb b/Client.Main/MGContent/bin/DesktopGL/Content/WaterSplashParticle.xnb
new file mode 100644
index 00000000..0b944a8e
Binary files /dev/null and b/Client.Main/MGContent/bin/DesktopGL/Content/WaterSplashParticle.xnb differ
diff --git a/Client.Main/MuGame.cs b/Client.Main/MuGame.cs
index d2c3de24..b766adb9 100644
--- a/Client.Main/MuGame.cs
+++ b/Client.Main/MuGame.cs
@@ -282,8 +282,9 @@ private Point GetActualScreenSize()
protected override void Initialize()
{
- var fullPath = Path.GetFullPath(Constants.SETTINGS_PATH);
- ConfigDirectory = Path.GetDirectoryName(fullPath)!;
+ // Uses the executable directory as the basis for appsettings.json,
+ // ensuring the file can be found regardless of the CWD.
+ ConfigDirectory = AppContext.BaseDirectory;
AppConfiguration = new ConfigurationBuilder()
.SetBasePath(ConfigDirectory)
.AddJsonFile(Constants.SETTINGS_PATH, optional: false, reloadOnChange: true)
diff --git a/MuMac/MuMac.csproj b/MuMac/MuMac.csproj
index a9ec84e0..b0cd7acc 100644
--- a/MuMac/MuMac.csproj
+++ b/MuMac/MuMac.csproj
@@ -21,6 +21,9 @@
$(DefineConstants);MACOS
+
+
+ $([System.IO.Path]::GetFullPath('$(MSBuildProjectDirectory)/../Client.Main/MGContent/bin/DesktopGL/Content'))
@@ -41,12 +44,35 @@
-
+
+
+
Content\Content.mgcb
+
+
+
+
+
+
+
+
+
+ <_PrebuiltXnb Include="$(MGContentPrebuiltDir)/**/*.xnb" />
+
+
+
+