diff --git a/dependencies.gradle b/dependencies.gradle index fd2296d27..2e51531a4 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,26 +1,26 @@ // Add your dependencies here dependencies { - implementation('com.github.GTNewHorizons:NotEnoughItems:2.8.152-GTNH:dev') + implementation('com.github.GTNewHorizons:NotEnoughItems:2.8.155-GTNH:dev') implementation("com.github.GTNewHorizons:GTNHLib:0.11.52:dev") implementation('curse.maven:cofh-core-69162:2388751') - compileOnlyApi('com.github.GTNewHorizons:Angelica:2.2.22:dev') + compileOnlyApi('com.github.GTNewHorizons:Angelica:2.2.26:dev') compileOnlyApi('com.github.GTNewHorizons:EnderCore:0.5.15:dev') {transitive = false} compileOnly("com.github.GTNewHorizons:Postea:1.2.7:dev") compileOnly('com.github.GTNewHorizons:ThaumicTinkerer:2.12.33:dev') {transitive = false} - compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.63:dev') {transitive = false} + compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.64:dev') {transitive = false} compileOnly('com.github.GTNewHorizons:ForestryMC:4.11.38:dev') {transitive = false} // required to compile CraftingV2Tests.java now compileOnly('com.github.GTNewHorizons:ForgeMultipart:1.7.15:dev') {transitive = false} - compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.54.189:dev') {transitive = false} - compileOnly('com.github.GTNewHorizons:ModularUI2:2.3.91-1.7.10:dev') {transitive = false} + compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.54.195:dev') {transitive = false} + compileOnly('com.github.GTNewHorizons:ModularUI2:2.3.92-1.7.10:dev') {transitive = false} compileOnly('com.github.GTNewHorizons:Jabba:1.5.23:dev') {transitive = false} compileOnly('com.github.GTNewHorizons:inventory-tweaks:1.7.1:api') {transitive = false} - compileOnly('com.github.GTNewHorizons:OpenComputers:1.12.63-GTNH:api') {transitive = false} + compileOnly('com.github.GTNewHorizons:OpenComputers:1.12.64-GTNH:api') {transitive = false} compileOnly('com.github.GTNewHorizons:waila:1.19.34:dev') {transitive = false} compileOnly('com.github.GTNewHorizons:Railcraft:9.17.31:api') {transitive = false} compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') {transitive = false } - compileOnly("com.github.GTNewHorizons:Backhand:1.8.15:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Backhand:1.8.16:dev") { transitive = false } compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:api') compileOnly('curse.maven:minefactory-reloaded-66672:2366150') compileOnly('pneumaticCraft:PneumaticCraft-1.7.10:1.12.7-152:api') {transitive = false} @@ -31,7 +31,7 @@ dependencies { compileOnly(rfg.deobf('curse.maven:mekanism-268560:2475797')) // https://www.curseforge.com/minecraft/mc-mods/mekanism/files/2475797 compileOnly(rfg.deobf('maven.modrinth:immibis-microblocks:59.1.2')) // https://modrinth.com/mod/immibis-microblocks/version/59.1.2 compileOnly("curse.maven:endlessids-665730:7585931") {transitive = false } - compileOnly('com.github.GTNewHorizons:AE2FluidCraft-Rework:1.5.110-gtnh:dev') { transitive = false } + compileOnly('com.github.GTNewHorizons:AE2FluidCraft-Rework:1.5.111-gtnh:dev') { transitive = false } compileOnly('com.github.GTNewHorizons:ae2stuff:0.10.20-GTNH:dev') { exclude module: "Applied-Energistics-2-Unofficial" } @@ -48,7 +48,7 @@ dependencies { functionalTestImplementation('org.junit.platform:junit-platform-engine') functionalTestImplementation('org.junit.platform:junit-platform-launcher') functionalTestImplementation('org.junit.platform:junit-platform-reporting') - functionalTestImplementation('com.github.GTNewHorizons:GT5-Unofficial:5.09.54.189:dev') { + functionalTestImplementation('com.github.GTNewHorizons:GT5-Unofficial:5.09.54.195:dev') { exclude module: "Applied-Energistics-2-Unofficial" exclude module: "Hodgepodge" exclude module: "waila" @@ -64,14 +64,14 @@ dependencies { runtimeOnlyNonPublishable('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') { exclude module: "Baubles" } - runtimeOnlyNonPublishable('com.github.GTNewHorizons:ThaumicEnergistics:1.7.61-GTNH:dev') { transitive = false } - runtimeOnlyNonPublishable('com.github.GTNewHorizons:AE2FluidCraft-Rework:1.5.110-gtnh:dev') { transitive = false } + runtimeOnlyNonPublishable('com.github.GTNewHorizons:ThaumicEnergistics:1.7.62-GTNH:dev') { transitive = false } + runtimeOnlyNonPublishable('com.github.GTNewHorizons:AE2FluidCraft-Rework:1.5.111-gtnh:dev') { transitive = false } runtimeOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughEnergistics:1.7.45:dev') { exclude module: "Applied-Energistics-2-Unofficial" exclude module: "waila" } - //runtimeOnlyNonPublishable('com.github.GTNewHorizons:GT5-Unofficial:5.09.54.189:dev') { + //runtimeOnlyNonPublishable('com.github.GTNewHorizons:GT5-Unofficial:5.09.54.195:dev') { // exclude module: "Applied-Energistics-2-Unofficial" // exclude module: "Hodgepodge" // exclude module: "waila" @@ -86,7 +86,7 @@ dependencies { //Uncomment if you need to test chunkloading and warps/homes //runtimeOnlyNonPublishable('com.github.GTNewHorizons:ServerUtilities:2.4.13:dev') - //runtimeOnlyNonPublishable('com.github.GTNewHorizons:Backhand:1.8.15:dev') + //runtimeOnlyNonPublishable('com.github.GTNewHorizons:Backhand:1.8.16:dev') //runtimeOnlyNonPublishable('com.github.GTNewHorizons:ForgeMultipart:1.7.15:dev') {transitive = false} //runtimeOnlyNonPublishable('com.github.GTNewHorizons:MouseTweaks:2.5.3-GTNH:dev') } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d997cfc60..eddabd2ee 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c42672d95..ad7845be3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -2,6 +2,8 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip networkTimeout=10000 +retries=0 +retryBackOffMs=500 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 0262dcbd5..249efbb03 100755 --- a/gradlew +++ b/gradlew @@ -20,7 +20,7 @@ ############################################################################## # -# Gradle start up script for POSIX generated by Gradle. +# gradlew start up script for POSIX generated by Gradle. # # Important for running: # @@ -29,7 +29,7 @@ # bash, then to run this script, type that shell name before the whole # command line, like: # -# ksh Gradle +# ksh gradlew # # Busybox and similar reduced shells will NOT work, because this script # requires all of these POSIX shell features: @@ -57,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/b631911858264c0b6e4d6603d677ff5218766cee/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. diff --git a/gradlew.bat b/gradlew.bat index c4bdd3ab8..a51ec4f58 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -19,12 +19,12 @@ @if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem -@rem Gradle startup script for Windows +@rem gradlew startup script for Windows @rem @rem ########################################################################## -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal +@rem Set local scope for the variables, and ensure extensions are enabled +setlocal EnableExtensions set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. @@ -51,7 +51,7 @@ echo. 1>&2 echo Please set the JAVA_HOME variable in your environment to match the 1>&2 echo location of your Java installation. 1>&2 -goto fail +"%COMSPEC%" /c exit 1 :findJavaFromJavaHome set JAVA_HOME=%JAVA_HOME:"=% @@ -65,29 +65,18 @@ echo. 1>&2 echo Please set the JAVA_HOME variable in your environment to match the 1>&2 echo location of your Java installation. 1>&2 -goto fail +"%COMSPEC%" /c exit 1 :execute @rem Setup the command line -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* +@rem Execute gradlew +@rem endlocal doesn't take effect until after the line is parsed and variables are expanded +@rem which allows us to clear the local environment before executing the java command +endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +:exitWithErrorLevel +@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts +"%COMSPEC%" /c exit %ERRORLEVEL% diff --git a/settings.gradle b/settings.gradle index 902f15982..44fcfbeba 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.32' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.34' }