Merge branch 'master' into add-tweak-to-disable-bop-quicksand

dependencies.gradle

@@ -16,15 +16,15 @@ dependencies {
 
     compileOnly("com.gtnewhorizons.retrofuturabootstrap:RetroFuturaBootstrap:1.0.2") { transitive = false }
 
-    transformedMod("com.github.GTNewHorizons:NotEnoughItems:2.6.0-GTNH:dev") // force a more up-to-date NEI version
-    transformedModCompileOnly("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-402-GTNH")
+    transformedMod("com.github.GTNewHorizons:NotEnoughItems:2.6.1-GTNH:dev") // force a more up-to-date NEI version
+    transformedModCompileOnly("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-404-GTNH")
     transformedModCompileOnly("com.github.GTNewHorizons:Baubles:1.0.4:dev")
     // Transitive updates to make runClient17 work
-    transformedModCompileOnly("com.github.GTNewHorizons:ForgeMultipart:1.4.8:dev")
-    transformedModCompileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.46.23:dev")
-    transformedModCompileOnly("com.github.GTNewHorizons:harvestcraft:1.2.0-GTNH:dev")
+    transformedModCompileOnly("com.github.GTNewHorizons:ForgeMultipart:1.5.0:dev")
+    transformedModCompileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.48.09:dev")
+    transformedModCompileOnly("com.github.GTNewHorizons:harvestcraft:1.2.1-GTNH:dev")
     transformedModCompileOnly("com.github.GTNewHorizons:HungerOverhaul:1.1.0-GTNH:dev")
-    transformedModCompileOnly("com.github.GTNewHorizons:MrTJPCore:1.1.7:dev") // Do not update, fixed afterwards
+    transformedModCompileOnly("com.github.GTNewHorizons:MrTJPCore:1.2.0:dev") // Do not update, fixed afterwards
     transformedModCompileOnly("com.github.GTNewHorizons:Railcraft:9.15.8:dev") { exclude group: "thaumcraft", module: "Thaumcraft" }
     transformedModCompileOnly("com.github.GTNewHorizons:TinkersConstruct:1.12.2-GTNH:dev")
     transformedModCompileOnly(deobfCurse("bibliocraft-228027:2423369"))