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-05-13 10:53:57 +01:00
commit 9069b4c1a6
119 changed files with 6882 additions and 2127 deletions
Download patch file Download diff file Expand all files Collapse all files

12
kubejs/startup_scripts/firmalife/constants.js
View file

@ -30,9 +30,6 @@ global.FIRMALIFE_DISABLED_ITEMS = [
'firmalife:copper_pipe',
'firmalife:oxidized_copper_pipe',
'firmalife:irrigation_tank',
'firmalife:iron_greenhouse_port',
'firmalife:copper_greenhouse_port',
'firmalife:treated_wood_greenhouse_port'
];
global.FIRMALIFE_HIDED_ITEMS = [
@ -45,15 +42,6 @@ global.FIRMALIFE_HIDED_ITEMS = [
'firmalife:weathered_copper_greenhouse_door',
'firmalife:weathered_copper_greenhouse_port',
'firmalife:stainless_steel_greenhouse_wall',
'firmalife:stainless_steel_greenhouse_panel_wall',
'firmalife:stainless_steel_greenhouse_panel_roof',
'firmalife:stainless_steel_greenhouse_roof',
'firmalife:stainless_steel_greenhouse_roof_top',
'firmalife:stainless_steel_greenhouse_trapdoor',
'firmalife:stainless_steel_greenhouse_door',
'firmalife:stainless_steel_greenhouse_port',
'firmalife:rusted_iron_greenhouse_wall',
'firmalife:rusted_iron_greenhouse_panel_wall',
'firmalife:rusted_iron_greenhouse_panel_roof',

3
kubejs/startup_scripts/greate/constants.js
View file

@ -25,9 +25,6 @@ global.GREATE_DISABLED_ITEMS = [
'greate:andesite_alloy_encased_fan',
'greate:andesite_alloy_mechanical_mixer',
'greate:andesite_alloy_mechanical_pump',
'greate:aluminium_millstone',
'greate:stainless_steel_millstone',
'greate:titanium_millstone',
// Disabled because they don't respect the cleanroom requirement of some recipes
'greate:stainless_steel_mechanical_saw',

2
kubejs/startup_scripts/gtceu/constants.js
View file

@ -86,6 +86,8 @@ global.GTCEU_DISABLED_ITEMS = [
'gtceu:zpm_solar_panel',
'gtceu:uv_solar_panel',
'gtceu:compressed_clay',
// Sculk
'gtceu:tiny_echo_shard_dust',
'gtceu:small_echo_shard_dust',

10
kubejs/startup_scripts/tfc/constants.js
View file

@ -811,7 +811,7 @@ global.TFC_FURNACE_MOLD_RECIPE_COMPONENTS = [
];
global.TFC_CLAY_TO_UNFIRED_MOLD_RECIPE_COMPONENTS = [
{ input: '5x minecraft:clay_ball', output: 'tfc:ceramic/unfired_ingot_mold', name: 'ingot_mold' },
{ input: '5x minecraft:clay_ball', output: '2x tfc:ceramic/unfired_ingot_mold', name: 'ingot_mold' },
{ input: '5x minecraft:clay_ball', output: 'tfc:ceramic/unfired_pickaxe_head_mold', name: 'pickaxe_head_mold' },
{ input: '5x minecraft:clay_ball', output: 'tfc:ceramic/unfired_propick_head_mold', name: 'propick_head_mold' },
{ input: '5x minecraft:clay_ball', output: 'tfc:ceramic/unfired_axe_head_mold', name: 'axe_head_mold' },
@ -826,16 +826,18 @@ global.TFC_CLAY_TO_UNFIRED_MOLD_RECIPE_COMPONENTS = [
{ input: '5x minecraft:clay_ball', output: 'tfc:ceramic/unfired_knife_blade_mold', name: 'knife_blade_mold' },
{ input: '5x minecraft:clay_ball', output: 'tfc:ceramic/unfired_scythe_blade_mold', name: 'scythe_blade_mold' },
{ input: '5x minecraft:clay_ball', output: 'tfc:ceramic/unfired_bell_mold', name: 'bell_mold' },
{ input: '5x minecraft:clay_ball', output: 'tfc:ceramic/unfired_brick', name: 'brick' },
{ input: '5x minecraft:clay_ball', output: 'tfc:ceramic/unfired_flower_pot', name: 'flower_pot' },
{ input: '5x minecraft:clay_ball', output: '3x tfc:ceramic/unfired_brick', name: 'brick' },
{ input: '5x minecraft:clay_ball', output: '2x tfc:ceramic/unfired_flower_pot', name: 'flower_pot' },
{ input: '5x minecraft:clay_ball', output: 'tfc:ceramic/unfired_pan', name: 'pan' },
{ input: '5x minecraft:clay_ball', output: 'tfc:ceramic/unfired_blowpipe', name: 'ceramic_blowpipe' },
{ input: '5x minecraft:clay_ball', output: 'tfc:ceramic/unfired_bowl', name: 'bowl' },
{ input: '5x minecraft:clay_ball', output: '4x tfc:ceramic/unfired_bowl', name: 'bowl' },
{ input: '5x minecraft:clay_ball', output: 'tfc:ceramic/unfired_jug', name: 'jug' },
{ input: '5x minecraft:clay_ball', output: 'tfc:ceramic/unfired_pot', name: 'pot' },
{ input: '5x minecraft:clay_ball', output: 'tfc:ceramic/unfired_spindle_head', name: 'spindle_head' },
{ input: '5x minecraft:clay_ball', output: 'tfc:ceramic/unfired_vessel', name: 'vessel' },
{ input: '5x minecraft:clay_ball', output: 'tfc:ceramic/unfired_large_vessel', name: 'large_vessel' },
{ input: '5x minecraft:clay_ball', output: 'tfcchannelcasting:unfired_heart_mold', name: 'heart_mold' },
{ input: '5x minecraft:clay_ball', output: '2x rnr:unfired_roof_tile', name: 'roof_tile' },
{ input: '5x tfc:fire_clay', output: 'tfc:ceramic/unfired_fire_ingot_mold', name: 'fire_ingot_mold' },
{ input: '5x tfc:fire_clay', output: '3x tfc:ceramic/unfired_fire_brick', name: 'fire_brick' },
{ input: '5x tfc:fire_clay', output: 'tfc:ceramic/unfired_crucible', name: 'crucible' },

3
kubejs/startup_scripts/tfg/items.js
View file

@ -161,6 +161,9 @@ const registerTFGItems = (event) => {
event.create('tfg:fletching')
.translationKey('item.tfg.fletching')
event.create('tfg:armor_stand_arms')
.translationKey('item.tfg.armor_stand_arms')
event.create('tfg:fishing_net/wood')
.translationKey('item.tfg.fishing_net.wood')
.parentModel('tfg:item/fishing_nets/wood_fishing_net')