From 7ddb24c2d6e65acd79eb238ece952f4f9d2438d2 Mon Sep 17 00:00:00 2001 From: DM0000 <98051919+DM0000@users.noreply.github.com> Date: Thu, 5 Dec 2024 10:00:24 -0700 Subject: [PATCH 1/2] Fix spelling in folder name --- .../Filtvelt Citizens Militia.jpg | Bin .../Thumpers.jpg | Bin 2 files changed, 0 insertions(+), 0 deletions(-) rename MekHQ/data/images/camo/{Filtvelt Coaltion => Filtvelt Coalition}/Filtvelt Citizens Militia.jpg (100%) rename MekHQ/data/images/camo/{Filtvelt Coaltion => Filtvelt Coalition}/Thumpers.jpg (100%) diff --git a/MekHQ/data/images/camo/Filtvelt Coaltion/Filtvelt Citizens Militia.jpg b/MekHQ/data/images/camo/Filtvelt Coalition/Filtvelt Citizens Militia.jpg similarity index 100% rename from MekHQ/data/images/camo/Filtvelt Coaltion/Filtvelt Citizens Militia.jpg rename to MekHQ/data/images/camo/Filtvelt Coalition/Filtvelt Citizens Militia.jpg diff --git a/MekHQ/data/images/camo/Filtvelt Coaltion/Thumpers.jpg b/MekHQ/data/images/camo/Filtvelt Coalition/Thumpers.jpg similarity index 100% rename from MekHQ/data/images/camo/Filtvelt Coaltion/Thumpers.jpg rename to MekHQ/data/images/camo/Filtvelt Coalition/Thumpers.jpg From 6fb89c7fd2e4ee82e6d9de46aa4e7823e5fcda68 Mon Sep 17 00:00:00 2001 From: HammerGS Date: Thu, 5 Dec 2024 14:10:02 -0700 Subject: [PATCH 2/2] Updating history.txt --- MekHQ/docs/history.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/MekHQ/docs/history.txt b/MekHQ/docs/history.txt index c5e399531b..fb2c1b07c8 100644 --- 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)