Merge branch 'master' into develop

# Conflicts: # BFB/src/main/java/BFB/Common/Constants.java # build.gradle # saw/src/main/java/saw/Constants.java # ssw/src/main/java/ssw/constants/SSWConstants.java # sswlib/src/main/java/common/Constants.java
Solaris-Skunk-Werks · Oct 20, 2019 · 25002c7 · 25002c7
2 parents 0964b83 + 9145b2a
commit 25002c7
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/BFB/src/main/java/BFB/Common/Constants.java b/BFB/src/main/java/BFB/Common/Constants.java
@@ -30,7 +30,7 @@ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
 public class Constants {
     public final static String AppName = "Battletech Force Balancer",
                         AppDescription = "Battletech Force Balancer",
-                        Version = "0.7.2.20191015",
+                        Version = "0.7.3.20191019",
                         AppRelease = "Nightly",
                         Author = "George Blouin",
                         EMail = "[email protected]",

diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'java'
 
 allprojects {
-    version '0.7.2.20191015'
+    version '0.7.3.20191019'
     jar {
         onlyIf { !sourceSets.main.allSource.files.isEmpty() }
     }

diff --git a/saw/src/main/java/saw/Constants.java b/saw/src/main/java/saw/Constants.java
@@ -34,7 +34,7 @@ public class Constants {
     // here is the versioning and program name
     public final static String AppName = "SAW",
                         AppDescription = "Solaris Armor Werks",
-                        Version = "0.7.2.20191015",
+                        Version = "0.7.3.20191019",
                         AppRelease = "Nightly",
                         ImageListFileName = "S7Images",
                         LogFileName = "Logs/SAW_Log.txt",

diff --git a/ssw/src/main/java/ssw/constants/SSWConstants.java b/ssw/src/main/java/ssw/constants/SSWConstants.java
@@ -34,7 +34,7 @@ public class SSWConstants {
     // here is the versioning and program name
     public final static String AppName = "SSW",
                         AppDescription = "Solaris Skunk Werks",
-                        Version = "0.7.2.20191015",
+                        Version = "0.7.3.20191019",
                         AppRelease = "Nightly",
                         ImageListFileName = "Data/Solaris7/S7Images",
                         LogDirectoryName = "Logs",

diff --git a/sswlib/src/main/java/common/Constants.java b/sswlib/src/main/java/common/Constants.java
@@ -29,7 +29,7 @@
 package common;
 
 public class Constants {
-    public final static String LibVersion = "0.7.2.20191015",
+    public final static String LibVersion = "0.7.3.20191019",
                                BASELOADOUT_NAME = "Base Loadout",
                                WEAPONSFILE = "Data/Equipment/weapons.dat",
                                PHYSICALSFILE = "Data/Equipment/physicals.dat",