Merge branch 'master' into feature/kill-command

MegaMek · Nov 11, 2024 · 300dc96 · 300dc96
2 parents cb1d927 + 92c4f1b
commit 300dc96
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git 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/data/forcegenerator/3060.xml b/megamek/data/forcegenerator/3060.xml
@@ -6325,7 +6325,7 @@
 			</model>
 		</chassis>
 		<chassis name='Intruder' unitType='Dropship'>
-			<availability>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</availability>
+			<availability>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</availability>
 			<model name='(2655)'>
 				<roles>assault</roles>
 				<availability>General:6</availability>
@@ -10851,7 +10851,7 @@
 			</model>
 		</chassis>
 		<chassis name='Spider' unitType='Mek'>
-			<availability>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</availability>
+			<availability>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</availability>
 			<model name='SDR-5D'>
 				<roles>anti_infantry</roles>
 				<availability>FS:5</availability>

diff --git 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

diff --git 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
@@ -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