Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix GT tools with duplicates in TFC cannot set on the tool racks, and fix GT spare parts melting recipes #334

Merged
merged 7 commits into from
Apr 27, 2024
Merged

Fix GT tools with duplicates in TFC cannot set on the tool racks, and fix GT spare parts melting recipes #334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5930ee7
Fix GT tools with duplicates in TFC cannot set on the tool racks
chemlzh Apr 27, 2024
5200434
Fix spared parts molten product inconsistency between GT and TFC
chemlzh Apr 27, 2024
9cf8777
Update ev__extreme_voltage.snbt
chemlzh Apr 27, 2024
cbf074e
Update ev__extreme_voltage.snbt
chemlzh Apr 27, 2024
d6fad9b
Rollback for 0.7.3 update
chemlzh Apr 27, 2024
86e8196
Update tags.js
Exzept1on Apr 27, 2024
f465228
Merge branch 'main' into main
Exzept1on Apr 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions config/ftbquests/quests/chapters/ev__extreme_voltage.snbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@
"30A6EDDF25A5E5F8"
]
description: [
"&aTungstensteel Coils&r raise the Heat Capacity to a scorching &d4,500K&r."
"&aRuthenium-tungsten-molybdenum (RTM) Alloy Coils&r raise the Heat Capacity to a scorching &d4,500K&r."
""
"This will be required in &1IV&r, but as always, you should still get this earlier for the &6Coil bonuses&r."
]
Expand All @@ -538,7 +538,7 @@
item: "gtceu:rtm_alloy_coil_block"
type: "item"
}]
title: "Tungstensteel Coils"
title: "RTM Alloy Coils"
x: 9.0d
y: 2.25d
}
Expand Down
6 changes: 3 additions & 3 deletions kubejs/server_scripts/tfc/recipes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@ const registerTFCRecipes = (event) => {

// Болт -> Металл
event.recipes.tfc.heating(boltItem, tfcProperty.getMeltTemp())
.resultFluid(Fluid.of(outputMaterial.getFluid(), 36))
.resultFluid(Fluid.of(outputMaterial.getFluid(), 18))
.id(`tfc:heating/metal/${material.getName()}_bolt`)

// Стержень -> Болт
Expand All @@ -518,7 +518,7 @@ const registerTFCRecipes = (event) => {

// Винт -> Металл
event.recipes.tfc.heating(screwItem, tfcProperty.getMeltTemp())
.resultFluid(Fluid.of(outputMaterial.getFluid(), 72))
.resultFluid(Fluid.of(outputMaterial.getFluid(), 16))
Exzept1on marked this conversation as resolved.
Show resolved Hide resolved
.id(`tfc:heating/metal/${material.getName()}_screw`)

// Стержень -> Винт
Expand All @@ -533,7 +533,7 @@ const registerTFCRecipes = (event) => {

// Кольцо -> Металл
event.recipes.tfc.heating(ringItem, tfcProperty.getMeltTemp())
.resultFluid(Fluid.of(outputMaterial.getFluid(), 72))
.resultFluid(Fluid.of(outputMaterial.getFluid(), 36))
.id(`tfc:heating/metal/${material.getName()}_ring`)

// Стержень -> Кольцо
Expand Down
2 changes: 1 addition & 1 deletion kubejs/server_scripts/tfc/tags.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,4 +448,4 @@ const registerTFCPlacedFeatures = (event) => {
event.add('tfc:in_biome/veins', 'tfg:vein/surface_sphalerite')
event.add('tfc:in_biome/veins', 'tfg:vein/surface_tetrahedrite')
event.add('tfc:in_biome/veins', 'tfg:geode')
}
}