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

Merge branch 'dev' into feature/create-6

Browse source
This commit is contained in:
Pyritie 2025-06-09 21:15:33 +01:00
commit cf7fc7f4d1
60 changed files with 1080 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

13
CHANGELOG.md
View file

@ -1,6 +1,19 @@
# Changelog
## [Unreleased]
### New features
- Added back the vanilla stonecutter @Pyritie
- Added our own recipes for crafting GregTech facades - 3 cast iron plates for 8 facades, or 3 titanium plates for 32 facades (#1145) @BlueBoat29
### Changes
### Bug fixes
- Fixed trowel being consumed on use (#1143) @Redeix
- Fixed glass dust dupe with unfinished lamps (#1134) @Pyritie
- Fixed ultimate battery recipe stack size issue (#1149) @Pyritie
- Fixed assembler recipe conflicts with certain wrought iron create items (#1142) @TomPlop & @Pyritie
- Quest fixes (#1119, #1142) @TomPlop
- Fixed recipe conflicts with scaffolding and paintings, and wine glasses and jars (#1141) @JeanRdSz
## [0.9.10] - 05.06.2025
### New features
- Added Trowel tool to randomly place blocks from hotbar (#1106) @Redeix
- Started work on Brazilian Portuguese translations @gifpxto
- Added Aqueous Accumulator machine, basically a rock breaker but for fluids (#1030) @Pyritie

2
config/emi.css
View file

@ -141,7 +141,7 @@
/**
* Whether recipes should have a button to set as default.
*/
recipe-default-button: false;
recipe-default-button: true;
/**
* Whether recipes should have a button to show the recipe tree.

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

@ -1268,12 +1268,12 @@
{
dependencies: ["45769156F4253C86"]
dependency_requirement: "one_completed"
description: ["{quests.medium_voltage.mv_.desc}"]
description: ["{quests.medium_voltage.mv_jetpack.desc}"]
id: "6FA956DAA72D6139"
optional: true
shape: "heart"
size: 1.0d
subtitle: "{quests.medium_voltage.mv_.subtitle}"
subtitle: "{quests.medium_voltage.mv_jetpack.subtitle}"
tasks: [{
id: "022324F9630960C6"
item: {

35
config/ftbquests/quests/chapters/queststfc_tips.snbt
View file

@ -1269,6 +1269,7 @@
Damage: 0
}
}
optional_task: true
type: "item"
}
{
@ -1280,6 +1281,7 @@
Damage: 0
}
}
optional_task: true
type: "item"
}
{
@ -1291,6 +1293,7 @@
Damage: 0
}
}
optional_task: true
type: "item"
}
{
@ -1302,6 +1305,7 @@
Damage: 0
}
}
optional_task: true
type: "item"
}
{
@ -1614,18 +1618,25 @@
description: ["{quests.tfg_tips.get_milk.desc}"]
id: "3C7F170E065B60E1"
subtitle: "{quests.tfg_tips.get_milk.subtitle}"
tasks: [{
id: "5ADFB5FC06EAED6C"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
"ftbfiltersystem:filter": "or(only_one(nbt(fuzzy:{fluid:{Amount:1000,FluidName:\"minecraft:milk\"}})item(minecraft:milk_bucket))only_one(nbt(fuzzy:{fluid:{Amount:1000,FluidName:\"firmalife:yak_milk\"}})item(firmalife:bucket/yak_milk))only_one(nbt(fuzzy:{fluid:{Amount:1000,FluidName:\"firmalife:goat_milk\"}})item(firmalife:bucket/goat_milk)))"
tasks: [
{
id: "5ADFB5FC06EAED6C"
item: {
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
"ftbfiltersystem:filter": "or(only_one(nbt(fuzzy:{fluid:{Amount:1000,FluidName:\"minecraft:milk\"}})item(minecraft:milk_bucket))only_one(nbt(fuzzy:{fluid:{Amount:1000,FluidName:\"firmalife:yak_milk\"}})item(firmalife:bucket/yak_milk))only_one(nbt(fuzzy:{fluid:{Amount:1000,FluidName:\"firmalife:goat_milk\"}})item(firmalife:bucket/goat_milk)))"
}
}
optional_task: true
title: "{quests.tfg_tips.get_milk.task}"
type: "item"
}
title: "{quests.tfg_tips.get_milk.task}"
type: "item"
}]
{
id: "26460F400A280214"
type: "checkmark"
}
]
title: "{quests.tfg_tips.get_milk.title}"
x: 4.5d
y: -8.5d
@ -1996,7 +2007,7 @@
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
"ftbfiltersystem:filter": "custom(HasPreservation/firmaciv:smoked)custom(HasPreservation/tfc:brined)"
"ftbfiltersystem:filter": "custom(HasPreservation/firmalife:smoked)custom(HasPreservation/tfc:brined)"
}
}
title: "{quests.tfg_tips.smoke_meat.task}"
@ -5269,7 +5280,7 @@
Count: 1
id: "ftbfiltersystem:smart_filter"
tag: {
"ftbfiltersystem:filter": "custom(HasPreservation/firmaciv:smoked)item(tfc:food/pork)"
"ftbfiltersystem:filter": "custom(HasPreservation/firmalife:smoked)item(tfc:food/pork)"
}
}
title: "{quests.tfg_tips.bacon.task}"

2
kubejs/assets/emi/category/properties/ae2_attunement.json
View file

@ -1 +1 @@
{"ae2:attunement":{"order":137}}
{"ae2:attunement":{"order":138}}

2
kubejs/assets/emi/category/properties/ae2_entropy.json
View file

@ -1 +1 @@
{"ae2:entropy":{"order":138}}
{"ae2:entropy":{"order":139}}

2
kubejs/assets/emi/category/properties/create_draining.json
View file

@ -1 +1 @@
{"create:draining":{"order":139}}
{"create:draining":{"order":140}}

2
kubejs/assets/emi/category/properties/create_spout_filling.json
View file

@ -1 +1 @@
{"create:spout_filling":{"order":140}}
{"create:spout_filling":{"order":141}}

2
kubejs/assets/emi/category/properties/domum_ornamentum_architects_cutter.json
View file

@ -1 +1 @@
{"domum_ornamentum:architects_cutter":{"order":135}}
{"domum_ornamentum:architects_cutter":{"order":136}}

2
kubejs/assets/emi/category/properties/emi_info.json
View file

@ -1 +1 @@
{"emi:info":{"order":143}}
{"emi:info":{"order":144}}

2
kubejs/assets/emi/category/properties/emi_tag.json
View file

@ -1 +1 @@
{"emi:tag":{"order":144}}
{"emi:tag":{"order":145}}

2
kubejs/assets/emi/category/properties/exposure_photograph_stacking.json
View file

@ -1 +1 @@
{"exposure:photograph_stacking":{"order":141}}
{"exposure:photograph_stacking":{"order":142}}

2
kubejs/assets/emi/category/properties/framedblocks_framing_saw.json
View file

@ -1 +1 @@
{"framedblocks:framing_saw":{"order":134}}
{"framedblocks:framing_saw":{"order":135}}

2
kubejs/assets/emi/category/properties/ftbquests_quest.json
View file

@ -1 +1 @@
{"ftbquests:quest":{"order":142}}
{"ftbquests:quest":{"order":143}}

2
kubejs/assets/emi/category/properties/greate_block_cutting.json
View file

@ -1 +1 @@
{"greate:block_cutting":{"order":133}}
{"greate:block_cutting":{"order":134}}

2
kubejs/assets/emi/category/properties/gtceu_programmed_circuit.json
View file

@ -1 +1 @@
{"gtceu:programmed_circuit":{"order":136}}
{"gtceu:programmed_circuit":{"order":137}}

1
kubejs/assets/emi/category/properties/minecraft_stonecutting.json Normal file
View file

@ -0,0 +1 @@
{"minecraft:stonecutting":{"order":133}}

3
kubejs/assets/emi/recipe/filters/categories.json
View file

@ -6,9 +6,6 @@
{
"category": "minecraft:brewing"
},
{
"category": "minecraft:stonecutting"
},
{
"category": "minecraft:blasting"
},

3
kubejs/assets/gtceu/lang/en_us.json
View file

@ -74,7 +74,8 @@
"material.gtceu.vitrified_asbestos": "Vitrified Asbestos",
"metaitem.dust.tooltip.purify": "Drop in Water to get Clean Dust",
"metaitem.crushed.tooltip.purify": "Drop in Water to get Purified Ore",
"item.gtceu.tool.behavior.silk_ice": "Silk Harvests Packed Ice",
"item.gtceu.tool.behavior.silk_ice": "Silk harvests Packed Ice",
"item.gtceu.tool.butchery_knife.tooltip": "Butchers animals for more meat",
"block.gtceu.overworld_marker": "Earth",
"block.gtceu.the_nether_marker": "The Beneath",
"tagprefix.sword_head": "%s Sword Head",

19
kubejs/assets/railways/lang/en_us.json
View file

@ -3,5 +3,22 @@
"block.railways.track_create_andesite_wide": "Wide Train Track",
"block.railways.track_create_andesite_narrow": "Narrow Train Track",
"item.railways.track_incomplete_create_andesite_wide": "Incomplete Wide Track",
"item.railways.track_incomplete_create_andesite_narrow": "Incomplete Narrow Track"
"item.railways.track_incomplete_create_andesite_narrow": "Incomplete Narrow Track",
"tfc.recipe.barrel.railways.barrel.dyeing.cap_decolor": "Decoloring",
"tfc.recipe.barrel.railways.barrel.dyeing.black_conductor_cap": "Dyeing",
"tfc.recipe.barrel.railways.barrel.dyeing.gray_conductor_cap": "Dyeing",
"tfc.recipe.barrel.railways.barrel.dyeing.light_conductor_gray_cap": "Dyeing",
"tfc.recipe.barrel.railways.barrel.dyeing.white_conductor_cap": "Dyeing",
"tfc.recipe.barrel.railways.barrel.dyeing.pink_conductor_cap": "Dyeing",
"tfc.recipe.barrel.railways.barrel.dyeing.magenta_conductor_cap": "Dyeing",
"tfc.recipe.barrel.railways.barrel.dyeing.purple_conductor_cap": "Dyeing",
"tfc.recipe.barrel.railways.barrel.dyeing.blue_conductor_cap": "Dyeing",
"tfc.recipe.barrel.railways.barrel.dyeing.light_conductor_blue_cap": "Dyeing",
"tfc.recipe.barrel.railways.barrel.dyeing.cyan_conductor_cap": "Dyeing",
"tfc.recipe.barrel.railways.barrel.dyeing.green_conductor_cap": "Dyeing",
"tfc.recipe.barrel.railways.barrel.dyeing.lime_conductor_cap": "Dyeing",
"tfc.recipe.barrel.railways.barrel.dyeing.yellow_conductor_cap": "Dyeing",
"tfc.recipe.barrel.railways.barrel.dyeing.orange_conductor_cap": "Dyeing",
"tfc.recipe.barrel.railways.barrel.dyeing.red_conductor_cap": "Dyeing",
"tfc.recipe.barrel.railways.barrel.dyeing.brown_conductor_cap": "Dyeing"
}

21
kubejs/data/greate/loot_tables/blocks/andesite_encased_large_aluminium_cogwheel.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "greate:large_aluminium_cogwheel"
}
],
"rolls": 1.0
}
],
"random_sequence": "greate:blocks/andesite_encased_large_aluminium_cogwheel"
}

21
kubejs/data/greate/loot_tables/blocks/andesite_encased_large_andesite_alloy_cogwheel.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "greate:large_andesite_alloy_cogwheel"
}
],
"rolls": 1.0
}
],
"random_sequence": "greate:blocks/andesite_encased_large_andesite_alloy_cogwheel"
}

21
kubejs/data/greate/loot_tables/blocks/andesite_encased_large_darmstadtium_cogwheel.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "greate:large_darmstadtium_cogwheel"
}
],
"rolls": 1.0
}
],
"random_sequence": "greate:blocks/andesite_encased_large_darmstadtium_cogwheel"
}

21
kubejs/data/greate/loot_tables/blocks/andesite_encased_large_naquadah_alloy_cogwheel.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "greate:large_naquadah_alloy_cogwheel"
}
],
"rolls": 1.0
}
],
"random_sequence": "greate:blocks/andesite_encased_large_naquadah_alloy_cogwheel"
}

21
kubejs/data/greate/loot_tables/blocks/andesite_encased_large_neutronium_cogwheel.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "greate:large_neutronium_cogwheel"
}
],
"rolls": 1.0
}
],
"random_sequence": "greate:blocks/andesite_encased_large_neutronium_cogwheel"
}

21
kubejs/data/greate/loot_tables/blocks/andesite_encased_large_rhodium_plated_palladium_cogwheel.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "greate:large_rhodium_plated_palladium_cogwheel"
}
],
"rolls": 1.0
}
],
"random_sequence": "greate:blocks/andesite_encased_large_rhodium_plated_palladium_cogwheel"
}

21
kubejs/data/greate/loot_tables/blocks/andesite_encased_large_stainless_steel_cogwheel.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "greate:large_stainless_steel_cogwheel"
}
],
"rolls": 1.0
}
],
"random_sequence": "greate:blocks/andesite_encased_large_stainless_steel_cogwheel"
}

21
kubejs/data/greate/loot_tables/blocks/andesite_encased_large_steel_cogwheel.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "greate:large_steel_cogwheel"
}
],
"rolls": 1.0
}
],
"random_sequence": "greate:blocks/andesite_encased_large_steel_cogwheel"
}

21
kubejs/data/greate/loot_tables/blocks/andesite_encased_large_titanium_cogwheel.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "greate:large_titanium_cogwheel"
}
],
"rolls": 1.0
}
],
"random_sequence": "greate:blocks/andesite_encased_large_titanium_cogwheel"
}

21
kubejs/data/greate/loot_tables/blocks/andesite_encased_large_tungsten_steel_cogwheel.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "greate:large_tungsten_steel_cogwheel"
}
],
"rolls": 1.0
}
],
"random_sequence": "greate:blocks/andesite_encased_large_tungsten_steel_cogwheel"
}

21
kubejs/data/greate/loot_tables/blocks/brass_encased_large_aluminium_cogwheel.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "greate:large_aluminium_cogwheel"
}
],
"rolls": 1.0
}
],
"random_sequence": "greate:blocks/brass_encased_large_aluminium_cogwheel"
}

21
kubejs/data/greate/loot_tables/blocks/brass_encased_large_andesite_alloy_cogwheel.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "greate:large_andesite_alloy_cogwheel"
}
],
"rolls": 1.0
}
],
"random_sequence": "greate:blocks/brass_encased_large_andesite_alloy_cogwheel"
}

21
kubejs/data/greate/loot_tables/blocks/brass_encased_large_darmstadtium_cogwheel.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "greate:large_darmstadtium_cogwheel"
}
],
"rolls": 1.0
}
],
"random_sequence": "greate:blocks/brass_encased_large_darmstadtium_cogwheel"
}

21
kubejs/data/greate/loot_tables/blocks/brass_encased_large_naquadah_alloy_cogwheel.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "greate:large_naquadah_alloy_cogwheel"
}
],
"rolls": 1.0
}
],
"random_sequence": "greate:blocks/brass_encased_large_naquadah_alloy_cogwheel"
}

21
kubejs/data/greate/loot_tables/blocks/brass_encased_large_neutronium_cogwheel.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "greate:large_neutronium_cogwheel"
}
],
"rolls": 1.0
}
],
"random_sequence": "greate:blocks/brass_encased_large_neutronium_cogwheel"
}

21
kubejs/data/greate/loot_tables/blocks/brass_encased_large_rhodium_plated_palladium_cogwheel.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "greate:large_rhodium_plated_palladium_cogwheel"
}
],
"rolls": 1.0
}
],
"random_sequence": "greate:blocks/brass_encased_large_rhodium_plated_palladium_cogwheel"
}

21
kubejs/data/greate/loot_tables/blocks/brass_encased_large_stainless_steel_cogwheel.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "greate:large_stainless_steel_cogwheel"
}
],
"rolls": 1.0
}
],
"random_sequence": "greate:blocks/brass_encased_large_stainless_steel_cogwheel"
}

21
kubejs/data/greate/loot_tables/blocks/brass_encased_large_steel_cogwheel.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "greate:large_steel_cogwheel"
}
],
"rolls": 1.0
}
],
"random_sequence": "greate:blocks/brass_encased_large_steel_cogwheel"
}

21
kubejs/data/greate/loot_tables/blocks/brass_encased_large_titanium_cogwheel.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "greate:large_titanium_cogwheel"
}
],
"rolls": 1.0
}
],
"random_sequence": "greate:blocks/brass_encased_large_titanium_cogwheel"
}

21
kubejs/data/greate/loot_tables/blocks/brass_encased_large_tungsten_steel_cogwheel.json Normal file
View file

@ -0,0 +1,21 @@
{
"type": "minecraft:block",
"pools": [
{
"bonus_rolls": 0.0,
"conditions": [
{
"condition": "minecraft:survives_explosion"
}
],
"entries": [
{
"type": "minecraft:item",
"name": "greate:large_tungsten_steel_cogwheel"
}
],
"rolls": 1.0
}
],
"random_sequence": "greate:blocks/brass_encased_large_tungsten_steel_cogwheel"
}

2
kubejs/server_scripts/ae2/tags.js
View file

@ -5,7 +5,7 @@ const registerAE2ItemTags = (event) => {
global.AE2_DISABLED_ITEMS.forEach(item => {
event.removeAllTagsFrom(item)
event.add('c:hidden_from_recipe_viewers', item)
})
})
}
const registerAE2BlockTags = (event) => {

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

@ -373,6 +373,7 @@ const registerCreateRecipes = (event) => {
.itemOutputs('create:rope_pulley')
.duration(50)
.EUt(GTValues.VA[GTValues.ULV])
.circuit(22)
// Шкиф подъемника
event.shaped('create:elevator_pulley', [
@ -411,6 +412,7 @@ const registerCreateRecipes = (event) => {
.itemOutputs('create:cart_assembler')
.duration(50)
.EUt(GTValues.VA[GTValues.ULV])
.circuit(21)
// Контроллер рельсы
event.shaped('create:controller_rail', [
@ -477,6 +479,7 @@ const registerCreateRecipes = (event) => {
.itemOutputs('create:mechanical_drill')
.duration(50)
.EUt(GTValues.VA[GTValues.ULV])
.circuit(19)
event.shaped('create:mechanical_roller', [
'GBG',
@ -497,6 +500,7 @@ const registerCreateRecipes = (event) => {
.itemOutputs('create:mechanical_roller')
.duration(50)
.EUt(GTValues.VA[GTValues.ULV])
.circuit(20)
// Редстоуновый контакт
event.shaped('2x create:redstone_contact', [
@ -555,7 +559,7 @@ const registerCreateRecipes = (event) => {
event.recipes.gtceu.assembler('tfg:create/mechanical_plough')
.itemInputs('3x #forge:hoe_heads', '2x #forge:plates/wrought_iron', '#tfg:small_cogwheels', 'create:andesite_casing')
.circuit(4)
.circuit(5)
.itemOutputs('create:mechanical_plough')
.duration(200)
.EUt(20)
@ -715,7 +719,7 @@ const registerCreateRecipes = (event) => {
event.recipes.gtceu.assembler('create:andesite_funnel')
.itemInputs('#forge:plates/wrought_iron', '#forge:foils/rubber')
.itemOutputs('create:andesite_funnel')
.circuit(4)
.circuit(6)
.duration(50)
.EUt(GTValues.VA[GTValues.ULV])
@ -732,7 +736,7 @@ const registerCreateRecipes = (event) => {
event.recipes.gtceu.assembler('create:andesite_funnel_leather')
.itemInputs('#forge:plates/wrought_iron', '#forge:leather')
.itemOutputs('create:andesite_funnel')
.circuit(4)
.circuit(7)
.duration(50)
.EUt(GTValues.VA[GTValues.ULV])
@ -752,7 +756,7 @@ const registerCreateRecipes = (event) => {
event.recipes.gtceu.assembler('create:brass_funnel')
.itemInputs('2x #forge:plates/brass', '2x #forge:foils/rubber', 'create:electron_tube')
.itemOutputs('2x create:brass_funnel')
.circuit(6)
.circuit(8)
.duration(50)
.EUt(GTValues.VA[GTValues.ULV])
@ -771,7 +775,7 @@ const registerCreateRecipes = (event) => {
event.recipes.gtceu.assembler('create:brass_funnel_leather')
.itemInputs('2x #forge:plates/brass', '2x #forge:leather', 'create:electron_tube')
.itemOutputs('2x create:brass_funnel')
.circuit(6)
.circuit(9)
.duration(50)
.EUt(GTValues.VA[GTValues.ULV])
@ -789,7 +793,7 @@ const registerCreateRecipes = (event) => {
event.recipes.gtceu.assembler('create:andesite_tunnel')
.itemInputs('#forge:plates/wrought_iron', '#forge:foils/rubber')
.itemOutputs('create:andesite_tunnel')
.circuit(5)
.circuit(10)
.duration(50)
.EUt(GTValues.VA[GTValues.ULV])
@ -806,7 +810,7 @@ const registerCreateRecipes = (event) => {
event.recipes.gtceu.assembler('create:andesite_tunnel_leather')
.itemInputs('#forge:plates/wrought_iron', '#forge:leather')
.itemOutputs('create:andesite_tunnel')
.circuit(5)
.circuit(11)
.duration(50)
.EUt(GTValues.VA[GTValues.ULV])
@ -825,7 +829,7 @@ const registerCreateRecipes = (event) => {
event.recipes.gtceu.assembler('create:brass_tunnel')
.itemInputs('2x #forge:plates/brass', '2x #forge:foils/rubber', 'create:electron_tube')
.itemOutputs('2x create:brass_tunnel')
.circuit(5)
.circuit(12)
.duration(50)
.EUt(GTValues.VA[GTValues.ULV])
@ -843,7 +847,7 @@ const registerCreateRecipes = (event) => {
event.recipes.gtceu.assembler('create:brass_tunnel_leather')
.itemInputs('2x #forge:plates/brass', '2x #forge:leather', 'create:electron_tube')
.itemOutputs('2x create:brass_tunnel')
.circuit(5)
.circuit(13)
.duration(50)
.EUt(GTValues.VA[GTValues.ULV])
@ -863,6 +867,7 @@ const registerCreateRecipes = (event) => {
.itemInputs('2x #forge:plates/wrought_iron', '2x #forge:rings/wrought_iron', '#forge:small_gears')
.itemOutputs('create:display_board')
.duration(50)
.circuit(14)
.EUt(GTValues.VA[GTValues.ULV])
// Латунная рука
@ -913,6 +918,7 @@ const registerCreateRecipes = (event) => {
.itemOutputs('2x create:electron_tube')
.duration(50)
.EUt(7)
.circuit(14)
event.shaped('4x create:electron_tube', [
'FAG',
@ -1687,6 +1693,7 @@ const registerCreateRecipes = (event) => {
.itemOutputs('create:contraption_controls')
.duration(50)
.EUt(GTValues.VA[GTValues.ULV])
.circuit(18)
event.shaped('create:wrench', [
' BB',
@ -1757,6 +1764,7 @@ const registerCreateRecipes = (event) => {
.itemOutputs('create:redstone_link')
.duration(50)
.EUt(GTValues.VA[GTValues.ULV])
.circuit(17)
event.shaped('create:display_link', [
'FED',
@ -1833,6 +1841,7 @@ const registerCreateRecipes = (event) => {
.itemOutputs('create:mechanical_bearing')
.duration(50)
.EUt(GTValues.VA[GTValues.ULV])
.circuit(15)
event.shaped('create:gantry_carriage', [
'DCE',
@ -1871,6 +1880,7 @@ const registerCreateRecipes = (event) => {
.itemOutputs('create:weighted_ejector')
.duration(50)
.EUt(GTValues.VA[GTValues.ULV])
.circuit(16)
event.shaped('create:turntable', [
'DA ',

26
kubejs/server_scripts/gregtech/recipes.js
View file

@ -1132,7 +1132,31 @@ const registerGTCEURecipes = (event) => {
.EUt(2)
//#endregion
//#region GT Facades
event.shapeless(Item.of('gtceu:facade_cover', 8, '{Facade: {Count:1b,id:"minecraft:stone"}}'), ['3x #forge:plates/iron', "#tfg:whitelisted/facades"])
.modifyResult((craftingGrid, result) =>
{
let blockID = craftingGrid.find(Ingredient.of("#tfg:whitelisted/facades")).id
console.log(blockID)
let facadeNBT = "{Facade: {Count:1b,id:" + "'" + blockID + "'" + "}}"
result.nbt = facadeNBT
return result;
}).id('gtceu:facade_cover');
event.shapeless(Item.of('gtceu:facade_cover', 32, '{Facade: {Count:1b,id:"minecraft:stone"}}'), ['3x #forge:plates/titanium', "#tfg:whitelisted/facades"])
.modifyResult((craftingGrid, result) =>
{
let blockID = craftingGrid.find(Ingredient.of("#tfg:whitelisted/facades")).id
console.log(blockID)
let facadeNBT = "{Facade: {Count:1b,id:" + "'" + blockID + "'" + "}}"
result.nbt = facadeNBT
return result;
}).id('gtceu:facade_cover32');
//#endregion
event.recipes.gtceu.laser_engraver('tfg:diamond_gear')
.itemInputs('4x #forge:plates/diamond')
.itemOutputs('#forge:gears/diamond')

24
kubejs/server_scripts/gregtech/recipes.machines.js
View file

@ -718,6 +718,30 @@ function registerGTCEuMachineRecipes(event) {
.EUt(GTValues.VA[GTValues.ZPM])
.stationResearch(b => b.researchStack(Item.of('gtceu:me_pattern_buffer')).EUt(GTValues.VA[GTValues.LuV]).CWUt(32))
event.remove({ id: 'gtceu:assembly_line/ultimate_battery' })
event.recipes.gtceu.assembly_line('ultimate_battery')
.itemInputs('16x #forge:double_plates/darmstadtium',
'4x #gtceu:circuits/uhv',
'16x #gtceu:batteries/uv',
'4x gtceu:uv_field_generator',
'64x gtceu:uhpic_wafer',
'64x gtceu:uhpic_wafer',
'64x gtceu:advanced_smd_diode',
'64x gtceu:advanced_smd_capacitor',
'64x gtceu:advanced_smd_resistor',
'64x gtceu:advanced_smd_transistor',
'64x gtceu:advanced_smd_inductor',
'32x gtceu:enriched_naquadah_trinium_europium_duranide_double_wire',
'64x #forge:bolts/neutronium')
.inputFluids(
Fluid.of('gtceu:soldering_alloy', 5760),
Fluid.of('gtceu:polybenzimidazole', 2304),
Fluid.of('gtceu:naquadria', 2592))
.itemOutputs('gtceu:max_battery')
.duration(100 * 20)
.EUt(300000)
.stationResearch(b => b.researchStack(Item.of('gtceu:energy_cluster')).EUt(GTValues.VA[GTValues.UHV]).CWUt(144))
// #endregion
// Контроллер теплицы

2
kubejs/server_scripts/gregtech/recipes.materials.js
View file

@ -666,7 +666,7 @@ function registerGTCEUMetalRecipes(event) {
event.recipes.gtceu.arc_furnace(`tfg:arc_${material.getName()}_unfinished_lamp`)
.itemInputs(unfinishedLampStack)
.itemOutputs([materialIngotStack, glassDustStack])
.itemOutputs(materialIngotStack)
.duration(material.getMass() * 8)
.category(GTRecipeCategories.ARC_FURNACE_RECYCLING)
.EUt(GTValues.VA[GTValues.ULV])

18
kubejs/server_scripts/minecraft/recipes.js
View file

@ -1010,4 +1010,22 @@ const registerMinecraftRecipes = (event) => {
.itemOutputs('minecraft:shroomlight')
.duration(200)
.EUt(GTValues.VA[GTValues.ULV])
// Stonecutter
event.shaped('minecraft:stonecutter',
[
' E ',
'CAC',
'BDB'
],
{
A: '#forge:plates/wrought_iron',
B: '#tfc:lumber',
C: '#forge:plates/brass',
D: '#forge:small_gears',
E: '#forge:buzz_saw_heads'
}).id('tfg:shaped/stonecutter');
event.stonecutting('minecraft:smooth_quartz', 'minecraft:quartz_block')
}

1
kubejs/server_scripts/minecraft/recipes.removes.js
View file

@ -689,6 +689,7 @@ function removeMinecraftRecipes(event) {
event.remove({ id: 'minecraft:quartz' })
event.remove({ id: 'minecraft:quartz_from_blasting' })
event.remove({ id: 'minecraft:smooth_quartz' })
//#endregion

40
kubejs/server_scripts/railways/recipes.js
View file

@ -85,6 +85,46 @@ const registerRailWaysRecipes = (event) => {
//#endregion
//#region conductor
event.recipes.gtceu.assembler(`tfg:railways/conductor_cap`)
.itemInputs('#gtceu:circuits/lv','#gtceu:electric_motors','2x #forge:string','#tfc:high_quality_cloth')
.circuit(15)
.itemOutputs('railways:white_conductor_cap')
.duration(80)
.inputFluids(Fluid.of('gtceu:glue', 200))
.EUt(16)
event.recipes.tfc.barrel_sealed(1000)
.inputs('#tfg:colored_caps', Fluid.of(`tfc:lye`, 288))
.outputItem(`railways:white_conductor_cap`)
.id(`railways:barrel/cap_decolor`)
global.MINECRAFT_DYE_NAMES.forEach(dye => {
event.recipes.gtceu.chemical_bath(`railways/${dye}_conductor_cap`)
.itemInputs('railways:white_conductor_cap')
.inputFluids(Fluid.of(`tfc:${dye}_dye`, 288))
.itemOutputs(`railways:${dye}_conductor_cap`)
.duration(200)
.EUt(4)
.category(GTRecipeCategories.CHEM_DYES)
if (dye != "white") {
event.recipes.tfc.barrel_sealed(1000)
.inputs(`railways:white_conductor_cap`, Fluid.of(`tfc:${dye}_dye`, 288))
.outputItem(`railways:${dye}_conductor_cap`)
.id(`railways:barrel/dyeing/${dye}_conductor_cap`)
event.recipes.gtceu.chemical_bath(`tfg:cap_decolor_bath`)
.itemInputs('#tfg:colored_caps')
.inputFluids(Fluid.of('gtceu:chlorine',20))
.itemOutputs('railways:white_conductor_cap')
.duration(80)
.EUt(4)
.category(GTRecipeCategories.CHEM_DYES)
}
})
//#endregion
// Переключатель пути поезда из андезита
event.shaped('railways:track_switch_andesite', [
'BAB',

6
kubejs/server_scripts/railways/tags.js
View file

@ -7,8 +7,12 @@ const registerRailWaysItemTags = (event) => {
event.removeAllTagsFrom(item)
event.add('c:hidden_from_recipe_viewers', item)
})
// Adding Conductor tags
global.MINECRAFT_DYE_NAMES.forEach(dye => {
if (dye != 'white') event.add('tfg:colored_caps', `railways:${dye}_conductor_cap`)
event.remove('c:hidden_from_recipe_viewers',`railways:${dye}_conductor_cap`)
})
}
const registerRailWaysBlockTags = (event) => {
// Удаление тегов у отключенных предметов

12
kubejs/server_scripts/sophisticated_backpacks/recipes.js
View file

@ -422,4 +422,16 @@ const registerSophisticatedBackpacksRecipes = (event) => {
F: '#forge:tools/wrenches',
G: 'gtceu:aluminium_drum',
}).id('tfg:sophisticated_backpacks/shaped/tank_upgrade')
// Stonecutter upgrade
event.shaped('sophisticatedbackpacks:stonecutter_upgrade', [
'ABA',
'CDC',
'ACA'
], {
A: '#forge:rods/steel',
B: 'minecraft:stonecutter',
C: '#forge:plates/steel',
D: 'sophisticatedbackpacks:upgrade_base',
}).id('tfg:sophisticated_backpacks/shaped/stonecutter_upgrade')
}

2
kubejs/server_scripts/tfc/recipes.machines.js
View file

@ -355,7 +355,7 @@ function registerTFCMachineRecipes(event) {
// Empty Jar
event.recipes.gtceu.alloy_smelter('tfc:jar_alloying')
.itemInputs('#tfc:glass_batches_tier_2')
.notConsumable('gtceu:cylinder_casting_mold')
.notConsumable('gtceu:ball_casting_mold')
.itemOutputs('tfc:empty_jar')
.duration(100)
.EUt(2)

12
kubejs/server_scripts/tfg/recipes.miscellaneous.js
View file

@ -124,7 +124,7 @@ function registerTFGMiscellaneousRecipes(event) {
.outputFluids(Fluid.of('firmalife:curdled_goat_milk', 1000))
.duration(300)
.EUt(GTValues.VA[GTValues.LV])
//Scaffolding Frame
event.shaped('tfg:scaffolding_frame',
[
@ -136,13 +136,7 @@ function registerTFGMiscellaneousRecipes(event) {
A: '#forge:rods/wood',
B: '#forge:cloth'
}).id('tfg:shaped/scaffolding_frame');
event.recipes.gtceu.assembler('tfg:assembler/scaffolding_frame')
.itemInputs('4x #forge:rods/wood', '#forge:cloth')
.itemOutputs('tfg:scaffolding_frame')
.duration(10)
.EUt(GTValues.VA[GTValues.ULV]);
//Airship Hull
event.shaped('tfg:airship_hull', [
'A B',
@ -485,4 +479,4 @@ function registerTFGMiscellaneousRecipes(event) {
.duration(40)
.circuit(4)
.EUt(GTValues.VA[GTValues.ULV])
}
}

324
kubejs/server_scripts/tfg/tags.facades.js Normal file
View file

@ -0,0 +1,324 @@
// priority: 0
function registerFacadeWhitelistTags(event) {
const facade_materials = [
//tags
'#tfc:rock/bricks',
'#tfc:rock/smooth',
'#tfc:rock/gravel',
'#tfc:rock/cracked_bricks',
'#tfc:rock/chiseled',
'#tfc:rock/raw',
'#tfc:metal_plated_blocks',
'#tfc:colored_raw_alabaster',
'#tfc:colored_bricks_alabaster',
'#tfc:colored_polished_alabaster',
'#tfc:mud_bricks',
'#forge:sandstone',
'#forge:storage_blocks',
'#forge:glass',
'#minecraft:terracotta',
'#create:casing',
'#dormum_ornamentum:brick_items',
'#simplylight:any_lamp_on',
'#simplylight:any_lamp_off',
'#minecraft:planks',
'#minecraft:logs',
//rnr shingles
'rnr:ceramic_roof',
'rnr:terracotta_roof',
//tfc blocks
'tfc:fire_bricks',
'tfc:aggregate',
'tfc:alabaster/raw',
'tfc:alabaster/bricks',
'tfc:alabaster/polished',
//firmalife blocks
'firmalife:metal/blocks/stainless_steel',
'firmalife:metal/blocks/chromium',
'firmalife:sealed_bricks',
'firmalife:chiseled_sealed_bricks',
'firmalife:polished_sealed_bricks',
//gtceu blocks
'gtceu:coke_oven_bricks',
'gtceu:firebricks',
'gtceu:wood_wall',
'gtceu:tempered_glass',
'gtceu:laminated_glass',
'gtceu:plascrete',
'gtceu:cleanroom_glass',
//gtceu casing
'gtceu:steam_machine_casing',
'gtceu:heatproof_machine_casing',
'gtceu:frostproof_machine_casing',
'gtceu:solid_machine_casing',
'gtceu:clean_machine_casing',
'gtceu:stable_machine_casing',
'gtceu:robust_machine_casing',
'gtceu:inert_machine_casing',
'gtceu:sturdy_machine_casing',
'gtceu:stainless_evaporation_casing',
'gtceu:nonconducting_casing',
'gtceu:vibration_safe_casing',
'gtceu:watertight_casing',
'gtceu:secure_maceration_casing',
'gtceu:high_temperature_smelting_casing',
'gtceu:laser_safe_engraving_casing',
'gtceu:large_scale_assembler_casing',
'gtceu:shock_proof_cutting_casing',
'gtceu:stress_proof_casing',
'gtceu:corrosion_proof_casing',
'gtceu:reaction_safe_mixing_casing',
'gtceu:assembly_line_casing',
'gtceu:titanium_turbine_casing',
'gtceu:stainless_turbine_casing',
'gtceu:tungstensteel_turbine_casing',
'gtceu:computer_casing',
'gtceu:advanced_computer_casing',
'gtceu:high_power_casing',
//gtceu hazard signs
'gtceu:acid_hazard_sign_block',
'gtceu:antimatter_hazard_sign_block',
'gtceu:bio_hazard_sign_block',
'gtceu:boss_hazard_sign_block',
'gtceu:causality_hazard_sign_block',
'gtceu:explosion_hazard_sign_block',
'gtceu:fire_hazard_sign_block',
'gtceu:frost_hazard_sign_block',
'gtceu:generic_hazard_sign_block',
'gtceu:gregification_hazard_sign_block',
'gtceu:high_pressure_hazard_sign_block',
'gtceu:high_voltage_hazard_sign_block',
'gtceu:laser_hazard_sign_block',
'gtceu:magic_hazard_sign_block',
'gtceu:magnetic_hazard_sign_block',
'gtceu:mob_infestation_hazard_sign_block',
'gtceu:mob_spawner_hazard_sign_block',
'gtceu:noise_hazard_sign_block',
'gtceu:radioactive_hazard_sign_block',
'gtceu:spatial_storage_hazard_sign_block',
'gtceu:turret_hazard_sign_block',
'gtceu:void_hazard_sign_block',
'gtceu:yellow_stripes_block_a',
'gtceu:yellow_stripes_block_b',
//windows
'create:dark_oak_window',
'create:mangrove_window',
'create:ornate_iron_window',
'create_connected:cherry_window',
'create_connected:bamboo_window',
'createdeco:andesite_window',
'createdeco:copper_window',
'createdeco:iron_window',
'createdeco:industrial_iron_window',
'createdeco:brass_window',
'createdeco:zinc_window',
'everycomp:c/domum_ornamentum/cactus_window',
'everycomp:c/domum_ornamentum/cactus_extra_window',
'ae2:quartz_glass',
//create deco
'createdeco:andesite_sheet_metal',
'createdeco:brass_sheet_metal',
'createdeco:iron_sheet_metal',
'createdeco:copper_sheet_metal',
'createdeco:industrial_iron_sheet_metal',
'createdeco:zinc_sheet_metal'
];
const mc_colors =
[
'white',
'orange',
'magenta',
'light_blue',
'yellow',
'lime',
'pink',
'gray',
'light_gray',
'cyan',
'purple',
'blue',
'brown',
'green',
'red',
'black'
]
const wood_types_tfc =
[
'acacia',
'ash',
'aspen',
'birch',
'blackwood',
'chestnut',
'douglas_fir',
'hickory',
'kapok',
'mangrove',
'maple',
'oak',
'palm',
'pine',
'rosewood',
'sequoia',
'spruce',
'sycamore',
'white_cedar',
'willow'
]
const wood_types_afc =
[
'baobao',
'eucalyptus',
'mahogany',
'heavea',
'tualang',
'teak',
'cypress',
'fig',
'ironwood',
'ipe'
]
const createdeco_bricks_fm =
[
'pearl_bricks',
'verdant_bricks',
'red_bricks',
'dean_bricks',
'umber_bricks',
'dusk_bricks',
'blue_bricks',
'scarlet_bricks'
]
const gtceu_stonelike_fm =
[
'light_concrete',
'dark_concrete',
'red_granite',
'marble'
]
const create_copper_fm =
[
'copper',
'exposed_copper',
'weathered_copper',
'oxidized_copper'
]
const create_rock_types_fm =
[
'granite',
'diorite',
'andesite',
'calcite',
'dripstone',
'deepslate',
'limestone'
//'ochrum',
//'scoria',
//'scorchia',
//'veridium'
//'tuff',
//'asurine',
//'crimsite',
]
//misc blocks
facade_materials.forEach(facade_material => {
event.add('tfg:whitelisted/facades', `${facade_material}`)
});
//gtceu stonelike stuff
gtceu_stonelike_fm.forEach(facade_material => {
if(facade_material != 'marble')
{
event.add('tfg:whitelisted/facades', 'gtceu:' + facade_material + '_cobblestone')
event.add('tfg:whitelisted/facades', 'gtceu:mossy_' + facade_material + '_cobblestone')
event.add('tfg:whitelisted/facades', 'gtceu:' + facade_material + '_bricks')
event.add('tfg:whitelisted/facades', 'gtceu:cracked_' + facade_material + '_bricks')
event.add('tfg:whitelisted/facades', 'gtceu:mossy_' + facade_material + '_bricks')
}
event.add('tfg:whitelisted/facades', 'gtceu:polished_' + facade_material)
event.add('tfg:whitelisted/facades', 'gtceu:chiseled' + facade_material)
event.add('tfg:whitelisted/facades', 'gtceu:small_' + facade_material + '_bricks')
event.add('tfg:whitelisted/facades', 'gtceu:square_' + facade_material + '_bricks')
event.add('tfg:whitelisted/facades', 'gtceu:' + facade_material + '_tile')
event.add('tfg:whitelisted/facades', 'gtceu:' + facade_material + '_small_tile')
event.add('tfg:whitelisted/facades', 'gtceu:' + facade_material + '_windmill_a')
event.add('tfg:whitelisted/facades', 'gtceu:' + facade_material + '_windmill_b')
});
//gtceu misc colored blocks
mc_colors.forEach(facade_material => {
event.add('tfg:whitelisted/facades', 'gtceu:' + facade_material + '_metal_sheet')
event.add('tfg:whitelisted/facades', 'gtceu:' + facade_material + '_large_metal_sheet')
event.add('tfg:whitelisted/facades', 'gtceu:' + facade_material + '_studs')
});
//create copper
create_copper_fm.forEach(facade_material => {
event.add('tfg:whitelisted/facades', 'create:' + facade_material + '_shingles')
event.add('tfg:whitelisted/facades', 'create:' + facade_material + '_tiles')
});
//create rocks
create_rock_types_fm.forEach(facade_material => {
if(facade_material == 'limestone')
{
event.add('tfg:whitelisted/facades', 'create:' + facade_material)
}
event.add('tfg:whitelisted/facades', 'create:cut_' + facade_material)
event.add('tfg:whitelisted/facades', 'create:polished_cut_' + facade_material)
event.add('tfg:whitelisted/facades', 'create:cut_' + facade_material + '_bricks')
event.add('tfg:whitelisted/facades', 'create:small_' + facade_material + '_bricks')
event.add('tfg:whitelisted/facades', 'create:layered_' + facade_material)
event.add('tfg:whitelisted/facades', 'create:' + facade_material + '_pillar')
});
//rnr shingles
wood_types_tfc.concat(wood_types_afc).forEach(facade_material => {
event.add('tfg:whitelisted/facades', 'rnr:wood/shingles/' + facade_material)
});
//createdeco bricks
createdeco_bricks_fm.forEach(facade_material => {
if (facade_material != 'red_bricks')
{
event.add('tfg:whitelisted/facades', 'createdeco:' + facade_material)
}
event.add('tfg:whitelisted/facades', 'createdeco:short_' + facade_material)
event.add('tfg:whitelisted/facades', 'createdeco:long_' + facade_material)
event.add('tfg:whitelisted/facades', 'createdeco:tiled_' + facade_material)
event.add('tfg:whitelisted/facades', 'createdeco:corner_' + facade_material)
event.add('tfg:whitelisted/facades', 'createdeco:cracked_' + facade_material)
event.add('tfg:whitelisted/facades', 'createdeco:mossy_' + facade_material)
});
//everycomp windows
wood_types_tfc.forEach(facade_material => {
event.add('tfg:whitelisted/facades', 'everycomp:c/tfc/' + facade_material + '_window')
});
wood_types_afc.forEach(facade_material => {
event.add('tfg:whitelisted/facades', 'everycomp:c/afc/' + facade_material + '_window')
});
}

1
kubejs/server_scripts/tfg/tags.js
View file

@ -1,6 +1,7 @@
const registerTFGItemTags = (event) => {
registerTFGTrimTags(event)
registerFacadeWhitelistTags(event)
//temporary hidden items
event.add('c:hidden_from_recipe_viewers', 'tfg:geyser_source_small')

53
kubejs/startup_scripts/create/constants.js
View file

@ -186,63 +186,12 @@ global.CREATE_DISABLED_ITEMS = [
'create:warped_window_pane',
// Blocks
'create:andesite_alloy_block',
'create:industrial_iron_block',
'create:andesite_alloy_block',
'create:experience_block',
'create:rose_quartz_block',
'create:rose_quartz_tiles',
'create:small_rose_quartz_tiles',
// Shit Copper Blocks (Когда гребаный Create стал модом про декор)
'create:oxidized_copper_tiles',
'create:copper_tile_slab',
'create:exposed_copper_tile_slab',
'create:weathered_copper_tile_slab',
'create:oxidized_copper_tile_slab',
'create:copper_tile_stairs',
'create:exposed_copper_tile_stairs',
'create:weathered_copper_tile_stairs',
'create:oxidized_copper_tile_stairs',
'create:copper_shingles',
'create:exposed_copper_shingles',
'create:weathered_copper_shingles',
'create:oxidized_copper_shingles',
'create:copper_shingle_slab',
'create:exposed_copper_shingle_slab',
'create:weathered_copper_shingle_slab',
'create:oxidized_copper_shingle_slab',
'create:copper_shingle_stairs',
'create:exposed_copper_shingle_stairs',
'create:weathered_copper_shingle_stairs',
'create:oxidized_copper_shingle_stairs',
'create:waxed_copper_shingles',
'create:waxed_exposed_copper_shingles',
'create:waxed_weathered_copper_shingles',
'create:waxed_oxidized_copper_shingles',
'create:waxed_copper_shingle_slab',
'create:waxed_exposed_copper_shingle_slab',
'create:waxed_weathered_copper_shingle_slab',
'create:waxed_oxidized_copper_shingle_slab',
'create:waxed_copper_shingle_stairs',
'create:waxed_exposed_copper_shingle_stairs',
'create:waxed_weathered_copper_shingle_stairs',
'create:waxed_oxidized_copper_shingle_stairs',
'create:copper_tiles',
'create:exposed_copper_tiles',
'create:weathered_copper_tiles',
'create:waxed_copper_tiles',
'create:waxed_exposed_copper_tiles',
'create:waxed_weathered_copper_tiles',
'create:waxed_oxidized_copper_tiles',
'create:waxed_copper_tile_slab',
'create:waxed_exposed_copper_tile_slab',
'create:waxed_weathered_copper_tile_slab',
'create:waxed_oxidized_copper_tile_slab',
'create:waxed_copper_tile_stairs',
'create:waxed_exposed_copper_tile_stairs',
'create:waxed_weathered_copper_tile_stairs',
'create:waxed_oxidized_copper_tile_stairs',
// Other
'create:honey_bucket',
'create:chocolate_bucket',

1
kubejs/startup_scripts/minecraft/constants.js
View file

@ -503,7 +503,6 @@ global.MINECRAFT_DISABLED_ITEMS = [
'minecraft:mud',
'minecraft:netherite_scrap',
'minecraft:suspicious_gravel',
'minecraft:stonecutter',
'minecraft:gravel',
'minecraft:large_fern',
'minecraft:tall_grass',

18
kubejs/startup_scripts/railways/constants.js
View file

@ -100,24 +100,6 @@ global.RAIL_WAYS_DISABLED_ITEMS = [
'railways:track_incomplete_tieless_narrow',
'railways:track_incomplete_tieless_wide',
// Caps
'railways:white_conductor_cap',
'railways:orange_conductor_cap',
'railways:magenta_conductor_cap',
'railways:light_blue_conductor_cap',
'railways:yellow_conductor_cap',
'railways:lime_conductor_cap',
'railways:pink_conductor_cap',
'railways:gray_conductor_cap',
'railways:light_gray_conductor_cap',
'railways:cyan_conductor_cap',
'railways:purple_conductor_cap',
'railways:blue_conductor_cap',
'railways:brown_conductor_cap',
'railways:green_conductor_cap',
'railways:red_conductor_cap',
'railways:black_conductor_cap',
// Incomplete Caps
'railways:white_incomplete_conductor_cap',
'railways:orange_incomplete_conductor_cap',

1
kubejs/startup_scripts/sophisticated_backpacks/constants.js
View file

@ -8,7 +8,6 @@ global.SOPHISTICATED_BACKPACKS_DISABLED_ITEMS = [
'sophisticatedbackpacks:auto_smoking_upgrade',
'sophisticatedbackpacks:blasting_upgrade',
'sophisticatedbackpacks:auto_blasting_upgrade',
'sophisticatedbackpacks:stonecutter_upgrade',
'sophisticatedbackpacks:stack_upgrade_tier_2',
'sophisticatedbackpacks:stack_upgrade_tier_3',
'sophisticatedbackpacks:stack_upgrade_tier_4',

113
pakku-lock.json
View file

@ -1462,6 +1462,44 @@
}
]
},
{
"pakku_id": "0Cv6dO3ZGvsziQH1",
"type": "MOD",
"slug": {
"curseforge": "clean-swing-through-grass"
},
"name": {
"curseforge": "Clean Swing Through Grass"
},
"id": {
"curseforge": "915308"
},
"files": [
{
"type": "curseforge",
"file_name": "cleanswing-1.20-1.8.jar",
"mc_versions": [
"1.20.1",
"1.20"
],
"loaders": [
"neoforge",
"forge"
],
"release_type": "release",
"url": "https://edge.forgecdn.net/files/5962/530/cleanswing-1.20-1.8.jar",
"id": "5962530",
"parent_id": "915308",
"hashes": {
"sha1": "c128e24c47ab4a389b3868ff6913ee0631f254e8",
"md5": "84f9950e09245d82f72a6461f57ca30f"
},
"required_dependencies": [],
"size": 8305,
"date_published": "2024-12-04T16:23:38.883Z"
}
]
},
{
"pakku_id": "PDE7RB7hlFnTfgkq",
"type": "MOD",
@ -1651,6 +1689,45 @@
}
]
},
{
"pakku_id": "On44S9fQbI0vVJTW",
"type": "RESOURCE_PACK",
"slug": {
"curseforge": "computercraft-greg-flavored"
},
"name": {
"curseforge": "ComputerCraft: Greg Flavored"
},
"id": {
"curseforge": "1061743"
},
"files": [
{
"type": "curseforge",
"file_name": "ComputerCraft Greg Refreshed 1.1 - 1.20.1.zip",
"mc_versions": [
"1.20.2",
"1.20.5",
"1.20.3",
"1.20.1",
"1.20",
"1.20.6",
"1.20.4"
],
"release_type": "release",
"url": "https://edge.forgecdn.net/files/5560/613/ComputerCraft Greg Refreshed 1.1 - 1.20.1.zip",
"id": "5560613",
"parent_id": "1061743",
"hashes": {
"sha1": "6d1d3642537c40ea813507379941773a49c62f28",
"md5": "57d0168a3d006bca79603d0646594f83"
},
"required_dependencies": [],
"size": 957439,
"date_published": "2024-07-24T09:35:57.853Z"
}
]
},
{
"pakku_id": "MaU4DxZPJWpFlsaT",
"type": "MOD",
@ -2494,7 +2571,7 @@
{
"pakku_id": "SG15bUHPcW2KqNGd",
"type": "MOD",
"side": "BOTH",
"side": "CLIENT",
"slug": {
"curseforge": "detected-setblock-be-gone"
},
@ -5881,6 +5958,39 @@
}
]
},
{
"pakku_id": "v7A0bgYd4KcqmpVA",
"type": "RESOURCE_PACK",
"slug": {
"curseforge": "new-animals-for-terrafirmacraft"
},
"name": {
"curseforge": "New Animals for TerraFirmaCraft"
},
"id": {
"curseforge": "1246070"
},
"files": [
{
"type": "curseforge",
"file_name": "TerraFirmaCraft_New_Animals.zip",
"mc_versions": [
"1.20.1"
],
"release_type": "release",
"url": "https://edge.forgecdn.net/files/6436/812/TerraFirmaCraft_New_Animals.zip",
"id": "6436812",
"parent_id": "1246070",
"hashes": {
"sha1": "c3318956eff6b4c9e49e81b89ff2b49eaf16d4dc",
"md5": "09466b7016348fb845c40886f466e9b2"
},
"required_dependencies": [],
"size": 65591,
"date_published": "2025-04-18T17:00:53.570Z"
}
]
},
{
"pakku_id": "PelbQK42HFCTe5cc",
"type": "MOD",
@ -6559,7 +6669,6 @@
"id": {
"curseforge": "585406"
},
"export": false,
"files": [
{
"type": "curseforge",

2
pakku.json
View file

@ -1,6 +1,6 @@
{
"name": "TerraFirmaGreg-Modern",
"version": "0.9.9",
"version": "0.9.10",
"description": "An innovative modpack that contains GregTech and TerraFirmaCraft on 1.20.x.",
"author": "Exception, Xikaro",
"overrides": [