(372c6e60a) More automatic text scaling + merge fix

Barotrauma/BarotraumaServer/Source/GameMain.cs

@@ -162,31 +162,6 @@ namespace Barotrauma
             }
         }
 
-        /// <summary>
-        /// Returns the file paths of all files of the given type in the content packages.
-        /// </summary>
-        /// <param name="type"></param>
-        /// <param name="searchAllContentPackages">If true, also returns files in content packages that are installed but not currently selected.</param>
-        public IEnumerable<string> GetFilesOfType(ContentType type, bool searchAllContentPackages = false)
-        {
-            if (searchAllContentPackages)
-            {
-                return ContentPackage.GetFilesOfType(ContentPackage.List, type);
-            }
-            else
-            {
-                return ContentPackage.GetFilesOfType(SelectedPackages, type);
-            }
-        }
-
-        /// <summary>
-        /// Returns the file paths of all files of the given type in the currently selected content packages.
-        /// </summary>
-        public IEnumerable<string> GetFilesOfType(ContentType type)
-        {
-            return ContentPackage.GetFilesOfType(SelectedPackages, type);
-        }
-
         public void StartServer()
         {
             string name = "Server";