Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Tweaks #939

Merged
merged 6 commits into from
Apr 9, 2024
Merged

Tweaks #939

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
73e0534
fellable
MuteTiefling Apr 9, 2024
b3b476c
Update CHANGELOG.md
MuteTiefling Apr 9, 2024
f0b6bd9
saplings
MuteTiefling Apr 9, 2024
ffd4ada
dusts
MuteTiefling Apr 9, 2024
809147a
brew
MuteTiefling Apr 9, 2024
fc57337
Update CHANGELOG.md
MuteTiefling Apr 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions changelogs/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down
46 changes: 0 additions & 46 deletions kubejs/data/farmingforblockheads/farmingforblockheads_compat/saplings_for_emeralds.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" },
Expand Down
24 changes: 18 additions & 6 deletions kubejs/server_scripts/base/recipes/thermal/crystallizer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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' }],
Expand All @@ -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`
}
];

Expand Down
2 changes: 2 additions & 0 deletions kubejs/server_scripts/base/tags/blocks/ars_nouveau/harvest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']);
});
5 changes: 5 additions & 0 deletions kubejs/startup_scripts/base/brewing_registry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down