Merge remote-tracking branch 'upstream/master'

Author: JoyfulShush

src/TSMapEditor/CCEngine/CCFileManager.cs

@@ -28,9 +28,7 @@ public class CCFileManager
 
         public void ReadConfig()
         {
-            string configPath =
-                Helpers.NormalizePath(Path.Combine(Environment.CurrentDirectory, "Config", "FileManagerConfig.ini"));
-            var iniFile = new IniFile(configPath);
+            var iniFile = Helpers.ReadConfigINI("FileManagerConfig.ini");
 
             AddSearchDirectory(Environment.CurrentDirectory);
             iniFile.DoForEveryValueInSection("SearchDirectories", v => AddSearchDirectory(Path.Combine(GameDirectory, v)));

src/TSMapEditor/CCEngine/GameConfigINIFiles.cs

@@ -26,7 +26,7 @@ public GameConfigINIFiles(string gameDirectory, CCFileManager fileManager)
             AIIni = IniFileEx.FromPathOrMix(Constants.AIIniPath, gameDirectory, fileManager);
             AIFSIni = IniFileEx.FromPathOrMix(Constants.FirestormAIIniPath, gameDirectory, fileManager);
 
-            IniFile artOverridesIni = new(Path.Combine(Environment.CurrentDirectory, "Config/ArtOverrides.ini"));
+            IniFile artOverridesIni = Helpers.ReadConfigINI("ArtOverrides.ini");
             IniFile.ConsolidateIniFiles(ArtFSIni, artOverridesIni);
         }