From 8d50b69da192b9821c9802ebb8a37b010a667d71 Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Sat, 8 Nov 2025 11:15:56 +0100 Subject: [PATCH] Merge remote-tracking branch 'AbdoDayem/master' into dev # Conflicts: # src/main/java/com/glodblock/github/common/storage/FluidCellInventoryHandler.java --- dependencies.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 3553b86e..bf54a3f1 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -34,13 +34,13 @@ * For more details, see https://docs.gradle.org/8.0.1/userguide/java_library_plugin.html#sec:java_library_configurations_graph */ dependencies { - api('com.github.GTNewHorizons:NotEnoughItems:2.8.33-GTNH:dev') - api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-739-GTNH:dev') + api('com.github.GTNewHorizons:NotEnoughItems:2.8.35-GTNH:dev') + api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-740-GTNH-pre:dev') api('curse.maven:cofh-core-69162:2388751') api('com.github.GTNewHorizons:waila:1.9.7:dev') - api("com.github.GTNewHorizons:GTNHLib:0.8.0:dev") + api("com.github.GTNewHorizons:GTNHLib:0.8.2:dev") - implementation("com.github.GTNewHorizons:WirelessCraftingTerminal:99:dev") { + implementation("com.github.GTNewHorizons:WirelessCraftingTerminal:1.12.8-pre:dev") { exclude group: 'com.github.GTNewHorizons', module: 'Applied-Energistics-2-Unofficial' }