Merge branch 'master' into dev

# Conflicts:
#	dependencies.gradle
This commit is contained in:
Martin Robertz committed 2025-05-24 22:29:43 +02:00
commit d91ad1a39b
1 file changed
+2 -2
+2 -2
View File
@@ -35,7 +35,7 @@
*/
dependencies {
api('com.github.GTNewHorizons:NotEnoughItems:2.7.45-GTNH:dev')
api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-614-GTNH-pre:dev')
api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-616-GTNH-pre:dev')
api('curse.maven:cofh-core-69162:2388751')
api('com.github.GTNewHorizons:waila:1.8.4:dev')
api("com.github.GTNewHorizons:GTNHLib:0.6.22:dev")
@@ -48,7 +48,7 @@ dependencies {
compileOnly('com.github.GTNewHorizons:ExtraCells2:2.5.35:dev') { transitive = false }
compileOnly('com.github.GTNewHorizons:ForestryMC:4.10.8:dev')
compileOnly('com.github.GTNewHorizons:EnderIO:2.9.14:dev')
compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.298:dev') {
compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.299:dev') {
exclude group: 'com.github.GTNewHorizons', module: 'AE2FluidCraft-Rework'
exclude group: 'com.github.GTNewHorizons', module: 'Applied-Energistics-2-Unofficial'
}