Merge branch 'master' into dev

dependencies.gradle

@@ -37,11 +37,11 @@ dependencies {
     api('com.github.GTNewHorizons:NotEnoughItems:2.5.4-GTNH:dev')
     api('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-310-GTNH:dev')
     api('curse.maven:cofh-core-69162:2388751')
-    api('com.github.GTNewHorizons:waila:1.6.5:dev')
+    api('com.github.GTNewHorizons:waila:1.7.0:dev')
 
     implementation("com.github.GTNewHorizons:WirelessCraftingTerminal:1.11.0:dev")
 
-    compileOnly('com.github.GTNewHorizons:Baubles:1.0.3:dev')
+    compileOnly('com.github.GTNewHorizons:Baubles:1.0.4:dev')
     compileOnly('com.github.GTNewHorizons:ExtraCells2:2.5.34:dev') { transitive = false }
     compileOnly('com.github.GTNewHorizons:ForestryMC:4.8.2:dev')
     compileOnly('com.github.GTNewHorizons:EnderIO:2.6.3:dev')
@@ -51,7 +51,7 @@ dependencies {
     compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev')
     compileOnly('com.gregoriust.gregtech:gregtech_1.7.10:6.14.23:dev') { transitive = false }
     compileOnly('com.github.GTNewHorizons:OpenComputers:1.10.6-GTNH:dev') { transitive = false }
-    compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.6.1-GTNH:dev') { transitive = false }
+    compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.6.2-GTNH:dev') { transitive = false }
     compileOnly("com.github.GTNewHorizons:Hodgepodge:2.4.8:dev") { transitive = false }
 
     runtimeOnlyNonPublishable("com.github.GTNewHorizons:DuraDisplay:1.2.0:dev")