From 5eec8071d01e2df7f02b051c44b4364db2c5a71e Mon Sep 17 00:00:00 2001
From: canitzp <canitzp@gmail.com>
Date: Fri, 4 Sep 2020 07:34:25 +0200
Subject: [PATCH] Dependency updates

---
 .gitignore                               | 12 ++------
 build.gradle                             | 39 ++++++++++++------------
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 src/main/resources/META-INF/mods.toml    |  2 +-
 4 files changed, 23 insertions(+), 32 deletions(-)

diff --git a/.gitignore b/.gitignore
index 315181ae1..0cb358301 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,6 @@
 /lib
 /classes
 /bin/
-/run/
 
 *.classpath
 *.project
@@ -19,12 +18,5 @@
 *.launch
 .settings/org.eclipse.jdt.core.prefs
 *.prefs
-/run/
-.DS_Store
-src/.DS_Store
-src/main/.DS_Store
-src/main/java/.DS_Store
-src/main/java/de/.DS_Store
-src/main/java/de/ellpeck/.DS_Store
-src/main/java/de/ellpeck/actuallyadditions/.DS_Store
-src/main/java/de/ellpeck/actuallyadditions/mod/.DS_Store
+/run/*
+*.DS_Store
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 8df4d2b80..a6e2db02c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,18 +22,18 @@ archivesBaseName = "ActuallyAdditions-1.14.4"
 sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8'
 
 minecraft {
-    mappings channel: "snapshot", version: "20191107-1.14.3"
-	runs {
+    mappings channel: "stable", version: "58-1.14.4"
+    runs {
         client = {
             properties 'forge.logging.markers': ''
             properties 'forge.logging.console.level': 'debug'
-            workingDirectory project.file('run').canonicalPath
+            workingDirectory project.file('run/client')
             source sourceSets.main
         }
         server = {
             properties 'forge.logging.markers': ''
             properties 'forge.logging.console.level': 'debug'
-            workingDirectory project.file('run/server').canonicalPath
+            workingDirectory project.file('run/server')
             source sourceSets.main
         }
         data = {
@@ -42,8 +42,8 @@ minecraft {
             mods {
                 actuallyadditions {
                     source sourceSets.main
-				}
-			}
+                }
+            }
         }
     }
 }
@@ -52,27 +52,26 @@ repositories {
     maven {
         url "https://dvs1.progwml6.com/files/maven"
     }
-	maven {
-		url "https://tehnut.info/maven"
-	}
+    //maven {
+    //	url "https://tehnut.info/maven"
+    //}
 }
 
 dependencies {
-    minecraft 'net.minecraftforge:forge:1.14.4-28.1.86'
-	compile fg.deobf('mezz.jei:jei-1.14.4:6.0.0.24')
-	compile fg.deobf('mcp.mobius.waila:Hwyla:1.10.6-B67_1.14.4')
-	compile fileTree(dir: 'libs', include: '*.jar')
+    minecraft 'net.minecraftforge:forge:1.14.4-28.2.0'
+    compile fg.deobf('mezz.jei:jei-1.14.4:6.0.1.30')
+    //compile fg.deobf('mcp.mobius.waila:Hwyla:1.10.6-B67_1.14.4')
+    //compile fileTree(dir: 'libs', include: '*.jar')
 }
 
-
 jar {
     manifest {
-        attributes(["Specification-Title": "actuallyadditions",
-                    "Specification-Vendor": "Ellpeck",
-                    "Specification-Version": "24.0",
-                    "Implementation-Title": project.name,
-                    "Implementation-Version": "${version}",
-                    "Implementation-Vendor" :"Ellpeck",
+        attributes(["Specification-Title"     : "actuallyadditions",
+                    "Specification-Vendor"    : "Ellpeck",
+                    "Specification-Version"   : "24.0",
+                    "Implementation-Title"    : project.name,
+                    "Implementation-Version"  : "${version}",
+                    "Implementation-Vendor"   : "Ellpeck",
                     "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")],)
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 949819d28..bd24854fe 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip
diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
index 2a42c54c7..e8e92fcf3 100644
--- a/src/main/resources/META-INF/mods.toml
+++ b/src/main/resources/META-INF/mods.toml
@@ -15,7 +15,7 @@ authors="Ellpeck, Shadows_of_Fire"
 	[[dependencies.actuallyadditions]]
 	    modId="forge"
 	    mandatory=true
-	    versionRange="[28.1.86,)"
+	    versionRange="[28.2,)"
 	    ordering="NONE"
 	    side="BOTH"