Fixing merge conflicts

MekHQ/build.gradle

@@ -1,5 +1,7 @@
 import edu.sc.seis.launch4j.tasks.Launch4jLibraryTask
 
+import java.time.LocalDateTime
+
 plugins {
     id 'application'
     id 'maven-publish'
@@ -99,10 +101,11 @@ task mmJar (type: Jar, dependsOn: compileMM) {
     from "${mmDir}/megamek/build/classes/java/main"
     from "${mmDir}/megamek/build/resources/main"
     manifest {
-        attributes "Main-Class": 'megamek.MegaMek'
-        attributes 'Class-Path' : project.sourceSets.main.runtimeClasspath.files
+        attributes "Main-Class" : 'megamek.MegaMek'
+        attributes "Class-Path" : project.sourceSets.main.runtimeClasspath.files
             .findAll { it.name.endsWith(".jar") && !it.name.toLowerCase().startsWith("megamek") }
             .collect { "${lib}/${it.name}" }.join(' ')
+        attributes "Build-Date" : LocalDateTime.now()
     }
     ext.jarLocation = "${buildDir}/libs/${archiveFileName.get()}"
     inputs.dir "${mmDir}/megamek/build/classes/java/main"
@@ -117,10 +120,11 @@ task mmJarLibDir (type: Jar, dependsOn: compileMM) {
     from "${mmDir}/megamek/build/classes/java/main"
     from "${mmDir}/megamek/build/resources/main"
     manifest {
-        attributes "Main-Class": 'megamek.MegaMek'
-        attributes 'Class-Path' : project.sourceSets.main.runtimeClasspath.files
+        attributes "Main-Class" : 'megamek.MegaMek'
+        attributes "Class-Path" : project.sourceSets.main.runtimeClasspath.files
             .findAll { it.name.endsWith(".jar") && !it.name.toLowerCase().startsWith("megamek") }
             .collect { it.name }.join(' ')
+        attributes "Build-Date" : LocalDateTime.now()
     }
     ext.jarLocation = "${buildDir}/libs/${archiveFileName.get()}"
     inputs.dir "${mmDir}/build/classes/java/main"
@@ -142,10 +146,11 @@ task mmlJar (type: Jar, dependsOn: compileMML) {
     from "${mmlDir}/build/classes/java/main"
     from "${mmlDir}/build/resources/main"
     manifest {
-        attributes "Main-Class": 'megameklab.com.MegaMekLab'
-        attributes 'Class-Path' : "${mmJar.archiveFileName.get()} " + (project.sourceSets.main.runtimeClasspath.files
+        attributes "Main-Class" : 'megameklab.com.MegaMekLab'
+        attributes "Class-Path" : "${mmJar.archiveFileName.get()} " + (project.sourceSets.main.runtimeClasspath.files
             .findAll { it.name.endsWith(".jar") && !it.name.toLowerCase().startsWith("megamek")}
             .collect { "${lib}/${it.name}" }.join(' '))
+        attributes "Build-Date" : LocalDateTime.now()
     }
     ext.jarLocation = "${buildDir}/libs/${archiveFileName.get()}"
     inputs.dir "${mmlDir}/build/classes/java/main"
@@ -156,10 +161,11 @@ task mmlJar (type: Jar, dependsOn: compileMML) {
 jar {
     archiveFileName = "MekHQ.jar"
     manifest {
-        attributes "Main-Class": mainClassName
-        attributes 'Class-Path' : "${mmJar.archiveFileName.get()} ${mmlJar.archiveFileName.get()} " + (project.sourceSets.main.runtimeClasspath.files
+        attributes "Main-Class" : mainClassName
+        attributes "Class-Path" : "${mmJar.archiveFileName.get()} ${mmlJar.archiveFileName.get()} " + (project.sourceSets.main.runtimeClasspath.files
             .findAll { it.name.endsWith(".jar") && !it.name.toLowerCase().startsWith("megamek") }
             .collect { "${lib}/${it.name}" }.join(' '))
+        attributes "Build-Date" : LocalDateTime.now()
     }
 }
 

MekHQ/docs/history.txt

@@ -1,6 +1,8 @@
 VERSION HISTORY:
 ----------------
-0.49.7-SNAPSHOT
+0.49.8-SNAPSHOT
+
+0.49.7 (2021-12-18 0300 UTC)
 + PR #3043: Logging: Default Global Exception Handler and Standardized Legacy Logging
 + Issue #3040: Fixing Unit Icon Filename Write Copy/paste Error
 + Issue #3038: Fixing missing Personnel Table Integer Comparators
@@ -43,6 +45,9 @@ VERSION HISTORY:
 + Fixing Republic of the Barrens faction name
 + Fixing Starting Contract Count label so it says it's not implemented
 + PR #3033: New Campaign Project: AtB Company Generator
++ CampaignAnon Starter Guide v4.0, with New Campaign Project coverage
++ PR #3121: Replacing MHQ's Startup GUI with a modified version of MML's
++ PR #3122: Adding Font Directory Parsing
 
 0.49.6 (2021-12-31 2200 UTC)
 + PR #2857: Personnel Status: Expansions for Random Death

MekHQ/docs/mekhq-contributors.txt

@@ -6,7 +6,6 @@ MegaMek GitHub Organization <https://github.com/MegaMek>
 
 	Lead Developers:
 		Carl Spain
-		Christopher Watford
 		NickAragua
 		Justin "Windchild" Bowen
 
@@ -17,12 +16,14 @@ MegaMek GitHub Organization <https://github.com/MegaMek>
 		Frederic Morel <natitf@users.sourceforge.net>
 		Deric Page
 		Robin Toll <fastsammy@users.sourceforge.net>
+		Christopher Watford
 
 	More Code:
 		Daniel Vystrcil
 		Longinus00
 		Josh Street
 		Neyah Peterson
+		Juliez
 
 Data
 	Unit Updates:

MekHQ/mmconf/campaignPresets/AgainstTheBot.xml → MekHQ/mmconf/campaignPresets/AtB.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gamePreset version="0.49.1-SNAPSHOT">
-	<title>Official AtB Options</title>
-	<description>(Release 2) These are the default settings for the Against the Bot campaign system. As always change them to what you like for your style of play.</description>
+	<title>AtB - Official Options</title>
+	<description>(Release 2) These are the default settings for the Against the Bot campaign system. As always, please feel free to change them to what you like for your style of play. Also, note that using the AtB Starter Guide preset initially is highly recommended.</description>
 	<date>3025-01-01</date>
 	<faction>MERC</faction>
 	<campaignOptions>