diff --git a/.gitignore b/.gitignore
index 1b3e879d..edb67bb7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -187,6 +187,11 @@ PublishScripts/
*.nupkg
# NuGet Symbol Packages
*.snupkg
+
+# Except for *.nupkg and *.snupkg files in src/TSMapEditor/References
+!src/TSMapEditor/References/*.nupkg
+!src/TSMapEditor/References/*.snupkg
+
# The packages folder can be ignored because of Package Restore
**/[Pp]ackages/*
# except build/, which is used as an MSBuild target.
diff --git a/src/TSMapEditor/Content/Fonts.ini b/src/TSMapEditor/Content/Fonts.ini
new file mode 100644
index 00000000..5b024c9c
--- /dev/null
+++ b/src/TSMapEditor/Content/Fonts.ini
@@ -0,0 +1,12 @@
+[Fonts]
+Count=2
+
+[Font0]
+Type=Forme
+Path=arial.ttf
+Size=14
+
+[Font1]
+Type=Forme
+Path=arial.ttf
+Size=14
diff --git a/src/TSMapEditor/Content/arial.ttf b/src/TSMapEditor/Content/arial.ttf
new file mode 100644
index 00000000..1e519bc1
Binary files /dev/null and b/src/TSMapEditor/Content/arial.ttf differ
diff --git a/src/TSMapEditor/NuGet.config b/src/TSMapEditor/NuGet.config
new file mode 100644
index 00000000..546b02c0
--- /dev/null
+++ b/src/TSMapEditor/NuGet.config
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/TSMapEditor/References/Rampastring.XNAUI.WindowsDX.3.1.8-copilot-add-forme-ttf-font-wrapper.1.nupkg b/src/TSMapEditor/References/Rampastring.XNAUI.WindowsDX.3.1.8-copilot-add-forme-ttf-font-wrapper.1.nupkg
new file mode 100644
index 00000000..3d200a56
Binary files /dev/null and b/src/TSMapEditor/References/Rampastring.XNAUI.WindowsDX.3.1.8-copilot-add-forme-ttf-font-wrapper.1.nupkg differ
diff --git a/src/TSMapEditor/References/Rampastring.XNAUI.WindowsDX.3.1.8-copilot-add-forme-ttf-font-wrapper.1.snupkg b/src/TSMapEditor/References/Rampastring.XNAUI.WindowsDX.3.1.8-copilot-add-forme-ttf-font-wrapper.1.snupkg
new file mode 100644
index 00000000..b91bcb12
Binary files /dev/null and b/src/TSMapEditor/References/Rampastring.XNAUI.WindowsDX.3.1.8-copilot-add-forme-ttf-font-wrapper.1.snupkg differ
diff --git a/src/TSMapEditor/References/Rampastring.XNAUI.WindowsDX.Debug.3.1.8-copilot-add-forme-ttf-font-wrapper.1.nupkg b/src/TSMapEditor/References/Rampastring.XNAUI.WindowsDX.Debug.3.1.8-copilot-add-forme-ttf-font-wrapper.1.nupkg
new file mode 100644
index 00000000..7f70451a
Binary files /dev/null and b/src/TSMapEditor/References/Rampastring.XNAUI.WindowsDX.Debug.3.1.8-copilot-add-forme-ttf-font-wrapper.1.nupkg differ
diff --git a/src/TSMapEditor/References/Rampastring.XNAUI.WindowsDX.Debug.3.1.8-copilot-add-forme-ttf-font-wrapper.1.snupkg b/src/TSMapEditor/References/Rampastring.XNAUI.WindowsDX.Debug.3.1.8-copilot-add-forme-ttf-font-wrapper.1.snupkg
new file mode 100644
index 00000000..a2903cfa
Binary files /dev/null and b/src/TSMapEditor/References/Rampastring.XNAUI.WindowsDX.Debug.3.1.8-copilot-add-forme-ttf-font-wrapper.1.snupkg differ
diff --git a/src/TSMapEditor/Rendering/GameClass.cs b/src/TSMapEditor/Rendering/GameClass.cs
index 3515f607..3dc6c00c 100644
--- a/src/TSMapEditor/Rendering/GameClass.cs
+++ b/src/TSMapEditor/Rendering/GameClass.cs
@@ -132,21 +132,21 @@ protected override void Initialize()
AssetLoader.AssetSearchPaths.Add(Path.Combine(Environment.CurrentDirectory, "Config", "Translations", TranslatorSetup.ActiveTranslationDirectory()));
AssetLoader.AssetSearchPaths.Add(Environment.CurrentDirectory + DSC + "Content" + DSC);
- // Hack: allow translations to override fonts
- int i = 0;
- while (true)
- {
- string spriteFontPath = Path.Combine("Translations", TranslatorSetup.ActiveTranslationDirectory(), "SpriteFont" + i + ".xnb");
- if (AssetLoader.AssetExists(Path.Combine(Environment.CurrentDirectory, "Config", spriteFontPath)))
- {
- var spriteFont = Content.Load(spriteFontPath);
- Renderer.GetFontList()[i] = spriteFont;
- }
- else
- {
- break;
- }
- }
+ // // Hack: allow translations to override fonts
+ // int i = 0;
+ // while (true)
+ // {
+ // string spriteFontPath = Path.Combine("Translations", TranslatorSetup.ActiveTranslationDirectory(), "SpriteFont" + i + ".xnb");
+ // if (AssetLoader.AssetExists(Path.Combine(Environment.CurrentDirectory, "Config", spriteFontPath)))
+ // {
+ // var spriteFont = Content.Load(spriteFontPath);
+ // Renderer.GetFontList()[i] = spriteFont;
+ // }
+ // else
+ // {
+ // break;
+ // }
+ // }
windowManager = new WindowManager(this, graphics);
windowManager.Initialize(Content, Environment.CurrentDirectory + DSC + "Content" + DSC);
diff --git a/src/TSMapEditor/TSMapEditor.csproj b/src/TSMapEditor/TSMapEditor.csproj
index 7607e44a..f3a0d381 100644
--- a/src/TSMapEditor/TSMapEditor.csproj
+++ b/src/TSMapEditor/TSMapEditor.csproj
@@ -435,6 +435,12 @@
PreserveNewest
+
+ PreserveNewest
+
+
+ PreserveNewest
+
PreserveNewest
@@ -493,10 +499,10 @@
-
+
-
-
+
+