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 Nov 27, 2023
2 parents 9af04bf + 70d6599 commit ce91b2b
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ dependencies {
compileOnly("com.github.GTNewHorizons:twilightforest:2.5.1:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:GalacticGregGT5:1.0.10:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:GTNH-Intergalactic:1.2.4:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:TecTech:5.3.13:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:bartworks:0.8.11:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:TecTech:5.3.14:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:bartworks:0.8.12:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Mantle:0.3.7:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.10.11-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:WitcheryExtras:1.1.14:dev") { transitive = false }
compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false }
compileOnly("curse.maven:witchery-69673:2234410") { transitive = false }
compileOnly("com.github.GTNewHorizons:GTplusplus:1.10.29:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Chisel:2.12.2-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:GTplusplus:1.10.32:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Chisel:2.12.3-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Botania:1.10.3-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:BloodMagic:1.4.3:dev") { transitive = false }
compileOnly("curse.maven:extra-utilities-225561:2264384") { transitive = false }
Expand Down

0 comments on commit ce91b2b

Please sign in to comment.