Merge branch 'main' into theRealThomasMarikEffect

# Conflicts:
#	MekHQ/resources/mekhq/resources/GlossaryEntry.properties

Author: IllianiBird

.github/workflows/ci.yml

@@ -26,13 +26,13 @@ jobs:
 
     steps:
       - name: Checkout Data Repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           repository: megamek/mm-data
           path: mm-data
 
       - name: Checkout out MekHQ
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           path: mekhq
 
@@ -52,7 +52,7 @@ jobs:
           exit 0
 
       - name: Checkout MegaMek
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           repository: ${{ steps.find_mm.outputs.mmRepo }}
           ref: ${{ steps.find_mm.outputs.mmBranch }}
@@ -80,7 +80,7 @@ jobs:
           exit 0
 
       - name: Checkout MegaMekLab
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           repository: ${{ steps.find_mml.outputs.mmlRepo }}
           ref: ${{ steps.find_mml.outputs.mmlBranch }}

.github/workflows/code-coverage.yml

@@ -20,23 +20,23 @@ jobs:
 
     steps:
       - name: Checkout Data Repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           repository: megamek/mm-data
           path: mm-data
 
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           path: mekhq
 
       - name: Checkout MegaMek
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           repository: MegaMek/megamek
           path: megamek
 
       - name: Checkout MegaMekLab
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           repository: MegaMek/megameklab
           path: megameklab

.github/workflows/codeql-analysis.yml

@@ -37,7 +37,7 @@ jobs:
           exit 0
 
       - name: Checkout MegaMek
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           repository: ${{ steps.find_mm.outputs.mmRepo }}
           ref: ${{ steps.find_mm.outputs.mmBranch }}
@@ -59,14 +59,14 @@ jobs:
           exit 0
 
       - name: Checkout MegaMekLab
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           repository: ${{ steps.find_mml.outputs.mmlRepo }}
           ref: ${{ steps.find_mml.outputs.mmlBranch }}
           path: megameklab
 
       - name: "Check out MekHQ"
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           path: mekhq
 

.github/workflows/dependency-scan.yml

@@ -10,25 +10,25 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Data Repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           repository: megamek/mm-data
           path: mm-data
 
       - name: "Check out MekHQ"
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           path: MekHQ
 
       - name: "Check out MegaMekLab"
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           repository: MegaMek/megameklab
           ref: main
           path: megameklab
 
       - name: Checkout MegaMek
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           repository: MegaMek/megamek
           ref: main

.github/workflows/java-doc-pr.yml

@@ -19,13 +19,13 @@ jobs:
 
     steps:
       - name: Checkout Data Repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           repository: megamek/mm-data
           path: mm-data
 
       - name: Checkout out MekHQ
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           path: mekhq
 
@@ -45,7 +45,7 @@ jobs:
           exit 0
 
       - name: Checkout MegaMek
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           repository: ${{ steps.find_mm.outputs.mmRepo }}
           ref: ${{ steps.find_mm.outputs.mmBranch }}
@@ -67,7 +67,7 @@ jobs:
           exit 0
 
       - name: Checkout MegaMekLab
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           repository: ${{ steps.find_mml.outputs.mmlRepo }}
           ref: ${{ steps.find_mml.outputs.mmlBranch }}

.github/workflows/java-doc.yml

@@ -18,25 +18,25 @@ jobs:
 
     steps:
       - name: Checkout Data Repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           repository: megamek/mm-data
           path: mm-data
 
       - name: "Check out MekHQ"
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           path: MekHQ
 
       - name: "Check out MegaMekLab"
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           repository: MegaMek/megameklab
           ref: main
           path: megameklab
 
       - name: Checkout MegaMek
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           repository: MegaMek/megamek
           ref: main

.github/workflows/nightly-ci.yml

@@ -23,17 +23,17 @@ jobs:
 
     steps:
       - name: Checkout Data Repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           repository: megamek/mm-data
           path: mm-data
 
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
         with:
           path: mekhq
 
       - name: Checkout MegaMek
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           repository: MegaMek/megamek
           path: megamek
@@ -45,7 +45,7 @@ jobs:
           echo "$calculatedSha" >> megamek/docs/mm-revision.txt
 
       - name: Checkout MegaMekLab
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           repository: MegaMek/megameklab
           path: megameklab

MekHQ/resources/mekhq/resources/GlossaryEntry.properties

@@ -150,12 +150,15 @@ ALT_ADVANCED_MEDICAL.definition=In 2009 Advanced Medical was introduced to add e
   roll is made. If this final roll is also a 6, then the injury is as severe as possible: if the primary location is a\
   \ limb, the limb is completely severed (fatal, if the 'limb' was the head). Otherwise, recovery time is increased \
   further (to the maximum of +300%).</p>\
-  <h2>Hits</h2>In the original Advanced Medical an injury was worth a number of Hits (TW-scale damage) equal to its \
+  <h2>Hits</h2>\
+  In the original Advanced Medical, an injury was worth a number of Hits (TW-scale damage) equal to its \
   severity (a semi-random value). This made it difficult to know how badly injured your character was. In AAM all \
   injuries are worth one Hit each.\
   <p>Prosthetics and implants apply an 'injury' to the character. These are not true injuries and are included only \
   as a record (and a way for us to apply the modifiers from those surgeries). These injuries are not factored into \
   the character's Hits (or injury penalty, see below).\
+  <p>Similarly, the various injuries added by Flaws (such as addictions) are not factored into the character's Hits. \
+  This is to prevent characters from being killed by crippling flashbacks.</p>\
   <h2>Injury Penalty</h2>\
   All healing attempts suffer a penalty equal to the number of non-prosthetic injuries the patient currently has. \
   For example, a character with a prosthetic leg, a fractured skull, and heart trauma would apply a -2 penalty to all \
@@ -1258,7 +1261,7 @@ UNABLE_TO_START_SCENARIO.definition=If you find yourself unable to start a scena
 VEHICLE_CREWS.title=Vehicle & Vessel Crews
 VEHICLE_CREWS.definition=Some vehicles have crew requirements outside of drivers and gunners. These 'seats' can be \
   filled by any character with one of the following professions (primary or secondary):\
-  <p>- AeroTek\
+  <blockquote>- AeroTek\
   <br>- Any admin profession\
   <br>- Astech\
   <br>- Battle Armor Tech\
@@ -1271,7 +1274,9 @@ VEHICLE_CREWS.definition=Some vehicles have crew requirements outside of drivers
   <br>- Soldier\
   <br>- Tech/Communications\
   <br>- Tech/Sensors\
-  <br>- Combat Engineers</p>\
+  <br>- Vehicle Crew/Ground\
+  <br>- Vehicle Crew/Naval\
+  <br>- Vehicle Crew/VTOL</blockquote>\
   <p>It is ultimately left to your discretion to decide what professions you use to fill these seats.</p>\
   <p>Large Vessels, such as DropShips, may also have crew requirements. These can only be filled by characters with \
   the Vessel Crewmember profession.</p>

MekHQ/resources/mekhq/resources/InjuryEffect.properties

@@ -100,7 +100,7 @@ InjuryEffect.TYPE_6_LIMB_REPLACEMENT.name=T6-Prosthetic
 InjuryEffect.TYPE_2_SENSORY_REPLACEMENT.name=T2-Sensory Replacement
 InjuryEffect.TYPE_3_SENSORY_REPLACEMENT.name=T3-Sensory Replacement
 InjuryEffect.TYPE_4_SENSORY_REPLACEMENT.name=T4-Sensory Replacement
-InjuryEffect.BONE_AND_JOIN_REINFORCEMENT.name=Reinforced
+InjuryEffect.BONE_REINFORCEMENT.name=Reinforced
 InjuryEffect.LIVER_FILTRATION_IMPLANT.name=Liver Implant
 InjuryEffect.TYPE_1_SURVIVAL_IMPLANT.name=T1-Survival Implant
 InjuryEffect.TYPE_2_SURVIVAL_IMPLANT.name=T2-Survival Implant

MekHQ/resources/mekhq/resources/PersonViewPanel.properties

@@ -94,7 +94,8 @@ scenarioLogHeader.title=Show Scenario Log
 scenarioLog.title=Hide Scenario Log
 assignmentLogHeader.title=Show Assignments Log
 assignmentLog.title=Hide Assignments Log
-pnlInjuries.title=Injury Report
+pnlInjuries.title=Injuries
+pnlProsthetics.title=Prosthetics
 pnlSkills.profession=Profession Skills
 pnlSkills.utility=Utility Skills
 pnlSkills.roleplay=Roleplay Skills
@@ -126,4 +127,6 @@ format.kills=Kills: %d
 format.killDetail=%s with %s
 format.scenarios=Scenarios: %d
 format.italic=<html><i>%s</i></html>
-format.injuryLabel=<html>%s (%s days)</html>
+format.injuryLabel.injury=<html>%s (%s days)</html>
+format.injuryLabel.permanent=<html>%s (%s)</html>
+format.injuryLabel.prosthetic=<html>%s</html>