Merge branch 'Theta-1-Testing' of https://github.com/StarT-Dev-Team/Star-Technology into Theta-1-Testing

Author: KillLaAqua

config/ftbquests/quests/chapters/draconic_age_part_1.snbt

@@ -1886,7 +1886,7 @@
 							}
 							{
 								Count: 1b
-								id: "gtceu:fermenting_arboreal_rejuvination_monstronsity"
+								id: "gtceu:fermenting_arboreal_rejuvenation_monstrosity"
 							}
 							{
 								Count: 1b

config/ftbquests/quests/chapters/early_game.snbt

@@ -42,7 +42,7 @@
 		{
 			id: "73A12DB8625E666F"
 			linked_quest: "27F5DD0860E43CFF"
-			x: 4.0d
+			x: 0.0d
 			y: 6.5d
 		}
 	]
@@ -1961,7 +1961,7 @@
 				}
 			]
 			title: "{ftbquests.early_game.steam_alloy_smelter.title}"
-			x: 4.0d
+			x: 2.0d
 			y: 4.5d
 		}
 		{
@@ -1976,7 +1976,7 @@
 				title: "{ftbquests.early_game.steam.title}"
 				type: "checkmark"
 			}]
-			x: 2.0d
+			x: 0.0d
 			y: 4.5d
 		}
 		{
@@ -2034,7 +2034,7 @@
 				}
 			]
 			title: "{ftbquests.early_game.large_steam_machines.title}"
-			x: 2.0d
+			x: -2.0d
 			y: 6.5d
 		}
 		{
@@ -2102,7 +2102,7 @@
 				}
 			]
 			title: "{ftbquests.early_game.steam_boilers.title}"
-			x: 0.0d
+			x: -2.0d
 			y: 4.5d
 		}
 		{
@@ -2120,7 +2120,7 @@
 				type: "item"
 			}]
 			x: 4.0d
-			y: 2.5d
+			y: 4.5d
 		}
 		{
 			dependencies: ["53A9BA26813A1141"]
@@ -2188,7 +2188,7 @@
 				item: "gtceu:kiln"
 				type: "item"
 			}]
-			x: -2.0d
+			x: 2.0d
 			y: 6.5d
 		}
 		{
@@ -2210,7 +2210,7 @@
 				item: "gtceu:steam_kiln"
 				type: "item"
 			}]
-			x: 0.0d
+			x: 4.0d
 			y: 6.5d
 		}
 		{
@@ -2372,7 +2372,7 @@
 			y: -3.5d
 		}
 		{
-			dependencies: ["10126B9D6EC90F59"]
+			dependencies: ["46E41B05B9F6FA82"]
 			description: ["{ftbquests.early_game.ulv_components.description}"]
 			id: "366227E714CDA617"
 			tasks: [{
@@ -2401,8 +2401,8 @@
 				type: "item"
 			}]
 			title: "{ftbquests.early_game.ulv_components.title}"
-			x: -4.0d
-			y: 4.5d
+			x: 4.0d
+			y: 2.5d
 		}
 		{
 			dependencies: ["10126B9D6EC90F59"]
@@ -2419,7 +2419,7 @@
 				title: "{ftbquests.early_game.steam_age_path.title}"
 				type: "checkmark"
 			}]
-			x: -2.0d
+			x: -4.0d
 			y: 4.5d
 		}
 		{

config/ftbquests/quests/chapters/line_of_progression.snbt

@@ -1471,7 +1471,7 @@
 							}
 							{
 								Count: 1b
-								id: "gtceu:fermenting_arboreal_rejuvination_monstronsity"
+								id: "gtceu:fermenting_arboreal_rejuvenation_monstrosity"
 							}
 							{
 								Count: 1b

config/ftbquests/quests/chapters/resource_production.snbt

@@ -1860,7 +1860,7 @@
 				"081AEA0310BAA2B6"
 			]
 			dependency_requirement: "one_completed"
-			description: ["{ftbquests.resource_production.hydro_cracking.description1}"]
+			description: ["{ftbquests.resource_production.hydro_cracking.description}"]
 			id: "3BD1916DC5208255"
 			optional: true
 			tasks: [{

config/ftbquests/quests/chapters/the_stars_await_greatness.snbt

@@ -961,5 +961,5 @@
 			y: 3.0d
 		}
 	]
-	title: "The Stars Await Greatness"
+	title: "{ftbquests.dsg.title}"
 }

kubejs/assets/ftbquestlocalizer/lang/en_us.json

@@ -339,7 +339,7 @@
     "ftbquests.csg.coordinate_crystal_usage.item_title": "Absorb the Crystal's Power",
     "ftbquests.csg.coordinate_crystal_usage.title": "§o§9Absorbing Hidden Knowledge",
     "ftbquests.csg.crude_stargate_rod.description": "Untempered and Unstable. Soon it will be ready to do something unimaginable.",
-    "ftbquests.csg.dimensional_finder.description": "A machine that sends signals into deep space in the hopes of inscribing the location of found dimensions and cosmic bodies onto coordinate crystals.",
+    "ftbquests.csg.dimensional_finder.description": "A machine that sends signals into deep space in the hopes of inscribing the location of found dimensions and cosmic bodies onto coordinate crystals.\n\nThe Dimensional Finder uses §3CWU§r much like the Research Station, also getting a discount for overclocks.",
     "ftbquests.csg.emergency_rescue.description": "How did you break /spawn AND /home????????",
     "ftbquests.csg.emergency_rescue.item_title": "To the overworld",
     "ftbquests.csg.emergency_rescue.title": "So You Got Stuck",
@@ -501,7 +501,7 @@
     "ftbquests.dsg.draconic_stargate.title": "DSG",
     "ftbquests.dsg.dsg_gate_line.title": "Gate 3 Line",
     "ftbquests.dsg.loaf.title": "LOAF",
-    "ftbquests.dsg.ending.description": "Having witnessed the magnificent Draconic Stargat, you have been illuminated.",
+    "ftbquests.dsg.ending.description": "Having witnessed the magnificent Draconic Stargate, you have been illuminated.",
     "ftbquests.dsg.poomba.description": "A legendary feline, combining the heat and cold from two dimensions. But differently?",
     "ftbquests.dsg.specialized_helix_t2.description": "Tier 2 Specialized Helixes",
     "ftbquests.dsg.title": "The Stars Await Greatness",
@@ -728,7 +728,7 @@
     "ftbquests.futuristic_mechanisms.raw_crystal_chip_parts.description": "This can be used for looping your crystal chips, so you don't need a ton of emeralds.",
     "ftbquests.futuristic_mechanisms.redstone_variadic_interface.description": "A way to monitor your multiblocks with §credstone§r outputs allowing for complex systems.\n\n§7Currently this isn't needed till UEV",
     "ftbquests.futuristic_mechanisms.reinforced_epoxy_resin_plate.description": "Solidify your Epoxy in a more durable manner.",
-    "ftbquests.futuristic_mechanisms.research_station.description": "Scanner are not powerful enough to research high tier technologies. This multiblock can research almost anything!",
+    "ftbquests.futuristic_mechanisms.research_station.description": "Scanner are not powerful enough to research high tier technologies. This multiblock can research almost anything!\n\nFor each overclock you get a 2.5% (additive) discount on the §3CWU§r requirement for your research.",
     "ftbquests.futuristic_mechanisms.rhodium_plated_palladium_ingot.description": "The core material for §dLuV§r.",
     "ftbquests.futuristic_mechanisms.ruridit_ingot.description": "An alloy made out of precious metals.",
     "ftbquests.futuristic_mechanisms.super_abs.description": "A Boosted ABS.....\n\n\"Woo, imabouttomakeanameformyselfhere\"\n\nOh... only 1 energy hatch, oh well its still cracked.",
@@ -1132,8 +1132,8 @@
     "ftbquests.pl.water.title": "Water",
     "ftbquests.pl.wood_tar.title": "Wood Tar",
     "ftbquests.pl.wood_vinegar.title": "Wood Vinegar",
-    "ftbquests.pl.zapolgium.description": "A material gotten by processing Abydos Zapolite-rich Magma",
-    "ftbquests.pl.zirconium.description": "An element with excellent resistance against a number of factors. Made by processing Abydos Titanite-rich Magma",
+    "ftbquests.pl.zapolgium.description": "A material gotten by processing zapolite.",
+    "ftbquests.pl.zirconium.description": "An element with excellent resistance against a number of factors. Made by processing titanite.",
     "ftbquests.pl1.title": "Processing Lines - 1",
     "ftbquests.pl2.title": "Processing Lines - 2",
     "ftbquests.pl3.title": "Processing Lines - 3",

kubejs/assets/gtceu/lang/en_us.json

@@ -765,7 +765,7 @@
     "material.gtceu.reactive_dense_residue": "Reactivity Dense Residue",
     "material.gtceu.rare_earth_sulfate_solution": "Rare Earth Sulfate Solution",
     "material.gtceu.rare_earth_leach_mixture": "Rare Earth Leach Mixture",
-    "material.gtceu.rare_earth_concentrate": "Rare Eath Concentrate",
+    "material.gtceu.rare_earth_concentrate": "Rare Earth Concentrate",
     "material.gtceu.xenotime": "Xenotime",
     "material.gtceu.kitkaite": "Kitkaite",
     "material.gtceu.abydos_magma_slag": "Abydos Magma Slag",
@@ -1209,9 +1209,9 @@
     "block.gtceu.electro_magnetic_material_ripper.tooltip.0": "§3§lMulti-threaded Energizer",
     "block.gtceu.electro_magnetic_material_ripper.tooltip.1": "§7A violent yet impossibly controlled field-flux engine that tears molecular alignments apart and reconfigures them under overwhelming authority.",
 
-    "block.gtceu.fermenting_arboreal_rejuvination_monstronsity": "Fermenting Arboreal Rejuvination Monstronsity [FARM]",
-    "block.gtceu.fermenting_arboreal_rejuvination_monstronsity.tooltip.0": "§3§lMulti-threaded Farm",
-    "block.gtceu.fermenting_arboreal_rejuvination_monstronsity.tooltip.1": "§7A biomaterial megastructure that coerces flora, fauna, and microbial substrates into perpetual metabolic overdrive, yielding resources at an unnatural ecological cadence.",
+    "block.gtceu.fermenting_arboreal_rejuvenation_monstrosity": "Fermenting Arboreal Rejuvenation Monstrosity [FARM]",
+    "block.gtceu.fermenting_arboreal_rejuvenation_monstrosity.tooltip.0": "§3§lMulti-threaded Farm",
+    "block.gtceu.fermenting_arboreal_rejuvenation_monstrosity.tooltip.1": "§7A biomaterial megastructure that coerces flora, fauna, and microbial substrates into perpetual metabolic overdrive, yielding resources at an unnatural ecological cadence.",
 
     "block.gtceu.gravitational_compression_chamber": "Gravitational Compression Chamber [GCC]",
     "block.gtceu.gravitational_compression_chamber.tooltip.0": "§3§lMulti-threaded Compressor",

kubejs/assets/gtceu/lang/ja_jp.json

@@ -1307,11 +1307,11 @@
     "block.gtceu.electro_magnetic_material_ripper.tooltip.2": "§8-----------------------------------",
     "block.gtceu.electro_magnetic_material_ripper.tooltip.3": "§7使用可能なレシピの種類: §f磁化装置§7、§f電磁分離機§7、§f電解槽",
 
-    "block.gtceu.fermenting_arboreal_rejuvination_monstronsity": "発酵樹木再生統合装置",
-    "block.gtceu.fermenting_arboreal_rejuvination_monstronsity.tooltip.0": "§3§lマルチスレッド式植物栽培機",
-    "block.gtceu.fermenting_arboreal_rejuvination_monstronsity.tooltip.1": "§7動植物や微生物の基質を永続的に代謝を活発化させ、人工的に植物資源を大量に生み出す、バイオマテリアル巨大装置。",
-    "block.gtceu.fermenting_arboreal_rejuvination_monstronsity.tooltip.2": "§8-----------------------------------",
-    "block.gtceu.fermenting_arboreal_rejuvination_monstronsity.tooltip.3": "§7使用可能なレシピの種類: §f水耕栽培ガーデン§7、§f堆肥工場§7、§f工業用漁獲機§7、§f樹木温室",
+    "block.gtceu.fermenting_arboreal_rejuvenation_monstrosity": "発酵樹木再生統合装置",
+    "block.gtceu.fermenting_arboreal_rejuvenation_monstrosity.tooltip.0": "§3§lマルチスレッド式植物栽培機",
+    "block.gtceu.fermenting_arboreal_rejuvenation_monstrosity.tooltip.1": "§7動植物や微生物の基質を永続的に代謝を活発化させ、人工的に植物資源を大量に生み出す、バイオマテリアル巨大装置。",
+    "block.gtceu.fermenting_arboreal_rejuvenation_monstrosity.tooltip.2": "§8-----------------------------------",
+    "block.gtceu.fermenting_arboreal_rejuvenation_monstrosity.tooltip.3": "§7使用可能なレシピの種類: §f水耕栽培ガーデン§7、§f堆肥工場§7、§f工業用漁獲機§7、§f樹木温室",
 
     "block.gtceu.gravitational_compression_chamber": "重力型素材圧縮室",
     "block.gtceu.gravitational_compression_chamber.tooltip.0": "§3§lマルチスレッド式圧縮機",

kubejs/assets/gtceu/lang/ko_kr.json

@@ -1292,11 +1292,11 @@
     "block.gtceu.electro_magnetic_material_ripper.tooltip.2": "§8-----------------------------------",
     "block.gtceu.electro_magnetic_material_ripper.tooltip.3": "§7가능한 레시피 타입: §f폴라라이저§7, §f전기 분해기§7, §f전해조",
 
-    "block.gtceu.fermenting_arboreal_rejuvination_monstronsity": "수목 재생 유기체 발효 처리 시설",
-    "block.gtceu.fermenting_arboreal_rejuvination_monstronsity.tooltip.0": "§3§l멀티 스레드 농장",
-    "block.gtceu.fermenting_arboreal_rejuvination_monstronsity.tooltip.1": "§7생물학적 거대 구조체로, 식물, 동물이나 미생물 기질을 강제적으로 지속적인 대사 과잉 상태로 만들어 비정상적인 생태학적 리듬으로 자원을 생산하게 합니다.",
-    "block.gtceu.fermenting_arboreal_rejuvination_monstronsity.tooltip.2": "§8-----------------------------------",
-    "block.gtceu.fermenting_arboreal_rejuvination_monstronsity.tooltip.3": "§7가능한 레시피 타입: §f수경 온실§7, §f비료화 공장§7, §f공업용 어망§7, §f나무 온실",
+    "block.gtceu.fermenting_arboreal_rejuvenation_monstrosity": "수목 재생 유기체 발효 처리 시설",
+    "block.gtceu.fermenting_arboreal_rejuvenation_monstrosity.tooltip.0": "§3§l멀티 스레드 농장",
+    "block.gtceu.fermenting_arboreal_rejuvenation_monstrosity.tooltip.1": "§7생물학적 거대 구조체로, 식물, 동물이나 미생물 기질을 강제적으로 지속적인 대사 과잉 상태로 만들어 비정상적인 생태학적 리듬으로 자원을 생산하게 합니다.",
+    "block.gtceu.fermenting_arboreal_rejuvenation_monstrosity.tooltip.2": "§8-----------------------------------",
+    "block.gtceu.fermenting_arboreal_rejuvenation_monstrosity.tooltip.3": "§7가능한 레시피 타입: §f수경 온실§7, §f비료화 공장§7, §f공업용 어망§7, §f나무 온실",
 
     "block.gtceu.gravitational_compression_chamber": "과중력 압축 챔버",
     "block.gtceu.gravitational_compression_chamber.tooltip.0": "§3§l멀티 스레드 압축기",