Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/feature/baubles' into dev
Browse files Browse the repository at this point in the history
# Conflicts:
#	dependencies.gradle
  • Loading branch information
Dream-Master committed May 5, 2024
2 parents 193a948 + ee0ba30 commit 7d6ab6c
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 @@ -24,7 +24,7 @@ dependencies {
transitive = false
}
implementation("com.github.GTNewHorizons:Railcraft:9.15.8:dev")

implementation("com.github.GTNewHorizons:Baubles:1.0.3:dev")
implementation("com.github.GTNewHorizons:BloodMagic:1.6.0:dev")
// for convenience of debug
runtimeOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.6.0-GTNH:dev")
Expand Down

0 comments on commit 7d6ab6c

Please sign in to comment.