change hss-g coils, update mars quests, langs

CHANGELOG.md

@@ -24,6 +24,10 @@
 - Cupronickel coils now also need blue steel foil instead of bronze
 - Polyethylene now requires an MV chemical reactor
 - Added the Artisan Table to "knap" circuit boards and GT extruder and casting molds, replacing their crafting table recipes. @BlueBoat29 @Redeix
+#### EV changes
+(tom's changelist goes here)
+#### IV changes
+- Multi-Layer Insulated Shielding is now required for HSS-G coils.
 ### Changes
 - Added much more music to the different dimensions @Pyritie
 - Vanadium magnetite is now usable as an iron ore for TFC purposes (#2834) @Pyritie
@@ -44,7 +48,7 @@
 - Added assembler recipe for framed cubes (#2889) @Coox1e
 - Added a furnace recipe for dead grass to thatch (#2935) @Coox1e
 - Added support for Bluemap (#2922) @trisjob
-- Added mixer recipes for dye fluids (#2925) @OLOXpl
+- Added mixer and barrel recipes for dye fluids (#2925, #2938) @OLOXpl
 ### Bug fixes
 - Fixed large miners not outputting crushed ore when mining Migmatite @Pyritie
 - Fixed red granite ores never dropping poor or rich raw ores @Pyritie

config/ftbquests/quests/chapters/mars.snbt

@@ -153,7 +153,7 @@
 				type: "item"
 			}]
 			title: "{quests.space_survival.heavy_ammoniacal_water.title}"
-			x: 15.0d
+			x: 15.5d
 			y: -4.0d
 		}
 		{
@@ -174,7 +174,7 @@
 		{
 			dependencies: ["5AC5AAB9B3758E30"]
 			description: ["{quests.space_survival.soarer.desc}"]
-			guide_page: "tfc:field_guide tfc:tfg_tips/space_fauna 20"
+			guide_page: "tfc:field_guide tfc:tfg_tips/space_fauna 21"
 			icon: "wan_ancient_beasts:soarer_egg"
 			id: "2F711C064635EF2D"
 			optional: true
@@ -289,7 +289,7 @@
 			}]
 			title: "{quests.space_survival.mars_crops.title}"
 			x: 13.5d
-			y: -1.5d
+			y: -2.0d
 		}
 		{
 			dependencies: ["0967CE7F5DFF5CF6"]
@@ -460,7 +460,7 @@
 			]
 			title: "{quests.space_survival.bulbkin_pie.title}"
 			x: 13.5d
-			y: 0.0d
+			y: -0.5d
 		}
 		{
 			dependencies: ["155F421FC2F39C3C"]
@@ -479,7 +479,7 @@
 		{
 			dependencies: ["5AC5AAB9B3758E30"]
 			description: ["{quests.space_survival.surfer.desc}"]
-			guide_page: "tfc:field_guide tfc:tfg_tips/space_fauna 17"
+			guide_page: "tfc:field_guide tfc:tfg_tips/space_fauna 20"
 			id: "43EBECA48E341C47"
 			optional: true
 			shape: "heart"
@@ -578,6 +578,65 @@
 			x: 12.0d
 			y: -6.5d
 		}
+		{
+			dependencies: ["5AC5AAB9B3758E30"]
+			description: ["{quests.space_survival.charger.desc}"]
+			guide_page: "tfc:field_guide tfc:tfg_tips/space_fauna 19"
+			icon: "wan_ancient_beasts:charger_egg"
+			id: "148C2DA8FB1D6DB1"
+			optional: true
+			shape: "heart"
+			subtitle: "{quests.space_survival.charger.subtitle}"
+			tasks: [
+				{
+					icon: "wan_ancient_beasts:charger_egg"
+					id: "78EBECCA1C40A3BD"
+					observe_type: 5
+					timer: 0L
+					title: "{quests.space_survival.charger.task}"
+					to_observe: "wan_ancient_beasts:charger"
+					type: "observation"
+				}
+				{
+					id: "33ADD26F6AA89CA7"
+					item: {
+						Count: 1
+						id: "ftbfiltersystem:smart_filter"
+						tag: {
+							"ftbfiltersystem:filter": "ftbfiltersystem:item_tag(wan_ancient_beasts:charger_armors)"
+						}
+					}
+					optional_task: true
+					title: "Any #wan_ancient_beasts:charger_armors"
+					type: "item"
+				}
+			]
+			title: "{quests.space_survival.charger.title}"
+			x: 9.0d
+			y: -4.0d
+		}
+		{
+			dependencies: ["5AC5AAB9B3758E30"]
+			description: ["{quests.space_survival.snatcher.desc}"]
+			guide_page: "tfc:field_guide tfc:tfg_tips/space_fauna 17"
+			icon: "wan_ancient_beasts:snatcher_egg"
+			id: "02A7FD58F462320F"
+			optional: true
+			shape: "heart"
+			subtitle: "{quests.space_survival.snatcher.subtitle}"
+			tasks: [{
+				icon: "wan_ancient_beasts:snatcher_egg"
+				id: "4AC531B94CBA93CE"
+				observe_type: 5
+				timer: 0L
+				title: "{quests.space_survival.snatchertask}"
+				to_observe: "wan_ancient_beasts:snatcher"
+				type: "observation"
+			}]
+			title: "{quests.space_survival.snatcher.title}"
+			x: 9.0d
+			y: -3.0d
+		}
 	]
 	subtitle: ["{quests.mars.subtitle}"]
 	title: "{quests.mars}"

kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_tips/space_fauna.json

@@ -108,7 +108,7 @@
 		{
 			"type": "patchouli:text",
 			"title": "Snatcher",
-			"text": "$(thing)Snatchers$() are passive animals that like to steal your stuff! Attack them to retrieve your items, or feed them $(item)Raw Fish$() to tame them.$(br2)Once tamed, you can carry them on your back and equip them with a wooden chest. Press $(k:key.wan_ancient_beasts.special_ability)$() to throw them, and they will steal the contents of the chest and bring it to you."
+			"text": "$(thing)Snatchers$() are passive animals that like to steal your stuff! Attack them to retrieve your items, or feed them $(item)Raw Fish$() to tame them.$(br2)Once tamed, you can carry them on your back and equip them with a wooden chest. Press $(k:key.wan_ancient_beasts.special_ability)$() to throw them, and they will steal the contents of a nearby chest and bring it to you."
 		},
 		{
 			"type": "patchouli:entity",

kubejs/assets/tfg/lang/en_us.json

@@ -3928,12 +3928,20 @@
   "quests.space_survival.bulbkin_pie.desc": "Wraptor Eggs can be extracted for a Sugar substitute, while Sniffer eggs are full of Cream.\n\n&eBulbkin Pie&r is probably the pinnacle of Mars' food, boasting high amounts of four different kinds of nutrition, at the expense of being a bit of a pain to craft.\n\n&eBeer-Battered Dinosaur Nuggets&r combine the huge protein of dinosaur meat with a little grain, and can also be put in your meal bags.\n\n&9Tip:&r It's not really a food, but you can also mix together Bulbkin Chunks and Alphacene Mushroom Blocks to get Glowstone Dust.",
   "quests.space_survival.soarer.title": "Soarer",
   "quests.space_survival.soarer.subtitle": "Need a lift?",
-  "quests.space_survival.soarer.desc": "Airplanes don't work on Mars, and your space suit doesn't have a jetpack, so there's no other way to fly, right?\n\nIf you're able to find an elusive &4Soarer&r, you can tame them with raw fish and equip them with a Saddle to glide through the Martian skies with ease.\n\nThey can't fly forever though, indicated by the wing icons on the top left, and will need to land occasionally. Still, they're a great option for long-distance travel, and won't upset the sandworm either!\n\n&9Note&r: Soarers are unable to survive on particularly hot planets such as &6Venus&r.",
+  "quests.space_survival.soarer.desc": "Airplanes don't work on Mars, and your space suit doesn't have a jetpack, so there's no other way to fly, right?\n\nIf you're able to find an elusive &4Soarer&r, you can tame them with Raw Fish and equip them with a Saddle to glide through the Martian skies with ease.\n\nThey can't fly forever though, indicated by the wing icons on the top left, and will need to land occasionally. (You can feed them more Raw Fish to speed up their recovery.)\n\nStill, they're a great option for long-distance travel, and won't upset the sandworm either!\n\n&9Note&r: Soarers are unable to survive on particularly hot planets such as &6Venus&r.",
   "quests.space_survival.soarer.task": "Find a Soarer",
   "quests.space_survival.surfer.title": "Surfer",
   "quests.space_survival.surfer.subtitle": "Need a swim?",
   "quests.space_survival.surfer.desc": "&bSurfers&r can be found in the small bodies of water. You can tame them by sneaking up to them while they're lying on the shore, and feeding them raw fish. Once tamed, you can equip them with a saddle to swim quickly underwater too.\n\nThis doesn't sound particularly useful on Mars, but remember that you can transport entities around through AE2's Spatial Storage Disks, and there will be a certain oceanic icy moon in the future...\n\n&9Note&r: Surfers are unable to survive on particularly hot planets such as &6Venus&r.",
   "quests.space_survival.surfer.task": "Find a Surfer",
+  "quests.space_survival.charger.title": "Charger",
+  "quests.space_survival.charger.subtitle": "Chaaaaaaaaarge!",
+  "quests.space_survival.charger.desc": "&bChargers&r are large green herbivores that can be found roaming around. You can tame them with any Martian crop, but don't feed them &cBeetroot&r...\n\nOnce tamed, you can equip them with a saddle and Armor for some extra defence, hold down Spacebar to charge forward in a straight line (dealing extra damage and knockback), or press the &eSpecial Ability&r keybind (default &9C&r) for a headbutt attack.\n\nFeeding them more Martian crops will restore their health.\n\n&9Note&r: Surfers are unable to survive on particularly hot planets such as &6Venus&r.",
+  "quests.space_survival.charger.task": "Find a Charger",
+  "quests.space_survival.snatcher.title": "Snatcher",
+  "quests.space_survival.snatcher.subtitle": "Yoink!",
+  "quests.space_survival.snatcher.desc": "&bSnatchers&r are passive animals that like to steal your stuff! Attack them to retrieve your items, or feed them Raw Fish to tame them.\n\nOnce tamed, you can carry them on your back and equip them with a wooden chest for a little extra inventory space. Press the &eSpecial Ability&r keybind (default &9C&r) to throw them, and they will steal the contents of a nearby chest and bring it to you.\n\nFeeding them more Raw Fish will restore their health.\n\n&9Note&r: Surfers are unable to survive on particularly hot planets such as &6Venus&r.",
+  "quests.space_survival.snatcher.task": "Find a Snatcher",
   "quests.space_survival.sniffer_or_wraptor.title": "Sniffers and Wraptors",
   "quests.space_survival.sniffer_or_wraptor.subtitle": "Cow and Chicken",
   "quests.space_survival.sniffer_or_wraptor.desc": "&2Sniffers&r and &dWraptors&r can be found all over Mars and can be domesticated for meat, eggs, and most importantly, their mineral-rich tufts and feathers.\n\nThey eat any Martian crops, and you can automatically breed and feed them with the Feeding Troughs just like on Earth.",
@@ -3945,10 +3953,10 @@
   "quests.space_survival.mars_nest.task": "Either Nest",
   "quests.space_survival.mineral_rich_wool.title": "Mineral-Rich Wool",
   "quests.space_survival.mineral_rich_wool.subtitle": "Built up from years of dust storms",
-  "quests.space_survival.mineral_rich_wool.desc": "Once your Sniffers or Wraptors are familiar enough, you can shear them for mineral-rich tufts of fur or feathers.\n\nThese can be melted down in an EBF for an infinite and cheap source of Alkaline Earth Silicate, and are also a required component of &6Bio-AES Reinforced R-Polyurethane Foam.",
+  "quests.space_survival.mineral_rich_wool.desc": "Once your Sniffers or Wraptors are familiar enough, you can shear them for mineral-rich tufts of fur or feathers. (This can be automated with a Deployer holding Shears.)\n\nThese can be melted down in an EBF for an infinite and cheap source of Alkaline Earth Silicate, and are also a required component of &6Bio-AES Reinforced R-Polyurethane Foam.",
   "quests.space_survival.aes_insulation.title": "Multi-Layer Insulated Shielding",
   "quests.space_survival.aes_insulation.subtitle": "Not an ice cream sandwich",
-  "quests.space_survival.aes_insulation.desc": "This may not be used for much at the moment, but it will be a critical component of your &1IV&r rocket in the future.",
+  "quests.space_survival.aes_insulation.desc": "This is used for a few components in &1IV&r.",
   "quests.space_survival.mars_shields.title": "Advanced Shields",
   "quests.space_survival.mars_shields.subtitle": "Isn't it about time you upgraded your old metal shield?",
   "quests.space_survival.mars_shields.desc": "The &3Reinforced Shield&r deals damage back to attackers, like the Thorns enchant in normal Minecraft. Its crafting materials can be found from Crunchers and Eaters.\n\nThe &5Corrupted Shield&r randomly teleports attackers, which can be good for keeping them away from you... but it can also teleport them behind you. You can get the teeth from the Cave Endermen under the surface.\n\nThe &4Ricoshield&r absorbs an amount of damage before releasing a shockwave, hurting anything else nearby. You can find the Kinetic Core as a rare drop from the hostile golems in the Martian caves.",

kubejs/server_scripts/tfg/machines/recipes.coils.js

@@ -91,4 +91,19 @@ function registerTFGCoilRecipes(event) {
 		.outputFluids('tfg:nichromium_iodomethylate 244')
 		.duration(20 * 8)
 		.EUt(GTValues.VA[GTValues.HV])
+
+	// #endregion
+
+	// #region HSS-G
+
+	event.remove({ id : 'gtceu:assembler/coil_hssg' })
+	event.recipes.gtceu.assembler('tfg:coil_hssg')
+		.itemInputs('8x #forge:double_wires/hssg', '8x #forge:foils/tungsten_carbide', '2x #forge:insulation_t3/sheet')
+		.inputFluids('gtceu:tungsten 144')
+		.itemOutputs('gtceu:hssg_coil_block')
+		.duration(20 * 30)
+		.EUt(GTValues.VA[GTValues.IV])
+		.addMaterialInfo(true, true)
+
+	// #endregion
 }