Merge branch 'dev-1.12.2' into release-1.12.2

CHANGELOG.md

@@ -2,7 +2,15 @@
 
 [Added]
 
-  - command /leaverace to leave GC SpaceRace team
-    (Team owners cannot use command)
+  - Ability to unlock Rocket Schematics via Configs
 
-  - Feature to fix planet/star Icon sizes when using AsmodeusCore celestial map
+  - Dimensional-Comets Spawn Rate can be modified per dimension via Configs
+
+  - Custom Spawn Dimension can be set via Configs
+
+  - New Version checking system
+
+
+[Changed]
+
+  - Overworld-Comets merged into Dimensional-Comets

build.gradle

@@ -67,7 +67,11 @@ jacocoTestReport {
 }
 
 repositories {
-	jcenter()
+	maven {
+		// Location of CurseAPI Files
+		url "https://jitpack.io"
+	}
+	mavenCentral()
 	maven {
 		name 'MJRLegends'
 		url = "https://maven.mjrlegends.com/"
@@ -87,19 +91,17 @@ repositories {
 	maven {
 		url = "https://www.cursemaven.com"
 	}
-	maven {
-		// Location of CurseAPI Files
-		url "https://jitpack.io"
-	}
+
 }
 
 dependencies {
-
-	compile "com.vdurmont:semver4j:3.1.0"
-
-	compile("com.github.TheRandomLabs:CurseAPI:master-SNAPSHOT"){
-		exclude group: 'com.google.guava', module: 'guava'
+
+	compile("com.github.TheRandomLabs:CurseAPI:master-SNAPSHOT"){	
+		exclude group: 'com.google.guava', module: 'guava'	
 		}
+
+	compile "org.apache.logging.log4j:log4j-core:2.13.3"
+	compile "org.apache.logging.log4j:log4j-slf4j18-impl:2.13.3"
 
 	compile "org.projectlombok:lombok:1.18.12"
 	apt "org.projectlombok:lombok:1.18.12"
@@ -108,7 +110,7 @@ dependencies {
 
 	// LOAD GC ADDONS
 	compile "com.mjr.planetprogression:PlanetProgression:1.12.2-0.4.5:api"
-	compile "curse.maven:AsmodeusCore-Dev:3039768"
+	compile "curse.maven:AsmodeusCore-Dev:3063158"
 	compile "curse.maven:GSMod-0.0.14:3015062"
 	compile "curse.maven:ExtraPlanets-1.7.0:3031689"
 	runtime "curse.maven:MJRLib-1.2.0:3029769"
@@ -128,6 +130,25 @@ minecraft {
 	replaceIn "Ref.java"
 }
 
+processResources {
+    inputs.property "version", project.version
+    inputs.property "mcversion", project.minecraft.version
+    from(sourceSets.main.resources.srcDirs) {
+        include 'mcmod.info'
+        expand 'version':project.version, 'mcversion':project.minecraft.version
+    }
+    from(sourceSets.main.resources.srcDirs) {
+        exclude 'mcmod.info'
+    }
+    rename '(.+_at.cfg)', 'META-INF/$1'
+}
+
+jar {
+    manifest {
+ 	    attributes 'FMLAT': 'galactictweaks_at.cfg'
+ 	}
+ }
+
 jar {
 	manifest {
 		mainAttributes(

gradle.properties

@@ -15,7 +15,7 @@ mcp=snapshot_20171003
 
 ## Mod Versioning
 versionMajor=1
-versionMinor=2
+versionMinor=3
 versionRev=0
 
 ##  Cureforge Upload Configs