From 97dcabc527ec1d23c8d5d3ee8400f70f81b048d7 Mon Sep 17 00:00:00 2001
From: JackCarterSmith <arechristopher1@gmail.com>
Date: Wed, 1 Apr 2020 00:30:17 +0200
Subject: [PATCH] Updated config to the new version format

Cleaned up unecessary files.

Signed-off-by: JackCarterSmith <arechristopher1@gmail.com>
---
 .gitignore        | 7 ++++++-
 build.gradle      | 8 ++++----
 gradle.properties | 2 +-
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2c770e0..b47d54f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 # eclipse
 bin
+eclipse
 *.launch
 .settings
 .metadata
@@ -8,6 +9,7 @@ bin
 
 # idea
 out
+classes
 *.ipr
 *.iws
 *.iml
@@ -18,5 +20,8 @@ build
 .gradle
 
 # other
-eclipse
+*.DS_Store*
 run
+!LICENSE
+!README.*
+!.gitignore
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 634a488..22e7372 100644
--- a/build.gradle
+++ b/build.gradle
@@ -48,9 +48,9 @@ if (System.getenv("BUILD_NUMBER") != null) {
 
 }
 
-version = "$baseVersion.$buildNumber"
+version = "$project.minecraftVersion-$baseVersion.$buildNumber"
 group = "fr.jackcartersmith.orbsat"
-archivesBaseName = "OrbitalSatellite-$project.minecraftVersion"
+archivesBaseName = "OrbitalSatellite"
 
 sourceCompatibility = targetCompatibility = 1.8
 compileJava {
@@ -61,8 +61,8 @@ minecraft {
     version = "$project.minecraftVersion-$project.forgeVersion"
     runDir = "eclipse"
     
-    mappings = "stable_39"
-	//mappings = "snapshot_20180814"
+    //mappings = "stable_39"
+	mappings = "snapshot_20180814"
     makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
 }
 
diff --git a/gradle.properties b/gradle.properties
index d1308a9..ae9fb38 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,6 +1,6 @@
 # Sets default memory used for gradle commands. Can be overridden by user or command line properties.
 # This is required to provide enough memory for the Minecraft decompilation process.
-baseVersion=1.0
+baseVersion=0.1
 minecraftVersion=1.12.2
 forgeVersion=14.23.5.2847
 org.gradle.jvmargs=-Xmx4G