Seattle, WA
Interests: systems programming, Minecraft modding, Touhou Project
From Vincent Lee to ~williewillus/violet-moon
Alwinfy ok-ed this (but sent it to me off-list by accident), so committed and pushed. In the future, I would include the rationale and details of your change in the commit message (above the --- in the patch), it's useful to have that in the commit log. I've amended the patch commit message before pushing for you.
From Vincent Lee to ~williewillus/violet-moon
Pushed, thanks > "minecraft:starve", > "minecraft:fly_into_wall", > +"minecraft:freeze", Make sure you format things properly in the future, I amended your patch to properly format. > "#minecraft:is_fire" > ] > -} > \ No newline at end of file > +}
From Vincent Lee to ~williewillus/violet-moon
Committed, thanks
From Vincent Lee to ~williewillus/violet-moon
Code looks good, gonna defer to Alwinfy on the design aspect.
From Vincent Lee to ~williewillus/violet-moon
The changes look good to me to stamping. Wondering what Artemis and Alwinfy think about the new cost though? If they don't object then I'll commit this during the weekend.
From Vincent Lee to ~williewillus/violet-moon
Suggested by Wormbo --- Xplat/src/generated/resources/.cache/8482c265eb392e1fe5c3863ee4f62f310932c269 | 3 ++ Xplat/src/generated/resources/data/botania/recipes/mana_infusion/ochre_froglight_to_verdant_froglight.json | 15 ++++++++++ Xplat/src/generated/resources/data/botania/recipes/mana_infusion/pearlescent_froglight_to_ochre_froglight.json | 15 ++++++++++ Xplat/src/generated/resources/data/botania/recipes/mana_infusion/verdant_froglight_to_pearlescent_froglight.json | 15 ++++++++++ Xplat/src/main/java/vazkii/botania/data/recipes/ManaInfusionProvider.java | 1 + Xplat/src/main/resources/assets/botania/lang/en_us.json | 2 + Xplat/src/main/resources/assets/botania/patchouli_books/lexicon/en_us/entries/devices/mana_alchemy.json | 6 ++++ 7 files changed, 57 insertions(+), 0 deletions(-) diff --git a/Xplat/src/generated/resources/.cache/8482c265eb392e1fe5c3863ee4f62f310932c269 b/Xplat/src/generated/resources/.cache/8482c265eb392e1fe5c3863ee4f62f310932c269 --- a/Xplat/src/generated/resources/.cache/8482c265eb392e1fe5c3863ee4f62f310932c269 [message trimmed]
From Vincent Lee to ~williewillus/violet-moon
--- Xplat/src/generated/resources/.cache/c2a5de4735ee8fb15e1f367981a1cbf708af95f5 | 2 +- Xplat/src/generated/resources/data/botania/recipes/mana_spreader.json | 6 +++--- Xplat/src/main/java/vazkii/botania/data/recipes/CraftingRecipeProvider.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Xplat/src/generated/resources/.cache/c2a5de4735ee8fb15e1f367981a1cbf708af95f5 b/Xplat/src/generated/resources/.cache/c2a5de4735ee8fb15e1f367981a1cbf708af95f5 --- a/Xplat/src/generated/resources/.cache/c2a5de4735ee8fb15e1f367981a1cbf708af95f5 +++ b/Xplat/src/generated/resources/.cache/c2a5de4735ee8fb15e1f367981a1cbf708af95f5 @@ -1218,7 +1218,7 @@ 20f2a317308e9954e5ce839ad43c9734c43a8309 data/botania/recipes/mana_quartz_stairs.json 262f6c87e1671d15052fd9483988b1ad02dc8df1 data/botania/recipes/mana_ring.json ceb9a39e8bee94b7f48f8bfec538af724ed1e7d2 data/botania/recipes/mana_ring_greater.json [message trimmed]
From Vincent Lee to ~williewillus/violet-moon
Suggested by lolkazu --- Xplat/src/generated/resources/.cache/5e449fe289648869bd1f4d4d99715c8b4e0c057d | 2 +- Xplat/src/generated/resources/data/minecraft/tags/items/freeze_immune_wearables.json | 6 +++++- Xplat/src/main/java/vazkii/botania/data/ItemTagProvider.java | 3 ++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/Xplat/src/generated/resources/.cache/5e449fe289648869bd1f4d4d99715c8b4e0c057d b/Xplat/src/generated/resources/.cache/5e449fe289648869bd1f4d4d99715c8b4e0c057d --- a/Xplat/src/generated/resources/.cache/5e449fe289648869bd1f4d4d99715c8b4e0c057d +++ b/Xplat/src/generated/resources/.cache/5e449fe289648869bd1f4d4d99715c8b4e0c057d @@ -58,7 +58,7 @@ 43bfa13de3ebc0be372fc48b0e4be56a25cb1893 data/minecraft/tags/items/axes.json a101ef4ecfece48f1cdff62f34f30f9f25b3dbd3 data/minecraft/tags/items/cluster_max_harvestables.json [message trimmed]
From Vincent Lee to ~williewillus/violet-moon
I applied this and things didn't explode so blind stamp and I'll trust you didn't make a typo :P
From Vincent Lee to ~williewillus/violet-moon
Artemis System <theartemissystem@gmail.com> writes: > --- > .../botania/common/block/BotaniaBlocks.java | 260 +++++++++--------- > .../botania/common/item/BotaniaItems.java | 20 +- > 2 files changed, 140 insertions(+), 140 deletions(-) > > diff --git a/Xplat/src/main/java/vazkii/botania/common/block/BotaniaBlocks.java b/Xplat/src/main/java/vazkii/botania/common/block/BotaniaBlocks.java > index b7bf9f903..4db71db32 100644 > --- a/Xplat/src/main/java/vazkii/botania/common/block/BotaniaBlocks.java > +++ b/Xplat/src/main/java/vazkii/botania/common/block/BotaniaBlocks.java > @@ -596,117 +596,117 @@ public final class BotaniaBlocks { >