~williewillus/violet-moon

botania: Lexicon macro + advancement title fixes v1 PROPOSED

Adarsh: 1
 Lexicon macro + advancement title fixes

 1 files changed, 6 insertions(+), 6 deletions(-)
#1140172 linux.yml failed
Export patchset (mbox)
How do I use this?

Copy & paste the following snippet into your terminal to import this patchset into git:

curl -s https://lists.sr.ht/~williewillus/violet-moon/patches/49024/mbox | git am -3
Learn more about email & git

[PATCH botania] Lexicon macro + advancement title fixes Export this patch

Added macros for Pasture Seeds entry, corrected Blaze and Cocoon gog macros and fixes Botania advancement group title
---
 .../main/resources/assets/botania/lang/en_us.json    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Xplat/src/main/resources/assets/botania/lang/en_us.json b/Xplat/src/main/resources/assets/botania/lang/en_us.json
index d4888618f..668226b7e 100644
--- a/Xplat/src/main/resources/assets/botania/lang/en_us.json
+++ b/Xplat/src/main/resources/assets/botania/lang/en_us.json
@@ -5,7 +5,7 @@
  "_comment3": "Untranslated entries will automatically be inherited from this file.",
  "_comment4": "Once again, don't copy from English, and THANK YOU for your hard work!",

  "itemGroup.botania.botania": "Botania",
  "itemGroup.botania": "Botania",
  "botania.landing": "Magic, Tech. Naturally.$(br2)Botania is a tech mod themed around natural magic. The main concept is to create magical flowers and devices utilizing the power of the earth, in the form of $(thing)Mana$().",
  "botania.desc": "Magic, Tech. Naturally",

@@ -1835,11 +1835,11 @@
  "botania.page.gardenOfGlass3": "Creating $(item)Saplings$(0)",
  "botania.page.gardenOfGlass4": "Creating $(l:basics/flowers)$(item)Floral Fertilizer$(0)$(/l)",
  "botania.page.gardenOfGlass5": "Creating $(item)Cobblestone$(0)",
  "botania.page.gardenOfGlass6": "Aside from that, some things in $(thing)Botania$(0) have been changed to fit Skyblock gameplay: The $(l:functional_flowers/orechid_gog)$(item)Orechid$(0)$(/l) is easier to make, faster, and much more $(thing)Mana$(0)-efficient; The $(l:devices/cocoon)$(item)Cocoon of Caprice$(0)$(/l) and the $(l:mana/spreader)$(item)Mana Spreader$(0)$(/l) have simpler recipes; the $(l:misc/blaze_block)$(item)Blaze Mesh$(0)$(/l), which can be purified into $(item)Obsidian$(0), is made from powder instead of rods; melon and pumpkin seeds can drop from tall grass; floral fertilizer yields more per craft; and certain additional recipes have been added.",
  "botania.page.gardenOfGlass6": "Aside from that, some things in $(thing)Botania$(0) have been changed to fit Skyblock gameplay: The $(l:functional_flowers/orechid_gog)$(item)Orechid$(0)$(/l) is easier to make, faster, and much more $(thing)Mana$(0)-efficient; The $(l:devices/cocoon_gog)$(item)Cocoon of Caprice$(0)$(/l) and the $(l:mana/spreader)$(item)Mana Spreader$(0)$(/l) have simpler recipes; the $(l:misc/blaze_block)$(item)Blaze Mesh$(0)$(/l), which can be purified into $(item)Obsidian$(0), is made from powder instead of rods; melon and pumpkin seeds can drop from tall grass; floral fertilizer yields more per craft; and certain additional recipes have been added.",
  "botania.page.gardenOfGlass7": "Creating $(item)Sugar Canes$(0)",
  "botania.page.gardenOfGlass8": "Creating $(item)Slimeballs$(0)",
  "botania.page.gardenOfGlass13": "Infusing $(item)Prismarine$(0)",
  "botania.page.gardenOfGlass9": "Entering the $(thing)Nether$(0) might seem difficult under these conditions-- worry not, however, as $(l:misc/blaze_block)$(item)Blaze Meshes$(0)$(/l) (as mentioned previously) can be converted into $(item)Obsidian$(0). To get these lamps, spawn $(item)Blazes$(0) from $(l:devices/fel_pumpkin)$(item)Fel Pumpkins$(0)$(/l).$(p)Since there's no easily accessible $(item)Flint$(0) on an island in space, a $(item)Fire Charge$(0) will have to do for portal-opening.",
  "botania.page.gardenOfGlass9": "Entering the $(thing)Nether$(0) might seem difficult under these conditions-- worry not, however, as $(l:misc/blaze_block)$(item)Blaze Meshes$(0)$(/l) (as mentioned previously) can be converted into $(item)Obsidian$(0). To get these lamps, spawn $(thing)Blazes$(0) from $(l:devices/fel_pumpkin)$(item)Fel Pumpkins$(0)$(/l).$(p)Since there's no easily accessible $(item)Flint$(0) on an island in space, a $(item)Fire Charge$(0) will have to do for portal-opening.",
  "botania.page.gardenOfGlass11": "The $(item)Mana Flash$(0) present in the starting area will allow a player without a $(l:basics/lexicon)$(item)Lexica Botania$(0)$(/l) to exchange a $(item)Sapling$(0) for one, by right-clicking the $(item)Sapling$(0) on the $(item)Mana Flash$(0).",
  "botania.page.gardenOfGlass12": "Lastly, a way to reach the End",
  "botania.page.gardenOfGlass14": "Creating the $(item)Heart of the Sea$(0)",
@@ -2651,9 +2651,9 @@
  "botania.entry.grassSeeds": "Pasture Seeds",
  "botania.tagline.grassSeeds": "Seeds to create Grass, Podzol and Mycelium",
  "botania.page.grassSeeds0": "Watching the slow grow of $(item)Grass$(0) is seldom a fun activity. $(item)Tall Grass$(0), infused with $(thing)Mana$(0), becomes $(item)Pasture Seeds$(0), which will grow grass in a nearby area when used on a $(item)Dirt$(0) block, either by hand or in a $(item)Dispenser$(0).$(p)Other dirt-type blocks can also be grown, such as $(item)Podzol$(0) or $(item)Mycelium$(0), from alternative seeds.",
  "botania.page.grassSeeds1": "$(item)Pasture Seeds$(0) for grass",
  "botania.page.grassSeeds2": "$(item)Boreal Seeds$(0) for podzol",
  "botania.page.grassSeeds3": "$(item)Infestation Spores$(0) for mycelium",
  "botania.page.grassSeeds1": "$(item)Pasture Seeds$(0) for $(item)Grass$(0)",
  "botania.page.grassSeeds2": "$(item)Boreal Seeds$(0) for $(item)Podzol$(0)",
  "botania.page.grassSeeds3": "$(item)Infestation Spores$(0) for $(item)Mycelium$(0)",
  "botania.page.grassSeeds4": "An additional six types of $(item)Pasture Seeds$(0) can be created, for alternative grasslike blocks with various textures.$(p)These spread to dirt like normal and can sustain any plant a block of grass can. Similarly, they may only be picked up with $(thing)Silk Touch$(0). However, these blocks don't decay back into dirt if covered.",
  "botania.page.grassSeeds5": "The alternate $(item)Pasture Seeds$(0)",

-- 
2.34.1
botania/patches/linux.yml: FAILED in 1m15s

[Lexicon macro + advancement title fixes][0] from [Adarsh][1]

[0]: https://lists.sr.ht/~williewillus/violet-moon/patches/49024
[1]: mailto:actuallyadarsh@gmail.com

✗ #1140172 FAILED botania/patches/linux.yml https://builds.sr.ht/~williewillus/job/1140172