diff options
| -rw-r--r-- | build.gradle | 23 | ||||
| -rw-r--r-- | dependencies.gradle | 14 | ||||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.jar | bin | 62076 -> 63375 bytes | |||
| -rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 3 | ||||
| -rwxr-xr-x | gradlew | 5 |
5 files changed, 17 insertions, 28 deletions
diff --git a/build.gradle b/build.gradle index 4e31dc883b..8507c7dfbd 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -//version: 1700844281 +//version: 1701530445 /* DO NOT CHANGE THIS FILE! Also, you may replace this file at any time if there is an update available. @@ -28,27 +28,12 @@ import java.util.concurrent.TimeUnit buildscript { repositories { - mavenCentral() - - maven { - name 'forge' - url 'https://maven.minecraftforge.net' - } maven { // GTNH RetroFuturaGradle and ASM Fork name "GTNH Maven" url "http://jenkins.usrv.eu:8081/nexus/content/groups/public/" allowInsecureProtocol = true } - maven { - name 'sonatype' - url 'https://oss.sonatype.org/content/repositories/snapshots/' - } - maven { - name 'Scala CI dependencies' - url 'https://repo1.maven.org/maven2/' - } - mavenLocal() } } @@ -793,12 +778,12 @@ ext.java17PatchDependenciesCfg = configurations.create("java17PatchDependencies" } dependencies { - def lwjgl3ifyVersion = '1.5.1' + def lwjgl3ifyVersion = '1.5.7' if (modId != 'lwjgl3ify') { java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}") } if (modId != 'hodgepodge') { - java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.17') + java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.35') } java17PatchDependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}:forgePatches") {transitive = false} @@ -1310,7 +1295,7 @@ def addCurseForgeRelation(String type, String name) { // Updating -def buildscriptGradleVersion = "8.2.1" +def buildscriptGradleVersion = "8.5" tasks.named('wrapper', Wrapper).configure { gradleVersion = buildscriptGradleVersion diff --git a/dependencies.gradle b/dependencies.gradle index e0f168bbaa..66b75554c5 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -36,12 +36,12 @@ dependencies { api("com.github.GTNewHorizons:StructureLib:1.2.9:dev") api("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev") - api("com.github.GTNewHorizons:NotEnoughItems:2.4.12-GTNH:dev") + api("com.github.GTNewHorizons:NotEnoughItems:2.4.13-GTNH:dev") api("com.github.GTNewHorizons:GTNHLib:0.0.13:dev") api("com.github.GTNewHorizons:ModularUI:1.1.24:dev") api("com.github.GTNewHorizons:waila:1.6.5:dev") - api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-288-GTNH:dev") - api("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.1.68-gtnh-pre:dev") + api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-291-GTNH:dev") + api("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.1.69-gtnh:dev") implementation("com.github.GTNewHorizons:Avaritia:1.46:dev") @@ -54,13 +54,13 @@ dependencies { compileOnly("com.github.GTNewHorizons:EnderCore:0.2.18:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Galacticraft:3.0.74-GTNH:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.10.11-GTNH:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.10.12-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Chisel:2.12.3-GTNH:dev") { transitive = false } compileOnly("com.github.GTNewHorizons:Translocators:1.1.2.21:dev") { transitive = false } compileOnly("curse.maven:cofh-core-69162:2388751") { transitive = false } - compileOnly("com.github.GTNewHorizons:Nuclear-Control:2.4.19:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Nuclear-Control:2.5.0:dev") { transitive = false } compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false } - compileOnly("com.github.GTNewHorizons:Hodgepodge:2.3.35:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Hodgepodge:2.3.36:dev") { transitive = false } compileOnly('com.github.GTNewHorizons:Botania:1.10.3-GTNH:dev') { transitive = false } compileOnly('com.github.GTNewHorizons:HoloInventory:2.3.2-GTNH:dev') { transitive = false } compileOnly('curse.maven:minefactory-reloaded-66672:2366150') { transitive = false } @@ -69,7 +69,7 @@ dependencies { annotationProcessor("com.google.auto.value:auto-value:1.10.1") // For testing iApiary - //runtimeOnlyNonPublishable("com.github.GTNewHorizons:ForestryMC:4.6.14:dev") + //runtimeOnlyNonPublishable("com.github.GTNewHorizons:ForestryMC:4.7.0:dev") testImplementation(platform('org.junit:junit-bom:5.9.2')) testImplementation('org.junit.jupiter:junit-jupiter') diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar Binary files differindex c1962a79e2..033e24c4cd 100644 --- a/gradle/wrapper/gradle-wrapper.jar +++ b/gradle/wrapper/gradle-wrapper.jar diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 17a8ddce2d..1af9e0930b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists @@ -130,10 +130,13 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. |