Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
# Conflicts:
#	dependencies.gradle
  • Loading branch information
Dream-Master committed Jun 7, 2024
2 parents e975035 + 04cd7ed commit 118df9e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
Expand Down

0 comments on commit 118df9e

Please sign in to comment.