resolved conflicts from main

2024-10-11 20:58:42 +02:00
parent 958503fb30 7c235eccb5
commit 2e0f915cd0
3 changed files with 11 additions and 8 deletions
@@ -26,7 +26,7 @@ do
            elseif first == "[" then
                result.isBackup = false
            else
-                table.insert(Spearhead.MissionEditingWarnings, "Could not parse the CAP config for group: " .. groupName)
+                Spearhead.AddMissionEditorWarning("Could not parse the CAP config for group: " .. groupName)
                return nil
            end

@@ -62,8 +62,7 @@ do
            end
            return result
        else
-            table.insert(Spearhead.MissionEditingWarnings,
-                "CAP Group with name: " .. groupName .. "should have at least 3 parts, but has " .. partCount)
+            Spearhead.AddMissionEditorWarning("CAP Group with name: " .. groupName .. "should have at least 3 parts, but has " .. partCount)
            return nil
        end
    end