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 Dec 23, 2024
2 parents a0cd405 + e73d173 commit b054b24
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 @@ -6,7 +6,7 @@ dependencies {
api('com.github.GTNewHorizons:Thaumic_Exploration:1.3.7-GTNH:dev'){
exclude group: 'com.github.GTNewHorizons', module: 'ThaumicBoots'
}
api('com.github.GTNewHorizons:Electro-Magic-Tools:1.6.0:dev'){
api('com.github.GTNewHorizons:Electro-Magic-Tools:1.6.1:dev'){
exclude group: 'com.github.GTNewHorizons', module: 'ThaumicBoots'
}
api('com.github.GTNewHorizons:Tainted-Magic:7.6.13-GTNH'){
Expand Down

0 comments on commit b054b24

Please sign in to comment.