Merge branch 'master' into feat/caspar-ai

Author: Scoppio

.editorconfig

@@ -37,9 +37,9 @@ jobs:
           build-scan-terms-of-use-url: "https://gradle.com/terms-of-service"
           build-scan-terms-of-use-agree: "yes"
 
-      - name: Build with Gradle
+      - name: Test
         working-directory: megamek
-        run: ./gradlew build sentryUploadSourceBundleJava --stacktrace --scan
+        run: ./gradlew test
 
       - name: Upload Test Logs on Failure
         uses: actions/upload-artifact@v4
@@ -55,6 +55,10 @@ jobs:
           fail_ci_if_error: false
           verbose: true
 
+      - name: Build with Gradle
+        working-directory: megamek
+        run: ./gradlew build -x test
+
       - name: Upload TarGZ Release
         uses: actions/upload-artifact@v4
         with:

.github/workflows/ci.yml

@@ -3,8 +3,9 @@ plugins {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
 }
 
 allprojects {

build.gradle

@@ -10,8 +10,9 @@ plugins {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
 }
 
 sourceSets {
@@ -155,6 +156,7 @@ tasks.register('copyFiles', Copy) {
     exclude "${mmconf}/mml.preferences"
 
     exclude "${rats}/**"
+    exclude "${data}/mekfiles/units.cache"
     include "${userdata}/"
 
     into fileStagingDir
@@ -189,15 +191,13 @@ tasks.register('officialUnitList', JavaExec) {
     args = ['-oul', "${projectDir}/docs/OfficialUnitList.txt"]
 }
 
-task unitFilesZip(dependsOn: copyFiles) {
+tasks.register('unitFilesZip', Zip) {
+    dependsOn copyFiles
     description = 'Creates zip archives of all the unit file folders.'
-    file(unitFiles).eachDir { subDir ->
-        dependsOn tasks.create("${name}${subDir.name}", Zip) {
-            from subDir
-            archiveFileName = "${subDir.name}.zip"
-            destinationDirectory = file("${fileStagingDir}/${unitFiles}")
-        }
-    }
+    from unitFiles
+    archiveFileName = "unit_files.zip"
+    destinationDirectory = file("${fileStagingDir}/${unitFiles}")
+
     inputs.dir "${projectDir}/${unitFiles}"
     outputs.dir "${fileStagingDir}/${unitFiles}"
 }
@@ -305,19 +305,12 @@ distTar {
     compression = Compression.GZIP
 }
 
-// The distribution plugin adds the distribution packages to the assemble task, which causes the build task
-// to run all the packaging tasks.
-task assemble(overwrite: true) {
+assemble {
     dependsOn jar
 }
 
-// Replace the assembleDist task created by the distributions plugin to create the packages we want to
-task assembleDist(overwrite: true) {
-    description = 'Build unix, Windows, and source packages'
-    group = 'distribution'
-    dependsOn test
+assembleDist {
     dependsOn distTar
-    dependsOn distZip
 }
 
 test {

megamek/build.gradle

@@ -14,6 +14,11 @@ MEGAMEK VERSION HISTORY:
 + PR #6770: Fixed ConcurrentModification Exceptions In BV Calculation Methods 
 + PR #6768: Fixed issues with Implicit narrowing conversion in compound assignment. 
 + PR #6782: add Save As to the board preview in the lobby 
++ PR #6795: Fixes for various Artillery and Artillery Flak issues
++ PR #6796: feat: add a callsign to princess instead of numbers
++ PR #6806: Added Method for Variable Cost Check in MiscType
++ Fix #6807: Auto-set SI in ASFs
++ PR #6816 parse mek/blk from string
 
 0.50.04 (2025-03-22 1600 UTC)
 + PR #6494: Cap splashscreen button width

megamek/docs/history.txt

@@ -4020,6 +4020,7 @@ WeaponAttackAction.LegBlockedByTerrain=Nearby terrain blocks leg weapons.
 WeaponAttackAction.MinimumAlt1=attacker must be at least at elevation 1
 WeaponAttackAction.NoAeroDirectArty=Airborne aerospace units cannot make direct-fire artillery attacks.
 WeaponAttackAction.FlakOnGroundedAero=Grounded aerospace/vtol units are not valid Flak targets.
+WeaponAttackAction.FlakIndirect=Flak Artillery attacks must be Direct Attacks
 WeaponAttackAction.ADARangeBracket=ADA range brackets (+0/+2/+4)
 WeaponAttackAction.NoAttacker=Invalid Attacker!
 WeaponAttackAction.NoBombInMekMode=Cannot launch bomb in mek mode.

megamek/i18n/megamek/client/messages.properties

@@ -432,6 +432,7 @@
 3383=Terrain burns for <data> damage.
 3384=Hex <data>: terrain takes <data> damage.
 3385=Terrain takes <data> damage.
+3386=Hex <data>: terrain takes <data> damage at level <data>.
 3390=<span class='success'><B>hits</B></span>.
 3395=However, <data> (<data>) has fire protection gear so no damage is done.
 3400=Target gains <data> <msg:3401,3402> heat during heat phase.
@@ -449,6 +450,7 @@
 3426=The remaining <data> missile(s) find no new target due to hostile ECM interference.
 3430=Needs <data> [<data>] to ignite, rolls <data>
 3433=-2 bonus for laser-guided bomb against tagged target!
+3434=<data><data><data> points of damage at level <data>.
 3435=<data><data><data> points of damage.
 3436=<newline><data> points absorbed by armor. <data> armor remaining.
 3437=<newline>Damage changed to <data> due to building scale.