Skip to content

Commit

Permalink
Merge branch 'master' into cleanup-fake-essentia-items
Browse files Browse the repository at this point in the history
  • Loading branch information
Dream-Master authored Dec 21, 2024
2 parents c69c378 + 7e2ebbc commit 8d4d826
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
14 changes: 7 additions & 7 deletions dependencies.gradle
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
// Add your dependencies here

dependencies {
implementation("com.github.GTNewHorizons:NotEnoughItems:2.6.44-GTNH:dev")
implementation("com.github.GTNewHorizons:CodeChickenCore:1.3.9:dev")
implementation("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-472-GTNH:dev")
implementation("com.github.GTNewHorizons:NotEnoughItems:2.7.0-GTNH:dev")
implementation("com.github.GTNewHorizons:CodeChickenCore:1.3.10:dev")
implementation("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-503-GTNH:dev")
implementation("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev")
implementation("curse.maven:thaumcraft-nei-plugin-225095:2241913") { transitive = false }

compileOnly('com.github.GTNewHorizons:ExtraCells2:2.5.35:dev') { transitive = false }
compileOnly('com.github.GTNewHorizons:AE2FluidCraft-Rework:1.3.45-gtnh:dev') { transitive = false }
compileOnly("com.github.GTNewHorizons:waila:1.8.1:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.50.58:dev") { transitive = false }
compileOnly('com.github.GTNewHorizons:AE2FluidCraft-Rework:1.4.0-gtnh:dev') { transitive = false }
compileOnly("com.github.GTNewHorizons:waila:1.8.2:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.16:dev") { transitive = false }
compileOnly("curse.maven:computercraft-67504:2269339") { transitive = false }
compileOnly("curse.maven:cofh-lib-220333:2388748") { transitive = false }
compileOnly("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev") { transitive = false }

runtimeOnlyNonPublishable('com.github.GTNewHorizons:GTNHLib:0.5.19:dev')
runtimeOnlyNonPublishable('com.github.GTNewHorizons:GTNHLib:0.6.0:dev')
runtimeOnly("com.github.GTNewHorizons:Baubles:1.0.4:dev")
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ pluginManagement {
}

plugins {
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.29'
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.30'
}


0 comments on commit 8d4d826

Please sign in to comment.