Merge branch 'refs/heads/master' into unitAssignment_conventionalFigh…

…ters # Conflicts: # MekHQ/src/mekhq/campaign/personnel/enums/PersonnelRole.java
MegaMek · Sep 13, 2024 · 194a17f · 194a17f
2 parents 639fe21 + c6d0ada
commit 194a17f
Show file tree

Hide file tree

Showing 15,925 changed files with 1,598,855 additions and 1,430,714 deletions.
diff --git a/.github/ISSUE_TEMPLATE/request_for_enhancement.yml b/.github/ISSUE_TEMPLATE/request_for_enhancement.yml
@@ -1,5 +1,5 @@
 name: Request for Enhancement
-description: Request an enhancement for MekHQ. Review our Content Policy first.
+description: Use this to submit a Request for Enhancement (RFE)—asking for a new feature, extending an existing feature, or implementing missing rules or errata.
 title: "[RFE] Brief Description"
 labels: [(RFE) Enhancement]
 body:

diff --git a/.gitignore b/.gitignore
@@ -21,8 +21,8 @@
 /MekHQ/data/images/portraits/Female/
 /MekHQ/data/images/portraits/Male/
 /MekHQ/data/images/temp/
-/MekHQ/data/mechfiles/units.cache
-/MekHQ/data/mechfiles/customs/
+/MekHQ/data/mekfiles/units.cache
+/MekHQ/data/mekfiles/customs/
 /MekHQ/data/universe/awards/
 !/MekHQ/data/universe/awards/standard.xml
 /MekHQ/logs/

diff --git a/MekHQ/build.gradle b/MekHQ/build.gradle
@@ -226,7 +226,7 @@ distributions {
 
             // MegaMekLab Includes
             from ("${mmlDir}/megameklab/build/files") {
-                exclude 'data/mechfiles'
+                exclude 'data/mekfiles'
             }
             from ("${mmlDir}/megameklab/build/launch4j/lib") {
                 into "${lib}"

diff --git a/MekHQ/campaigns/Fist and Falcon/Binary Bravo, 1st Falcon Strikers.cpnx b/MekHQ/campaigns/Fist and Falcon/Binary Bravo, 1st Falcon Strikers.cpnx
diff --git a/...ist and Falcon/Kewran Wolfhounds, C Company, 3rd Battalion, 25th Arcturan Guards RCT.cpnx b/...ist and Falcon/Kewran Wolfhounds, C Company, 3rd Battalion, 25th Arcturan Guards RCT.cpnx
diff --git a/...agon/Fox's Teeth, McKinnon's Company, Vausur's Battalion, Seventh Crucis Lancers RCT.cpnx b/...agon/Fox's Teeth, McKinnon's Company, Vausur's Battalion, Seventh Crucis Lancers RCT.cpnx
diff --git a/...u Company, Otomo, formerly Third Company, Tarwater's Battalion, Fifth Sword of Light.cpnx b/...u Company, Otomo, formerly Third Company, Tarwater's Battalion, Fifth Sword of Light.cpnx
diff --git a/...ns/Wolf and Blake/Black Widow Company, Church's Independent Company, Wolf's Dragoons.cpnx b/...ns/Wolf and Blake/Black Widow Company, Church's Independent Company, Wolf's Dragoons.cpnx
diff --git a/...mpaigns/Wolf and Blake/Shadow Hunters, Opacus Venatori, Fifty-second Shadow Division.cpnx b/...mpaigns/Wolf and Blake/Shadow Hunters, Opacus Venatori, Fifty-second Shadow Division.cpnx