Merge pull request #531 from StarT-Dev-Team/HF3

trulyno · web-flow · commit 26135f37ebad · 2026-05-31T15:24:01.000+03:00
HF3
diff --git a/config/fancymenu/customization/title_screen_layout_alpha.txt b/config/fancymenu/customization/title_screen_layout_alpha.txt
@@ -368,7 +368,7 @@ element {
 
 element {
   interactable = true
-  source = Theta 1 Hotfix 2
+  source = Theta 1 Hotfix 3
   source_mode = direct
   shadow = true
   scale = 1.0
diff --git a/config/fancymenu/customization/title_screen_layout_beta_1.txt b/config/fancymenu/customization/title_screen_layout_beta_1.txt
@@ -368,7 +368,7 @@ element {
 
 element {
   interactable = true
-  source = Theta 1 Hotfix 2
+  source = Theta 1 Hotfix 3
   source_mode = direct
   shadow = true
   scale = 1.0
diff --git a/config/fancymenu/customization/title_screen_layout_beta_10.txt b/config/fancymenu/customization/title_screen_layout_beta_10.txt
@@ -368,7 +368,7 @@ element {
 
 element {
   interactable = true
-  source = Theta 1 Hotfix 2
+  source = Theta 1 Hotfix 3
   source_mode = direct
   shadow = true
   scale = 1.0
diff --git a/config/fancymenu/customization/title_screen_layout_beta_2.txt b/config/fancymenu/customization/title_screen_layout_beta_2.txt
@@ -368,7 +368,7 @@ element {
 
 element {
   interactable = true
-  source = Theta 1 Hotfix 2
+  source = Theta 1 Hotfix 3
   source_mode = direct
   shadow = true
   scale = 1.0
diff --git a/config/fancymenu/customization/title_screen_layout_beta_3.txt b/config/fancymenu/customization/title_screen_layout_beta_3.txt
@@ -368,7 +368,7 @@ element {
 
 element {
   interactable = true
-  source = Theta 1 Hotfix 2
+  source = Theta 1 Hotfix 3
   source_mode = direct
   shadow = true
   scale = 1.0
diff --git a/config/fancymenu/customization/title_screen_layout_beta_4.txt b/config/fancymenu/customization/title_screen_layout_beta_4.txt
@@ -368,7 +368,7 @@ element {
 
 element {
   interactable = true
-  source = Theta 1 Hotfix 2
+  source = Theta 1 Hotfix 3
   source_mode = direct
   shadow = true
   scale = 1.0
diff --git a/config/fancymenu/customization/title_screen_layout_beta_5.txt b/config/fancymenu/customization/title_screen_layout_beta_5.txt
@@ -368,7 +368,7 @@ element {
 
 element {
   interactable = true
-  source = Theta 1 Hotfix 2
+  source = Theta 1 Hotfix 3
   source_mode = direct
   shadow = true
   scale = 1.0
diff --git a/config/fancymenu/customization/title_screen_layout_beta_6.txt b/config/fancymenu/customization/title_screen_layout_beta_6.txt
@@ -368,7 +368,7 @@ element {
 
 element {
   interactable = true
-  source = Theta 1 Hotfix 2
+  source = Theta 1 Hotfix 3
   source_mode = direct
   shadow = true
   scale = 1.0
diff --git a/config/fancymenu/customization/title_screen_layout_beta_7.txt b/config/fancymenu/customization/title_screen_layout_beta_7.txt
@@ -368,7 +368,7 @@ element {
 
 element {
   interactable = true
-  source = Theta 1 Hotfix 2
+  source = Theta 1 Hotfix 3
   source_mode = direct
   shadow = true
   scale = 1.0
diff --git a/config/fancymenu/customization/title_screen_layout_beta_8.txt b/config/fancymenu/customization/title_screen_layout_beta_8.txt
@@ -368,7 +368,7 @@ element {
 
 element {
   interactable = true
-  source = Theta 1 Hotfix 2
+  source = Theta 1 Hotfix 3
   source_mode = direct
   shadow = true
   scale = 1.0
diff --git a/config/fancymenu/customization/title_screen_layout_beta_9.txt b/config/fancymenu/customization/title_screen_layout_beta_9.txt
@@ -368,7 +368,7 @@ element {
 
 element {
   interactable = true
-  source = Theta 1 Hotfix 2
+  source = Theta 1 Hotfix 3
   source_mode = direct
   shadow = true
   scale = 1.0
diff --git a/config/fancymenu/customization/title_screen_layout_delta.txt b/config/fancymenu/customization/title_screen_layout_delta.txt
@@ -368,7 +368,7 @@ element {
 
 element {
   interactable = true
-  source = Theta 1 Hotfix 2
+  source = Theta 1 Hotfix 3
   source_mode = direct
   shadow = true
   scale = 1.0
diff --git a/config/fancymenu/customization/title_screen_layout_epsilon.txt b/config/fancymenu/customization/title_screen_layout_epsilon.txt
@@ -368,7 +368,7 @@ element {
 
 element {
   interactable = true
-  source = Theta 1 Hotfix 2
+  source = Theta 1 Hotfix 3
   source_mode = direct
   shadow = true
   scale = 1.0
diff --git a/config/fancymenu/customization/title_screen_layout_eta.txt b/config/fancymenu/customization/title_screen_layout_eta.txt
@@ -368,7 +368,7 @@ element {
 
 element {
   interactable = true
-  source = Theta 1 Hotfix 2
+  source = Theta 1 Hotfix 3
   source_mode = direct
   shadow = true
   scale = 1.0
diff --git a/config/fancymenu/customization/title_screen_layout_gamma.txt b/config/fancymenu/customization/title_screen_layout_gamma.txt
@@ -368,7 +368,7 @@ element {
 
 element {
   interactable = true
-  source = Theta 1 Hotfix 2
+  source = Theta 1 Hotfix 3
   source_mode = direct
   shadow = true
   scale = 1.0
diff --git a/config/fancymenu/customization/title_screen_layout_zeta.txt b/config/fancymenu/customization/title_screen_layout_zeta.txt
@@ -368,7 +368,7 @@ element {
 
 element {
   interactable = true
-  source = Theta 1 Hotfix 2
+  source = Theta 1 Hotfix 3
   source_mode = direct
   shadow = true
   scale = 1.0
diff --git a/config/ftbquests/quests/chapters/mechanics.snbt b/config/ftbquests/quests/chapters/mechanics.snbt
@@ -10,6 +10,7 @@
 	quests: [
 		{
 			dependencies: ["390CB178FC2D2CCC"]
+			dependency_requirement: "one_completed"
 			description: ["{ftbquests.mechanics.multiblocks.description}"]
 			icon: "gtceu:electric_blast_furnace"
 			id: "73D5AA58DE5B72AA"
@@ -23,6 +24,7 @@
 		}
 		{
 			dependencies: ["390CB178FC2D2CCC"]
+			dependency_requirement: "one_completed"
 			description: ["{ftbquests.mechanics.wall_sharing.description}"]
 			icon: "gtceu:multi_smelter"
 			id: "48374090EA89E869"
@@ -36,6 +38,7 @@
 		}
 		{
 			dependencies: ["5B70B63D4157594F"]
+			dependency_requirement: "one_completed"
 			description: ["{ftbquests.mechanics.distinct_buses.description}"]
 			icon: "gtceu:mv_input_bus"
 			id: "2757CDEC1D8F5CCE"
@@ -50,6 +53,7 @@
 		}
 		{
 			dependencies: ["56BA79287C4DBE52"]
+			dependency_requirement: "one_completed"
 			description: ["{ftbquests.mechanics.overclocking.description}"]
 			icon: "gtceu:lv_energy_input_hatch"
 			id: "34EDF98BDC245F77"
@@ -63,6 +67,7 @@
 		}
 		{
 			dependencies: ["5B70B63D4157594F"]
+			dependency_requirement: "one_completed"
 			description: ["{ftbquests.mechanics.perfect_overclocking.description}"]
 			icon: "gtceu:ev_energy_input_hatch"
 			id: "0C78BD4A7A0B98E4"
@@ -76,6 +81,7 @@
 		}
 		{
 			dependencies: ["1820787D031EAB15"]
+			dependency_requirement: "one_completed"
 			description: ["{ftbquests.mechanics.large_chemical_reactor_skips.description}"]
 			icon: "gtceu:large_chemical_reactor"
 			id: "0F4C5DF2922568B2"
@@ -92,6 +98,7 @@
 				"1820787D031EAB15"
 				"5B70B63D4157594F"
 			]
+			dependency_requirement: "one_completed"
 			description: ["{ftbquests.mechanics.lockable_fluid_hatches.description}"]
 			icon: "gtceu:mv_input_hatch"
 			id: "4A4275186719AD8D"
@@ -105,6 +112,7 @@
 		}
 		{
 			dependencies: ["3AF688ADC18E580C"]
+			dependency_requirement: "one_completed"
 			description: ["{ftbquests.mechanics.superconductors.description}"]
 			icon: "gtceu:soul_infused_hex_wire"
 			id: "18080B4F89AD24D2"
@@ -118,6 +126,7 @@
 		}
 		{
 			dependencies: ["70875F86587758D7"]
+			dependency_requirement: "one_completed"
 			description: ["{ftbquests.mechanics.cheaper_circuits.description}"]
 			icon: "gtceu:basic_integrated_circuit"
 			id: "6F7EE9A1BC718801"
@@ -142,6 +151,7 @@
 		}
 		{
 			dependencies: ["0742EF8F43044102"]
+			dependency_requirement: "one_completed"
 			description: ["{ftbquests.mechanics.ghost_circuits.description}"]
 			icon: "kubejs:ulv_universal_circuit"
 			id: "2A608D87158DF4CB"
@@ -155,6 +165,7 @@
 		}
 		{
 			dependencies: ["2D1184752D7ACA66"]
+			dependency_requirement: "one_completed"
 			description: ["{ftbquests.mechanics.machine_modes.description}"]
 			icon: "gtceu:lv_robot_arm"
 			id: "76CD29559C341985"
@@ -168,6 +179,7 @@
 		}
 		{
 			dependencies: ["0A6534BD104A2B08"]
+			dependency_requirement: "one_completed"
 			description: [
 				"{ftbquests.mechanics.parallels.description.1}"
 				"{@pagebreak}"
@@ -187,6 +199,7 @@
 		}
 		{
 			dependencies: ["141911C5DD68CD2A"]
+			dependency_requirement: "one_completed"
 			description: ["{ftbquests.mechanics.wireless_power.description}"]
 			icon: "start_core:uhv_64a_dream_link_energy_hatch"
 			id: "2F63F0E239737E38"
@@ -204,6 +217,7 @@
 				"09C1739F3FE3298F"
 				"2027351D670E4CC6"
 			]
+			dependency_requirement: "one_completed"
 			description: [
 				"{ftbquests.mechanics.throughput_boosting.description.1}"
 				"{@pagebreak}"
@@ -221,6 +235,7 @@
 		}
 		{
 			dependencies: ["13118B7518370623"]
+			dependency_requirement: "one_completed"
 			description: [
 				"{ftbquests.mechanics.bulking.description.1}"
 				"{@pagebreak}"
@@ -238,6 +253,7 @@
 		}
 		{
 			dependencies: ["076F21506A7C19D5"]
+			dependency_requirement: "one_completed"
 			description: [
 				"{ftbquests.mechanics.threading.description.1}"
 				"{@pagebreak}"
@@ -283,6 +299,7 @@
 		}
 		{
 			dependencies: ["027C5CE3CFCB5649"]
+			dependency_requirement: "one_completed"
 			description: ["{ftbquests.mechanics.layered_inputs.description}"]
 			icon: "gtceu:large_rotor_machine"
 			id: "6AEB17C2D2AF5344"
diff --git a/kubejs/assets/kubejs/lang/en_us.json b/kubejs/assets/kubejs/lang/en_us.json
@@ -768,7 +768,7 @@
     "item.kubejs.borealic_neutron_reflector" : "Borealic Neutron Reflector",
     "item.kubejs.borealic_neutron_reflector.tooltip" : "§7The beginnings of stellar substances.",
     "item.kubejs.dragonic_neutron_reflector" : "Dragonic Neutron Reflector",
-    "item.kubejs.dragonic_neutron_reflector.tooltip" : "§7Ultized for the most intense of plasmas.",
+    "item.kubejs.dragonic_neutron_reflector.tooltip" : "§7Utilized for the most intense of plasmas.",
     "item.kubejs.prismalic_neutron_reflector" : "Prismalic Neutron Reflector",
     "item.kubejs.prismalic_neutron_reflector.tooltip" : "§7Prismalic Ascension: Initiated",
 
diff --git a/kubejs/server_scripts/common/systems/draco_infusion.js b/kubejs/server_scripts/common/systems/draco_infusion.js
@@ -19,11 +19,8 @@ ServerEvents.recipes(event => {
     event.remove({id: 'minecraft:popped_chorus_fruit'});
     event.replaceInput({ input: 'minecraft:popped_chorus_fruit' },'minecraft:popped_chorus_fruit','minecraft:chorus_fruit');
     event.recipes.gtceu.assembly_line(id('true_absolute_chorus'))
-        .itemInputs('kubejs:voidic_core', '64x minecraft:popped_chorus_fruit', '64x minecraft:popped_chorus_fruit', '64x minecraft:popped_chorus_fruit', 
-        '64x minecraft:popped_chorus_fruit', '64x minecraft:popped_chorus_fruit', '64x minecraft:popped_chorus_fruit', '64x minecraft:popped_chorus_fruit', 
-        '64x minecraft:popped_chorus_fruit', '64x minecraft:popped_chorus_fruit', '64x minecraft:popped_chorus_fruit', '64x minecraft:popped_chorus_fruit', 
-        '64x minecraft:popped_chorus_fruit', '64x minecraft:popped_chorus_fruit', '64x minecraft:popped_chorus_fruit', '64x minecraft:popped_chorus_fruit')
-        .inputFluids('gtceu:dragon_breath 1500')
+        .itemInputs('kubejs:voidic_core', '1024x minecraft:popped_chorus_fruit')
+        .inputFluids('gtceu:ender_air 5000000')
         .itemOutputs('kubejs:true_absolute_chorus')
         .duration(12000)
         .stationResearch(
diff --git a/kubejs/server_scripts/default/additions/progression/early_game/sieving.js b/kubejs/server_scripts/default/additions/progression/early_game/sieving.js
@@ -257,6 +257,7 @@ global.not_hardmode(() => {
             // Waterlogged Dust Sieving
             SievingRecipeHandler
                 .input(csi.dust)
+                .waterlogged(true)
                 .add('xycraft_world:xychorium_gem_blue', 0.75)
                 .add('xycraft_world:xychorium_gem_red', 0.75)
                 .add('xycraft_world:xychorium_gem_green', 0.75)
diff --git a/kubejs/server_scripts/hardmode/progression/pre_lv/ulv.js b/kubejs/server_scripts/hardmode/progression/pre_lv/ulv.js
@@ -287,7 +287,7 @@ ServerEvents.recipes(event => {
         event.shapeless(
           Item.of(`kubejs:ulv_${component}`),
           [`gtceu:ulv_${component}`]
-        ).id(id(`old_to_new_HM_ulv_${component}`));
+        ).id(id(`old_to_new_hm_ulv_${component}`));
     });
 
     //ulv removals
diff --git a/kubejs/server_scripts/utils/id_loader.js b/kubejs/server_scripts/utils/id_loader.js
@@ -1,3 +1,3 @@
 // priority: 1000000
 
-global.id = (id) => `start:${id}`;
+global.id = (id) => `start:${id.toLowerCase()}`;
