From 031352ea480a96db4ca6b05a7fdfd6bed6bb45d7 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Tue, 29 Sep 2026 09:02:08 +0200 Subject: [PATCH] update+deps+gradle --- dependencies.gradle | 56 ++++++++++++------------ gradle.properties | 5 +++ gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle | 2 +- 4 files changed, 35 insertions(+), 30 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 0611a41ac..fd2296d27 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,46 +1,46 @@ // Add your dependencies here dependencies { - implementation('com.github.GTNewHorizons:NotEnoughItems:2.8.139-GTNH:dev') - implementation("com.github.GTNewHorizons:GTNHLib:0.11.48:dev") + implementation('com.github.GTNewHorizons:NotEnoughItems:2.8.152-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.13:dev') + compileOnlyApi('com.github.GTNewHorizons:Angelica:2.2.22:dev') compileOnlyApi('com.github.GTNewHorizons:EnderCore:0.5.15:dev') {transitive = false} - compileOnly("com.github.GTNewHorizons:Postea:1.2.6:dev") - compileOnly('com.github.GTNewHorizons:ThaumicTinkerer:2.12.32: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:ForestryMC:4.11.37:dev') {transitive = false} // required to compile CraftingV2Tests.java now - compileOnly('com.github.GTNewHorizons:ForgeMultipart:1.7.14:dev') {transitive = false} - compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.54.151:dev') {transitive = false} - compileOnly('com.github.GTNewHorizons:ModularUI2:2.3.89-1.7.10: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: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.61-GTNH:api') {transitive = false} + compileOnly('com.github.GTNewHorizons:OpenComputers:1.12.63-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.14:dev") { transitive = false } + compileOnly("com.github.GTNewHorizons:Backhand:1.8.15: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} compileOnly('curse.maven:better-storage-232919:2731636') compileOnly('api:immibis:1') compileOnly('curse.maven:computercraft-67504:2269339') - compileOnly('com.github.GTNewHorizons:EnderIO:2.10.45:dev') { transitive = false } + compileOnly('com.github.GTNewHorizons:EnderIO:2.10.48:dev') { transitive = false } 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.108-gtnh:dev') { transitive = false } + compileOnly('com.github.GTNewHorizons:AE2FluidCraft-Rework:1.5.110-gtnh:dev') { transitive = false } compileOnly('com.github.GTNewHorizons:ae2stuff:0.10.20-GTNH:dev') { exclude module: "Applied-Energistics-2-Unofficial" } compileOnly('curse.maven:rotarycraft-235596:4721191') - compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.2.23-GTNH:dev') + compileOnly('com.github.GTNewHorizons:Baubles-Expanded:2.2.24-GTNH:dev') compileOnly('com.github.GTNewHorizons:RemoteIO:2.7.10:dev') { transitive = false } compileOnly("org.jetbrains:annotations:26.0.2") - compileOnly("com.github.GTNewHorizons:Postea:1.2.6:dev") - compileOnly("com.github.GTNewHorizons:InventoryBogoSorter:1.3.50-GTNH:dev") + compileOnly("com.github.GTNewHorizons:Postea:1.2.7:dev") + compileOnly("com.github.GTNewHorizons:InventoryBogoSorter:1.3.54-GTNH:dev") testImplementation('junit:junit:4.12') functionalTestImplementation(platform('org.junit:junit-bom:5.9.2')) @@ -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.151:dev') { + functionalTestImplementation('com.github.GTNewHorizons:GT5-Unofficial:5.09.54.189:dev') { exclude module: "Applied-Energistics-2-Unofficial" exclude module: "Hodgepodge" exclude module: "waila" @@ -56,38 +56,38 @@ dependencies { devOnlyNonPublishable("com.github.GTNewHorizons:Horizon-QA:0.15.0:dev") - runtimeOnlyNonPublishable("com.github.GTNewHorizons:Postea:1.2.6:dev") + runtimeOnlyNonPublishable("com.github.GTNewHorizons:Postea:1.2.7:dev") runtimeOnlyNonPublishable('com.github.GTNewHorizons:waila:1.19.34:dev') {transitive = false} runtimeOnlyNonPublishable("com.github.GTNewHorizons:DuraDisplay:1.4.6:dev") runtimeOnlyNonPublishable('com.github.GTNewHorizons:RemoteIO:2.7.10:dev') { transitive = false } - runtimeOnlyNonPublishable('com.github.GTNewHorizons:Baubles-Expanded:2.2.23-GTNH:dev') + runtimeOnlyNonPublishable('com.github.GTNewHorizons:Baubles-Expanded:2.2.24-GTNH:dev') runtimeOnlyNonPublishable('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') { exclude module: "Baubles" } - runtimeOnlyNonPublishable('com.github.GTNewHorizons:ThaumicEnergistics:1.7.60-GTNH:dev') { transitive = false } - runtimeOnlyNonPublishable('com.github.GTNewHorizons:AE2FluidCraft-Rework:1.5.108-gtnh:dev') { transitive = false } - runtimeOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughEnergistics:1.7.42:dev') { + 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:NotEnoughEnergistics:1.7.45:dev') { exclude module: "Applied-Energistics-2-Unofficial" exclude module: "waila" } - //runtimeOnlyNonPublishable('com.github.GTNewHorizons:GT5-Unofficial:5.09.54.188:dev') { + //runtimeOnlyNonPublishable('com.github.GTNewHorizons:GT5-Unofficial:5.09.54.189:dev') { // exclude module: "Applied-Energistics-2-Unofficial" // exclude module: "Hodgepodge" // exclude module: "waila" //} - //runtimeOnlyNonPublishable("com.github.GTNewHorizons:BloodMagic:1.9.13") { transitive = false } + //runtimeOnlyNonPublishable("com.github.GTNewHorizons:BloodMagic:1.9.14") { transitive = false } //Uncomment to add thermal expansion + foundation for testing //runtimeOnlyNonPublishable('curse.maven:thermal-foundation-222880:2388753') //runtimeOnlyNonPublishable('curse.maven:thermal-expansion-69163:2388759') //Uncomment if you need to test chunkloading and warps/homes - //runtimeOnlyNonPublishable('com.github.GTNewHorizons:ServerUtilities:2.4.10:dev') + //runtimeOnlyNonPublishable('com.github.GTNewHorizons:ServerUtilities:2.4.13:dev') - //runtimeOnlyNonPublishable('com.github.GTNewHorizons:Backhand:1.8.14:dev') - //runtimeOnlyNonPublishable('com.github.GTNewHorizons:ForgeMultipart:1.7.14:dev') {transitive = false} + //runtimeOnlyNonPublishable('com.github.GTNewHorizons:Backhand:1.8.15:dev') + //runtimeOnlyNonPublishable('com.github.GTNewHorizons:ForgeMultipart:1.7.15:dev') {transitive = false} //runtimeOnlyNonPublishable('com.github.GTNewHorizons:MouseTweaks:2.5.3-GTNH:dev') } @@ -97,7 +97,7 @@ project.getConfigurations() final DependencySubstitutions ds = c.getResolutionStrategy() .getDependencySubstitution(); ds.substitute(ds.module("com.github.GTNewHorizons:Baubles")) - .using(ds.module("com.github.GTNewHorizons:Baubles-Expanded:2.2.23-GTNH")) + .using(ds.module("com.github.GTNewHorizons:Baubles-Expanded:2.2.24-GTNH")) .withClassifier("dev") .because("Baubles-Expanded replaces Baubles"); }); diff --git a/gradle.properties b/gradle.properties index 8c71a9719..ccd951946 100644 --- a/gradle.properties +++ b/gradle.properties @@ -177,6 +177,11 @@ modrinthRelations = # Leave this empty if you don't want to publish on CurseForge. curseForgeProjectId = +# Comma-separated supported CurseForge environments: client, server (case-insensitive). +# Use client or server for mods that only support one environment. Defaults to client,server. +# These tags describe where the mod can run, not whether installation is required on both sides. +curseForgeEnvironments = client,server + # The project's relations on CurseForge. You can use this to refer to other projects on CurseForge. # Syntax: type1:name1;type2:name2;... # Where type can be one of [requiredDependency, embeddedLibrary, optionalDependency, tool, incompatible], diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index dbc3ce4a0..c42672d95 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.4.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle b/settings.gradle index 6c3901111..902f15982 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.29' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.32' }