diff --git a/dependencies.gradle b/dependencies.gradle index 8c79c2f8..594e03a3 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,27 +1,27 @@ // Add your dependencies here dependencies { - api('com.github.GTNewHorizons:Baubles-Expanded:2.2.6-GTNH:dev') + api('com.github.GTNewHorizons:Baubles-Expanded:2.2.11-GTNH:dev') api('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') {transitive=false} - api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-839-GTNH:api') + api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-865-GTNH:api') api('com.github.GTNewHorizons:ThaumicBoots:1.5.8:dev') {transitive=false} - compileOnly('com.github.GTNewHorizons:Botania:1.13.14-GTNH:dev') {transitive=false} - compileOnly('com.github.GTNewHorizons:EnderCore:0.5.5:dev') {transitive=false} - compileOnly('com.github.GTNewHorizons:EnderIO:2.10.20:dev') {transitive=false} + compileOnly('com.github.GTNewHorizons:Botania:1.13.16-GTNH:dev') {transitive=false} + compileOnly('com.github.GTNewHorizons:EnderCore:0.5.9:dev') {transitive=false} + compileOnly('com.github.GTNewHorizons:EnderIO:2.10.21:dev') {transitive=false} compileOnly('com.github.GTNewHorizons:EnderStorage:1.8.2:dev') {transitive=false} compileOnly('com.github.GTNewHorizons:waila:1.19.22:api') {transitive=false} - compileOnly('com.github.GTNewHorizons:TinkersConstruct:1.14.30-GTNH:dev') {transitive=false} - compileOnly('com.github.GTNewHorizons:ForgeMultipart:1.7.2:dev') {transitive=false} - compileOnly('com.github.GTNewHorizons:CodeChickenCore:1.4.10:dev') {transitive=false} - compileOnly('com.github.GTNewHorizons:OpenComputers:1.12.16-GTNH:api') {transitive=false} + compileOnly('com.github.GTNewHorizons:TinkersConstruct:1.14.37-GTNH:dev') {transitive=false} + compileOnly('com.github.GTNewHorizons:ForgeMultipart:1.7.3:dev') {transitive=false} + compileOnly('com.github.GTNewHorizons:CodeChickenCore:1.4.12:dev') {transitive=false} + compileOnly('com.github.GTNewHorizons:OpenComputers:1.12.22-GTNH:api') {transitive=false} compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:api') {transitive=false} - compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.52.308:dev") {exclude group: 'com.github.GTNewHorizons', module: 'ThaumicTinkerer'} + compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.52.362:dev") {exclude group: 'com.github.GTNewHorizons', module: 'ThaumicTinkerer'} compileOnly('curse.maven:computercraft-67504:2269339') compileOnly('curse.maven:cofh-core-69162:2388751') // For testing purposes - //runtimeOnlyNonPublishable("com.github.GTNewHorizons:Electro-Magic-Tools:1.7.17:dev") + //runtimeOnlyNonPublishable("com.github.GTNewHorizons:Electro-Magic-Tools:1.7.20:dev") runtimeOnly(rfg.deobf('curse.maven:thaumcraft-nei-plugin-225095:2241913')) runtimeOnly('com.github.GTNewHorizons:TCNEIAdditions:1.5.13:dev') diff --git a/gradle/gradle-daemon-jvm.properties b/gradle/gradle-daemon-jvm.properties index b612cc98..cbe2529d 100644 --- a/gradle/gradle-daemon-jvm.properties +++ b/gradle/gradle-daemon-jvm.properties @@ -1,12 +1,12 @@ #This file is generated by updateDaemonJvm -toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c5ee947fbfb70bc347d8d531e3a578c4/redirect +toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1630f7ebef05444cb27a2709ea0249b3/redirect toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/5ee463876563a46fff651cce1bc53a4c/redirect -toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c5ee947fbfb70bc347d8d531e3a578c4/redirect +toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1630f7ebef05444cb27a2709ea0249b3/redirect toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/5ee463876563a46fff651cce1bc53a4c/redirect -toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e1118b4c7c2858d28154d086dbff010e/redirect -toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/59a9771cad43219260d9aac9a8ec4d6a/redirect -toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c5ee947fbfb70bc347d8d531e3a578c4/redirect +toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/d4fd992c9557644e637ebe98263e0ae7/redirect +toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/faa12903720d410b387cc69ccafb1a74/redirect +toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1630f7ebef05444cb27a2709ea0249b3/redirect toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/5ee463876563a46fff651cce1bc53a4c/redirect -toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/832229f0f6f0be60ed817c5a5e5848eb/redirect -toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/b96cb7670c095245220e7d01d5927b58/redirect +toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/3689d0bcdd77ac01674ba3c9dbbe94d0/redirect +toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/8e1d9ee5d0f13e442218f6884a306da1/redirect toolchainVersion=25 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 61285a65..d997cfc6 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 37f78a6a..dbc3ce4a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index adff685a..0262dcbd 100755 --- a/gradlew +++ b/gradlew @@ -57,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/b631911858264c0b6e4d6603d677ff5218766cee/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/settings.gradle.kts b/settings.gradle.kts index eff766eb..0ecad981 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -17,7 +17,7 @@ pluginManagement { } plugins { - id("com.gtnewhorizons.gtnhsettingsconvention") version "2.0.20" + id("com.gtnewhorizons.gtnhsettingsconvention") version "2.0.24" }