Merge branch 'master' into Ethryan-Patch

dependencies.gradle

@@ -5,21 +5,31 @@ dependencies {
 	api ('com.github.GTNewHorizons:ThaumicBoots:1.4.0:dev'){transitive=false}
 
 	implementation('com.github.GTNewHorizons:Baubles-Expanded:2.0.3:dev')
-	implementation('com.github.GTNewHorizons:Tainted-Magic:7.6.13-GTNH:dev') {
-		// we don't want the old Baubles Messing stuff up so lets disable that
+	implementation('com.github.GTNewHorizons:Tainted-Magic:7.6.14:dev')
+  		// we don't want the old Baubles Messing stuff up so lets disable that
 		exclude module: "Baubles"
+	implementation('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.48:dev')
+	implementation('com.github.GTNewHorizons:ForbiddenMagic:0.8.0-GTNH:dev')
+	implementation('com.github.GTNewHorizons:twilightforest:2.7.1:dev')
+	implementation('curse.maven:travellers-gear-224440:2262113')
+	implementation('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev')
+	implementation('com.github.GTNewHorizons:NotEnoughItems:2.7.11-GTNH:dev')
+	api ('com.github.GTNewHorizons:ThaumicBoots:1.4.2:dev'){
+		exclude group: 'com.github.GTNewHorizons', module: 'WitchingGadgets'
+
 	}
 	implementation('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.31:dev') {exclude module: "Baubles" }
 	implementation('com.github.GTNewHorizons:ForbiddenMagic:0.7.0-GTNH:dev') {exclude module: "Baubles" }
 	implementation('com.github.GTNewHorizons:twilightforest:2.7.1:dev')
 	implementation('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') {transitive=false}
 	implementation('com.github.GTNewHorizons:NotEnoughItems:2.7.4-GTNH:dev')
 
-	compileOnly('com.github.GTNewHorizons:ForgeMultipart:1.5.0:dev') {transitive=false}
-	compileOnly('com.github.GTNewHorizons:Botania:1.12.2-GTNH:api') {transitive=false}
+	compileOnly('com.github.GTNewHorizons:ForgeMultipart:1.6.0:dev') {transitive=false}
+	compileOnly('com.github.GTNewHorizons:Botania:1.12.3-GTNH:api') {transitive=false}
 	compileOnly('com.github.GTNewHorizons:CraftTweaker:3.4.0:dev') {transitive=false}
 	compileOnly('com.github.GTNewHorizons:ZenScript:1.0.0-GTNH') {transitive=false}
-	compileOnly('com.github.GTNewHorizons:MagicBees:2.8.5-GTNH:api') {transitive=false}
-	compileOnly('com.github.GTNewHorizons:TinkersConstruct:1.13.0-GTNH:dev') {transitive=false}
+	compileOnly('com.github.GTNewHorizons:MagicBees:2.9.0-GTNH:api') {transitive=false}
+	compileOnly('com.github.GTNewHorizons:TinkersConstruct:1.13.2-GTNH:dev') {transitive=false}
+
 	compileOnly(deobfCurse('enviromine-230236:2269710'))
 }

src/main/resources/assets/witchinggadgets/lang/en_US.lang

@@ -1,6 +1,7 @@
 # -- Blocks --
 tile.WG_WallMirror.name=Mirror on the Wall
 tile.WG_VoidWalkway.name=Void Walkway
+tile.WG_StoneDevice.name=Stone Device
 tile.WG_StoneDevice.etherealWall.name=Ethereal Wall
 tile.WG_StoneDevice.magicTileLock.name=Magical Lock
 tile.WG_StoneDevice.obsidianPlate.name=Obsidian Plate
@@ -11,6 +12,7 @@ tile.WG_StoneDevice.sarcophagus.name=Sarcophagus
 tile.WG_StoneDevice.timeStone.name=Ageing Stone
 tile.WG_StoneDevice.blastFurnace.name=Infernal Blast Furnace
 
+tile.WG_WoodenDevice.name=Wooden Device
 tile.WG_WoodenDevice.spinningWheel.name=Spinning Wheel
 tile.WG_WoodenDevice.loom.name=Loom
 tile.WG_WoodenDevice.snowGen.name=Thaumic Snowballer
@@ -21,6 +23,7 @@ tile.WG_WoodenDevice.cuttingTable.name=Cutting Table
 tile.WG_WoodenDevice.saunaStove.name=Thaumic Sauna Stove
 tile.WG_WoodenDevice.labelLibrary.name=Aspect Library
 
+tile.WG_MetalDevice.name=Metal Device
 tile.WG_MetalDevice.essentiaPump.name=Essentia Pump
 tile.WG_MetalDevice.voidmetalBlock.name=Void metal Block
 tile.WG_MetalDevice.terraformer.name=Arcane Terrestrial Reformer
@@ -41,6 +44,7 @@ tile.WG_CustomAir.name=Glimmer of Light
 
 #
 # -- Items --
+item.WG_Material.name=Material
 item.WG_Material.threadSimple.name=Yarn
 item.WG_Material.threadGold.name=Golden Thread
 item.WG_Material.threadThaumium.name=Thaumium Thread
@@ -63,12 +67,14 @@ item.WG_Material.gemstoneDust.name=Gemstone Dust
 
 item.WG_Cluster.name=Native %1$s Cluster
 
+item.WG_Bag.name=Bag
 item.WG_Bag.normal.name=Bag of Tricks
 item.WG_Bag.void.name=Voidlinked Bag
 item.WG_Bag.ender.name=Enderlinked Bag
 item.WG_Bag.hungry.name=Hungry Bag
 
 item.WG_ThaumiumShears.name=Thaumium Shears
+item.WG_MagicFood.name=Magic Food
 item.WG_MagicFood.sweetwart.name=Sweetwart
 item.WG_MagicFood.nethercake.name=Nethercake
 item.WG_MagicFood.brainjerky.name=Brain Jerky
@@ -77,18 +83,22 @@ item.WG_AdvancedRobeLegs.name=Bewitched Leggings
 
 item.WG_AdvancedScribingTools.name=Illuminated Scribing Tools
 
+item.WG_Cloak.name=Cloak
 item.WG_Cloak.standard.name=Cloak
 item.WG_Cloak.storage.name=Cloak of Voluminous Pockets
 item.WG_Cloak.raven.name=Mantle of the Raven
 item.WG_Cloak.spectral.name=Spectral Mantle
 item.WG_Cloak.wolf.name=Wolven Cloak
 
+item.WG_Kama.name=Kama
 item.WG_Kama.standard.name=Kama
 item.WG_Kama.storage.name=Kama of Voluminous Pockets
 item.WG_Kama.raven.name=Kama of the Raven
 item.WG_Kama.spectral.name=Spectral Kama
 item.WG_Kama.wolf.name=Wolven Kama
 
+item.WG_Baubles.name=Bauble
+
 #unused
 item.WG_EliteArmorHelm.ANGELIC_0.name=Ophanic Helm
 item.WG_EliteArmorChest.ANGELIC_1.name=Seraph's Cuirass
@@ -673,4 +683,4 @@ witchinggadgets_research_page.THAUMICAPPLICATOR.1=
 
 tc.research_page.PRIMORDRIALPEARL.1=You have started to understand how primordial pearls work and found a way to replicate them for future use. By hammering the primordial pearl into 3 pieces, you found that its losing energy really quickly. Perhaps, there is a way to reform each pieces them into a pearl.
 tc.research_name.PRIMORDRIALPEARL=Primordial Pearl
-tc.research_text.PRIMORDRIALPEARL=[GT:NH] You found a magical Way of duplication;
+tc.research_text.PRIMORDRIALPEARL=[GT:NH] You found a magical Way of duplication;