Merge remote-tracking branch 'origin/master' into pitchBlackChance

MegaMek · Mar 2, 2024 · c833278 · c833278
2 parents 23df016 + 3ea1787
commit c833278
Show file tree

Hide file tree

Showing 10 changed files with 91 additions and 80 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -30,7 +30,7 @@ jobs:
 
     steps:
     # Checkout the Pull Request source and put it in: ./mekhq
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         path: mekhq
 
@@ -71,7 +71,7 @@ jobs:
 
     # Checkout the latest MegaMek source and put it in: ./megamek
     - name: Checkout MegaMek
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
 #        repository: ${{ steps.find_mm.outputs.mmRepo }}
 #        ref:  ${{ steps.find_mm.outputs.mmBranch }}
@@ -107,7 +107,7 @@ jobs:
 
     # Checkout the latest MegaMekLab source and put it in: ./megameklab
     - name: Checkout MegaMekLab
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
 #        repository: ${{ steps.find_mml.outputs.mmlRepo }}
 #        ref: ${{ steps.find_mml.outputs.mmlBranch }}
@@ -122,7 +122,7 @@ jobs:
 
     # Setup the requested Java Distribution and Version from the matrix
     - name: Set up ${{ matrix.java-distribution }} JDK ${{ matrix.java-version }}
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         distribution: ${{ matrix.java-distribution }}
         java-version: ${{ matrix.java-version }}
@@ -144,7 +144,7 @@ jobs:
     # Output Variables:
     #    - buildScanUri
     - name: Build with Gradle
-      uses: gradle/gradle-build-action@v2
+      uses: gradle/actions/setup-gradle@v3
       with:
         arguments: clean build --no-build-cache --info --continue --stacktrace --max-workers=1 --scan
         build-root-directory: mekhq
@@ -181,14 +181,14 @@ jobs:
     # Put the Windows Release in an artifact
     # NB: Due to a GitHub Actions limitation we won't know what the filename is in order to display it somewhere.
     - name: Upload Windows Release
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: mhq-release-win-${{ matrix.java-distribution }}-jdk${{ matrix.java-version }}
         path: ./mekhq/MekHQ/build/distributions/mekhq-windows-*.zip
 
     # Put the non-Windows release in an artifact
     - name: Upload Nix/Mac Release
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: mhq-release-nix-mac-${{ matrix.java-distribution }}-jdk${{ matrix.java-version }}
         path: ./mekhq/MekHQ/build/distributions/*.tar
diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml
@@ -30,7 +30,7 @@ jobs:
 
     steps:
     # Checkout the Pull Request source and put it in: ./mekhq
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         path: mekhq
 
@@ -43,14 +43,14 @@ jobs:
 
     # Checkout the latest MegaMek source and put it in: ./megamek
     - name: Checkout MegaMek
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: MegaMek/megamek
         path: megamek
 
     # Checkout the latest MegaMekLab source and put it in: ./megameklab
     - name: Checkout MegaMekLab
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: MegaMek/megameklab
         path: megameklab
@@ -63,7 +63,7 @@ jobs:
 
     # Setup the requested Java Distribution and Version from the matrix
     - name: Set up ${{ matrix.java-distribution }} JDK ${{ matrix.java-version }}
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         distribution: ${{ matrix.java-distribution }}
         java-version: ${{ matrix.java-version }}
@@ -85,7 +85,7 @@ jobs:
     # Output Variables:
     #    - buildScanUri
     - name: Build with Gradle
-      uses: gradle/gradle-build-action@v2
+      uses: gradle/actions/setup-gradle@v3
       with:
         arguments: clean build --no-build-cache --info --stacktrace --max-workers=1 --scan
         build-root-directory: mekhq
@@ -94,7 +94,7 @@ jobs:
     #
     # The logs will be relative to the ./mekhq directory.
     - name: Upload Test Logs on Failure
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: failure()
       with:
         name: cd-failure-logs

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -35,18 +35,18 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Setup the requested Java Distribution and Version from the matrix
     - name: Set up ${{ matrix.java-distribution }} JDK ${{ matrix.java-version }}
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         distribution: ${{ matrix.java-distribution }}
         java-version: ${{ matrix.java-version }}
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -58,7 +58,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild MekHQ
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -72,4 +72,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3
diff --git a/.github/workflows/nightly-ci.yml b/.github/workflows/nightly-ci.yml
@@ -30,7 +30,7 @@ jobs:
 
     steps:
     # Checkout the latest source and put it in: ./mekhq
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         path: mekhq
 
@@ -43,14 +43,14 @@ jobs:
 
     # Checkout the latest MegaMek source and put it in: ./megamek
     - name: Checkout MegaMek
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: MegaMek/megamek
         path: megamek
 
     # Checkout the latest MegaMekLab source and put it in: ./megameklab
     - name: Checkout MegaMekLab
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: MegaMek/megameklab
         path: megameklab
@@ -63,7 +63,7 @@ jobs:
 
     # Setup the requested Java Distribution and Version from the matrix
     - name: Set up ${{ matrix.java-distribution }} JDK ${{ matrix.java-version }}
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         distribution: ${{ matrix.java-distribution }}
         java-version: ${{ matrix.java-version }}
@@ -76,13 +76,13 @@ jobs:
 
     # Include --stacktrace to make some build failures easier to figure out.
     - name: Build with Gradle
-      uses: gradle/gradle-build-action@v2
+      uses: gradle/actions/setup-gradle@v3
       with:
         arguments: clean build -x test --continue --stacktrace --max-workers=1 --scan
         build-root-directory: mekhq
 
     - name: Upload Test Logs on Failure
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: failure()
       with:
         name: ${{ matrix.os }}-${{ matrix.java-distribution }}-jdk${{ matrix.java-version }}-ci-failure-logs
@@ -92,7 +92,7 @@ jobs:
     #
     # NB: Due to a GitHub Actions limitation we won't know what the filename is in order to display it somewhere.
     - name: Upload Nix/Mac Releases
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: always() && matrix.os == 'ubuntu-latest'
       with:
         name: mhq-release-nix-mac-${{ matrix.java-distribution }}-jdk${{ matrix.java-version }}
@@ -102,7 +102,7 @@ jobs:
     #
     # NB: Due to a GitHub Actions limitation we won't know what the filename is in order to display it somewhere.
     - name: Upload Windows Release
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: always() && matrix.os == 'windows-latest'
       with:
         name: mhq-release-win-${{ matrix.java-distribution }}-jdk${{ matrix.java-version }}

diff --git a/.github/workflows/nightly-maven-ci.yml b/.github/workflows/nightly-maven-ci.yml
@@ -33,29 +33,29 @@ jobs:
 
     steps:
     # Checkout the latest source and put it in: ./mekhq
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         path: mekhq
 
     # Composite Build is NOT setup for this job.
 
     # Checkout the latest MegaMek source and put it in: ./megamek
     - name: Checkout MegaMek
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: MegaMek/megamek
         path: megamek
 
     # Checkout the latest MegaMekLab source and put it in: ./megameklab
     - name: Checkout MegaMekLab
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: MegaMek/megameklab
         path: megameklab
 
     # Setup the requested Java Distribution and Version from the matrix
     - name: Set up ${{ matrix.java-distribution }} JDK ${{ matrix.java-version }}
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         distribution: ${{ matrix.java-distribution }}
         java-version: ${{ matrix.java-version }}
@@ -68,13 +68,13 @@ jobs:
 
     # Include --stacktrace to make some build failures easier to figure out.
     - name: Build with Gradle
-      uses: gradle/gradle-build-action@v2
+      uses: gradle/actions/setup-gradle@v3
       with:
         arguments: clean build --continue --stacktrace --max-workers=1 --scan
         build-root-directory: mekhq
 
     - name: Upload Test Logs on Failure
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: failure()
       with:
         name: ${{ matrix.os }}-${{ matrix.java-distribution }}-jdk${{ matrix.java-version }}-maven-ci-failure-logs

diff --git a/MekHQ/data/names/callsigns.csv b/MekHQ/data/names/callsigns.csv
@@ -2259,7 +2259,6 @@ Weasel,1
 Webcap,1
 Wedge,1
 Weevil,1
-Wendigo,1
 Werewolf,1
 Wharf,1
 Wheel,1

diff --git a/MekHQ/docs/history.txt b/MekHQ/docs/history.txt
@@ -2,6 +2,7 @@ MEKHQ VERSION HISTORY:
 ---------------
 0.49.19-SNAPSHOT
 + PR #3845: Adaptations for Adding Clan Personnel Tracking to MegaMek
++ Fix #3775: Non-superheavy Tripods can now be assigned crews; pilots can now be assigned to SH and Tripods in the personnel tab
 
 0.49.18 (2024-02-17 1800 UTC)
 + PR #3805: Adaptations for the Internal Bomb Bay quirk