Merge branch 'master' into dev

# Conflicts:
#	dependencies.gradle
This commit is contained in:
Martin Robertz committed 2024-06-07 12:00:30 +02:00
commit 118df9e0b1
1 file changed
+1 -1
+1 -1
View File
@@ -45,7 +45,7 @@ dependencies {
compileOnly('com.github.GTNewHorizons:Baubles:1.0.4:dev')
compileOnly('com.github.GTNewHorizons:ExtraCells2:2.5.34:dev') { transitive = false }
compileOnly('com.github.GTNewHorizons:ForestryMC:4.9.3:dev')
compileOnly('com.github.GTNewHorizons:EnderIO:2.8.4:dev')
compileOnly('com.github.GTNewHorizons:EnderIO:2.8.6:dev')
compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.48.20:dev') {
exclude group: 'com.github.GTNewHorizons', module: 'AE2FluidCraft-Rework'
}