Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop

2023-12-14 11:56:39 -03:00
parent 283d9db518 7f295c291e
commit 448e4cdfbb
376 changed files with 7775 additions and 2879 deletions
@@ -155,6 +155,7 @@ namespace Barotrauma
                    .Distinct(new TypeComparer<ContentFile>())
                    .ForEach(f => f.Sort());
                MergedHash = Md5Hash.MergeHashes(All.Select(cp => cp.Hash));
+                TextManager.IncrementLanguageVersion();
            }

            public static int IndexOf(ContentPackage contentPackage)