From cd9b1a73633bf71a254f8923dc9af6efbab0015a Mon Sep 17 00:00:00 2001 From: Dave N <13752452+HammerGS@users.noreply.github.com> Date: Sun, 10 Nov 2024 14:51:38 -0700 Subject: [PATCH 1/3] Update 3060.xml Fixing data error that was breaking 50.01 release --- megamek/data/forcegenerator/3060.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/megamek/data/forcegenerator/3060.xml b/megamek/data/forcegenerator/3060.xml index fb6b41c404..e248282f98 100644 --- a/megamek/data/forcegenerator/3060.xml +++ b/megamek/data/forcegenerator/3060.xml @@ -6325,7 +6325,7 @@ - MOC:4,HL:2,CLAN:1,IS:4,WOB:4,SIC:4,FS:3,CIR:4,BAN:4,Periphery:3,CS:4FWL:6,NIOPS:4,DC:5 + MOC:4,HL:2,CLAN:1,IS:4,WOB:4,SIC:4,FS:3,CIR:4,BAN:4,Periphery:3,CS:4,FWL:6,NIOPS:4,DC:5 assault General:6 @@ -10851,7 +10851,7 @@ - MOC:2CC:4,FRR:5,IS:1,WOB:2,SIC:4,MERC:3,FS:4,Periphery:2,CS:3,OA:1,Periphery.MW:4,Periphery.ME:4,FWL:6,NIOPS:3,DC:6 + MOC:2,CC:4,FRR:5,IS:1,WOB:2,SIC:4,MERC:3,FS:4,Periphery:2,CS:3,OA:1,Periphery.MW:4,Periphery.ME:4,FWL:6,NIOPS:3,DC:6 anti_infantry FS:5 From 047c48f905d91821c9d6a9c667dcb5fde2dd466d Mon Sep 17 00:00:00 2001 From: HammerGS Date: Sun, 10 Nov 2024 16:00:05 -0700 Subject: [PATCH 2/3] Ready to Develop --- build.gradle | 2 +- megamek/docs/history.txt | 2 ++ megamek/src/megamek/SuiteConstants.java | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 3ec37200d5..b28f083c6e 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,7 @@ allprojects { subprojects { group = 'org.megamek' - version = '0.50.01' + version = '0.50.02-SNAPSHOT' } // A properties_local.gradle file can be used to override any of the above options. For instance, diff --git a/megamek/docs/history.txt b/megamek/docs/history.txt index cbc98312a8..b598c773cc 100644 --- a/megamek/docs/history.txt +++ b/megamek/docs/history.txt @@ -1,5 +1,7 @@ MEGAMEK VERSION HISTORY: ---------------- +0.50.02-SNAPSHOT + 0.50.01 (2024-11-10 1800 UTC) + PR #5962, #5964, #5966, #5974, #5931, #5983, #6154, #6159: Internal code changes (TWGameManager, extract processMovement, allow more classes for InputFilter, Victory, move test scenarios to testresources), Protomek code modernization diff --git a/megamek/src/megamek/SuiteConstants.java b/megamek/src/megamek/SuiteConstants.java index 83d5cf91a1..398827d084 100644 --- a/megamek/src/megamek/SuiteConstants.java +++ b/megamek/src/megamek/SuiteConstants.java @@ -29,7 +29,7 @@ protected SuiteConstants() { // region General Constants public static final String PROJECT_NAME = "MegaMek Suite"; - public static final Version VERSION = new Version("0.50.01"); + public static final Version VERSION = new Version("0.50.02-SNAPSHOT"); public static final int MAXIMUM_D6_VALUE = 6; // This is used in creating the name of save files, e.g. the MekHQ campaign file From 92c4f1b206ccb0d8e0fa9a224cfb780a6a5a1cc0 Mon Sep 17 00:00:00 2001 From: HammerGS Date: Sun, 10 Nov 2024 17:42:27 -0700 Subject: [PATCH 3/3] Updating MekHQ Data --- megamek/data/universe/eras.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/megamek/data/universe/eras.xml b/megamek/data/universe/eras.xml index efac4c69c6..440a2d91d5 100644 --- a/megamek/data/universe/eras.xml +++ b/megamek/data/universe/eras.xml @@ -4,7 +4,8 @@ Code: The unique String code for the era. Name: The display name for the era. End: The end date for the era. This can be in the formats "yyyy-MM-dd", "yyyy-MM" (assuming first day of the month), and "yyyy" (assuming first day of the year). One era should have this value -missing, which will put it as the final era. For the canon dates, these will be one year after their +missing, which will put it as the final era. For the canon dates, these will be one year after +their end date in the MUL, as that will swapover on the first day of the new era. Flag: The internal flags for the base eras. You can have multiple flag fields (multiple lines each with a single flag) per custom era, which isn't used in base MekHQ, but allows one to customize