diff --git a/CHANGELOG.md b/CHANGELOG.md index 471bfcc38..50a956a34 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ # Changelog -## [Unreleased] +## [0.10.2] - 20-07-2025 ### Changes +- Aged Corn Whiskey and Aged Rye Whiskey now have status effects (#1390) @EveProgrammingsockson +### Bug fixes +- Fixed TFG-Core version mismatch @Xikaro +- Fixed hardwood logs macerating into softwood pulp (#1391) @Forsuin +- Fixed iron flask dupe (#1397) @Pyritie ## [0.10.1] - 19-07-2025 ### Changes diff --git a/kubejs/data/tfc/tags/fluids/alcohols.json b/kubejs/data/tfc/tags/fluids/alcohols.json deleted file mode 100644 index 76c6115ca..000000000 --- a/kubejs/data/tfc/tags/fluids/alcohols.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "replace":true, - "values":[ - "tfc:beer", - "tfc:cider", - "tfc:rum", - "tfc:sake", - "tfc:vodka", - "tfc:whiskey", - "tfc:corn_whiskey", - "tfc:rye_whiskey", - "tfcagedalcohol:aged_beer", - "tfcagedalcohol:aged_cider", - "tfcagedalcohol:aged_rum", - "tfcagedalcohol:aged_sake", - "tfcagedalcohol:aged_vodka", - "tfcagedalcohol:aged_whiskey", - "tfcagedalcohol:aged_corn_whiskey", - "tfcagedalcohol:aged_rye_whiskey" - ] -} diff --git a/kubejs/data/tfc/tfc/drinkables/aged_beer.json b/kubejs/data/tfc/tfc/drinkables/aged_beer.json deleted file mode 100644 index 672675975..000000000 --- a/kubejs/data/tfc/tfc/drinkables/aged_beer.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "__comment__": "This file was automatically created by mcresources", - "ingredient": "tfcagedalcohol:aged_beer", - "thirst": 15, - "intoxication": 2000, - "effects": [ - { - "type": "minecraft:absorption", - "duration": 24000, - "amplifier": 1 - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfc/tfc/drinkables/aged_cider.json b/kubejs/data/tfc/tfc/drinkables/aged_cider.json deleted file mode 100644 index 23fd5bd5a..000000000 --- a/kubejs/data/tfc/tfc/drinkables/aged_cider.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "__comment__": "This file was automatically created by mcresources", - "ingredient": "tfcagedalcohol:aged_cider", - "thirst": 15, - "intoxication": 2000, - "effects": [ - { - "type": "minecraft:speed", - "duration": 6400, - "amplifier": 0 - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfc/tfc/drinkables/aged_rum.json b/kubejs/data/tfc/tfc/drinkables/aged_rum.json deleted file mode 100644 index 5653f8db1..000000000 --- a/kubejs/data/tfc/tfc/drinkables/aged_rum.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "__comment__": "This file was automatically created by mcresources", - "ingredient": "tfcagedalcohol:aged_rum", - "thirst": 15, - "intoxication": 2000, - "effects": [ - { - "type": "minecraft:speed", - "duration": 3200, - "amplifier": 1 - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfc/tfc/drinkables/aged_sake.json b/kubejs/data/tfc/tfc/drinkables/aged_sake.json deleted file mode 100644 index 049b397bc..000000000 --- a/kubejs/data/tfc/tfc/drinkables/aged_sake.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "__comment__": "This file was automatically created by mcresources", - "ingredient": "tfcagedalcohol:aged_sake", - "thirst": 15, - "intoxication": 2000, - "effects": [ - { - "type": "minecraft:resistance", - "duration": 6400, - "amplifier": 0 - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfc/tfc/drinkables/aged_vodka.json b/kubejs/data/tfc/tfc/drinkables/aged_vodka.json deleted file mode 100644 index ec4095c4a..000000000 --- a/kubejs/data/tfc/tfc/drinkables/aged_vodka.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "__comment__": "This file was automatically created by mcresources", - "ingredient": "tfcagedalcohol:aged_vodka", - "thirst": 15, - "intoxication": 2000, - "effects": [ - { - "type": "minecraft:resistance", - "duration": 3200, - "amplifier": 1 - } - ] -} \ No newline at end of file diff --git a/kubejs/data/tfc/tfc/drinkables/aged_whiskey.json b/kubejs/data/tfc/tfc/drinkables/aged_whiskey.json deleted file mode 100644 index b865f4376..000000000 --- a/kubejs/data/tfc/tfc/drinkables/aged_whiskey.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "__comment__": "This file was automatically created by mcresources", - "ingredient": "tfcagedalcohol:aged_whiskey", - "thirst": 15, - "intoxication": 2000, - "effects": [ - { - "type": "minecraft:haste", - "duration": 3200, - "amplifier": 1 - } - ] -} \ No newline at end of file diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index 5729af43d..013f440c3 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -517,6 +517,15 @@ const registerTFCFluidTags = (event) => { event.add('tfc:usable_in_blue_steel_bucket', 'tfc:spring_water') event.add('tfc:usable_in_red_steel_bucket', 'tfc:spring_water') + event.add('tfc:alcohols', "tfcagedalcohol:aged_beer") + event.add('tfc:alcohols', "tfcagedalcohol:aged_cider") + event.add('tfc:alcohols', "tfcagedalcohol:aged_rum") + event.add('tfc:alcohols', "tfcagedalcohol:aged_sake") + event.add('tfc:alcohols', "tfcagedalcohol:aged_vodka") + event.add('tfc:alcohols', "tfcagedalcohol:aged_whiskey") + event.add('tfc:alcohols', "tfcagedalcohol:aged_corn_whiskey") + event.add('tfc:alcohols', "tfcagedalcohol:aged_rye_whiskey") + // Добавляем тег для скрытия в EMI event.add('c:hidden_from_recipe_viewers', 'tfc:metal/bismuth') event.add('c:hidden_from_recipe_viewers', 'tfc:metal/bismuth_bronze')