Merge branch 'dev' of https://github.com/Regalis11/Barotrauma.git into unstable-tests

2022-04-08 12:52:28 -03:00
parent 0702d41a73 164d72ae3a
commit ccf5600ad1
990 changed files with 44338 additions and 38589 deletions
@@ -27,7 +27,7 @@ namespace Barotrauma
            get { return preset.IsSinglePlayer; }
        }

-        public string Name
+        public LocalizedString Name
        {
            get { return preset.Name; }
        }