MegaMek · HammerGS · Aug 23, 2023 · Aug 17, 2023 · Aug 17, 2023 · Aug 18, 2023
diff --git a/...ion War/Capellan Confederation/Aerospace/Dropships/Capellan Confederation Dropships A.txt b/...ion War/Capellan Confederation/Aerospace/Dropships/Capellan Confederation Dropships A.txt
@@ -1,7 +1,7 @@
 Capellan Confederation Dropships A
 Confederate (2602),1
 Gazelle (2531),2
-Dictator (Standard),3
+Dictator,3
 Triumph (2593),4
 Leopard CV (2581),5
 Union (2708),6

diff --git a/...ion War/Capellan Confederation/Aerospace/Dropships/Capellan Confederation Dropships B.txt b/...ion War/Capellan Confederation/Aerospace/Dropships/Capellan Confederation Dropships B.txt
@@ -2,7 +2,7 @@ Capellan Confederation Dropships B
 Fury (2638),1
 Confederate (2602),2
 Gazelle (2531),3
-Dictator (Standard),4
+Dictator,4
 Triumph (2593),5
 Leopard CV (2581),6
 Union (2708),5

diff --git a/...ion War/Capellan Confederation/Aerospace/Dropships/Capellan Confederation Dropships C.txt b/...ion War/Capellan Confederation/Aerospace/Dropships/Capellan Confederation Dropships C.txt
@@ -1,9 +1,9 @@
 Capellan Confederation Dropships C
-Black Eagle (Standard),1
+Black Eagle,1
 Fury (2638),2
 Confederate (2602),3
 Gazelle (2531),4
-Dictator (Standard),5
+Dictator,5
 Triumph (2593),6
 Leopard CV (2581),5
 Union (2708),4

diff --git a/...ion War/Capellan Confederation/Aerospace/Dropships/Capellan Confederation Dropships D.txt b/...ion War/Capellan Confederation/Aerospace/Dropships/Capellan Confederation Dropships D.txt
@@ -1,10 +1,10 @@
 Capellan Confederation Dropships D
 Leopard (2537),1
-Black Eagle (Standard),2
+Black Eagle,2
 Fury (2638),3
 Confederate (2602),4
 Gazelle (2531),5
-Dictator (Standard),6
+Dictator,6
 Triumph (2593),5
 Leopard CV (2581),4
 Union (2708),3

diff --git a/...ion War/Capellan Confederation/Aerospace/Dropships/Capellan Confederation Dropships F.txt b/...ion War/Capellan Confederation/Aerospace/Dropships/Capellan Confederation Dropships F.txt
@@ -1,11 +1,11 @@
 Capellan Confederation Dropships F
 Colossus Mk I,1
 Leopard (2537),2
-Black Eagle (Standard),3
+Black Eagle,3
 Fury (2638),4
 Confederate (2602),5
 Gazelle (2531),6
-Dictator (Standard),5
+Dictator,5
 Triumph (2593),4
 Leopard CV (2581),3
 Union (2708),2

diff --git a/...pellan Confederation Assault Mechs A.txt → ...apellan Confederation Assault Mechs A.txt b/...pellan Confederation Assault Mechs A.txt → ...apellan Confederation Assault Mechs A.txt
@@ -1,12 +1,12 @@
-Capellan Confederation Assault Mechs A
-Longbow LGB-0W,1
-Victor VTR-9B,2
-Stalker STK-3F,3
-Highlander HGN-732,4
-Thug THG-11E,5
-BattleMaster BLR-1G,6
-Longbow LGB-7Q,5
-Xanthos XNT-3O,4
-Pillager PLG-3Z,3
-Cyclops CP-10-Z,2
+Capellan Confederation Assault Mechs A
+Longbow LGB-0W,1
+Victor VTR-9B,2
+Stalker STK-3F,3
+Highlander HGN-732,4
+Thug THG-11E,5
+BattleMaster BLR-1G,6
+Longbow LGB-7Q,5
+Xanthos XNT-3O,4
+Pillager PLG-3Z,3
+Cyclops CP-10-Z,2
 King Crab KGC-000,1
diff --git a/...pellan Confederation Assault Mechs B.txt → ...apellan Confederation Assault Mechs B.txt b/...pellan Confederation Assault Mechs B.txt → ...apellan Confederation Assault Mechs B.txt
@@ -1,12 +1,12 @@
-Capellan Confederation Assault Mechs B
-Awesome AWS-8Q,1
-Longbow LGB-0W,2
-Victor VTR-9B,3
-Stalker STK-3F,4
-Highlander HGN-732,5
-Thug THG-11E,6
-BattleMaster BLR-1G,5
-Longbow LGB-7Q,4
-Xanthos XNT-3O,3
-Pillager PLG-3Z,2
+Capellan Confederation Assault Mechs B
+Awesome AWS-8Q,1
+Longbow LGB-0W,2
+Victor VTR-9B,3
+Stalker STK-3F,4
+Highlander HGN-732,5
+Thug THG-11E,6
+BattleMaster BLR-1G,5
+Longbow LGB-7Q,4
+Xanthos XNT-3O,3
+Pillager PLG-3Z,2
 Cyclops CP-10-Z,1
diff --git a/...pellan Confederation Assault Mechs C.txt → ...apellan Confederation Assault Mechs C.txt b/...pellan Confederation Assault Mechs C.txt → ...apellan Confederation Assault Mechs C.txt
@@ -1,12 +1,12 @@
-Capellan Confederation Assault Mechs C
-Goliath GOL-1H,1
-Awesome AWS-8Q,2
-Longbow LGB-0W,3
-Victor VTR-9B,4
-Stalker STK-3F,5
-Highlander HGN-732,6
-Thug THG-11E,5
-BattleMaster BLR-1G,4
-Longbow LGB-7Q,3
-Xanthos XNT-3O,2
+Capellan Confederation Assault Mechs C
+Goliath GOL-1H,1
+Awesome AWS-8Q,2
+Longbow LGB-0W,3
+Victor VTR-9B,4
+Stalker STK-3F,5
+Highlander HGN-732,6
+Thug THG-11E,5
+BattleMaster BLR-1G,4
+Longbow LGB-7Q,3
+Xanthos XNT-3O,2
 Pillager PLG-3Z,1
diff --git a/...pellan Confederation Assault Mechs D.txt → ...apellan Confederation Assault Mechs D.txt b/...pellan Confederation Assault Mechs D.txt → ...apellan Confederation Assault Mechs D.txt
@@ -1,12 +1,12 @@
-Capellan Confederation Assault Mechs D
-Banshee BNC-3E,1
-Goliath GOL-1H,2
-Awesome AWS-8Q,3
-Longbow LGB-0W,4
-Victor VTR-9B,5
-Stalker STK-3F,6
-Highlander HGN-732,5
-Thug THG-11E,4
-BattleMaster BLR-1G,3
-Longbow LGB-7Q,2
+Capellan Confederation Assault Mechs D
+Banshee BNC-3E,1
+Goliath GOL-1H,2
+Awesome AWS-8Q,3
+Longbow LGB-0W,4
+Victor VTR-9B,5
+Stalker STK-3F,6
+Highlander HGN-732,5
+Thug THG-11E,4
+BattleMaster BLR-1G,3
+Longbow LGB-7Q,2
 Xanthos XNT-3O,1
diff --git a/...pellan Confederation Assault Mechs F.txt → ...apellan Confederation Assault Mechs F.txt b/...pellan Confederation Assault Mechs F.txt → ...apellan Confederation Assault Mechs F.txt
@@ -1,12 +1,12 @@
-Capellan Confederation Assault Mechs F
-Striker STC-2C,1
-Banshee BNC-3E,2
-Goliath GOL-1H,3
-Awesome AWS-8Q,4
-Longbow LGB-0W,5
-Victor VTR-9B,6
-Stalker STK-3F,5
-Highlander HGN-732,4
-Thug THG-11E,3
-BattleMaster BLR-1G,2
+Capellan Confederation Assault Mechs F
+Striker STC-2C,1
+Banshee BNC-3E,2
+Goliath GOL-1H,3
+Awesome AWS-8Q,4
+Longbow LGB-0W,5
+Victor VTR-9B,6
+Stalker STK-3F,5
+Highlander HGN-732,4
+Thug THG-11E,3
+BattleMaster BLR-1G,2
 Longbow LGB-7Q,1
diff --git a/...War/Capellan Confederation/Vehicles/Assault/Capellan Confederation Assault Vehicles A.txt b/...War/Capellan Confederation/Vehicles/Assault/Capellan Confederation Assault Vehicles A.txt
@@ -1,7 +1,7 @@
 Capellan Confederation Assault Vehicles A
 Rhino Fire Support Tank (MG),1
 Puma Assault Tank PAT-005,2
-Rhino Fire Support Tank (Standard),3
+Rhino Fire Support Tank,3
 Puma Assault Tank PAT-005,4
 Fury Command Tank (Fury II),5
 Puma Assault Tank PAT-005,6

diff --git a/...War/Capellan Confederation/Vehicles/Assault/Capellan Confederation Assault Vehicles B.txt b/...War/Capellan Confederation/Vehicles/Assault/Capellan Confederation Assault Vehicles B.txt
@@ -2,7 +2,7 @@ Capellan Confederation Assault Vehicles B
 Mobile Long Tom Artillery LT-MOB-25,1
 Rhino Fire Support Tank (MG),2
 Puma Assault Tank PAT-005,3
-Rhino Fire Support Tank (Standard),4
+Rhino Fire Support Tank,4
 Puma Assault Tank PAT-005,5
 Fury Command Tank (Fury II),6
 Puma Assault Tank PAT-005,5

diff --git a/...War/Capellan Confederation/Vehicles/Assault/Capellan Confederation Assault Vehicles C.txt b/...War/Capellan Confederation/Vehicles/Assault/Capellan Confederation Assault Vehicles C.txt
@@ -3,7 +3,7 @@ Fury Command Tank (Fury II),1
 Mobile Long Tom Artillery LT-MOB-25,2
 Rhino Fire Support Tank (MG),3
 Puma Assault Tank PAT-005,4
-Rhino Fire Support Tank (Standard),5
+Rhino Fire Support Tank,5
 Puma Assault Tank PAT-005,6
 Fury Command Tank (Fury II),5
 Puma Assault Tank PAT-005,4

diff --git a/...War/Capellan Confederation/Vehicles/Assault/Capellan Confederation Assault Vehicles D.txt b/...War/Capellan Confederation/Vehicles/Assault/Capellan Confederation Assault Vehicles D.txt
@@ -4,7 +4,7 @@ Fury Command Tank (Fury II),2
 Mobile Long Tom Artillery LT-MOB-25,3
 Rhino Fire Support Tank (MG),4
 Puma Assault Tank PAT-005,5
-Rhino Fire Support Tank (Standard),6
+Rhino Fire Support Tank,6
 Puma Assault Tank PAT-005,5
 Fury Command Tank (Fury II),4
 Puma Assault Tank PAT-005,3

diff --git a/...War/Capellan Confederation/Vehicles/Assault/Capellan Confederation Assault Vehicles F.txt b/...War/Capellan Confederation/Vehicles/Assault/Capellan Confederation Assault Vehicles F.txt
@@ -5,7 +5,7 @@ Fury Command Tank (Fury II),3
 Mobile Long Tom Artillery LT-MOB-25,4
 Rhino Fire Support Tank (MG),5
 Puma Assault Tank PAT-005,6
-Rhino Fire Support Tank (Standard),5
+Rhino Fire Support Tank,5
 Puma Assault Tank PAT-005,4
 Fury Command Tank (Fury II),3
 Puma Assault Tank PAT-005,2

diff --git a/...ion War/Capellan Confederation/Vehicles/Heavy/Capellan Confederation Heavy Vehicles A.txt b/...ion War/Capellan Confederation/Vehicles/Heavy/Capellan Confederation Heavy Vehicles A.txt
@@ -1,12 +1,12 @@
 Capellan Confederation Heavy Vehicle A
-LRM Carrier (Standard),1
-Bulldog Medium Tank (Standard),2
-Burke Defense Tank (Standard),3
-Manticore Heavy Tank (Standard),4
-Magi Infantry Support Vehicle (Standard),5
+LRM Carrier,1
+Bulldog Medium Tank,2
+Burke Defense Tank,3
+Manticore Heavy Tank,4
+Magi Infantry Support Vehicle,5
 Von Luckner Heavy Tank VNL-K65N,6
-Marksman Artillery Vehicle (Standard),5
-Demon Tank (Standard),4
+Marksman Artillery Vehicle,5
+Demon Tank,4
 Von Luckner Heavy Tank (Star League),3
-Marksman Artillery Vehicle (Standard),2
-Thumper Artillery Vehicle (Standard),1
+Marksman Artillery Vehicle,2
+Thumper Artillery Vehicle,1
diff --git a/...ion War/Capellan Confederation/Vehicles/Heavy/Capellan Confederation Heavy Vehicles B.txt b/...ion War/Capellan Confederation/Vehicles/Heavy/Capellan Confederation Heavy Vehicles B.txt
@@ -1,12 +1,12 @@
 Capellan Confederation Heavy Vehicle B
-Thumper Artillery Vehicle (Standard),1
-LRM Carrier (Standard),2
-Bulldog Medium Tank (Standard),3
-Burke Defense Tank (Standard),4
-Manticore Heavy Tank (Standard),5
-Magi Infantry Support Vehicle (Standard),6
+Thumper Artillery Vehicle,1
+LRM Carrier,2
+Bulldog Medium Tank,3
+Burke Defense Tank,4
+Manticore Heavy Tank,5
+Magi Infantry Support Vehicle,6
 Von Luckner Heavy Tank VNL-K65N,5
-Marksman Artillery Vehicle (Standard),4
-Demon Tank (Standard),3
+Marksman Artillery Vehicle,4
+Demon Tank,3
 Von Luckner Heavy Tank (Star League),2
-Marksman Artillery Vehicle (Standard),1
+Marksman Artillery Vehicle,1
diff --git a/...ion War/Capellan Confederation/Vehicles/Heavy/Capellan Confederation Heavy Vehicles C.txt b/...ion War/Capellan Confederation/Vehicles/Heavy/Capellan Confederation Heavy Vehicles C.txt
@@ -1,12 +1,12 @@
 Capellan Confederation Heavy Vehicle C
-Gallant Urban Assault Tank (Standard),1
-Thumper Artillery Vehicle (Standard),2
-LRM Carrier (Standard),3
-Bulldog Medium Tank (Standard),4
-Burke Defense Tank (Standard),5
-Manticore Heavy Tank (Standard),6
-Magi Infantry Support Vehicle (Standard),5
+Gallant Urban Assault Tank,1
+Thumper Artillery Vehicle,2
+LRM Carrier,3
+Bulldog Medium Tank,4
+Burke Defense Tank,5
+Manticore Heavy Tank,6
+Magi Infantry Support Vehicle,5
 Von Luckner Heavy Tank VNL-K65N,4
-Marksman Artillery Vehicle (Standard),3
-Demon Tank (Standard),2
+Marksman Artillery Vehicle,3
+Demon Tank,2
 Von Luckner Heavy Tank (Star League),1
diff --git a/...ion War/Capellan Confederation/Vehicles/Heavy/Capellan Confederation Heavy Vehicles D.txt b/...ion War/Capellan Confederation/Vehicles/Heavy/Capellan Confederation Heavy Vehicles D.txt
@@ -1,12 +1,12 @@
 Capellan Confederation Heavy Vehicle D
 Merkava Heavy Tank Mk VIII,1
-Gallant Urban Assault Tank (Standard),2
-Thumper Artillery Vehicle (Standard),3
-LRM Carrier (Standard),4
-Bulldog Medium Tank (Standard),5
-Burke Defense Tank (Standard),6
-Manticore Heavy Tank (Standard),5
-Magi Infantry Support Vehicle (Standard),4
+Gallant Urban Assault Tank,2
+Thumper Artillery Vehicle,3
+LRM Carrier,4
+Bulldog Medium Tank,5
+Burke Defense Tank,6
+Manticore Heavy Tank,5
+Magi Infantry Support Vehicle,4
 Von Luckner Heavy Tank VNL-K65N,3
-Marksman Artillery Vehicle (Standard),2
-Demon Tank (Standard),1
+Marksman Artillery Vehicle,2
+Demon Tank,1
diff --git a/...ion War/Capellan Confederation/Vehicles/Heavy/Capellan Confederation Heavy Vehicles F.txt b/...ion War/Capellan Confederation/Vehicles/Heavy/Capellan Confederation Heavy Vehicles F.txt
@@ -1,12 +1,12 @@
 Capellan Confederation Heavy Vehicle F
-SRM Carrier (Standard),1
+SRM Carrier,1
 Merkava Heavy Tank Mk VIII,2
-Gallant Urban Assault Tank (Standard),3
-Thumper Artillery Vehicle (Standard),4
-LRM Carrier (Standard),5
-Bulldog Medium Tank (Standard),6
-Burke Defense Tank (Standard),5
-Manticore Heavy Tank (Standard),4
-Magi Infantry Support Vehicle (Standard),3
+Gallant Urban Assault Tank,3
+Thumper Artillery Vehicle,4
+LRM Carrier,5
+Bulldog Medium Tank,6
+Burke Defense Tank,5
+Manticore Heavy Tank,4
+Magi Infantry Support Vehicle,3
 Von Luckner Heavy Tank VNL-K65N,2
-Marksman Artillery Vehicle (Standard),1
+Marksman Artillery Vehicle,1
diff --git a/...on War/Capellan Confederation/Vehicles/Light/Capellan Confederation Light Vehiceles A.txt b/...on War/Capellan Confederation/Vehicles/Light/Capellan Confederation Light Vehiceles A.txt
@@ -1,12 +1,12 @@
 Capellan Confederation Light Vehicles A
-Heavy Wheeled APC (Standard),1
+Heavy Wheeled APC,1
 Galleon Light Tank GAL-100,2
-J. Edgar Light Hover Tank (Standard),3
-Cyrano Gunship (Standard),4
-Ripper Infantry Transport (Standard),5
-Chevalier Light Tank (Standard),6
-Beagle Hover Scout (Standard),5
-Lightning Attack Hovercraft (Standard),4
-Gabriel Reconnaissance Hovercraft (Standard),3
-Maultier Hover APC (Standard),2
+J. Edgar Light Hover Tank,3
+Cyrano Gunship,4
+Ripper Infantry Transport,5
+Chevalier Light Tank,6
+Beagle Hover Scout,5
+Lightning Attack Hovercraft,4
+Gabriel Reconnaissance Hovercraft,3
+Maultier Hover APC,2
 Packrat LRPV PKR-T5,1
diff --git a/...on War/Capellan Confederation/Vehicles/Light/Capellan Confederation Light Vehiceles B.txt b/...on War/Capellan Confederation/Vehicles/Light/Capellan Confederation Light Vehiceles B.txt
@@ -1,12 +1,12 @@
 Capellan Confederation Light Vehicles B
 Armored Personnel Carrier (Hover SRM),1
-Heavy Wheeled APC (Standard),2
+Heavy Wheeled APC,2
 Galleon Light Tank GAL-100,3
-J. Edgar Light Hover Tank (Standard),4
-Cyrano Gunship (Standard),5
-Ripper Infantry Transport (Standard),6
-Chevalier Light Tank (Standard),5
-Beagle Hover Scout (Standard),4
-Lightning Attack Hovercraft (Standard),3
-Gabriel Reconnaissance Hovercraft (Standard),2
-Maultier Hover APC (Standard),1
+J. Edgar Light Hover Tank,4
+Cyrano Gunship,5
+Ripper Infantry Transport,6
+Chevalier Light Tank,5
+Beagle Hover Scout,4
+Lightning Attack Hovercraft,3
+Gabriel Reconnaissance Hovercraft,2
+Maultier Hover APC,1