diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b653c7c7..9cb1c86b7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,8 +3,29 @@ ## Unreleased ### Changes - High Tier saws can Silk Harvest Ice (#3019) @Nebby1999 +- Colored small vessels now have new textures backported from 1.21 TFC +- The alloy smelter kaolin clay to powder recipe now uses a mold instead of a circuit (since steam machines don't have circuits) @Pyritie +- Added more of Create's decorative stone blocks to the Domum whitelist +- Blaze burners no longer work outside of Earth @Mqrius @thederpysockdude123 +- Drinkable alcohols can now be drank even when your hydration is full @Ujhik +- The Strength effect is now exclusive to wines, but all wines also now have an additional effect! @Pyritie ### Bug fixes +- Fixed the blur effect after being downed not going away +- Fixed arrow duplication (#2089) @Ujhik +- Fixed the blaze burner liquid fuel list not properly working on servers @Mqrius +- Fixed dimension indicator icons duplicating when increasing the energy tier display @BlueBoat29 +- Fixed the face mask new curio slot not actually preventing hazards @Bumperdo09 +- Fixed mars crop seeds not going in the seed pouch (#3058) @Pyritie +- Fixed not being able to make aluminium double plates with LV machines (#3030) @Pyritie +- Fixed not being able to recycle unfired firmalife oven parts @Pyritie +- Fixed not being able to fire scraping knife molds (#3038) @Pyritie +- Fixed some tree types not contributing to ambient bird noises +- Fixed a bunch of quests @Pyritie @Eilandor ### Translation updates +- Russian @Nixieeunrare +- German @Enderderschander +- Ukranian @MetEnBouldry +- Chinese (simplified) @jmecn ## [0.11.21] - 09-02-2026 ### Breaking changes diff --git a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/drinks.json b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/drinks.json index f4eefde87..d225a7466 100644 --- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/drinks.json +++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/mechanics/drinks.json @@ -27,12 +27,12 @@ { "type": "patchouli:text", "title": "Wine", - "text": "$(thing)Wine$() is another kind of alcohol that's made in a different way than the others. It's a complex but rewarding process that can't be automated in a machine. Check the $(l:firmalife/wine)Winemaking$() entry to learn how to craft it.", + "text": "$(thing)Wine$() is another kind of alcohol that's made in a different way than the others. It's a complex but rewarding process that can't be automated in a machine. Check the $(l:firmalife/wine)Winemaking$() entry to learn how to craft it.$(br2)All wines also give $(item)Strength (5:20)$() in addition to another effect!", "item": "firmalife:bucket/red_wine,firmalife:bucket/white_wine,firmalife:bucket/rose_wine,firmalife:bucket/sparkling_wine,firmalife:bucket/dessert_wine" }, { "type": "patchouli:text", - "text": "$(li)Red Wine: Strength (5:20)$(li)White Wine: Wither Resistance (5:20)$(li)Rose Wine: Swim Speed (5:20)$(li)Sparkling Wine: Jump Boost II (5:20)$(li)Dessert Wine: Knockback Resistance (5:20)" + "text": "$(li)Red Wine: Haste (5:20)$(li)White Wine: Wither Resistance (5:20)$(li)Rose Wine: Swim Speed (5:20)$(li)Sparkling Wine: Jump Boost II (5:20)$(li)Dessert Wine: Knockback Resistance (5:20)" }, { "type": "patchouli:spotlight", @@ -52,7 +52,7 @@ }, { "type": "patchouli:text", - "text": "$(li)Cocoa: Haste (0:30), warms you up by 4°C$(li)Coffee: Speed (0:30), warms you up by 4°C$(li)Lemonade: Haste (0:30), cools you down by 2°C$(li)Nalivka: Strength (2:40), cools you down by 2°C$(li)Kvass: Strength (1:20), cools you down by 2°C$(li)Compote: Jump Boost II (0:30)" + "text": "$(li)Cocoa: Haste (0:30), warms you up by 4°C$(li)Coffee: Speed (0:30), warms you up by 4°C$(li)Lemonade: Haste (0:30), cools you down by 2°C$(li)Nalivka: Haste (2:40), cools you down by 2°C$(li)Kvass: Haste (1:20), cools you down by 2°C$(li)Compote: Jump Boost II (0:30)" }, { "type": "patchouli:spotlight", diff --git a/kubejs/client_scripts/tooltips.js b/kubejs/client_scripts/tooltips.js index e3870c9b1..2de345771 100644 --- a/kubejs/client_scripts/tooltips.js +++ b/kubejs/client_scripts/tooltips.js @@ -453,7 +453,7 @@ const registerTooltips = (event) => { text.add(1, Text.translate("effect.minecraft.jump_boost").append(Text.of(" II (00:30)")).blue()); }) event.addAdvanced(['tfc_gourmet:kvass_bucket'], (item, advanced, text) => { - text.add(1, Text.translate("effect.minecraft.strength").append(Text.of(" (01:20)")).blue()); + text.add(1, Text.translate("effect.minecraft.haste").append(Text.of(" (01:20)")).blue()); text.add(2, Text.translate('tfg.tooltip.cooling_foods')); }) event.addAdvanced(['tfc_gourmet:lemonade_bucket'], (item, advanced, text) => { @@ -485,7 +485,7 @@ const registerTooltips = (event) => { text.add(2, Text.translate('tfg.tooltip.warming_foods')); }) event.addAdvanced(['tfc_gourmet:nalivka_bucket'], (item, advanced, text) => { - text.add(1, Text.translate("effect.minecraft.strength").append(Text.of(" (02:40)")).blue()); + text.add(1, Text.translate("effect.minecraft.haste").append(Text.of(" (02:40)")).blue()); text.add(2, Text.translate('tfg.tooltip.cooling_foods')); }) event.addAdvanced(['tfc:bucket/spring_water'], (item, advanced, text) => { @@ -493,18 +493,23 @@ const registerTooltips = (event) => { }) event.addAdvanced(['firmalife:bucket/red_wine'], (item, advanced, text) => { text.add(1, Text.translate("effect.minecraft.strength").append(Text.of(" (05:20)")).blue()); + text.add(2, Text.translate("effect.minecraft.haste").append(Text.of(" (05:20)")).blue()); }) event.addAdvanced(['firmalife:bucket/rose_wine'], (item, advanced, text) => { - text.add(1, Text.translate("effect.minecraft.dolphins_grace").append(Text.of(" (05:20)")).blue()); + text.add(1, Text.translate("effect.minecraft.strength").append(Text.of(" (05:20)")).blue()); + text.add(2, Text.translate("effect.minecraft.dolphins_grace").append(Text.of(" (05:20)")).blue()); }) event.addAdvanced(['firmalife:bucket/white_wine'], (item, advanced, text) => { - text.add(1, Text.translate("effect.species.wither_resistance").append(Text.of(" (05:20)")).blue()); + text.add(1, Text.translate("effect.minecraft.strength").append(Text.of(" (05:20)")).blue()); + text.add(2, Text.translate("effect.species.wither_resistance").append(Text.of(" (05:20)")).blue()); }) event.addAdvanced(['firmalife:bucket/dessert_wine'], (item, advanced, text) => { - text.add(1, Text.translate("effect.species.iron_will").append(Text.of(" (05:20)")).blue()); + text.add(1, Text.translate("effect.minecraft.strength").append(Text.of(" (05:20)")).blue()); + text.add(2, Text.translate("effect.species.iron_will").append(Text.of(" (05:20)")).blue()); }) event.addAdvanced(['firmalife:bucket/sparkling_wine'], (item, advanced, text) => { - text.add(1, Text.translate("effect.minecraft.jump_boost").append(Text.of(" II (05:20)")).blue()); + text.add(1, Text.translate("effect.minecraft.strength").append(Text.of(" (05:20)")).blue()); + text.add(2, Text.translate("effect.minecraft.jump_boost").append(Text.of(" II (05:20)")).blue()); }) //event.addAdvanced(['gtceu:ethanol_bucket'], (item, advanced, text) => { // text.add(1, Text.translate("effect.minecraft.nausea").append(Text.of(" (01:00)")).red()); diff --git a/kubejs/data/firmalife/tfc/drinkables/dessert_wine.json b/kubejs/data/firmalife/tfc/drinkables/dessert_wine.json index d85b72fa4..2f5d932cc 100644 --- a/kubejs/data/firmalife/tfc/drinkables/dessert_wine.json +++ b/kubejs/data/firmalife/tfc/drinkables/dessert_wine.json @@ -8,6 +8,11 @@ "type": "species:iron_will", "duration": 6400, "amplifier": 0 + }, + { + "type": "minecraft:strength", + "duration": 6400, + "amplifier": 0 } ] } \ No newline at end of file diff --git a/kubejs/data/firmalife/tfc/drinkables/red_wine.json b/kubejs/data/firmalife/tfc/drinkables/red_wine.json index 80917d52f..460ac44b2 100644 --- a/kubejs/data/firmalife/tfc/drinkables/red_wine.json +++ b/kubejs/data/firmalife/tfc/drinkables/red_wine.json @@ -8,6 +8,11 @@ "type": "minecraft:strength", "duration": 6400, "amplifier": 0 + }, + { + "type": "minecraft:haste", + "duration": 6400, + "amplifier": 0 } ] } \ No newline at end of file diff --git a/kubejs/data/firmalife/tfc/drinkables/rose_wine.json b/kubejs/data/firmalife/tfc/drinkables/rose_wine.json index ce11502bc..c098ec2aa 100644 --- a/kubejs/data/firmalife/tfc/drinkables/rose_wine.json +++ b/kubejs/data/firmalife/tfc/drinkables/rose_wine.json @@ -4,6 +4,11 @@ "intoxication": 4000, "may_drink_when_full": true, "effects": [ + { + "type": "minecraft:dolphins_grace", + "duration": 6400, + "amplifier": 0 + }, { "type": "minecraft:strength", "duration": 6400, diff --git a/kubejs/data/firmalife/tfc/drinkables/sparkling_wine.json b/kubejs/data/firmalife/tfc/drinkables/sparkling_wine.json index 77749fdda..357ed89b2 100644 --- a/kubejs/data/firmalife/tfc/drinkables/sparkling_wine.json +++ b/kubejs/data/firmalife/tfc/drinkables/sparkling_wine.json @@ -8,6 +8,11 @@ "type": "minecraft:jump_boost", "duration": 6400, "amplifier": 1 + }, + { + "type": "minecraft:strength", + "duration": 6400, + "amplifier": 0 } ] } \ No newline at end of file diff --git a/kubejs/data/firmalife/tfc/drinkables/white_wine.json b/kubejs/data/firmalife/tfc/drinkables/white_wine.json index da19eb209..f0985357a 100644 --- a/kubejs/data/firmalife/tfc/drinkables/white_wine.json +++ b/kubejs/data/firmalife/tfc/drinkables/white_wine.json @@ -8,6 +8,11 @@ "type": "species:wither_resistance", "duration": 6400, "amplifier": 0 + }, + { + "type": "minecraft:strength", + "duration": 6400, + "amplifier": 0 } ] } \ No newline at end of file diff --git a/kubejs/data/tfc_gurman/tfc/drinkables/kvass.json b/kubejs/data/tfc_gurman/tfc/drinkables/kvass.json index 17b9eabf9..e43dad202 100644 --- a/kubejs/data/tfc_gurman/tfc/drinkables/kvass.json +++ b/kubejs/data/tfc_gurman/tfc/drinkables/kvass.json @@ -4,7 +4,7 @@ "may_drink_when_full": true, "effects": [ { - "type": "minecraft:strength", + "type": "minecraft:haste", "duration": 1600, "amplifier": 0 }, diff --git a/kubejs/data/tfc_gurman/tfc/drinkables/nalivka.json b/kubejs/data/tfc_gurman/tfc/drinkables/nalivka.json index a93b02e15..e18d30942 100644 --- a/kubejs/data/tfc_gurman/tfc/drinkables/nalivka.json +++ b/kubejs/data/tfc_gurman/tfc/drinkables/nalivka.json @@ -5,7 +5,7 @@ "may_drink_when_full": true, "effects": [ { - "type": "minecraft:strength", + "type": "minecraft:haste", "duration": 3200, "amplifier": 0 },