diff --git a/Xplat/src/generated/resources/.cache/0a95e3f2812643aab6a774a66503a0f649a41d7a b/Xplat/src/generated/resources/.cache/0a95e3f2812643aab6a774a66503a0f649a41d7a index ff38216481..80f22d355a 100644 --- a/Xplat/src/generated/resources/.cache/0a95e3f2812643aab6a774a66503a0f649a41d7a +++ b/Xplat/src/generated/resources/.cache/0a95e3f2812643aab6a774a66503a0f649a41d7a @@ -5,7 +5,7 @@ 8431924222a9e00c9e7a534c8dbc67d82c725591 data/botania/recipes/petal_apothecary/bubbell.json a30dad97f9f54227d5e715b2c13275308d9670b6 data/botania/recipes/petal_apothecary/clayconia.json befdbcd92af4b283c33f4addbb2c97ae479181da data/botania/recipes/petal_apothecary/daffomill.json -f33e86ca02df5e04bc90615d63ed6b0643c17fe5 data/botania/recipes/petal_apothecary/dandelifeon.json +cc2a90e6268205ccc3a1ee3ee227ed46d09a1e4d data/botania/recipes/petal_apothecary/dandelifeon.json b90f83ffd09afee2a0d8e73da45198db86f8bdeb data/botania/recipes/petal_apothecary/daybloom_motif.json 2bc1fc7f8d89f11d35061940bb72c368f944d96f data/botania/recipes/petal_apothecary/dreadthorn.json 2ede815572202d5bb173a66256ca961cb0f8e08e data/botania/recipes/petal_apothecary/endoflame.json diff --git a/Xplat/src/generated/resources/data/botania/recipes/petal_apothecary/dandelifeon.json b/Xplat/src/generated/resources/data/botania/recipes/petal_apothecary/dandelifeon.json index e4ba6eefc4..1065af3675 100644 --- a/Xplat/src/generated/resources/data/botania/recipes/petal_apothecary/dandelifeon.json +++ b/Xplat/src/generated/resources/data/botania/recipes/petal_apothecary/dandelifeon.json @@ -25,6 +25,9 @@ { "item": "botania:rune_air" }, + { + "item": "botania:redstone_root" + }, { "item": "botania:life_essence" } diff --git a/Xplat/src/main/java/vazkii/botania/data/recipes/PetalApothecaryProvider.java b/Xplat/src/main/java/vazkii/botania/data/recipes/PetalApothecaryProvider.java index a36e0c9b3d..69133101c1 100644 --- a/Xplat/src/main/java/vazkii/botania/data/recipes/PetalApothecaryProvider.java +++ b/Xplat/src/main/java/vazkii/botania/data/recipes/PetalApothecaryProvider.java @@ -102,7 +102,7 @@ public void buildRecipes(Consumer con consumer.accept(make(BotaniaFlowerBlocks.spectrolus, red, red, green, green, blue, blue, white, white, runeWinter, runeAir, pixieDust)); consumer.accept(make(BotaniaFlowerBlocks.rafflowsia, purple, purple, green, green, black, runeEarth, runePride, pixieDust)); consumer.accept(make(BotaniaFlowerBlocks.shulkMeNot, purple, purple, magenta, magenta, lightGray, gaiaSpirit, runeEnvy, runeWrath)); - consumer.accept(make(BotaniaFlowerBlocks.dandelifeon, purple, purple, lime, green, runeWater, runeFire, runeEarth, runeAir, gaiaSpirit)); + consumer.accept(make(BotaniaFlowerBlocks.dandelifeon, purple, purple, lime, green, runeWater, runeFire, runeEarth, runeAir, redstoneRoot, gaiaSpirit)); consumer.accept(make(BotaniaFlowerBlocks.jadedAmaranthus, purple, lime, green, runeSpring, redstoneRoot)); consumer.accept(make(BotaniaFlowerBlocks.bellethorn, red, red, red, cyan, cyan, redstoneRoot)); diff --git a/web/changelog.md b/web/changelog.md index c111685fe0..7898db2788 100644 --- a/web/changelog.md +++ b/web/changelog.md @@ -21,6 +21,7 @@ and start a new "Upcoming" section. * Add: Horn and Drum of the Wild can break moss carpet, with the option to add more blocks through a block tag * Change: Cellular blocks around the boundary of a Dandelifeon's simulation area are ignored, unless they belong to another active Dandelifeon (NEstoll) * Change: Charm of the Diva also supports charming or targeting neutral mobs that are angry at the player or attacking one of the player's tamed animals, and properly prevents the player's tamed animals from being affected or targeted by the charm +* Change: Dandelifeon recipe also requires a redstone root (zacharybarbanell) * Fix: Flight bar for Flügel Tiara no longer overlaps with the refilling air bubbles indicator or the mount health bar, if that uses more than one row * Fix: The Manaseer Monocle's flower radius indicator no longer jumps around if you are very far from the world origin, and should also not Z-fight with the binding radius indicator of luminizers anymore * Fix: The air bubble created by Bubbells no longer flickers with inflowing water