Merge branch 'MegaMek:master' into acs-autoresolve

MegaMek · Dec 6, 2024 · 36fb7af · 36fb7af
2 parents 432e4cc + bbb9507
commit 36fb7af
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/...lt Coaltion/Filtvelt Citizens Militia.jpg → ...t Coalition/Filtvelt Citizens Militia.jpg b/...lt Coaltion/Filtvelt Citizens Militia.jpg → ...t Coalition/Filtvelt Citizens Militia.jpg
diff --git a/...mages/camo/Filtvelt Coaltion/Thumpers.jpg → ...ages/camo/Filtvelt Coalition/Thumpers.jpg b/...mages/camo/Filtvelt Coaltion/Thumpers.jpg → ...ages/camo/Filtvelt Coalition/Thumpers.jpg
diff --git a/MekHQ/docs/history.txt b/MekHQ/docs/history.txt
@@ -44,6 +44,17 @@ MEKHQ VERSION HISTORY:
 + PR #5266: Refactored Morale Calculations and Logging
 + PR #5268: Refactored Strategic Formations
 + Fix #5149: Better error message for null values in contract fields
++ Fix #5060: BriefingTab Fix
++ Fix #4733: Implemented Advanced StratCon Reinforcements
++ PR #5274: Improved Logging for Force Generation Process.
++ Fix #5114: Campaign now uses pickRandomCamouflage when initialized
++ PR #5280: Centralized Formation Size Logic & Adjusted Contract Required Lance Count
++ PR #5281: Refactored Leadership Unit Selection Logic
++ PR #5283: Adjusted Support Points Negotiation Logic
++ Fix #5285: Fixed SVArmor Price Calculation
++ Fix #5288: Added Recalculation of Scenario Objectives when Assigning Forces
++ Fix #5122 & #5084: Adjusted TO&E Menu Option Availability
+
 
 0.50.01 (2024-11-10 1800 UTC)
 + PR #4810: Respecting Trademarks (Mech to Mek)