diff --git a/build.gradle b/build.gradle index 12d9bb38..7d01454e 100755 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ buildscript { repositories { jcenter() - maven { url = "http://files.minecraftforge.net/maven" } + maven { url = "https://files.minecraftforge.net/maven" } } dependencies { classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT' @@ -59,14 +59,14 @@ dependencies { // deobfCompile "compact-machines:compactmachines3-${mc_version}:${cm_version}:${cm_build}" } repositories { - maven { url "https://dvs1.progwml6.com/files/maven" } - maven { url "https://modmaven.k-4u.nl" } - maven { url "https://maven.theillusivec4.top/" } + maven { url "https://dvs1.progwml6.com/files/maven" } + maven { url "https://modmaven.k-4u.nl" } + maven { url "https://maven.theillusivec4.top/" } maven { url "https://maven.blamejared.com" } maven { url "https://maven.blamejared.com/vazkii" } - maven { url "http://minecraft.curseforge.com/api/maven/" } - maven { url 'https://www.cursemaven.com' } - maven { url "https://maven.thiakil.com/" } + maven { url "https://minecraft.curseforge.com/api/maven/" } + maven { url 'https://www.cursemaven.com' } + maven { url "https://maven.thiakil.com/" } // ?? http://maven.thiakil.com/com/azanor/baubles/Baubles/ // ?? https://files.minecraftforge.net/maven/ // maven { url "https://tehnut.info/maven/" } // 404s @@ -86,14 +86,3 @@ processResources { } build.dependsOn signJar - -task copyJar(type: Copy) { - from jar - into "${dist_folder}" -} - -build.finalizedBy copyJar - -task cleanJar { - delete 'build/libs' -} diff --git a/gradle.properties b/gradle.properties index 0c0ae1a1..288cfb03 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,8 +1,6 @@ # see also: environment JAVA_HOME; IJ java compiler options using 1.8, java -version and the start.sh script. # special thanks thanks to ACGaming and KitsuneAlex for 1.12 gradle help -org.gradle.java.home=C:\\Program Files\\Eclipse Adoptium\\jdk-8.0.322.6-hotspot org.gradle.jvmargs=-Xmx3G -dist_folder=c:/temp mc_version=1.12.2 forge_version=14.23.5.2847 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e18cba72..6b071a78 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-bin.zip