Merge remote-tracking branch 'upstream/master' into develop

Barotrauma/BarotraumaShared/SharedSource/ContentManagement/ContentFile/CharacterFile.cs

@@ -106,9 +106,10 @@ namespace Barotrauma
                 void AddTexturePath(string path)
                 {
                     if (string.IsNullOrEmpty(path)) { return; }
+                    var contentPath = ContentPath.FromRaw(characterPrefab.ContentPackage, ragdollParams.Texture);
                     //if the path contains a gender variable, we can't load it yet because we don't know which gender we need
-                    if (path.Contains("[GENDER]")) { return; }
-                    texturePaths.Add(ContentPath.FromRaw(characterPrefab.ContentPackage, ragdollParams.Texture));
+                    if (contentPath.FullPath.Contains("[GENDER]")) { return; }
+                    texturePaths.Add(contentPath);
                 }
             }
 #endif

Barotrauma/BarotraumaShared/SharedSource/ContentManagement/ContentPackage/ContentPackage.cs

@@ -199,9 +199,16 @@ namespace Barotrauma
 
             try
             {
-                return success(doc.Root.GetAttributeBool("corepackage", false)
+                ContentPackage contentPackage = doc.Root.GetAttributeBool("corepackage", false)
                     ? new CorePackage(doc, path)
-                    : new RegularPackage(doc, path));
+                    : new RegularPackage(doc, path);
+                
+                if (System.IO.Path.GetFileNameWithoutExtension(path)?.Any(char.IsUpper) is true)
+                {
+                    DebugConsole.ThrowError($"Invalid filename casing. Please rename \"filelist.xml\" so it is entirely lowercase.", contentPackage: contentPackage);
+                }
+
+                return success(contentPackage);
             }
             catch (Exception e)
             {