(b451554e8) Merge remote-tracking branch 'origin/dev' into keymapping-refactor-test

2019-04-04 11:10:29 +03:00
parent b08a31a68f
commit cc122f2bbf
52 changed files with 601 additions and 786 deletions
@@ -38,6 +38,9 @@ namespace Barotrauma

            SerializableProperty.DeserializeProperties(this, configElement);

+            name = TextManager.Get("EntityName." + identifier, returnNull: true) ?? name;
+            Description = TextManager.Get("EntityDescription." + identifier, returnNull: true) ?? Description;
+
            int minX = int.MaxValue, minY = int.MaxValue;
            int maxX = int.MinValue, maxY = int.MinValue;
            DisplayEntities = new List<Pair<MapEntityPrefab, Rectangle>>();