Refactoring

Moving IconTest to the Utilites folders.

Data:
Cleaning up some unit stuff.

megameklab/data/images/units/mechset.txt

@@ -166,7 +166,7 @@ chassis "Lightning" "fighter/Lightning.png"
 chassis "Lucifer" "fighter/Lucifer.png"
 chassis "Lucifer II" "fighter/Lucifer.png"
 chassis "Lucifer III" "fighter/Lucifer III.png"
-chassis "Mengqin" "fighter/Mengqin.png"
+chassis "Mĕngqín" "fighter/Mengqin.png"
 chassis "Morgenstern" "fighter/Morgenstern.png"
 chassis "Oni" "fighter/Oni.png"
 chassis "Ogotai" "fighter/Ogotai.png"
@@ -411,9 +411,9 @@ chassis "Clan Medium Battle Armor" "battle armor/ClanBA_5.png"
 exact "Clan Medium Battle Armor (Laser) 'Volk' (Sqd4)" "battle armor/ClanBA_Volk_4.png"
 exact "Clan Medium Battle Armor (Laser) 'Volk' (Sqd5)" "battle armor/ClanBA_Volk_5.png"
 exact "Clan Medium Battle Armor (Laser) 'Volk' (Sqd6)" "battle armor/ClanBA_Volk_6.png"
-exact "Clan Medium Battle Armor (Naval) 'Bar' (Sqd4)" "battle armor/ClanBA_Bar_4.png"
-exact "Clan Medium Battle Armor (Naval) 'Bar' (Sqd5)" "battle armor/ClanBA_Bar_5.png"
-exact "Clan Medium Battle Armor (Naval) 'Bar' (Sqd6)" "battle armor/ClanBA_Bar_6.png"
+exact "Clan Medium Battle Armor (Naval) 'Bär' (Sqd4)" "battle armor/ClanBA_Bar_4.png"
+exact "Clan Medium Battle Armor (Naval) 'Bär' (Sqd5)" "battle armor/ClanBA_Bar_5.png"
+exact "Clan Medium Battle Armor (Naval) 'Bär' (Sqd6)" "battle armor/ClanBA_Bar_6.png"
 exact "Clan Medium Battle Armor (Rache)(Sqd4)" "battle armor/ClanBA_4.png"
 exact "Clan Medium Battle Armor (Rache)(Sqd6)" "battle armor/ClanBA_6.png"
 exact "Clan Medium Battle Armor (Rabid)(Sqd4)" "battle armor/ClanBA_4.png"
@@ -1464,7 +1464,7 @@ exact "Albatross ALB-6U" "mechs/Albatross_6U.png"
 exact "Albatross C 'Sooty Albatross'" "mechs/Albatross_C.png"
 exact "Albatross ALB-5W (Dantalion)" "mechs/Albatross_5WD.png"
 chassis "Alfar" "mechs/Alfar.png"
-exact "Alfar AL-D1 'Dokkalfar'" "mechs/Alfar_D1.png"
+exact "Alfar AL-D1 'Dökkálfar'" "mechs/Alfar_D1.png"
 chassis "Alpha Wolf" "mechs/AlphaWolf.png"
 exact "Alpha Wolf A" "mechs/AlphaWolf_A.png"
 exact "Alpha Wolf B" "mechs/AlphaWolf_B.png"
@@ -1506,7 +1506,7 @@ exact "Apollo APL-4M" "mechs/Apollo_4M.png"
 chassis "Aquagladius" "mechs/Aquagladius.png"
 exact "Aquagladius AQS-4" "mechs/Aquagladius_4.png"
 exact "Aquagladius AQS-5 MAM" "mechs/Aquagladius_5.png"
-chassis "Arana" "mechs/Arana.png"
+chassis "Araña" "mechs/Arana.png"
 chassis "Arbalest" "mechs/Arbalest.png"
 exact "Arbalest 2" "mechs/Arbalest_2.png"
 exact "Arbalest 3" "mechs/Arbalest_3.png"
@@ -2920,7 +2920,7 @@ exact "Goshawk II 2" "mechs/GoshawkII_2.png"
 exact "Goshawk II 3" "mechs/GoshawkII_3.png"
 exact "Goshawk II 4" "mechs/GoshawkII_4.png"
 exact "Goshawk II RISC" "mechs/GoshawkII_4.png"
-chassis "Gotterdammerung" "mechs/Gotterdammerung.png"
+chassis "Götterdämmerung" "mechs/Gotterdammerung.png"
 #Grand Crusader
 chassis "Grand Crusader" "mechs/GrandCrusader.png"
 exact "Grand Crusader GRN-D-01-X" "mechs/GrandCrusader_01X.png"
@@ -3063,9 +3063,9 @@ exact "Guillotine IIC 2" "mechs/Guillotine_IIC 2.png"
 chassis "Gulon MiningMech" "mechs/Gulon.png"
 chassis "Gulon SecurityMech" "mechs/Gulon.png"
 chassis "Gulon SolahmaMech" "mechs/Gulon.png"
-chassis "Gun" "mechs/Gun.png"
-exact "Gun GN-2OA" "mechs/Gun_A.png"
-exact "Gun GN-2OB" "mechs/Gun_B.png"
+chassis "Gùn" "mechs/Gun.png"
+exact "Gùn GN-2OA" "mechs/Gun_A.png"
+exact "Gùn GN-2OB" "mechs/Gun_B.png"
 chassis "Gunslinger" "mechs/Gunslinger.png"
 exact "Gunslinger GUN-2ERD" "mechs/Gunslinger_2ERD.png"
 exact "Gunslinger GUN-1ERD (Jared)" "mechs/Gunslinger_Jared.png"
@@ -7566,10 +7566,10 @@ exact "Brutus Assault Tank (PPC)" "vehicles/Brutus_PPC.png"
 exact "Brutus Assault Tank (PPC 2)" "vehicles/Brutus_PPC2.png"
 exact "Brutus Assault Tank (HPPC)" "vehicles/Brutus_HPPC.png"
 chassis "Buffalo Drone Bomb" "vehicles/Buffalo.png"
-chassis "Buffel Engineering Support Vehicle VII" "vehicles/Buffel.png"
-exact "Buffel Engineering Support Vehicle VII (Cargo)" "vehicles/Buffel_Cargo.png"
-exact "Buffel Engineering Support Vehicle VII (Reverse)" "vehicles/Buffel_RB.png"
-chassis "Buffel Engineering Support Vehicle VIII" "vehicles/Buffel_Cargo.png"
+chassis "Büffel Engineering Support Vehicle VII" "vehicles/Buffel.png"
+exact "Büffel Engineering Support Vehicle VII (Cargo)" "vehicles/Buffel_Cargo.png"
+exact "Büffel Engineering Support Vehicle VII (Reverse)" "vehicles/Buffel_RB.png"
+chassis "Büffel Engineering Support Vehicle VIII" "vehicles/Buffel_Cargo.png"
 chassis "Bulldog Medium Tank" "vehicles/Bulldog.png"
 exact "Bulldog Medium Tank (AC2)" "vehicles/Bulldog_AC2.png"
 exact "Bulldog Medium Tank (LRM)" "vehicles/Bulldog_LRM.png"
@@ -7848,8 +7848,8 @@ exact "Gun Trailer (Siege)" "vehicles/Guntrailer_Siege.png"
 exact "Gun Trailer (Stronghold)" "vehicles/Guntrailer_Stronghold.png"
 exact "Gun Trailer (Thunderbolt)" "vehicles/Guntrailer_Thunderbolt.png"
 exact "Gun Trailer (Ultra)" "vehicles/Guntrailer_Ultra.png"
-chassis "Gurteltier MBT" "vehicles/Gurteltier.png"
-exact "Gurteltier MBT (C3M)" "vehicles/Gurteltier_C3M.png"
+chassis "Gürteltier MBT" "vehicles/Gurteltier.png"
+exact "Gürteltier MBT (C3M)" "vehicles/Gurteltier_C3M.png"
 chassis "Gurzil Support Tank" "vehicles/Gurzil.png"
 chassis "Hachiman Fire Support Tank" "vehicles/Hachiman.png"
 exact "Hachiman Fire Support Tank (AAA)" "vehicles/Hachiman_AAA.png"
@@ -8146,7 +8146,7 @@ exact "Morningstar City Command Vehicle (Laser)" "vehicles/Morningstar_Laser.png
 chassis "Morrigu Fire Support Vehicle" "vehicles/Morrigu.png"
 exact "Morrigu Fire Support Vehicle (HAG)" "vehicles/Morrigu_HAG.png"
 exact "Morrigu Fire Support Vehicle (Laser)" "vehicles/Morrigu_Laser.png"
-chassis "Motuo Che Shang No.2" "vehicles/Motuoche.png"
+chassis "Mótuö Chë Shang No.2" "vehicles/Motuoche.png"
 chassis "Musketeer Hover Tank" "vehicles/Musketeer.png"
 exact "Musketeer Hover Tank (3080 Upgrade)" "vehicles/Musketeer_3080.png"
 exact "Musketeer Hover Tank (Armor)" "vehicles/Musketeer_Armor.png"
@@ -8446,7 +8446,7 @@ chassis "SM5 Field Commander" "vehicles/SM5FC.png"
 chassis "SM2 Heavy Artillery Vehicle" "vehicles/SM2.png"
 chassis "Sniper Artillery" "vehicles/SniperArty.png"
 #chassis "Sniper Attack umu" " .png"
-chassis "SOAR" "vehicles/Soar.png"
+chassis "SOAR VTOL" "vehicles/Soar.png"
 chassis "Soarece Superheavy MBT" "vehicles/Soarece.png"
 chassis "Sokar Urban Combat Unit" "vehicles/Sokar.png"
 chassis "Sortek Assault Craft" "vehicles/Sortek.png"
@@ -8665,15 +8665,15 @@ chassis "Long-Range Shuttlecraft" "dropships/Long-Range Shuttlecraft.png"
 chassis "Lyonesse Escort" "dropships/Lyonesse.png"
 exact "Lyonesse Escort M1" "dropships/Lyonesse.png"
 exact "Lyonesse Escort W1" "dropships/Lyonesse.png"
-chassis "Mowang Courier" "dropships/Mowang.png"
-exact "Mowang Courier (Clandestine)" "dropships/Mowang.png"
+chassis "Mówáng Courier" "dropships/Mowang.png"
+exact "Mówáng Courier (Clandestine)" "dropships/Mowang.png"
 exact "NL-45 Gunboat" "dropships/NL-45 Gunboat.png"
 chassis "Oo-Suzumebachi" "dropships/Oo-Suzumebachi.png"
 chassis "Pods/Lifeboats from " "dropships/EscapePods.png"
 exact "S7-P Bus 'Scarab'" "dropships/Bus.png"
 chassis "Shuttle" "dropships/Shuttle.png"
 exact "Tigress Close Patrol Craft TIG-15" "dropships/Tigress.png"
-chassis "Wurger Assault Craft" "dropships/Wurger.png"
+chassis "Würger Assault Craft" "dropships/Wurger.png"
 exact "Zhen Niao" "dropships/Zhen Niao.png"
 
 

megameklab/data/mechfiles/battlearmor/3075/Clan Med BA (Naval) (Bar) (Sqd5).blk

@@ -17,7 +17,7 @@ Clan Medium Battle Armor
 </Name>
 
 <Model>
-(Naval) Bär' (Sqd5)
+(Naval) 'Bär' (Sqd5)
 </Model>
 
 <mul id:>

megameklab/data/mechfiles/fighters/TRO3039u/Lucifer II LCF-R16K.blk

@@ -140,11 +140,11 @@ Chatham
 </primaryFactory>
 
 <systemManufacturers>
-CHASSIS:Lockhead/CBM 200
+CHASSIS:Lockheed/CBM 200
 ENGINE:Manatwist 260
 ARMOR:StarScale Type IV
-COMMUNICATIONS:Lockhead/CBM COMSET 100
-TARGETING:Lockhead/CBM TarSet 55
+COMMUNICATIONS:Lockheed/CBM COMSET 100
+TARGETING:Lockheed/CBM TarSet 55
 </systemManufacturers>
 
 

megameklab/data/mechfiles/fighters/TRO3039u/Lucifer II LCF-R16KR.blk

@@ -149,9 +149,9 @@ Chatham
 </primaryFactory>
 
 <systemManufacturers>
-CHASSIS:Lockhead/CBM 200
+CHASSIS:Lockheed/CBM 200
 ENGINE:Manatwist 260 XL
 ARMOR:StarScale Type IV
-COMMUNICATIONS:Lockhead/CBM COMSET 100
-TARGETING:Lockhead/CBM TarSet 55
+COMMUNICATIONS:Lockheed/CBM COMSET 100
+TARGETING:Lockheed/CBM TarSet 55
 </systemManufacturers>

megameklab/data/mechfiles/fighters/TRO3039u/Lucifer LCF-R15.blk

@@ -142,11 +142,11 @@ Donegal,Fefferfer
 </primaryFactory>
 
 <systemManufacturers>
-CHASSIS:Lockhead/CBM 200
+CHASSIS:Lockheed/CBM 200
 ENGINE:WAS 195
 ARMOR:StarScale Type IV
-COMMUNICATIONS:Lockhead/CBM COMSET 100
-TARGETING:Lockhead/CBM TarSet 55
+COMMUNICATIONS:Lockheed/CBM COMSET 100
+TARGETING:Lockheed/CBM TarSet 55
 </systemManufacturers>
 
 

megameklab/data/mechfiles/fighters/TRO3039u/Lucifer LCF-R16.blk

@@ -147,11 +147,11 @@ Donegal
 </primaryFactory>
 
 <systemManufacturers>
-CHASSIS:Lockhead/CBM 200
+CHASSIS:Lockheed/CBM 200
 ENGINE:WAS 195
 ARMOR:StarScale Ferro-Aluminum
-COMMUNICATIONS:Lockhead/CBM COMSET 100
-TARGETING:Lockhead/CBM TarSet 55
+COMMUNICATIONS:Lockheed/CBM COMSET 100
+TARGETING:Lockheed/CBM TarSet 55
 </systemManufacturers>
 
 

megameklab/data/mechfiles/fighters/TRO3039u/Lucifer LCF-R20.blk

@@ -136,9 +136,9 @@ Donegal
 </primaryFactory>
 
 <systemManufacturers>
-CHASSIS:Lockhead/CBM 200
+CHASSIS:Lockheed/CBM 200
 ENGINE:WAS 195
 ARMOR:StarScale Type IV
-COMMUNICATIONS:Lockhead/CBM COMSET 100
-TARGETING:Lockhead/CBM TarSet 55
+COMMUNICATIONS:Lockheed/CBM COMSET 100
+TARGETING:Lockheed/CBM TarSet 55
 </systemManufacturers>

megameklab/data/mechfiles/fighters/XTRs/Mercenaries/Lucifer LCF-X30.blk

@@ -143,11 +143,11 @@ Skye
 </primaryFactory>
 
 <systemManufacturers>
-CHASSIS:Lockhead/CBM 200
+CHASSIS:Lockheed/CBM 200
 ENGINE:Edasich Motors 195 XL
 ARMOR:StarScale Ferro-Aluminum
-COMMUNICATIONS:Lockhead/CBM COMSET 100
-TARGETING:Lockhead/CBM TarSet 55
+COMMUNICATIONS:Lockheed/CBM COMSET 100
+TARGETING:Lockheed/CBM TarSet 55
 </systemManufacturers>
 
 

megameklab/data/mechfiles/mechs/3075/Phoenix Hawk PXH-1b.mtf

@@ -1,52 +1,50 @@
+generator:MegaMek Suite 0.50.0-SNAPSHOT on 2024-07-11
 chassis:Phoenix Hawk
-model:PXH-1b (Special)
+model:PXH-1b 'Special'
 mul id:2492
 
 Config:Biped
-TechBase:Inner Sphere
-Era:2760
+techbase:Inner Sphere
+era:2760
 source:TRO: 3075
-Rules Level:2
+rules level:2
 role:Skirmisher
 
-
-
 quirk:command_mech
-quirk:imp_com
 quirk:ubiquitous_clan
 quirk:ubiquitous_is
+quirk:imp_com
 weaponquirk:jettison_capable:RA:4:ISERPPC
 
-
-Mass:45
-Engine:270 XL Engine
-Structure:Endo Steel
-Myomer:Standard
-
-Heat Sinks:10 Double
-Walk MP:6
-Jump MP:6
-
-Armor:Standard
-LA Armor:10
-RA Armor:10
-LT Armor:18
-RT Armor:18
-CT Armor:23
-HD Armor:6
-LL Armor:15
-RL Armor:15
-RTL Armor:4
-RTR Armor:4
-RTC Armor:5
+mass:45
+engine:270 XL Engine(IS)
+structure:IS Endo Steel
+myomer:Standard
+
+heat sinks:10 IS Double
+walk mp:6
+jump mp:6
+
+armor:Standard(Inner Sphere)
+LA armor:10
+RA armor:10
+LT armor:18
+RT armor:18
+CT armor:23
+HD armor:6
+LL armor:15
+RL armor:15
+RTL armor:4
+RTR armor:4
+RTC armor:5
 
 Weapons:6
+Medium Laser, Left Arm
+Machine Gun, Left Arm
 ER PPC, Right Arm
 Medium Laser, Right Arm
-Medium Laser, Left Arm
-ER Large Laser, Right Torso
 Machine Gun, Right Arm
-Machine Gun, Left Arm
+ER Large Laser, Right Torso
 
 Left Arm:
 Shoulder
@@ -55,9 +53,9 @@ Lower Arm Actuator
 Hand Actuator
 Medium Laser
 Machine Gun
-Endo Steel
-Endo Steel
-Endo Steel
+IS Endo Steel
+IS Endo Steel
+IS Endo Steel
 -Empty-
 -Empty-
 -Empty-
@@ -72,8 +70,8 @@ ISERPPC
 ISERPPC
 Medium Laser
 Machine Gun
-Endo Steel
-Endo Steel
+IS Endo Steel
+IS Endo Steel
 -Empty-
 
 Left Torso:
@@ -85,8 +83,8 @@ Jump Jet
 Jump Jet
 IS Ammo MG - Full
 ISCASE
-Endo Steel
-Endo Steel
+IS Endo Steel
+IS Endo Steel
 -Empty-
 -Empty-
 
@@ -99,8 +97,8 @@ Jump Jet
 Jump Jet
 ISERLargeLaser
 ISERLargeLaser
-Endo Steel
-Endo Steel
+IS Endo Steel
+IS Endo Steel
 -Empty-
 -Empty-
 
@@ -122,7 +120,7 @@ Head:
 Life Support
 Sensors
 Cockpit
-Endo Steel
+IS Endo Steel
 Sensors
 Life Support
 -Empty-
@@ -137,8 +135,8 @@ Hip
 Upper Leg Actuator
 Lower Leg Actuator
 Foot Actuator
-Endo Steel
-Endo Steel
+IS Endo Steel
+IS Endo Steel
 -Empty-
 -Empty-
 -Empty-
@@ -151,8 +149,8 @@ Hip
 Upper Leg Actuator
 Lower Leg Actuator
 Foot Actuator
-Endo Steel
-Endo Steel
+IS Endo Steel
+IS Endo Steel
 -Empty-
 -Empty-
 -Empty-