diff --git a/changelogs/CHANGELOG.md b/changelogs/CHANGELOG.md index d6b9a20ec..8c8676813 100644 --- a/changelogs/CHANGELOG.md +++ b/changelogs/CHANGELOG.md @@ -17,6 +17,9 @@ - Tablet of Awakening quest no longer requires an Amethyst Golem Charm [\#926](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/926) - [Expert] Mekanism Teleporter Frames now craft in batches of 9 [\#926](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/926) - Added entries for Amethyst Golems in Ars Nouveau's quests [\#928](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/928) +- Ars Nouveau's Fell spell will now harvest roots/liveroots from Twilight trees [\#939](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/939) +- Add crystallizer recipes for Fluix, Certus, and Amethyst Dust [\#939](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/939) +- Fire resist potions may now be crafted from wasabi [\#939](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/939) ### 🐛 Fixed Bugs @@ -29,6 +32,7 @@ - [Expert] Fix broken Parrot Familiar summon [\#920](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/920) - Add default tool for Enigmatic Unity and Energy Meters [\#921](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/921) - Clarified Assembly Table quests [\#932](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/932) +- Remove duplicate saplings from Market [\#939](https://github.com/EnigmaticaModpacks/Enigmatica9/issues/939) ### Enigmatica 9 v1.20.1 diff --git a/kubejs/data/farmingforblockheads/farmingforblockheads_compat/saplings_for_emeralds.json b/kubejs/data/farmingforblockheads/farmingforblockheads_compat/saplings_for_emeralds.json index 6ec7d92c5..42f68ba5b 100644 --- a/kubejs/data/farmingforblockheads/farmingforblockheads_compat/saplings_for_emeralds.json +++ b/kubejs/data/farmingforblockheads/farmingforblockheads_compat/saplings_for_emeralds.json @@ -14,52 +14,6 @@ { "output": "twilightforest:canopy_sapling" }, { "output": "twilightforest:twilight_oak_sapling" }, { "output": "thermal:rubberwood_sapling" }, - { "output": "byg:yellow_spruce_sapling" }, - { "output": "byg:yellow_birch_sapling" }, - { "output": "byg:red_spruce_sapling" }, - { "output": "byg:red_oak_sapling" }, - { "output": "byg:red_birch_sapling" }, - { "output": "byg:orchard_sapling" }, - { "output": "byg:orange_spruce_sapling" }, - { "output": "byg:orange_oak_sapling" }, - { "output": "byg:orange_birch_sapling" }, - { "output": "byg:joshua_sapling" }, - { "output": "byg:brown_zelkova_sapling" }, - { "output": "byg:brown_oak_sapling" }, - { "output": "byg:brown_birch_sapling" }, - { "output": "byg:blue_spruce_sapling" }, - { "output": "byg:araucaria_sapling" }, - { "output": "byg:withering_oak_sapling" }, - { "output": "byg:zelkova_sapling" }, - { "output": "byg:witch_hazel_sapling" }, - { "output": "byg:willow_sapling" }, - { "output": "byg:skyris_sapling" }, - { "output": "byg:redwood_sapling" }, - { "output": "byg:rainbow_eucalyptus_sapling" }, - { "output": "byg:pine_sapling" }, - { "output": "byg:palo_verde_sapling" }, - { "output": "byg:palm_sapling" }, - { "output": "byg:nightshade_sapling" }, - { "output": "byg:maple_sapling" }, - { "output": "byg:silver_maple_sapling" }, - { "output": "byg:red_maple_sapling" }, - { "output": "byg:white_mangrove_sapling" }, - { "output": "byg:mahogany_sapling" }, - { "output": "byg:jacaranda_sapling" }, - { "output": "byg:indigo_jacaranda_sapling" }, - { "output": "byg:lament_sapling" }, - { "output": "byg:holly_sapling" }, - { "output": "byg:green_enchanted_sapling" }, - { "output": "byg:fir_sapling" }, - { "output": "byg:ether_sapling" }, - { "output": "byg:ebony_sapling" }, - { "output": "byg:cypress_sapling" }, - { "output": "byg:cika_sapling" }, - { "output": "byg:white_cherry_sapling" }, - { "output": "byg:pink_cherry_sapling" }, - { "output": "byg:blue_enchanted_sapling" }, - { "output": "byg:baobab_sapling" }, - { "output": "byg:aspen_sapling" }, { "output": "minecraft:mangrove_propagule" }, { "output": "hexerei:willow_sapling" }, { "output": "hexerei:mahogany_sapling" }, diff --git a/kubejs/server_scripts/base/recipes/thermal/crystallizer.js b/kubejs/server_scripts/base/recipes/thermal/crystallizer.js index 008065a34..f9cb3b270 100644 --- a/kubejs/server_scripts/base/recipes/thermal/crystallizer.js +++ b/kubejs/server_scripts/base/recipes/thermal/crystallizer.js @@ -8,12 +8,6 @@ ServerEvents.recipes((event) => { energy: 2500, id: `${id_prefix}dimensional_shard_from_dust` }, - { - ingredients: [{ fluid: 'minecraft:water', amount: 1000 }, { tag: 'forge:dusts/fluorite' }], - result: [{ item: 'emendatusenigmatica:fluorite_gem' }], - energy: 2500, - id: `${id_prefix}fluorite_shard_from_dust` - }, { ingredients: [{ fluid: 'minecraft:water', amount: 1000 }, { tag: 'forge:dusts/therium' }], result: [{ item: 'byg:therium_crystal_shard' }], @@ -25,6 +19,24 @@ ServerEvents.recipes((event) => { result: [{ item: 'byg:subzero_crystal_shard' }], energy: 2500, id: `${id_prefix}subzero_shard_from_dust` + }, + { + ingredients: [{ fluid: 'minecraft:water', amount: 1000 }, { tag: 'forge:dusts/amethyst' }], + result: [{ item: 'minecraft:amethyst_shard' }], + energy: 2500, + id: `${id_prefix}amethyst_shard_from_dust` + }, + { + ingredients: [{ fluid: 'minecraft:water', amount: 1000 }, { tag: 'forge:dusts/certus_quartz' }], + result: [{ item: 'ae2:certus_quartz_crystal' }], + energy: 2500, + id: `${id_prefix}certus_quartz_crystal_from_dust` + }, + { + ingredients: [{ fluid: 'minecraft:water', amount: 1000 }, { tag: 'forge:dusts/fluix' }], + result: [{ item: 'ae2:fluix_crystal' }], + energy: 2500, + id: `${id_prefix}fluix_crystal_from_dust` } ]; diff --git a/kubejs/server_scripts/base/tags/blocks/ars_nouveau/harvest.js b/kubejs/server_scripts/base/tags/blocks/ars_nouveau/harvest.js index 205c90fb3..ebc5a0fc1 100644 --- a/kubejs/server_scripts/base/tags/blocks/ars_nouveau/harvest.js +++ b/kubejs/server_scripts/base/tags/blocks/ars_nouveau/harvest.js @@ -8,4 +8,6 @@ ServerEvents.tags('block', (event) => { event.add('ars_nouveau:harvest/foliage', shroom.foliage); event.add('ars_nouveau:harvest/stems', shroom.stems); }); + + event.add('ars_nouveau:harvest/fellable', ['twilightforest:root', 'twilightforest:liveroot_block']); }); diff --git a/kubejs/startup_scripts/base/brewing_registry.js b/kubejs/startup_scripts/base/brewing_registry.js index 9a4239a33..24d442b54 100644 --- a/kubejs/startup_scripts/base/brewing_registry.js +++ b/kubejs/startup_scripts/base/brewing_registry.js @@ -38,6 +38,11 @@ MoreJSEvents.registerPotionBrewing((event) => { input: 'minecraft:awkward', output: 'minecraft:fire_resistance' }, + { + reagent: 'sushigocrafting:wasabi_root', + input: 'minecraft:awkward', + output: 'minecraft:fire_resistance' + }, { reagent: 'byg:aloe_vera', input: 'minecraft:awkward',