Skip to content

Commit

Permalink
Merge branch 'master' into target-display
Browse files Browse the repository at this point in the history
  • Loading branch information
DESKTOP-C2SG422\Tim committed Jun 9, 2023
2 parents 32e7777 + e47dc1c commit 2bd05d2
Show file tree
Hide file tree
Showing 6,579 changed files with 22,449 additions and 21,011 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 1 addition & 1 deletion megamek/data/forcegenerator/3049.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7492,7 +7492,7 @@
</chassis>
<chassis name='Tarantula' unitType='Mek'>
<availability>FWL:3+</availability>
<model name='ZPH-1A'>
<model name='ZPH-1'>
<roles>recon</roles>
<availability>CC:8,MOC:8,General:8,FWL:8,MERC:8,DC:8</availability>
</model>
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/forcegenerator/3055.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8492,7 +8492,7 @@
</chassis>
<chassis name='Tarantula' unitType='Mek'>
<availability>CS:2,MOC:2+,CC:3,FWL:3+,IS:2+,WOB:3,MERC:3+</availability>
<model name='ZPH-1A'>
<model name='ZPH-1'>
<roles>recon</roles>
<availability>CC:8,MOC:8,General:8,FWL:8,MERC:8,DC:8</availability>
</model>
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/forcegenerator/3058.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9115,7 +9115,7 @@
</chassis>
<chassis name='Tarantula' unitType='Mek'>
<availability>CS:2,MOC:2+,CC:3,FWL:3+,IS:2+,WOB:3,MERC:3+,DC:3</availability>
<model name='ZPH-1A'>
<model name='ZPH-1'>
<roles>recon</roles>
<availability>CC:8,MOC:8,General:8,FWL:8,MERC:8,DC:8</availability>
</model>
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/forcegenerator/3060.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11344,7 +11344,7 @@
</chassis>
<chassis name='Tarantula' unitType='Mek'>
<availability>CS:3,MOC:3,CC:4,FWL:5,IS:3,WOB:4,MERC:4,DC:5</availability>
<model name='ZPH-1A'>
<model name='ZPH-1'>
<roles>recon</roles>
<availability>CC:6,MOC:6,General:6,FWL:6,MERC:6,DC:6</availability>
</model>
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/forcegenerator/3067.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14442,7 +14442,7 @@
</chassis>
<chassis name='Tarantula' unitType='Mek'>
<availability>CS:3,MOC:3,CC:5,FVC:3,FWL:6,IS:3,WOB:4,MERC:4,DC:6</availability>
<model name='ZPH-1A'>
<model name='ZPH-1'>
<roles>recon</roles>
<availability>CC:5,MOC:5,General:4,FWL:5,MERC:5,DC:5</availability>
</model>
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/forcegenerator/3075.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15463,7 +15463,7 @@
</chassis>
<chassis name='Tarantula' unitType='Mek'>
<availability>MOC:3,CC:5,CS:3,DTA:6,FVC:2,IS:2,FWL:6,WOB:4,MERC:4,DC:6</availability>
<model name='ZPH-1A'>
<model name='ZPH-1'>
<roles>recon</roles>
<availability>CC:5,MOC:5,General:2,FWL:5,MERC:5,DC:5</availability>
</model>
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/forcegenerator/3078.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16273,7 +16273,7 @@
</chassis>
<chassis name='Tarantula' unitType='Mek'>
<availability>MOC:3,CC:5,DoO:6,IS:1,WOB:4,DO:6,DGM:6,MERC:4,CS:3,DTA:6,SC:6,FVC:1,MCM:6,ROS:4,FWL:6,TP:6,DC:6</availability>
<model name='ZPH-1A'>
<model name='ZPH-1'>
<roles>recon</roles>
<availability>CC:5,MOC:5,ROS:5,General:1,FWL:5,MERC:5,DC:5</availability>
</model>
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/forcegenerator/3082.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15141,7 +15141,7 @@
</chassis>
<chassis name='Tarantula' unitType='Mek'>
<availability>MOC:3,CC:5,DoO:6,DO:6,DGM:6,MERC:4,DTA:6,SC:6,MCM:6,ROS:4,FWL:6,MSC:4,TP:6,DC:6</availability>
<model name='ZPH-1A'>
<model name='ZPH-1'>
<roles>recon</roles>
<availability>CC:4,MOC:4,ROS:4,FWL:4,MERC:4,DC:4</availability>
</model>
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/forcegenerator/3085.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15855,7 +15855,7 @@
</chassis>
<chassis name='Tarantula' unitType='Mek'>
<availability>MOC:3,CC:5,DTA:6,OP:6,DoO:6,ROS:4,FWL:6,DO:6,MSC:6,TP:6,MERC:4,DC:6</availability>
<model name='ZPH-1A'>
<model name='ZPH-1'>
<roles>recon</roles>
<availability>CC:4,MOC:4,ROS:4,FWL:4,MERC:4,DC:4</availability>
</model>
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/forcegenerator/3100.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16507,7 +16507,7 @@
</chassis>
<chassis name='Tarantula' unitType='Mek'>
<availability>MOC:3,CC:5,DTA:6,OP:6,ROS:4,FWL:6,MSC:6,MERC:4,DC:6</availability>
<model name='ZPH-1A'>
<model name='ZPH-1'>
<roles>recon</roles>
<availability>CC:3,MOC:3,ROS:3,FWL:3,MERC:3,DC:3</availability>
</model>
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/forcegenerator/3131.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17465,7 +17465,7 @@
</chassis>
<chassis name='Tarantula' unitType='Mek'>
<availability>MOC:3,CC:5,DTA:6,OP:6,ROS:4,FWL:6,MSC:6,MERC:4,CP:6,DC:6</availability>
<model name='ZPH-1A'>
<model name='ZPH-1'>
<roles>recon</roles>
<availability>CC:3,MOC:3,ROS:3,FWL:3,MERC:3,CP:3,DC:3</availability>
</model>
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/forcegenerator/3145.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17621,7 +17621,7 @@
</chassis>
<chassis name='Tarantula' unitType='Mek'>
<availability>MOC:3,CC:5,ROS:4,FWL:6,MERC:4,CP:6,DC:6</availability>
<model name='ZPH-1A'>
<model name='ZPH-1'>
<roles>recon</roles>
<availability>CC:2,MOC:2,ROS:2,FWL:2,MERC:2,CP:2,DC:2</availability>
</model>
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/forcegenerator/3150.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17724,7 +17724,7 @@
</chassis>
<chassis name='Tarantula' unitType='Mek'>
<availability>MOC:3,CC:5,ROS:4,FWL:6,MERC:4,CP:6,DC:6</availability>
<model name='ZPH-1A'>
<model name='ZPH-1'>
<roles>recon</roles>
<availability>CC:2,MOC:2,ROS:2,FWL:2,MERC:2,CP:2,DC:2</availability>
</model>
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/forcegenerator/3160.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17060,7 +17060,7 @@
</chassis>
<chassis name='Tarantula' unitType='Mek'>
<availability>MOC:3,CC:5,FWL:6,MERC:4,CP:6,DC:6</availability>
<model name='ZPH-1A'>
<model name='ZPH-1'>
<roles>recon</roles>
<availability>CC:2,MOC:2,FWL:2,MERC:2,CP:2,DC:2</availability>
</model>
Expand Down
1 change: 0 additions & 1 deletion megamek/data/mechfiles/.gitignore
View file

This file was deleted.

2 changes: 1 addition & 1 deletion megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 4) [David].blk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ Gibson,Irian,Washburn
</primaryFactory>

<source>
TRO 3058U - Civil War
TRO: 3058U - Civil War
</source>

<chassis>
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 4) [Flamer].blk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ Jump
</motion_type>

<source>
TRO 3058U - Clan Invasion
TRO: 3058U - Clan Invasion
</source>

<armor_tech>
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 4) [Laser].blk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ IS Level 2
</year>

<source>
TRO 3058U - Clan Invasion
TRO: 3058U - Clan Invasion
</source>

<motion_type>
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 4) [MG].blk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ Jump
</motion_type>

<source>
TRO 3058U - Clan Invasion
TRO: 3058U - Clan Invasion
</source>

<armor_tech>
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 4) [TAG].blk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ Jump
</motion_type>

<source>
TRO 3058U - Clan Invasion
TRO: 3058U - Clan Invasion
</source>

<armor_tech>
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 4) [WoB].blk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ IS BA Stealth (Improved):Body
</Trooper 4 Equipment>

<source>
TRO 3058U - Civil War
TRO: 3058U - Civil War
</source>

<chassis>
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 5) [David].blk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ Gibson,Irian,Washburn
</primaryFactory>

<source>
TRO 3058U - Civil War
TRO: 3058U - Civil War
</source>

<chassis>
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 5) [Flamer].blk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ Jump
</motion_type>

<source>
TRO 3058U - Clan Invasion
TRO: 3058U - Clan Invasion
</source>

<armor_tech>
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 5) [Laser].blk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ IS Level 2
</year>

<source>
TRO 3058U - Clan Invasion
TRO: 3058U - Clan Invasion
</source>

<motion_type>
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 5) [MG].blk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ Jump
</motion_type>

<source>
TRO 3058U - Clan Invasion
TRO: 3058U - Clan Invasion
</source>

<armor_tech>
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 5) [TAG].blk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ Jump
</motion_type>

<source>
TRO 3058U - Clan Invasion
TRO: 3058U - Clan Invasion
</source>

<armor_tech>
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 5) [WoB].blk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ IS BA Stealth (Improved):Body
</Squad Equipment>

<source>
TRO 3058U - Civil War
TRO: 3058U - Civil War
</source>

<chassis>
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqd 6) [David].blk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ Gibson,Irian,Washburn
</primaryFactory>

<source>
TRO 3058U - Civil War
TRO: 3058U - Civil War
</source>

<chassis>
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqn 6) [Flamer].blk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ Jump
</motion_type>

<source>
TRO 3058U - Civil War
TRO: 3058U - Civil War
</source>

<armor_tech>
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqn 6) [Laser].blk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ Jump
</motion_type>

<source>
TRO 3058U - Civil War
TRO: 3058U - Civil War
</source>

<armor_tech>
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqn 6) [MG].blk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ Jump
</motion_type>

<source>
TRO 3058U - Civil War
TRO: 3058U - Civil War
</source>

<armor_tech>
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqn 6) [TAG].blk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ Gibson,Irian,Washburn
</primaryFactory>

<source>
TRO 3058U - Civil War
TRO: 3058U - Civil War
</source>

<chassis>
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/battlearmor/3058Uu/Achileus BA (Sqn 6) [WoB].blk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ IS BA Stealth (Improved):Body
</Trooper 6 Equipment>

<source>
TRO 3058U - Civil War
TRO: 3058U - Civil War
</source>

<chassis>
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [Flamer] (Sqd4).blk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ BABattleClaw:LA
</Trooper 4 Equipment>

<source>
TRO 3058U - Clan Invasion
TRO: 3058U - Clan Invasion
</source>

<chassis>
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [Flamer] (Sqd5).blk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ BABattleClaw:LA
</Trooper 4 Equipment>

<source>
TRO 3058U - Clan Invasion
TRO: 3058U - Clan Invasion
</source>

<chassis>
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [Flamer] (Sqd6).blk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ BABattleClaw:LA
</Squad Equipment>

<source>
TRO 3058U - Clan Invasion
TRO: 3058U - Clan Invasion
</source>

<chassis>
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [Laser] (Sqd4).blk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ In German products the unit's proper name was translated to Chevalier, regardles
</notes>

<source>
TRO 3058U - Clan Invasion
TRO: 3058U - Clan Invasion
</source>

<chassis>
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [Laser] (Sqd5).blk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ BABattleClaw:LA
</Trooper 4 Equipment>

<source>
TRO 3058U - Clan Invasion
TRO: 3058U - Clan Invasion
</source>

<chassis>
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [Laser] (Sqd6).blk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ BABattleClaw:LA
</Squad Equipment>

<source>
TRO 3058U - Clan Invasion
TRO: 3058U - Clan Invasion
</source>

<chassis>
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [MG] (Sqd4).blk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ BABattleClaw:LA
</Trooper 4 Equipment>

<source>
TRO 3058U - Clan Invasion
TRO: 3058U - Clan Invasion
</source>

<chassis>
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [MG] (Sqd5).blk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ BABattleClaw:LA
</Trooper 4 Equipment>

<source>
TRO 3058U - Clan Invasion
TRO: 3058U - Clan Invasion
</source>

<chassis>
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [MG] (Sqd6).blk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ BABattleClaw:LA
</Squad Equipment>

<source>
TRO 3058U - Clan Invasion
TRO: 3058U - Clan Invasion
</source>

<chassis>
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [SRM] (Sqd4).blk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ BABattleClaw:LA
</Trooper 4 Equipment>

<source>
TRO 3058U - Clan Invasion
TRO: 3058U - Clan Invasion
</source>

<chassis>
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [SRM] (Sqd5).blk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ BABattleClaw:LA
</Trooper 4 Equipment>

<source>
TRO 3058U - Clan Invasion
TRO: 3058U - Clan Invasion
</source>

<chassis>
Expand Down
2 changes: 1 addition & 1 deletion megamek/data/mechfiles/battlearmor/3058Uu/Cavalier BA [SRM] (Sqd6).blk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ BABattleClaw:LA
</Squad Equipment>

<source>
TRO 3058U - Clan Invasion
TRO: 3058U - Clan Invasion
</source>

<chassis>
Expand Down
Loading

0 comments on commit 2bd05d2

Please sign in to comment.