Fix carrier names in factions.

The rest of the ships were covered but it looks like carriers were
missed.

Fixes https://github.com/dcs-liberation/dcs_liberation/issues/1258

resources/factions/NATO_Desert_Storm.json

@@ -76,10 +76,10 @@
     "PatriotEwrGenerator"
   ],
   "aircraft_carrier": [
-    "CVN_74_John_C__Stennis"
+    "Stennis"
   ],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
     "PERRY"

resources/factions/australia_2005.json

@@ -41,7 +41,7 @@
   ],
   "aircraft_carrier": [],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
     "USS_Arleigh_Burke_IIa"

resources/factions/australia_2005_c130.json

@@ -42,7 +42,7 @@
   ],
   "aircraft_carrier": [],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
     "USS_Arleigh_Burke_IIa"

resources/factions/bluefor_coldwar.json

@@ -49,10 +49,10 @@
     "HawkEwrGenerator"
   ],
   "aircraft_carrier": [
-    "CVN_74_John_C__Stennis"
+    "Stennis"
   ],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
     "USS_Arleigh_Burke_IIa"

resources/factions/bluefor_coldwar_a4.json

@@ -50,10 +50,10 @@
     "HawkEwrGenerator"
   ],
   "aircraft_carrier": [
-    "CVN_74_John_C__Stennis"
+    "Stennis"
   ],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
     "USS_Arleigh_Burke_IIa"

resources/factions/bluefor_coldwar_a4_mb339.json

@@ -51,10 +51,10 @@
     "HawkEwrGenerator"
   ],
   "aircraft_carrier": [
-    "CVN_74_John_C__Stennis"
+    "Stennis"
   ],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
     "USS_Arleigh_Burke_IIa"

resources/factions/bluefor_modern.json

@@ -72,10 +72,10 @@
     "PatriotEwrGenerator"
   ],
   "aircraft_carrier": [
-    "CVN_74_John_C__Stennis"
+    "Stennis"
   ],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
     "USS_Arleigh_Burke_IIa"

resources/factions/china_2010.json

@@ -66,7 +66,7 @@
   ],
   "coastal_group_count": 2,
   "aircraft_carrier": [
-    "CV_1143_5_Admiral_Kuznetsov"
+    "KUZNECOW"
   ],
   "carrier_names": [
     "001 Liaoning",

resources/factions/france_1985_frenchpack.json

@@ -51,7 +51,7 @@
   ],
   "aircraft_carrier": [],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
     "USS_Arleigh_Burke_IIa"

resources/factions/france_1995.json

@@ -50,7 +50,7 @@
   ],
   "aircraft_carrier": [],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
     "USS_Arleigh_Burke_IIa",

resources/factions/france_2005_frenchpack.json

@@ -55,10 +55,10 @@
     "HawkGenerator"
   ],
   "aircraft_carrier": [
-    "CVN_74_John_C__Stennis"
+    "Stennis"
   ],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
     "USS_Arleigh_Burke_IIa"

resources/factions/india_2010.json

@@ -59,7 +59,7 @@
     "TallRackGenerator"
   ],
   "aircraft_carrier": [
-    "CV_1143_5_Admiral_Kuznetsov"
+    "KUZNECOW"
   ],
   "helicopter_carrier": [],
   "helicopter_carrier_names": [],

resources/factions/italy_1990.json

@@ -44,7 +44,7 @@
   ],
   "aircraft_carrier": [],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
     "PERRY"

resources/factions/italy_1990_mb339.json

@@ -45,7 +45,7 @@
   ],
   "aircraft_carrier": [],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
     "PERRY"

resources/factions/japan_2005.json

@@ -51,7 +51,7 @@
   ],
   "aircraft_carrier": [],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
     "USS_Arleigh_Burke_IIa"

resources/factions/redfor_china_2010.json

@@ -85,7 +85,7 @@
     "TallRackGenerator"
   ],
   "aircraft_carrier": [
-    "CV_1143_5_Admiral_Kuznetsov"
+    "KUZNECOW"
   ],
   "carrier_names": [
     "001 Liaoning",

resources/factions/redfor_russia_2010.json

@@ -88,7 +88,7 @@
     "TallRackGenerator"
   ],
   "aircraft_carrier": [
-    "CV_1143_5_Admiral_Kuznetsov"
+    "KUZNECOW"
   ],
   "helicopter_carrier": [
     "Type_071_Amphibious_Transport_Dock"

resources/factions/russia_1990.json

@@ -75,7 +75,7 @@
     "TallRackGenerator"
   ],
   "aircraft_carrier": [
-    "CV_1143_5_Admiral_Kuznetsov"
+    "KUZNECOW"
   ],
   "helicopter_carrier": [],
   "helicopter_carrier_names": [],

resources/factions/russia_2010.json

@@ -78,7 +78,7 @@
     "TallRackGenerator"
   ],
   "aircraft_carrier": [
-    "CV_1143_5_Admiral_Kuznetsov"
+    "KUZNECOW"
   ],
   "helicopter_carrier": [],
   "helicopter_carrier_names": [],

resources/factions/russia_2010_hds.json

@@ -75,7 +75,7 @@
     "TallRackGenerator"
   ],
   "aircraft_carrier": [
-    "CV_1143_5_Admiral_Kuznetsov"
+    "KUZNECOW"
   ],
   "helicopter_carrier": [],
   "helicopter_carrier_names": [],

resources/factions/russia_2020.json

@@ -74,7 +74,7 @@
     "TallRackGenerator"
   ],
   "aircraft_carrier": [
-    "CV_1143_5_Admiral_Kuznetsov"
+    "KUZNECOW"
   ],
   "helicopter_carrier": [],
   "helicopter_carrier_names": [],

resources/factions/spain_1990.json

@@ -44,10 +44,10 @@
     "PatriotEwrGenerator"
   ],
   "aircraft_carrier": [
-    "CVN_74_John_C__Stennis"
+    "Stennis"
   ],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
     "PERRY"

resources/factions/uk_1990.json

@@ -50,10 +50,10 @@
     "HawkEwrGenerator"
   ],
   "aircraft_carrier": [
-    "CVN_74_John_C__Stennis"
+    "Stennis"
   ],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
     "PERRY"

resources/factions/usa_1990.json

@@ -70,10 +70,10 @@
     "PatriotEwrGenerator"
   ],
   "aircraft_carrier": [
-    "CVN_74_John_C__Stennis"
+    "Stennis"
   ],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
     "PERRY",

resources/factions/usa_2005.json

@@ -72,10 +72,10 @@
     "PatriotEwrGenerator"
   ],
   "aircraft_carrier": [
-    "CVN_74_John_C__Stennis"
+    "Stennis"
   ],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
     "USS_Arleigh_Burke_IIa"

resources/factions/usa_2005_c130.json

@@ -72,10 +72,10 @@
     "PatriotEwrGenerator"
   ],
   "aircraft_carrier": [
-    "CVN_74_John_C__Stennis"
+    "Stennis"
   ],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
     "USS_Arleigh_Burke_IIa"

resources/factions/usa_2005_modded.json

@@ -68,10 +68,10 @@
     "PatriotEwrGenerator"
   ],
   "aircraft_carrier": [
-    "CVN_74_John_C__Stennis"
+    "Stennis"
   ],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
     "USS_Arleigh_Burke_IIa"

resources/factions/usn_1985.json

@@ -46,10 +46,10 @@
     "VulcanGenerator"
   ],
   "aircraft_carrier": [
-    "CVN_74_John_C__Stennis"
+    "Stennis"
   ],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
     "PERRY"

tests/resources/invalid_faction_country.json

@@ -51,10 +51,10 @@
     "HawkGenerator"
   ],
   "aircraft_carrier": [
-    "CVN_74_John_C__Stennis"
+    "Stennis"
   ],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
     "PERRY",

tests/resources/valid_faction.json

@@ -53,10 +53,10 @@
     "HawkGenerator"
   ],
   "aircraft_carrier": [
-    "CVN_74_John_C__Stennis"
+    "Stennis"
   ],
   "helicopter_carrier": [
-    "LHA_1_Tarawa"
+    "LHA_Tarawa"
   ],
   "destroyers": [
     "PERRY",