illuc/neuralgia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev

Browse source
This commit is contained in:
Xikaro 2025-07-20 16:54:27 +05:00
commit d006c1e9fc
10 changed files with 35 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

7
CHANGELOG.md
View file

@ -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

21
kubejs/data/tfc/tags/fluids/alcohols.json
View file

@ -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"
]
}

13
kubejs/data/tfc/tfc/drinkables/aged_beer.json
View file

@ -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
}
]
}

13
kubejs/data/tfc/tfc/drinkables/aged_cider.json
View file

@ -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
}
]
}

13
kubejs/data/tfc/tfc/drinkables/aged_rum.json
View file

@ -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
}
]
}

13
kubejs/data/tfc/tfc/drinkables/aged_sake.json
View file

@ -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
}
]
}

13
kubejs/data/tfc/tfc/drinkables/aged_vodka.json
View file

@ -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
}
]
}

13
kubejs/data/tfc/tfc/drinkables/aged_whiskey.json
View file

@ -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
}
]
}

9
kubejs/server_scripts/tfc/tags.js
View file

@ -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')

38
kubejs/server_scripts/water_flasks/recipes.js
View file

@ -76,26 +76,28 @@ const registerWaterFlasksRecipes = (event) => {
}).id('tfg:shaped/iron_flask')
event.remove({ id: 'waterflasks:crafting/repair_broken_iron' })
event.shaped('waterflasks:iron_flask', [
'AB',
'CD'
], {
A: 'waterflasks:broken_iron_flask',
B: 'waterflasks:bladder',
C: '#forge:cloth',
D: '#forge:tools/knives'
}).id('tfg:shaped/repair_broken_iron')
event.recipes.tfc.no_remainder_shaped_crafting(
event.shaped('waterflasks:iron_flask', [
'AB',
'CD'
], {
A: 'waterflasks:broken_iron_flask',
B: 'waterflasks:bladder',
C: '#forge:cloth',
D: '#forge:tools/knives'
})).id('tfg:shaped/repair_broken_iron')
event.remove({ id: 'waterflasks:crafting/repair_iron' })
event.shaped('waterflasks:iron_flask', [
'AB',
'CD'
], {
A: 'waterflasks:iron_flask',
B: 'waterflasks:bladder',
C: '#forge:cloth',
D: '#forge:tools/knives'
}).id('tfg:shaped/repair_iron')
event.recipes.tfc.no_remainder_shaped_crafting(
event.shaped('waterflasks:iron_flask', [
'AB',
'CD'
], {
A: 'waterflasks:iron_flask',
B: 'waterflasks:bladder',
C: '#forge:cloth',
D: '#forge:tools/knives'
})).id('tfg:shaped/repair_iron')
event.remove({ id: 'waterflasks:crafting/red_steel_flask' })
event.shaped('waterflasks:red_steel_flask', [