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:
Pyritie 2025-05-18 19:14:27 +01:00
commit 58e29c68e7
4 changed files with 61 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -2,6 +2,7 @@
## [Unreleased]
### Changes
- Remove various overlapping recipe conflicts. @Oosyrag
## [0.9.7] - 17.05.2025
### Changes

71
config/ftbquests/quests/chapters/mv__medium_voltage.snbt
View file

@ -329,7 +329,7 @@
subtitle: "{quests.medium_voltage.electrolyzer.subtitle}"
tasks: [{
id: "1A599E57A9493E9F"
item: "gtceu:mv_chemical_reactor"
item: "gtceu:mv_electrolyzer"
type: "item"
}]
title: "{quests.medium_voltage.electrolyzer.title}"
@ -680,10 +680,7 @@
y: 14.0d
}
{
dependencies: [
"38DE506FF5B32031"
"3DFFA8F91452C62A"
]
dependencies: ["38DE506FF5B32031"]
description: ["{quests.medium_voltage.mv_second_hv.desc}"]
icon: "gtceu:micro_processor_assembly"
id: "5063FDFFBE3E4855"
@ -994,7 +991,6 @@
y: 2.5d
}
{
dependencies: ["6A304E453D74C57C"]
description: ["{quests.medium_voltage.mv_oilsands.desc}"]
id: "575B07D390D9D079"
optional: true
@ -1007,14 +1003,15 @@
type: "item"
}]
title: "{quests.medium_voltage.mv_oilsands.title}"
x: -8.0d
x: -2.5d
y: 1.0d
}
{
dependencies: [
"575B07D390D9D079"
"53DC6E32C41C94C3"
"6EB68C28BEE24DEF"
"05ADBAE5B6F38956"
"6EB68C28BEE24DEF"
]
dependency_requirement: "one_completed"
description: [
@ -1031,12 +1028,12 @@
size: 1.0d
subtitle: "{quests.medium_voltage.mv_distillery.subtitle}"
tasks: [{
id: "6C32C7BCF9D12EBC"
id: "685043442271A0D0"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
"ftbfiltersystem:filter": "or(item(gtceu:lv_distillery)item(gtceu:mv_distillery))"
"ftbfiltersystem:filter": "or(item(gtceu:mv_distillery)item(gtceu:lv_distillery))"
}
}
title: "{quests.medium_voltage.mv_distillery.task}"
@ -1174,7 +1171,7 @@
}]
title: "{quests.medium_voltage.mv_mutli_channel.title}"
x: -8.0d
y: -2.0d
y: 1.0d
}
{
dependencies: ["315169840E06110F"]
@ -1488,11 +1485,11 @@
}
{
dependencies: ["22E462070F8B027A"]
description: ["{quests.medium_voltage.mv_.desc}"]
description: ["{quests.medium_voltage.mv_chemical_reactor.desc}"]
id: "79E8DC4D9B5F6B97"
shape: "octagon"
size: 2.0d
subtitle: "{quests.medium_voltage.mv_.subtitle}"
subtitle: "{quests.medium_voltage.mv_chemical_reactor.subtitle}"
tasks: [{
id: "04A6D4858DA3CE94"
item: "gtceu:mv_chemical_reactor"
@ -1519,6 +1516,54 @@
x: 9.0d
y: 6.0d
}
{
dependencies: [
"26394C1290D70AB6"
"5063FDFFBE3E4855"
]
dependency_requirement: "one_completed"
description: ["{quests.medium_voltage.lsb.desc}"]
icon: "gtceu:steel_large_boiler"
id: "730D7C10DEED3117"
shape: "square"
size: 1.0d
subtitle: "{quests.medium_voltage.lsb.subtitle}"
tasks: [{
id: "67728209D0BE18B1"
item: "gtceu:steel_large_boiler"
type: "item"
}]
title: "{quests.medium_voltage.lsb.title}"
x: 1.28d
y: 16.5d
}
{
dependencies: ["315169840E06110F"]
description: ["{quests.medium_voltage.mv_cpu.desc}"]
icon: "gtceu:cpu_chip"
id: "2C875707A396B6D3"
subtitle: "{quests.medium_voltage.mv_cpu.subtitle}"
tasks: [
{
id: "0C0649DBFF188F15"
item: "gtceu:diamond_lens"
type: "item"
}
{
id: "54424809334833A8"
item: "gtceu:cpu_wafer"
type: "item"
}
{
id: "79DC85B4ACC166FB"
item: "gtceu:cpu_chip"
type: "item"
}
]
title: "{quests.medium_voltage.mv_cpu.title}"
x: 5.0d
y: 8.0d
}
]
subtitle: ["{quests.medium_voltage.subtitle}"]
title: "{quests.medium_voltage}"

2
kubejs/server_scripts/create/recipes.js
View file

@ -1449,6 +1449,7 @@ const registerCreateRecipes = (event) => {
.itemOutputs('create:windmill_bearing')
.duration(50)
.EUt(GTValues.VA[GTValues.ULV])
.circuit(1)
// #endregion
@ -1848,6 +1849,7 @@ const registerCreateRecipes = (event) => {
.itemOutputs('create:gantry_carriage')
.duration(50)
.EUt(GTValues.VA[GTValues.ULV])
.circuit(2)
event.shaped('create:weighted_ejector', [
' B ',

68
kubejs/server_scripts/firmalife/recipes.js
View file

@ -454,9 +454,6 @@ const registerFirmaLifeRecipes = (event) => {
.duration(300)
.EUt(16)
event.recipes.create.mixing('4x firmalife:food/pizza_dough', ['firmalife:spice/basil_leaves', '#tfc:foods/dough', 'tfc:powder/salt', Fluid.of('tfc:olive_oil', 1000)])
.id('firmalife:create/mixer/food/pizza_dough')
// Vanilla Ice Cream
event.recipes.gtceu.mixer('firmalife:food/vanilla_ice_cream')
.itemInputs('firmalife:ice_shavings', '#tfc:sweetener', 'firmalife:spice/vanilla')
@ -465,9 +462,6 @@ const registerFirmaLifeRecipes = (event) => {
.duration(300)
.EUt(16)
event.recipes.create.mixing('2x firmalife:food/vanilla_ice_cream', ['firmalife:ice_shavings', '#tfc:sweetener', 'firmalife:spice/vanilla', Fluid.of('firmalife:cream', 1000)])
.id('firmalife:create/mixer/food/vanilla_ice_cream')
// Pumpkin Pie Dough
event.recipes.gtceu.mixer('firmalife:food/pumpkin_pie_dough')
.itemInputs('#tfc:sweetener', '#forge:eggs', '2x tfc:food/pumpkin_chunks', '#tfc:foods/flour')
@ -477,9 +471,6 @@ const registerFirmaLifeRecipes = (event) => {
.EUt(16)
.circuit(2)
event.recipes.create.mixing('firmalife:food/pumpkin_pie_dough', ['#tfc:sweetener', '#forge:eggs', '2x tfc:food/pumpkin_chunks', '#tfc:foods/flour', Fluid.of('minecraft:water', 1000)]
).id('firmalife:create/mixer/food/pumpkin_pie_dough')
// Butter
event.recipes.gtceu.mixer('firmalife:food/butter')
.itemInputs('tfc:powder/salt')
@ -488,9 +479,6 @@ const registerFirmaLifeRecipes = (event) => {
.duration(300)
.EUt(16)
event.recipes.create.mixing('firmalife:food/butter', ['tfc:powder/salt', Fluid.of('firmalife:cream', 1000)])
.id('firmalife:create/mixer/food/butter')
// Pie Dough
event.recipes.gtceu.mixer('firmalife:food/pie_dough')
.itemInputs('#tfc:sweetener', 'firmalife:food/butter', '#tfc:foods/flour')
@ -500,9 +488,6 @@ const registerFirmaLifeRecipes = (event) => {
.EUt(16)
.circuit(2)
event.recipes.create.mixing('firmalife:food/pie_dough', ['#tfc:sweetener', 'firmalife:food/butter', '#tfc:foods/flour', Fluid.of('minecraft:water', 1000)])
.id('firmalife:create/mixer/food/pie_dough')
// Cookie Dough
event.recipes.gtceu.mixer('firmalife:food/cookie_dough')
.itemInputs('#tfc:sweetener', 'firmalife:food/butter', '#tfc:foods/flour', '#forge:eggs', 'firmalife:spice/vanilla')
@ -510,9 +495,6 @@ const registerFirmaLifeRecipes = (event) => {
.duration(300)
.EUt(16)
event.recipes.create.mixing('4x firmalife:food/cookie_dough', ['#tfc:sweetener', 'firmalife:food/butter', '#tfc:foods/flour', '#forge:eggs', 'firmalife:spice/vanilla'])
.id('firmalife:create/mixer/food/cookie_dough')
// Hardtack Dough
event.recipes.gtceu.mixer('firmalife:food/hardtack_dough')
.itemInputs('tfc:powder/salt', '#tfc:foods/flour')
@ -522,9 +504,6 @@ const registerFirmaLifeRecipes = (event) => {
.EUt(16)
.circuit(2)
event.recipes.create.mixing('4x firmalife:food/hardtack_dough', ['tfc:powder/salt', '#tfc:foods/flour', Fluid.of('minecraft:water', 1000)])
.id('firmalife:create/mixer/food/hardtack_dough')
// Yeast starter
event.recipes.gtceu.mixer('firmalife:yeast_starter')
.inputFluids(Fluid.of('firmalife:yeast_starter', 100))
@ -534,9 +513,6 @@ const registerFirmaLifeRecipes = (event) => {
.EUt(8)
.circuit(1)
event.recipes.create.mixing(Fluid.of('firmalife:yeast_starter', 600), ['#tfc:foods/flour', Fluid.of('firmalife:yeast_starter', 100)])
.id('firmalife:create/mixer/yeast_starter')
// Cocoa Powder
event.recipes.gtceu.macerator('firmalife:food/cocoa_powder')
.itemInputs('gtceu:cocoa_dust')
@ -558,9 +534,6 @@ const registerFirmaLifeRecipes = (event) => {
.duration(300)
.EUt(16)
event.recipes.create.mixing('firmalife:food/chocolate_ice_cream', ['firmalife:food/vanilla_ice_cream', Fluid.of('firmalife:chocolate', 1000)])
.id('firmalife:create/mixer/food/chocolate_ice_cream')
// White Chocolate Blend
event.recipes.gtceu.mixer('firmalife:food/white_chocolate_blend/milk')
.itemInputs('2x firmalife:food/cocoa_butter', '#tfc:sweetener')
@ -569,9 +542,6 @@ const registerFirmaLifeRecipes = (event) => {
.duration(300)
.EUt(16)
event.recipes.create.mixing('2x firmalife:food/white_chocolate_blend', ['2x firmalife:food/cocoa_butter', '#tfc:sweetener', Fluid.of('minecraft:milk', 1000)])
.id('firmalife:create/mixer/food/white_chocolate_blend/milk')
event.recipes.gtceu.mixer('firmalife:food/white_chocolate_blend/yak_milk')
.itemInputs('2x firmalife:food/cocoa_butter', '#tfc:sweetener')
.inputFluids(Fluid.of('firmalife:yak_milk', 1000))
@ -579,9 +549,6 @@ const registerFirmaLifeRecipes = (event) => {
.duration(300)
.EUt(16)
event.recipes.create.mixing('2x firmalife:food/white_chocolate_blend', ['2x firmalife:food/cocoa_butter', '#tfc:sweetener', Fluid.of('firmalife:yak_milk', 1000)])
.id('firmalife:create/mixer/food/white_chocolate_blend/yak_milk')
event.recipes.gtceu.mixer('firmalife:food/white_chocolate_blend/goat_milk')
.itemInputs('2x firmalife:food/cocoa_butter', '#tfc:sweetener')
.inputFluids(Fluid.of('firmalife:goat_milk', 1000))
@ -589,9 +556,6 @@ const registerFirmaLifeRecipes = (event) => {
.duration(300)
.EUt(16)
event.recipes.create.mixing('2x firmalife:food/white_chocolate_blend', ['2x firmalife:food/cocoa_butter', '#tfc:sweetener', Fluid.of('firmalife:goat_milk', 1000)])
.id('firmalife:create/mixer/food/white_chocolate_blend/goat_milk')
event.recipes.gtceu.mixer('firmalife:food/white_chocolate_blend/coconut_milk')
.itemInputs('2x firmalife:food/cocoa_butter', '#tfc:sweetener')
.inputFluids(Fluid.of('firmalife:coconut_milk', 1000))
@ -599,9 +563,6 @@ const registerFirmaLifeRecipes = (event) => {
.duration(300)
.EUt(16)
event.recipes.create.mixing('2x firmalife:food/white_chocolate_blend', ['2x firmalife:food/cocoa_butter', '#tfc:sweetener', Fluid.of('firmalife:coconut_milk', 1000)])
.id('firmalife:create/mixer/food/white_chocolate_blend/coconut_milk')
// Dark Chocolate Blend
event.recipes.gtceu.mixer('firmalife:food/dark_chocolate_blend/milk')
.itemInputs('2x firmalife:food/cocoa_powder', '#tfc:sweetener')
@ -610,9 +571,6 @@ const registerFirmaLifeRecipes = (event) => {
.duration(300)
.EUt(16)
event.recipes.create.mixing('2x firmalife:food/dark_chocolate_blend', ['2x firmalife:food/cocoa_powder', '#tfc:sweetener', Fluid.of('minecraft:milk', 1000)])
.id('firmalife:create/mixer/food/dark_chocolate_blend/milk')
event.recipes.gtceu.mixer('firmalife:food/dark_chocolate_blend/yak_milk')
.itemInputs('2x firmalife:food/cocoa_powder', '#tfc:sweetener')
.inputFluids(Fluid.of('firmalife:yak_milk', 1000))
@ -620,9 +578,6 @@ const registerFirmaLifeRecipes = (event) => {
.duration(300)
.EUt(16)
event.recipes.create.mixing('2x firmalife:food/dark_chocolate_blend', ['2x firmalife:food/cocoa_powder', '#tfc:sweetener', Fluid.of('firmalife:yak_milk', 1000)])
.id('firmalife:create/mixer/food/dark_chocolate_blend/yak_milk')
event.recipes.gtceu.mixer('firmalife:food/dark_chocolate_blend/goat_milk')
.itemInputs('2x firmalife:food/cocoa_powder', '#tfc:sweetener')
.inputFluids(Fluid.of('firmalife:goat_milk', 1000))
@ -630,8 +585,6 @@ const registerFirmaLifeRecipes = (event) => {
.duration(300)
.EUt(16)
event.recipes.create.mixing('2x firmalife:food/dark_chocolate_blend', ['2x firmalife:food/cocoa_powder', '#tfc:sweetener', Fluid.of('firmalife:goat_milk', 1000)])
.id('firmalife:create/mixer/food/dark_chocolate_blend/goat_milk')
event.recipes.gtceu.mixer('firmalife:food/dark_chocolate_blend/coconut_milk')
.itemInputs('2x firmalife:food/cocoa_powder', '#tfc:sweetener')
@ -640,9 +593,6 @@ const registerFirmaLifeRecipes = (event) => {
.duration(300)
.EUt(16)
event.recipes.create.mixing('2x firmalife:food/dark_chocolate_blend', ['2x firmalife:food/cocoa_powder', '#tfc:sweetener', Fluid.of('firmalife:coconut_milk', 1000)])
.id('firmalife:create/mixer/food/dark_chocolate_blend/coconut_milk')
// Milk Chocolate Blend
event.recipes.gtceu.mixer('firmalife:food/milk_chocolate_blend/milk')
.itemInputs('firmalife:food/cocoa_powder', 'firmalife:food/cocoa_butter', '#tfc:sweetener')
@ -651,9 +601,6 @@ const registerFirmaLifeRecipes = (event) => {
.duration(300)
.EUt(16)
event.recipes.create.mixing('2x firmalife:food/milk_chocolate_blend', ['firmalife:food/cocoa_powder', 'firmalife:food/cocoa_butter', '#tfc:sweetener', Fluid.of('minecraft:milk', 1000)])
.id('firmalife:create/mixer/food/milk_chocolate_blend/milk')
event.recipes.gtceu.mixer('firmalife:food/milk_chocolate_blend/yak_milk')
.itemInputs('firmalife:food/cocoa_powder', 'firmalife:food/cocoa_butter', '#tfc:sweetener')
.inputFluids(Fluid.of('firmalife:yak_milk', 1000))
@ -661,9 +608,6 @@ const registerFirmaLifeRecipes = (event) => {
.duration(300)
.EUt(16)
event.recipes.create.mixing('2x firmalife:food/milk_chocolate_blend', ['firmalife:food/cocoa_powder', 'firmalife:food/cocoa_butter', '#tfc:sweetener', Fluid.of('firmalife:yak_milk', 1000)])
.id('firmalife:create/mixer/food/milk_chocolate_blend/yak_milk')
event.recipes.gtceu.mixer('firmalife:food/milk_chocolate_blend/goat_milk')
.itemInputs('firmalife:food/cocoa_powder', 'firmalife:food/cocoa_butter', '#tfc:sweetener')
.inputFluids(Fluid.of('firmalife:goat_milk', 1000))
@ -671,9 +615,6 @@ const registerFirmaLifeRecipes = (event) => {
.duration(300)
.EUt(16)
event.recipes.create.mixing('2x firmalife:food/milk_chocolate_blend', ['firmalife:food/cocoa_powder', 'firmalife:food/cocoa_butter', '#tfc:sweetener', Fluid.of('firmalife:goat_milk', 1000)])
.id('firmalife:create/mixer/food/milk_chocolate_blend/goat_milk')
event.recipes.gtceu.mixer('firmalife:food/milk_chocolate_blend/coconut_milk')
.itemInputs('firmalife:food/cocoa_powder', 'firmalife:food/cocoa_butter', '#tfc:sweetener')
.inputFluids(Fluid.of('firmalife:coconut_milk', 1000))
@ -681,9 +622,6 @@ const registerFirmaLifeRecipes = (event) => {
.duration(300)
.EUt(16)
event.recipes.create.mixing('2x firmalife:food/milk_chocolate_blend', ['firmalife:food/cocoa_powder', 'firmalife:food/cocoa_butter', '#tfc:sweetener', Fluid.of('firmalife:coconut_milk', 1000)])
.id('firmalife:create/mixer/food/milk_chocolate_blend/coconut_milk')
// Strawberry Ice Cream
event.recipes.gtceu.mixer('firmalife:food/strawberry_ice_cream')
.itemInputs('firmalife:food/vanilla_ice_cream', '2x tfc:food/strawberry')
@ -691,9 +629,6 @@ const registerFirmaLifeRecipes = (event) => {
.duration(300)
.EUt(16)
event.recipes.create.mixing('firmalife:food/strawberry_ice_cream', ['firmalife:food/vanilla_ice_cream', '2x tfc:food/strawberry']
).id('firmalife:create/mixer/food/strawberry_ice_cream')
// Hardtack Dough
event.recipes.gtceu.mixer('firmalife:food/chocolate_chip_cookie_dough')
.itemInputs('4x firmalife:food/cookie_dough', '#firmalife:chocolate_blends')
@ -701,9 +636,6 @@ const registerFirmaLifeRecipes = (event) => {
.duration(300)
.EUt(16)
event.recipes.create.mixing('4x firmalife:food/chocolate_chip_cookie_dough', ['4x firmalife:food/cookie_dough', '#firmalife:chocolate_blends'])
.id('firmalife:create/mixer/food/chocolate_chip_cookie_dough')
//#endregion
//#region Обжарка некоторой еды