Skip to content

Commit

Permalink
Merge pull request MegaMek#5975 from rjhancock/mech-to-mek
Browse files Browse the repository at this point in the history
Mech to mek
  • Loading branch information
HammerGS authored Sep 6, 2024
2 parents 65610e9 + 6241156 commit 556af35
Show file tree
Hide file tree
Showing 6,725 changed files with 53,541 additions and 53,414 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
130 changes: 65 additions & 65 deletions megamek/data/forcegenerator/faction_rules/CCO.xml

Large diffs are not rendered by default.

193 changes: 96 additions & 97 deletions megamek/data/forcegenerator/faction_rules/CIH.xml

Large diffs are not rendered by default.

190 changes: 95 additions & 95 deletions megamek/data/forcegenerator/faction_rules/CLAN.xml

Large diffs are not rendered by default.

174 changes: 87 additions & 87 deletions megamek/data/forcegenerator/faction_rules/CSJ.xml

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions megamek/data/images/units/mechset.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1455,7 +1455,7 @@ exact "Zou Heavy Battle Armor (C3)(Sqd5)" "battle armor/Zou_5.png"
exact "Zou Heavy Battle Armor (Sqd6)" "battle armor/Zou_6.png"
exact "Zou Heavy Battle Armor (C3)(Sqd6)" "battle armor/Zou_6.png"

#BattleMechs
#BattleMeks
chassis "Agrotera" "mechs/Agrotera.png"
chassis "Akuma" "mechs/Akuma.png"
exact "Akuma AKU-1XJ" "mechs/Akuma_1XJ.png"
Expand Down Expand Up @@ -8867,4 +8867,3 @@ chassis "Assault Air Defense Missile Emplacement" "GunEmplacements/ArrowIV_Turre

# Local Server/Client moved here to support overrides of existing images!
include localserver_mechset.txt

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
Arcadian Cuirassiers Assault Meks
BattleMaster BLR-1G,1
Awesome AWS-8Q,2
Stalker STK-3F,3
Longbow LGB-7Q,4
Victor VTR-9B,5
BattleMaster BLR-1Gd,6
Emperor EMP-5A,5
Cyclops CP-10-Z,4
Thug THG-11E,3
Highlander HGN-732,2
Emperor EMP-6A,1
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
Arcadian Cuirassiers Heavy Meks
Marauder MAD-1R,1
Black Knight BL-6-KNT,2
Guillotine GLT-3N,3
Warhammer WHM-6R,4
Thunderbolt TDR-5S,5
Thunderbolt TDR-5Sd,6
Archer ARC-2R,5
Hammerhands HMH-3D,4
Marauder MAD-2R,3
Thunderbolt TDR-5Sd,2
Warhammer WHM-6Rb,1
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
Arcadian Cuirassiers Light Meks
Hussar HSR-200-D,1
Locust LCT-1M,2
Ostscout OTT-7J,3
Stinger STG-3R,4
Locust LCT-1V,5
Firestarter FS9-H,6
Falcon FLC-4N,5
Mongoose MON-66,4
Javelin JVN-10N,3
Talon TLN-5V,2
Hussar HSR-200-D,1
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
Arcadian Cuirassiers Medium Meks
Hoplite HOP-4C,1
Phoenix Hawk PXH-1,2
Clint CLNT-2-3T,3
Wolverine WVR-6R,4
Dervish DV-6M,5
Phoenix Hawk PXH-1D,6
Griffin GRF-1N,5
Shadow Hawk SHD-2H,4
Dervish DV-6Md,3
Kintaro KTO-19,2
Galahad GLH-1D,1

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
Avalon Hussars (1st-20th) Assault Meks
Stalker STK-3F,1
Longbow LGB-7Q,2
Victor VTR-9B,3
BattleMaster BLR-1Gd,4
Emperor EMP-5A,5
Cyclops CP-10-Z,6
Thug THG-11E,5
Highlander HGN-732,4
Emperor EMP-6A,3
Pillager PLG-3Z,2
BattleMaster BLR-1Gd,1
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
Avalon Hussars (1st-20th) Heavy Meks
Guillotine GLT-3N,1
Warhammer WHM-6R,2
Thunderbolt TDR-5S,3
Thunderbolt TDR-5Sd,4
Archer ARC-2R,5
Hammerhands HMH-3D,6
Marauder MAD-2R,5
Thunderbolt TDR-5Sd,4
Warhammer WHM-6Rb,3
Crusader CRD-2R,2
Excalibur EXC-B2,1
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
Avalon Hussars (1st-20th) Light Meks
Ostscout OTT-7J,1
Stinger STG-3R,2
Locust LCT-1V,3
Firestarter FS9-H,4
Falcon FLC-4N,5
Mongoose MON-66,6
Javelin JVN-10N,5
Talon TLN-5V,4
Hussar HSR-200-D,3
Firefly FFL-3A,2
Night Hawk NTK-2Q,1
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
Avalon Hussars (1st-20th) Medium Meks
Clint CLNT-2-3T,1
Wolverine WVR-6R,2
Dervish DV-6M,3
Phoenix Hawk PXH-1D,4
Griffin GRF-1N,5
Shadow Hawk SHD-2H,6
Dervish DV-6Md,5
Kintaro KTO-19,4
Galahad GLH-1D,3
Kyudo KY2-D-02,2
Griffin GRF-2N,1

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
Avalon Hussars (22nd-56th) Assault Meks
Awesome AWS-8Q,1
Stalker STK-3F,2
Longbow LGB-7Q,3
Victor VTR-9B,4
BattleMaster BLR-1Gd,5
Emperor EMP-5A,6
Cyclops CP-10-Z,5
Thug THG-11E,4
Highlander HGN-732,3
Emperor EMP-6A,2
Pillager PLG-3Z,1
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
Avalon Hussars (22nd-56th) Heavy Meks
Black Knight BL-6-KNT,1
Guillotine GLT-3N,2
Warhammer WHM-6R,3
Thunderbolt TDR-5S,4
Thunderbolt TDR-5Sd,5
Archer ARC-2R,6
Hammerhands HMH-3D,5
Marauder MAD-2R,4
Thunderbolt TDR-5Sd,3
Warhammer WHM-6Rb,2
Crusader CRD-2R,1
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
Avalon Hussars (22nd-56th) Light Meks
Locust LCT-1M,1
Ostscout OTT-7J,2
Stinger STG-3R,3
Locust LCT-1V,4
Firestarter FS9-H,5
Falcon FLC-4N,6
Mongoose MON-66,5
Javelin JVN-10N,4
Talon TLN-5V,3
Hussar HSR-200-D,2
Firefly FFL-3A,1
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
Avalon Hussars (22nd-56th) Medium Meks
Phoenix Hawk PXH-1,1
Clint CLNT-2-3T,2
Wolverine WVR-6R,3
Dervish DV-6M,4
Phoenix Hawk PXH-1D,5
Griffin GRF-1N,6
Shadow Hawk SHD-2H,5
Dervish DV-6Md,4
Kintaro KTO-19,3
Galahad GLH-1D,2
Kyudo KY2-D-02,1

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
Capellan & Draconis March Militia Assault Meks
King Crab KGC-000,1
Banshee BNC-3E,2
BattleMaster BLR-1G,3
Awesome AWS-8Q,4
Stalker STK-3F,5
Longbow LGB-7Q,6
Victor VTR-9B,5
BattleMaster BLR-1Gd,4
Emperor EMP-5A,3
Cyclops CP-10-Z,2
Thug THG-11E,1
Loading

0 comments on commit 556af35

Please sign in to comment.