Merge branch 'master' into fix/make-sticky-card-work-with-oredict

dependencies.gradle

@@ -1,7 +1,7 @@
 // Add your dependencies here
 
 dependencies {
-    implementation('com.github.GTNewHorizons:NotEnoughItems:2.6.33-GTNH:dev')
+    implementation('com.github.GTNewHorizons:NotEnoughItems:2.6.34-GTNH:dev')
     implementation('curse.maven:cofh-core-69162:2388751')
 
     compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta4:api')
@@ -10,9 +10,9 @@ dependencies {
     compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.39:dev') {transitive = false}
     compileOnly('com.github.GTNewHorizons:ForestryMC:4.9.10:dev') {transitive = false} // required to compile CraftingV2Tests.java now
     compileOnly('com.github.GTNewHorizons:ForgeMultipart:1.5.0:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.49.47:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.49.52:dev') {transitive = false}
     compileOnly('com.github.GTNewHorizons:Jabba:1.4.6:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:inventory-tweaks:1.6.2:api') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:inventory-tweaks:1.7.0:api') {transitive = false}
     compileOnly('com.github.GTNewHorizons:OpenComputers:1.10.22-GTNH:api') {transitive = false}
     compileOnly('com.github.GTNewHorizons:waila:1.8.1:dev') {transitive = false}
     compileOnly('com.github.GTNewHorizons:Railcraft:9.15.12:api') {transitive = false}
@@ -34,14 +34,14 @@ dependencies {
     functionalTestImplementation('org.junit.platform:junit-platform-engine')
     functionalTestImplementation('org.junit.platform:junit-platform-launcher')
     functionalTestImplementation('org.junit.platform:junit-platform-reporting')
-    functionalTestImplementation('com.github.GTNewHorizons:GT5-Unofficial:5.09.49.47:dev') {
+    functionalTestImplementation('com.github.GTNewHorizons:GT5-Unofficial:5.09.49.52:dev') {
         exclude module: "Applied-Energistics-2-Unofficial"
     }
 
     runtimeOnlyNonPublishable("com.github.GTNewHorizons:DuraDisplay:1.3.3:dev")
-    runtimeOnlyNonPublishable('com.github.GTNewHorizons:Baubles-Expanded:2.0.2:dev')
-    runtimeOnlyNonPublishable('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') {transitive = false }
+    runtimeOnlyNonPublishable('com.github.GTNewHorizons:Baubles:1.0.4:dev')
+    runtimeOnlyNonPublishable('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev')
     runtimeOnlyNonPublishable('com.github.GTNewHorizons:ThaumicEnergistics:1.6.22-GTNH:dev') { transitive = false }
-    runtimeOnlyNonPublishable('com.github.GTNewHorizons:AE2FluidCraft-Rework:1.3.33-gtnh:dev') { transitive = false }
+    runtimeOnlyNonPublishable('com.github.GTNewHorizons:AE2FluidCraft-Rework:1.3.34-gtnh:dev') { transitive = false }
     runtimeOnlyNonPublishable("com.github.GTNewHorizons:BloodMagic:1.6.2")  { transitive = false }
 }