Move latest from develop into 11.1 branch (#3414)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Starfire13 <72491792+Starfire13@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

resources/factions/blufor_late_coldwar.yaml

@@ -0,0 +1,96 @@
+---
+country: Combined Joint Task Forces Blue
+name: Blufor Late Cold War (80s)
+authors: Starfire
+description: <p>Blufor 1980s late cold war faction featuring units from NATO and NATO-aligned nations.</p>
+aircrafts: 
+  - A-10A Thunderbolt II
+  - A-4E Skyhawk
+  - AH-1W SuperCobra
+  - AJS-37 Viggen
+  - AV-8B Harrier II Night Attack
+  - B-1B Lancer
+  - B-52H Stratofortress
+  - C-101CC Aviojet
+  - C-130
+  - C-130J-30 Super Hercules
+  - C-47 Dakota
+  - CH-47D
+  - CH-53E
+  - F-14A Tomcat (Block 135-GR Late)
+  - F-14B Tomcat
+  - F-15C Eagle
+  - F-15E Strike Eagle (Suite 4+)
+  - F-16CM Fighting Falcon (Block 50)
+  - F/A-18C Hornet (Lot 20)
+  - F-4E Phantom II
+  - F-4E-45MC Phantom II
+  - F-5E Tiger II
+  - OH-58D(R) Kiowa Warrior
+  - Mi-8MTV2 Hip
+  - MiG-21bis Fishbed-N
+  - Mirage-F1B
+  - Mirage-F1BE
+  - Mirage-F1CE
+  - Mirage-F1C-200
+  - Mirage-F1EE
+  - S-3B Viking
+  - SA 342L Gazelle
+  - SA 342M Gazelle
+  - SH-60B Seahawk
+  - UH-1H Iroquois
+  - UH-60A
+  - UH-60L
+awacs: 
+  - E-2C Hawkeye
+  - E-3A
+tankers: 
+  - KC-130
+  - KC-135 Stratotanker
+frontline_units: 
+  - M113
+  - M163 Vulcan Air Defense System
+  - M48 Chaparral
+  - M60A3 "Patton"
+  - Leopard 2
+  - M1A2 Abrams
+  - M2A2 Bradley
+  - Marder 1A3
+  - VAB Mephisto
+artillery_units: 
+  - M109A6 Paladin
+  - M270 Multiple Launch Rocket System
+logistics_units: 
+  - Truck M818 6x6
+infantry_units: 
+  - Infantry M249
+  - Infantry M4
+missiles: []
+preset_groups: 
+  - Hawk
+  - Patriot
+  - Rapier
+naval_units: 
+  - FFG Oliver Hazard Perry
+  - CG Ticonderoga
+  - LHA-1 Tarawa
+  - CV-59 Forrestal
+air_defense_units: 
+  - SAM Hawk SR (AN/MPQ-50)
+  - M163 Vulcan Air Defense System
+  - M48 Chaparral
+  - Flakpanzer Gepard
+  - Roland 2 (Marder Chassis)
+carrier_names: 
+  - CVN-59 Forrestal
+  - CVN-60 Saratoga
+  - CVN-61 Ranger
+  - CVN-62 Independence
+helicopter_carrier_names: 
+  - LHA-1 Tarawa
+  - LHA-2 Saipan
+  - LHA-3 Belleau Wood
+  - LHA-4 Nassau
+  - LHA-5 Peleliu
+has_jtac: "false"
+doctrine: "coldwar"

resources/factions/egypt_1973.yaml

@@ -0,0 +1,44 @@
+---
+country: Egypt
+name: Egypt 1973
+authors: Starfire
+description: "<p>Egypt during the 1973 Yom Kippur War.</p>"
+locales:
+  - ar_SA
+aircrafts:
+  - MiG-21bis Fishbed-N
+  - MiG-19P Farmer-B
+  - Mi-8MTV2 Hip
+  - Tu-16 Badger
+awacs: []
+frontline_units:
+  - T-55A
+  - BMP-1
+  - BRDM-2
+  - BTR-80
+  - PT-76
+  - ZSU-23-4 Shilka
+artillery_units:
+  - BM-21 Grad
+logistics_units:
+  - Truck Ural-375
+  - Truck GAZ-66
+infantry_units:
+  - Infantry RPG
+  - Infantry AK-74 Rus
+preset_groups:
+  - SA-2/S-75
+  - SA-3/S-125
+  - SA-6
+naval_units: []
+missiles: []
+air_defense_units:
+  - SAM P19 "Flat Face" SR (SA-2/3)
+  - SAM SA-5 S-200 ST-68U "Tin Shield" SR
+  - ZSU-23-4 Shilka
+  - AAA ZU-23 Closed Emplacement
+  - ZU-23 on Ural-375
+  - S-60 57mm
+  - ZSU-57-2 'Sparka'
+has_jtac: false
+doctrine: coldwar

resources/factions/final_countdown_2.yaml

@@ -0,0 +1,62 @@
+---
+country: Combined Joint Task Forces Blue
+name: D-Day Allied Forces 1944 and 1990
+authors: Starfire
+description: <p>Faction for Final Countdown II.</p>
+aircrafts:
+  - Boston Mk.III
+  - Fortress Mk.III
+  - Mustang Mk.IV (Early)
+  - Mustang Mk.IV (Late)
+  - Spitfire LF Mk IX
+  - Spitfire LF Mk IX (Clipped Wings)
+  - Thunderbolt Mk.II (Early)
+  - Thunderbolt Mk.II (Late)
+  - Thunderbolt Mk.II (Mid)
+  - MosquitoFBMkVI
+  - AH-64D Apache Longbow
+  - AV-8B Harrier II Night Attack
+  - F-14B Tomcat
+  - F/A-18C Hornet (Lot 20)
+  - UH-1H Iroquois
+frontline_units:
+  - A17 Light Tank Mk VII Tetrarch
+  - A22 Infantry Tank MK IV Churchill VII
+  - A27L Cruiser Tank MK VIII Centaur IV
+  - A27M Cruiser Tank MK VIII Cromwell IV
+  - Daimler Armoured Car Mk I
+  - M2A1 Half-Track
+  - QF 40 mm Mark III
+  - Sherman Firefly VC
+  - Sherman III
+artillery_units: []
+awacs:
+  - E-2D Advanced Hawkeye
+tankers:
+  - S-3B Tanker
+logistics_units:
+  - Truck Bedford
+  - Truck GMC "Jimmy" 6x6 Truck
+infantry_units:
+  - Infantry SMLE No.4 Mk-1
+missiles: []
+air_defense_units:
+  - Bofors 40 mm Gun
+preset_groups:
+  - Ally Flak
+  - WW2LST
+naval_units:
+  - DDG Arleigh Burke IIa
+  - CG Ticonderoga
+  - LHA-1 Tarawa
+  - CVN-74 John C. Stennis
+requirements:
+  WW2 Asset Pack: https://www.digitalcombatsimulator.com/en/products/other/wwii_assets_pack/
+carrier_names:
+  - CVN-71 Theodore Roosevelt
+helicopter_carrier_names:
+  - LHA-4 Nassau
+has_jtac: true
+jtac_unit: MQ-9 Reaper
+unrestricted_satnav: true
+building_set: ww2ally

resources/factions/nva_1970.yaml

@@ -3,37 +3,37 @@ country: Vietnam
 name: NVA 1970
 authors: Starfire
 description: <p>North Vietnamese Army during the Vietnam War from 1965 to 1975</p>
-locales:
+locales: 
   - vi_Vn
-aircrafts:
+aircrafts: 
   - Mi-8MTV2 Hip
   - MiG-19P Farmer-B
   - MiG-21bis Fishbed-N
 awacs: []
 tankers: []
-frontline_units:
+frontline_units: 
   - T-55A
   - PT-76
   - M2A1 Half-Track
   - Grad MRL FDDM (FC)
-artillery_units:
+artillery_units: 
   - BM-21 Grad
-logistics_units:
+logistics_units: 
   - LUV UAZ-469 Jeep
   - Truck Ural-375
-infantry_units:
+infantry_units: 
   - Infantry AK-74 Rus
   - Infantry RPG
 missiles: []
-preset_groups:
+preset_groups: 
   - SA-2/S-75
   - SA-3/S-125
   - KS-19
   - Cold-War-Flak
-naval_units:
+naval_units: 
   - Boat Armed Hi-speed
   - Boat Schnellboot type S130
-air_defense_units:
+air_defense_units: 
   - SAM P19 "Flat Face" SR (SA-2/3)
   - S-60 57mm
   - 8.8 cm Flak 18
@@ -41,6 +41,5 @@ air_defense_units:
   - AAA ZU-23 Emplacement
   - ZU-23 on Ural-375
   - ZSU-23-4 Shilka
-
-requirements: {}
-doctrine: coldwar
+has_jtac: "false"
+doctrine: "coldwar"

resources/factions/russia_1980.yaml

@@ -0,0 +1,76 @@
+---
+country: Russia
+name: Russia 1980
+authors: Starfire
+description: <p>Soviet military in the 1980s.</p>
+locales: 
+  - ru_RU
+aircrafts: 
+  - IL-76MD
+  - Mi-24V Hind-E
+  - Mi-24P Hind-F
+  - Mi-8MTV2 Hip
+  - MiG-21bis Fishbed-N
+  - MiG-23MLD Flogger-K
+  - MiG-25PD Foxbat-E
+  - MiG-27K Flogger-J2
+  - MiG-29A Fulcrum-A
+  - MiG-31 Foxhound
+  - Su-17M4 Fitter-K
+  - Su-24M Fencer-D
+  - Su-25 Frogfoot
+  - Su-27 Flanker-B
+  - Tu-142 Bear-F
+  - Tu-22M3 Backfire-C
+  - Tu-95MS Bear-H
+awacs: 
+  - A-50
+tankers: 
+  - IL-78M
+frontline_units: 
+  - BMD-1
+  - BMP-1
+  - BRDM-2
+  - BTR-80
+  - PT-76
+  - T-55A
+  - T-72B with Kontakt-1 ERA
+artillery_units: 
+  - 2S1 Gvozdika
+  - 2S9 Nona-S
+  - BM-21 Grad
+logistics_units: 
+  - LUV UAZ-469 Jeep
+  - Truck Ural-375
+infantry_units: 
+  - Infantry AK-74 Rus
+  - Infantry RPG
+  - Mortar 2B11 120mm
+preset_groups: 
+  - SA-2/S-75
+  - SA-2/S-75 V-759/5V23
+  - SA-3/S-125
+  - SA-3/S-125 V-601P/5V27
+  - SA-5/S-200
+  - SA-6
+  - KS-19
+naval_units: 
+  - Corvette 1241.1 Molniya
+  - Corvette 1124.4 Grish
+air_defense_units: 
+  - SAM P19 "Flat Face" SR (SA-2/3)
+  - SAM SA-5 S-200 ST-68U "Tin Shield" SR
+  - SAM SA-8 Osa "Gecko" TEL
+  - SA-9 Strela
+  - SA-13 Gopher (9K35 Strela-10M3)
+  - ZSU-57-2 'Sparka'
+  - AAA ZU-23 Closed Emplacement
+  - ZU-23 on Ural-375
+  - ZSU-23-4 Shilka
+helicopter_carrier_names: 
+missiles: 
+  - SSM SS-1C Scud-B
+requirements: 
+carrier_names: 
+has_jtac: "false"
+doctrine: "coldwar"

resources/factions/usa_1970.yaml

@@ -3,9 +3,9 @@ country: USA
 name: USA 1970
 authors: Starfire
 description: <p>US military during the Vietnam War from 1965 to 1975</p>
-locales:
+locales: 
   - en_US
-aircrafts:
+aircrafts: 
   - F-14A Tomcat (Block 135-GR Late)
   - F-4C Phantom II
   - F-4B Phantom II
@@ -18,42 +18,43 @@ aircrafts:
   - B-52H Stratofortress
   - C-47 Skytrain
   - C-130
+  - C-130J-30 Super Hercules
   - UH-1H Iroquois
   - AH-1W SuperCobra
-  - OH-58D Kiowa Warrior
+  - OH-58D(R) Kiowa Warrior
   - CH-47D
   - CH-53E
-awacs:
+awacs: 
   - E-2C Hawkeye
-tankers:
+tankers: 
   - KC-130
   - KC-135 Stratotanker
-frontline_units:
+frontline_units: 
   - M113
   - M163 Vulcan Air Defense System
   - M60A3 "Patton"
-artillery_units:
+artillery_units: 
   - M109A6 Paladin
-logistics_units:
+logistics_units: 
   - Truck M818 6x6
   - LARC-V
-infantry_units:
+infantry_units: 
   - Infantry M249
   - Infantry M4
 missiles: []
-preset_groups:
+preset_groups: 
   - Hawk
-naval_units:
+naval_units: 
   - FFG Oliver Hazard Perry
   - CV-59 Forrestal
-air_defense_units:
+air_defense_units: 
   - SAM Hawk SR (AN/MPQ-50)
   - M163 Vulcan Air Defense System
   - M48 Chaparral
-carrier_names:
+carrier_names: 
   - CV-59 Forrestal
   - CV-60 Saratoga
   - CV-61 Ranger
   - CV-62 Independence
-requirements: {}
-doctrine: coldwar
+has_jtac: "false"
+doctrine: "coldwar"