Merge branch 'main' into recipe

oly2o6 · web-flow · commit 23eada662a15 · 2025-10-15T18:34:24.000+01:00
diff --git a/config/ftbquests/quests/chapters/basic_tools.snbt b/config/ftbquests/quests/chapters/basic_tools.snbt
@@ -1175,7 +1175,7 @@
 			}]
 			tasks: [{
 				id: "27D9C16A4E2CD5B5"
-				item: { components: { "draconicevolution:config_properties": [[ { : "DECIMAL" }, { formatter: "percent_1", max: 1.0d, min: 0.0d, name: "mining_speed", show_on_hud: 1b, value: 1.0d } ]], "draconicevolution:module_entities": [ ], "draconicevolution:provider_identity": [I; -1431768927, 1566720680, -1405879401, 443085220 ] }, count: 1, id: "draconicevolution:chaotic_pickaxe" }
+				item: { count: 1, id: "draconicevolution:chaotic_pickaxe" }
 				type: "item"
 			}]
 			x: 0.5d
diff --git a/config/ftbquests/quests/lang/en_us/chapters/draconic_evolution.snbt b/config/ftbquests/quests/lang/en_us/chapters/draconic_evolution.snbt
@@ -58,7 +58,7 @@
 	quest.1A53B6544782442E.title: "Wyvern Shield Control Module"
 	quest.1C8210712349A2E3.quest_desc: ["Pretty simple premise, Axes and Swords can do more Damage. Yes, it stacks!"]
 	quest.1C8210712349A2E3.title: "Basic Damage Module"
-	quest.1D3E2363CFD4C5E0.quest_desc: ["Fusion Crafting has Tiers which is determined by the Injectors. The Tiers go in ascending order: Draconium (I refer to it as Basic to help differentiate), Wyvern, Draconic, and Chaotic. The Injectors need to be placed on the Left and Right of the Fusion Crafting Core, a few blocks away from it. They can be placed in a cross shape at a max of 5 on each side of the Crafting Core. To give them Energy putting Relay IO Crystals connected to them will work, check out Crystak Binding to learn more."]
+	quest.1D3E2363CFD4C5E0.quest_desc: ["Fusion Crafting has Tiers which is determined by the Injectors. The Tiers go in ascending order: Draconium (I refer to it as Basic to help differentiate), Wyvern, Draconic, and Chaotic. The Injectors need to be placed on the Left and Right of the Fusion Crafting Core, a few blocks away from it. They can be placed in a cross shape at a max of 5 on each side of the Crafting Core. To give them Energy putting Relay IO Crystals connected to them will work, check out Crystal Binding to learn more."]
 	quest.1D3E2363CFD4C5E0.title: "Basic Tier"
 	quest.1E41A5071854DEC8.title: "Wyvern Damage Module"
 	quest.1F7D147C9AF6A4FC.quest_desc: [
diff --git a/kubejs/server_scripts/mods/dyenamics/lavender.js b/kubejs/server_scripts/mods/dyenamics/lavender.js
@@ -0,0 +1,4 @@
+ServerEvents.recipes((allthemods) => {
+  allthemods.remove({ id: "dyenamics:ma/dye/lavender_dye" })
+  allthemods.shaped("dyenamics:lavender_dye", [" D ", "   ", "D D"], { L: "dyenamics:lavender_dye" })
+})
diff --git a/kubejs/server_scripts/mods/exdeorum/exdeorum.js b/kubejs/server_scripts/mods/exdeorum/exdeorum.js
@@ -204,7 +204,7 @@ ServerEvents.recipes((allthemods) => {
   sieving("minecraft:sculk", Materials.EndStone, [{ mesh: Meshes.NETHERITE, amount: 1, chance: 0.075 }])
 
   // Crucible heating blocks
-  allthemods.recipes.exdeorum.crucible_heat_source({ block_tag: "alltheores:uranium" }, 20)
+  allthemods.recipes.exdeorum.crucible_heat_source({ block: "alltheores:uranium_block" }, 20)
   allthemods.recipes.exdeorum.crucible_heat_source({ block: "mekanism:superheating_element" }, 60)
   allthemods.recipes.exdeorum.crucible_heat_source({ block: "allthemodium:soul_lava" }, 120)
 
diff --git a/kubejs/server_scripts/mods/industrial_foregoing/laser_drill.js b/kubejs/server_scripts/mods/industrial_foregoing/laser_drill.js
@@ -88,6 +88,15 @@ ServerEvents.recipes((allthemods) => {
     80,
     3
   )
+
+  laserDrillFluid(
+    { fluid: "pneumaticcraft:oil", amount: 50 },
+    "minecraft:empty",
+    "industrialforegoing:black_laser_lens",
+    20,
+    60,
+    3
+  )
 })
 
 // This File has been authored by AllTheMods Staff, or a Community contributor for use in AllTheMods - AllTheMods 10: To the Sky.
diff --git a/kubejs/server_scripts/mods/silent gear/dagger_tags.js b/kubejs/server_scripts/mods/silent gear/dagger_tags.js
@@ -0,0 +1,7 @@
+ServerEvents.tags("item", (allthemods) => {
+  allthemods.add("minecraft:enchantable/sword", "silentgear:dagger")
+  allthemods.add("minecraft:enchantable/fire_aspect", "silentgear:dagger")
+  allthemods.add("minecraft:enchantable/sharp_weapon", "silentgear:dagger")
+  allthemods.add("minecraft:enchantable/weapon", "silentgear:dagger")
+  allthemods.add("minecraft:enchantable/vanishing", "silentgear:dagger")
+})
diff --git a/kubejs/server_scripts/mods/supplementaries/lapis_bricks.js b/kubejs/server_scripts/mods/supplementaries/lapis_bricks.js
@@ -0,0 +1,4 @@
+ServerEvents.recipes((allthemods) => {
+  allthemods.remove({ id: "supplementaries:lapis_bricks" })
+  allthemods.shaped("supplementaries:lapis_bricks", ["L L", "   ", "L L"], { L: "minecraft:lapis_lazuli" })
+})
diff --git a/kubejs/server_scripts/tweaks/removals.js b/kubejs/server_scripts/tweaks/removals.js
@@ -185,7 +185,9 @@ ServerEvents.recipes((allthemods) => {
     "mysticalagriculture:compressed_iron_seeds",
     "mysticalagriculture:compressed_iron_essence",
     "mysticalagriculture:draconium_seeds",
-    "mysticalagriculture:draconium_essence"
+    "mysticalagriculture:draconium_essence",
+    "mysticalagriculture:basalt_seeds",
+    "mysticalagriculture:basalt_essence"
   ]
 
   removals.forEach((entry) => {
@@ -201,11 +203,11 @@ ServerEvents.recipes((allthemods) => {
 
   allthemods.remove({ output: /exdeorum:.*_compressed_sieve/ })
   allthemods.remove({ output: /generatorgalore:.*_upgrade/ })
-  allthemods.remove({ id: `create:crushing/nether_gold_ore` })
-  allthemods.remove({ id: `create:crushing/deepslate_gold_ore` })
-  allthemods.remove({ id: `create:crushing/netherrack` })
-  allthemods.remove({ id: `create:crushing/ochrum_recycling` })
-  allthemods.remove({ id: `mekanism:sulfur_dye` })
+  allthemods.remove({ id: "create:crushing/nether_gold_ore" })
+  allthemods.remove({ id: "create:crushing/deepslate_gold_ore" })
+  allthemods.remove({ id: "create:crushing/netherrack" })
+  allthemods.remove({ id: "create:crushing/ochrum_recycling" })
+  allthemods.remove({ id: "mekanism:sulfur_dye" })
   allthemods.remove({ id: "alltheores:alloysmelter/brass/ingot" })
   allthemods.remove({ id: "soulshards:vile_dust_from_soul_sand" })
   allthemods.remove({ id: "oritech:crafting/alloy/steel" })
diff --git a/kubejs/server_scripts/tweaks/tags.js b/kubejs/server_scripts/tweaks/tags.js
@@ -16,6 +16,12 @@ ServerEvents.tags("block", (allthemods) => {
     "@waystones"
   ])
 
+  allthemods.add("c:ingots", [
+    "allthemodium:unobtainium_allthemodium_alloy_ingot",
+    "allthemodium:unobtainium_vibranium_alloy_ingot",
+    "allthemodium:vibranium_allthemodium_alloy_ingot"
+  ])
+
   allthemods.remove("c:relocation_not_supported", [
     "geore:budding_diamond",
     "geore:budding_gold",
@@ -247,6 +253,8 @@ ServerEvents.tags("item", (allthemods) => {
     "mysticalagriculture:draconium_essence",
     "mysticalagriculture:marble_seeds",
     "mysticalagriculture:marble_essence",
+    "mysticalagriculture:basalt_seeds",
+    "mysticalagriculture:basalt_essence",
     "exmachinis:netherite_upgrade",
     /geore:.*tungsten.*/,
     /geore:.*monazite.*/,

Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,15 @@ ServerEvents.recipes((allthemods) => {`
`88`	`88`	`80,`
`89`	`89`	`3`
`90`	`90`	`)`
	`91`	`+`
	`92`	`+ laserDrillFluid(`
	`93`	`+ { fluid: "pneumaticcraft:oil", amount: 50 },`
	`94`	`+ "minecraft:empty",`
	`95`	`+ "industrialforegoing:black_laser_lens",`
	`96`	`+ 20,`
	`97`	`+ 60,`
	`98`	`+ 3`
	`99`	`+ )`
`91`	`100`	`})`
`92`	`101`
`93`	`102`	`// This File has been authored by AllTheMods Staff, or a Community contributor for use in AllTheMods - AllTheMods 10: To the Sky.`