Skip to content

Commit

Permalink
Merge pull request MegaMek#1608 from rjhancock/mechwarrior-class-rename
Browse files Browse the repository at this point in the history 
Mechwarrior class rename
  • Loading branch information
@HammerGS
HammerGS authored Sep 13, 2024
2 parents 1cc43e7 + 04e239e commit 3cada67
Show file tree
Hide file tree
Showing 13,589 changed files with 12,416 additions and 10,355 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
3 changes: 2 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
/megameklab/bin/
/megameklab/build/
/megameklab/data/fonts/
/megameklab/data/mechfiles/units.cache
/megameklab/logs/
/megameklab/mmconf/*.preferences
/megameklab/mmconf/*.properties
/megameklab/out/
/megameklab/.classpath
/megameklab/.project
Expand All @@ -33,3 +33,4 @@
/megameklab/docs/OfficiaulUnitList.txt
/megameklab/docs/mml-revision.txt
/megameklab/MegaMekLab.l4j.ini
units.cache
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
5 changes: 4 additions & 1 deletion gradlew
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
Expand Down Expand Up @@ -84,7 +86,8 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down
2 changes: 2 additions & 0 deletions gradlew.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
Expand Down
10 changes: 5 additions & 5 deletions megameklab/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ dependencies {
implementation "org.megamek:megamek${mmBranchTag}:${version}"

implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2'
implementation 'org.apache.logging.log4j:log4j-core:2.23.1'
implementation 'org.apache.logging.log4j:log4j-core:2.24.0'
implementation 'org.apache.pdfbox:pdfbox:2.0.32'
implementation ('org.apache.xmlgraphics:batik-bridge:1.14') {
// We don't need the python and javascript engine taking up space
Expand All @@ -69,20 +69,20 @@ dependencies {
}
implementation 'org.apache.xmlgraphics:batik-rasterizer:1.14'
implementation 'org.apache.xmlgraphics:batik-svggen:1.14'
implementation ('org.apache.xmlgraphics:fop:2.7') {
implementation ('org.apache.xmlgraphics:fop:2.9') {
// We don't need this proprietary module
exclude group: 'com.sun.media', module: 'jai-codec'
exclude group: 'xml-apis'
}
testImplementation 'org.mockito:mockito-core:5.12.0'
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.3'
testImplementation 'org.mockito:mockito-core:5.13.0'
testImplementation 'org.junit.jupiter:junit-jupiter:5.11.0'

runtimeOnly 'org.glassfish.jaxb:jaxb-runtime:4.0.5'

//Required for printing scaled vector graphics (SVG) - EclipseIDE Comipatability.
runtimeOnly 'xml-apis:xml-apis-ext:1.3.04'

testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.10.3'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.11.0'
}

application {
Expand Down
6 changes: 3 additions & 3 deletions megameklab/data/fonts/btclassic/readme.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Fontname: Battletech Oldstyle
Created by: Jason M. Knight (aka Deathshadow)
http://www.classicbattletech.com/truetype/bt_oldstyle.zip

This file contains a recreation of the fonts used in the Classic Battletech Logo on products from 1984 to 1991. Upper and Lower case letters are identical except for the letter R, which appears differently on the Battleforce products than it does on the others. The lower case R is that used on Battleforce, while the upper case version is that used on Mechwarrior and Succession Wars.
This file contains a recreation of the fonts used in the Classic Battletech Logo on products from 1984 to 1991. Upper and Lower case letters are identical except for the letter R, which appears differently on the Battleforce products than it does on the others. The lower case R is that used on Battleforce, while the upper case version is that used on Mekwarrior and Succession Wars.

Additionally, the following 5 wingdings are available:

Expand All @@ -15,6 +15,6 @@ CHR ASCII IMAGE

This file is free for non-profit and recreational use, and is not to be used on commercial products without the permission of Fantasy Productions. Any future fonts will be archived at http://www.classicbattletech.com/truetype

Original contents of ClassicBattletech.com � 2001 Fantasy Productions, LLC.
Original contents of ClassicBattletech.com ©2001 Fantasy Productions, LLC.

Battletech, Mechwarrior and Battlemech are registered trademarks of WizKids, LLC. All Rights Reserved.� 2001 WizKids, LLC.
Battletech, Mechwarrior and Battlemech are registered trademarks of WizKids, LLC. All Rights Reserved. ©2001 WizKids, LLC.
45 changes: 30 additions & 15 deletions megameklab/data/forcegenerator/factions.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,8 @@
<ratingLevels>Provisional Garrison,Solahma,Second Line,Front Line,Keshik</ratingLevels>
<parentFaction>CGS,Periphery.Deep</parentFaction>
</faction>
<faction key='FC' name='Federated Commonwealth (Combined)' minor='false' clan='false' periphery='false'>
<faction key='FC' name='Federated Commonwealth (Combined)' minor='false' clan='false'
periphery='false'>
<years>3028-3057</years>
<ratingLevels>F,D,C,B,A</ratingLevels>
<parentFaction>FS,LA</parentFaction>
Expand Down Expand Up @@ -616,7 +617,8 @@
<ratingLevels>B,A</ratingLevels>
<parentFaction>IS</parentFaction>
</faction>
<faction key='FS.ACAD' name='Academy and Training Units' minor='false' clan='false' periphery='false'>
<faction key='FS.ACAD' name='Academy and Training Units' minor='false' clan='false'
periphery='false'>
<years>2317-</years>
<ratingLevels>D</ratingLevels>
<parentFaction>FS</parentFaction>
Expand All @@ -643,7 +645,8 @@
<ratingLevels>D</ratingLevels>
<parentFaction>DC</parentFaction>
</faction>
<faction key='DC.ALAG' name='Amphigean Light Assault Group' minor='false' clan='false' periphery='false'>
<faction key='DC.ALAG' name='Amphigean Light Assault Group' minor='false' clan='false'
periphery='false'>
<years>2319-</years>
<ratingLevels>B</ratingLevels>
<parentFaction>DC</parentFaction>
Expand Down Expand Up @@ -794,7 +797,8 @@
<ratingLevels>Provisional Garrison,Solahma,Second Line,Front Line,Keshik</ratingLevels>
<parentFaction>CP</parentFaction>
</faction>
<faction key='CC.CRC' name='Confederation Reserve Cavalry' minor='false' clan='false' periphery='false'>
<faction key='CC.CRC' name='Confederation Reserve Cavalry' minor='false' clan='false'
periphery='false'>
<years>2650-</years>
<ratingLevels>F</ratingLevels>
<parentFaction>CC</parentFaction>
Expand Down Expand Up @@ -873,7 +877,8 @@
<ratingLevels>B,A</ratingLevels>
<parentFaction>CS</parentFaction>
</faction>
<faction key='FC.FCC' name='Federated Commonwealth Corps' minor='false' clan='false' periphery='false'>
<faction key='FC.FCC' name='Federated Commonwealth Corps' minor='false' clan='false'
periphery='false'>
<years>3028-3057</years>
<ratingLevels>A</ratingLevels>
<parentFaction>FC</parentFaction>
Expand All @@ -888,12 +893,14 @@
<ratingLevels>A</ratingLevels>
<parentFaction>FWL</parentFaction>
</faction>
<faction key='MSC.FWL' name='Free Worlds Legionnaires' minor='false' clan='false' periphery='false'>
<faction key='MSC.FWL' name='Free Worlds Legionnaires' minor='false' clan='false'
periphery='false'>
<years>3082-3138</years>
<ratingLevels>B</ratingLevels>
<parentFaction>MSC</parentFaction>
</faction>
<faction key='FWL.FWL' name='Free Worlds Legionnaires' minor='false' clan='false' periphery='false'>
<faction key='FWL.FWL' name='Free Worlds Legionnaires' minor='false' clan='false'
periphery='false'>
<years>3042-3079</years>
<ratingLevels>B</ratingLevels>
<parentFaction>FWL</parentFaction>
Expand Down Expand Up @@ -923,7 +930,8 @@
<ratingLevels>C</ratingLevels>
<parentFaction>DC</parentFaction>
</faction>
<faction key='CLAN.GC' name='Grand Council (Ebon Keshik)' minor='false' clan='true' periphery='false'>
<faction key='CLAN.GC' name='Grand Council (Ebon Keshik)' minor='false' clan='true'
periphery='false'>
<years>2820-</years>
<ratingLevels>Keshik</ratingLevels>
<parentFaction>CLAN.HW</parentFaction>
Expand Down Expand Up @@ -976,7 +984,8 @@
<ratingLevels>Provisional Garrison,Solahma,Second Line,Front Line,Keshik</ratingLevels>
<parentFaction>CFM</parentFaction>
</faction>
<faction key='CFM.MiKrKl' name='Kindraa Mick-Kreese-Kline' minor='false' clan='true' periphery='false'>
<faction key='CFM.MiKrKl' name='Kindraa Mick-Kreese-Kline' minor='false' clan='true'
periphery='false'>
<years>3067-3073</years>
<ratingLevels>Provisional Garrison,Solahma,Second Line,Front Line,Keshik</ratingLevels>
<parentFaction>CFM</parentFaction>
Expand All @@ -1001,7 +1010,8 @@
<ratingLevels>Provisional Garrison,Solahma,Second Line,Front Line,Keshik</ratingLevels>
<parentFaction>CFM</parentFaction>
</faction>
<faction key='FWL.KIS' name='Knights of the Inner Sphere' minor='false' clan='false' periphery='false'>
<faction key='FWL.KIS' name='Knights of the Inner Sphere' minor='false' clan='false'
periphery='false'>
<years>3055-3079</years>
<ratingLevels>A</ratingLevels>
<parentFaction>FWL</parentFaction>
Expand Down Expand Up @@ -1076,7 +1086,8 @@
<ratingLevels>F</ratingLevels>
<parentFaction>MSC</parentFaction>
</faction>
<faction key='CC.MAC' name='McCarron&apos;s Armored Cavalry' minor='false' clan='false' periphery='false'>
<faction key='CC.MAC' name='McCarron&apos;s Armored Cavalry' minor='false' clan='false'
periphery='false'>
<years>3060-</years>
<ratingLevels>A</ratingLevels>
<parentFaction>CC</parentFaction>
Expand Down Expand Up @@ -1280,12 +1291,14 @@
<ratingLevels>C</ratingLevels>
<parentFaction>FWL</parentFaction>
</faction>
<faction key='RWR.HG' name='Rim Worlds Republic - Home Guard' minor='false' clan='false' periphery='true'>
<faction key='RWR.HG' name='Rim Worlds Republic - Home Guard' minor='false' clan='false'
periphery='true'>
<years>2250-2769</years>
<ratingLevels>F,D,C,B,A</ratingLevels>
<parentFaction>Periphery.R</parentFaction>
</faction>
<faction key='RWR.TC' name='Rim Worlds Republic - Terran Corps' minor='false' clan='false' periphery='true'>
<faction key='RWR.TC' name='Rim Worlds Republic - Terran Corps' minor='false' clan='false'
periphery='true'>
<years>2765-2779</years>
<ratingLevels>B,A</ratingLevels>
<parentFaction>SL.R,Periphery.R</parentFaction>
Expand Down Expand Up @@ -1376,7 +1389,8 @@
<ratingLevels>B</ratingLevels>
<parentFaction>CC</parentFaction>
</faction>
<faction key='SL3.CJF' name='Star League (Clan Jade Falcon)' minor='true' clan='true' periphery='false'>
<faction key='SL3.CJF' name='Star League (Clan Jade Falcon)' minor='true' clan='true'
periphery='false'>
<years>3151-</years>
<ratingLevels>Front Line,Keshik</ratingLevels>
<parentFaction>CJF,CLAN.IS</parentFaction>
Expand Down Expand Up @@ -1440,7 +1454,8 @@
<ratingLevels>Provisional Garrison,Solahma</ratingLevels>
<parentFaction>CJF</parentFaction>
</faction>
<faction key='CC.VCR' name='Victoria Commonality Rangers' minor='false' clan='false' periphery='false'>
<faction key='CC.VCR' name='Victoria Commonality Rangers' minor='false' clan='false'
periphery='false'>
<years>3060-</years>
<ratingLevels>C</ratingLevels>
<parentFaction>CC</parentFaction>
Expand Down
0 megameklab/data/images/fluff/Mech/.gitignore → megameklab/data/images/fluff/Mek/.gitignore
View file
File renamed without changes.
0 megameklab/data/images/fluff/Mech/hud.png → megameklab/data/images/fluff/Mek/hud.png
View file
File renamed without changes
0 ...eets/templates_iso/mech_biped_default.svg → ...heets/templates_iso/mek_biped_default.svg
View file
File renamed without changes
0 ...heets/templates_iso/mech_biped_toheat.svg → ...sheets/templates_iso/mek_biped_toheat.svg
View file
File renamed without changes
8 changes: 4 additions & 4 deletions ...sheets/templates_iso/mech_lam_default.svg → ...dsheets/templates_iso/mek_lam_default.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions ...dsheets/templates_iso/mech_lam_toheat.svg → ...rdsheets/templates_iso/mek_lam_toheat.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
0 ...heets/templates_iso/mech_quad_default.svg → ...sheets/templates_iso/mek_quad_default.svg
View file
File renamed without changes
0 ...sheets/templates_iso/mech_quad_toheat.svg → ...dsheets/templates_iso/mek_quad_toheat.svg
View file
File renamed without changes
0 ...ts/templates_iso/mech_quadvee_default.svg → ...ets/templates_iso/mek_quadvee_default.svg
View file
File renamed without changes
0 ...ets/templates_iso/mech_quadvee_toheat.svg → ...eets/templates_iso/mek_quadvee_toheat.svg
View file
File renamed without changes
0 ...ets/templates_iso/mech_tripod_default.svg → ...eets/templates_iso/mek_tripod_default.svg
View file
File renamed without changes
0 ...eets/templates_iso/mech_tripod_toheat.svg → ...heets/templates_iso/mek_tripod_toheat.svg
View file
File renamed without changes
Loading

0 comments on commit 3cada67

Please sign in to comment.