resolved conflicts from main

classes/capClasses/CapGroup.lua

@@ -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

classes/spearhead_base.lua

@@ -881,13 +881,11 @@ do --setup route util
     ---@return table
     local function GetCAPTargetTypes(attackHelos)
         local targetTypes = {
-            [1] = "Fighters",
-            [2] = "Multirole fighters",
-            [3] = "Bombers"
+            [1] = "Planes",
         }
 
         if attackHelos then
-            targetTypes[4] = "Helicopters"
+            targetTypes[2] = "Helicopters"
         end
 
         return targetTypes