(cc26984a5) Merge remote-tracking branch 'origin/dev' into human-ai

2019-05-16 05:45:37 +03:00
parent 04997cd2f3
commit 68ced76e1b
53 changed files with 791 additions and 243 deletions
@@ -117,11 +117,11 @@ namespace Barotrauma.Items.Components
            {
                if (uiElements[i] is GUIButton button)
                {
-                    button.Text = labels[i];
+                    button.Text = customInterfaceElementList[i].Label;
                }
                else if (uiElements[i] is GUITickBox tickBox)
                {
-                    tickBox.Text = labels[i];
+                    tickBox.Text = customInterfaceElementList[i].Label;
                }
            }
        }