Merge branch 'main' into create-additions

Signed-off-by: Pyritie <pyritie@gmail.com>
This commit is contained in:
Pyritie 2025-01-17 22:10:34 +00:00 committed by GitHub
commit 324ac1adda
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
43 changed files with 776 additions and 211 deletions

View file

@ -322,33 +322,20 @@ global.CREATE_DISABLED_ITEMS = [
'create:granite_pillar',
// Shit Glass
'create:tiled_glass',
'create:framed_glass',
'create:horizontal_framed_glass',
'create:vertical_framed_glass',
'create:tiled_glass_pane',
'create:horizontal_framed_glass_pane',
'create:vertical_framed_glass_pane',
'create:crimson_window',
'create:warped_window',
'create:oak_window',
'create:spruce_window',
'create:birch_window',
'create:jungle_window',
'create:acacia_window',
'create:dark_oak_window',
'create:mangrove_window',
'create:crimson_window',
'create:warped_window',
'create:ornate_iron_window',
'create:oak_window_pane',
'create:spruce_window_pane',
'create:birch_window_pane',
'create:jungle_window_pane',
'create:acacia_window_pane',
'create:dark_oak_window_pane',
'create:mangrove_window_pane',
'create:crimson_window_pane',
'create:crimson_window_pane',
'create:warped_window_pane',
'create:ornate_iron_window_pane',
// Blocks
'create:zinc_block',
@ -467,6 +454,5 @@ global.CREATE_DISABLED_ITEMS = [
'create:empty_blaze_burner',
'create:minecart_contraption',
'create:furnace_minecart_contraption',
'create:chest_minecart_contraption',
'create:framed_glass_pane'
'create:chest_minecart_contraption'
];

View file

@ -33,8 +33,7 @@ global.FIRMALIFE_DISABLED_ITEMS = [
'firmalife:metal/block/stainless_steel_slab',
// Other
'firmalife:compost_tumbler',
'firmalife:pumping_station'
'firmalife:compost_tumbler'
];
global.FIRMALIFE_HIDED_ITEMS = [
@ -130,4 +129,4 @@ global.FIRMALIFE_FURNACE_FLATBREAD_RECIPE_COMPONENTS = [
{ input: 'tfc:food/rice_dough', output: 'firmalife:food/rice_flatbread', name: 'rice_flatbread' },
{ input: 'tfc:food/wheat_dough', output: 'firmalife:food/wheat_flatbread', name: 'wheat_flatbread' },
{ input: 'firmalife:food/masa', output: 'firmalife:food/corn_tortilla', name: 'corn_tortilla' },
];
];

View file

@ -52,4 +52,22 @@ global.GTCEU_HIDED_ITEMS = [
'gtceu:netherrack_dust',
'gtceu:small_netherrack_dust',
'gtceu:tiny_netherrack_dust'
];
];
global.GTCEU_ARMORS = [
'gtceu:hazmat_chestpiece',
'gtceu:hazmat_leggings',
'gtceu:hazmat_boots',
'gtceu:hazmat_headpiece',
'gtceu:nanomuscle_chestplate',
'gtceu:nanomuscle_leggings',
'gtceu:nanomuscle_boots',
'gtceu:nanomuscle_helmet',
// typo in gtceu
'gtceu:avanced_nanomuscle_chestplate',
'gtceu:quarktech_chestplate',
'gtceu:quarktech_leggings',
'gtceu:quarktech_boots',
'gtceu:quarktech_helmet',
'gtceu:advanced_quarktech_chestplate'
];

View file

@ -491,23 +491,7 @@ global.MINECRAFT_DISABLED_ITEMS = [
'minecraft:burn_pottery_sherd',
// Шаблоны брони
/*'minecraft:wayfinder_armor_trim_smithing_template',
'minecraft:dune_armor_trim_smithing_template',
'minecraft:snout_armor_trim_smithing_template',
'minecraft:shaper_armor_trim_smithing_template',
'minecraft:coast_armor_trim_smithing_template',
'minecraft:vex_armor_trim_smithing_template',
'minecraft:host_armor_trim_smithing_template',
'minecraft:rib_armor_trim_smithing_template',
'minecraft:silence_armor_trim_smithing_template',
'minecraft:spire_armor_trim_smithing_template',
'minecraft:tide_armor_trim_smithing_template',
'minecraft:eye_armor_trim_smithing_template',
'minecraft:raiser_armor_trim_smithing_template',
'minecraft:wild_armor_trim_smithing_template',
'minecraft:sentry_armor_trim_smithing_template',
'minecraft:ward_armor_trim_smithing_template',*/
'minecraft:netherite_upgrade_smithing_template',
'minecraft:netherite_upgrade_smithing_template',
// Свечи
'minecraft:candle',

View file

@ -22,6 +22,9 @@ global.RAIL_WAYS_DISABLED_ITEMS = [
'railways:track_ender',
'railways:track_phantom',
'railways:track_mangrove',
'railways:track_cherry',
'railways:track_bamboo',
'railways:track_stripped_bamboo',
'railways:track_oak_wide',
'railways:track_warped_wide',
'railways:track_spruce_wide',
@ -33,10 +36,16 @@ global.RAIL_WAYS_DISABLED_ITEMS = [
'railways:track_jungle_wide',
'railways:track_mangrove_wide',
'railways:track_crimson_wide',
'railways:track_cherry_wide',
'railways:track_bamboo_wide',
'railways:track_stripped_bamboo_wide',
'railways:track_oak_narrow',
'railways:track_spruce_narrow',
'railways:track_warped_narrow',
'railways:track_acacia_narrow',
'railways:track_cherry_narrow',
'railways:track_bamboo_narrow',
'railways:track_stripped_bamboo_narrow',
// Возможно включим позже
'railways:track_tieless',
'railways:track_tieless_narrow',
@ -62,6 +71,9 @@ global.RAIL_WAYS_DISABLED_ITEMS = [
'railways:track_incomplete_ender',
'railways:track_incomplete_phantom',
'railways:track_incomplete_mangrove',
'railways:track_incomplete_cherry',
'railways:track_incomplete_bamboo',
'railways:track_incomplete_stripped_bamboo',
'railways:track_incomplete_oak_wide',
'railways:track_incomplete_warped_wide',
'railways:track_incomplete_spruce_wide',
@ -73,10 +85,16 @@ global.RAIL_WAYS_DISABLED_ITEMS = [
'railways:track_incomplete_jungle_wide',
'railways:track_incomplete_mangrove_wide',
'railways:track_incomplete_crimson_wide',
'railways:track_incomplete_cherry_wide',
'railways:track_incomplete_bamboo_wide',
'railways:track_incomplete_stripped_bamboo_wide',
'railways:track_incomplete_oak_narrow',
'railways:track_incomplete_spruce_narrow',
'railways:track_incomplete_warped_narrow',
'railways:track_incomplete_acacia_narrow',
'railways:track_incomplete_cherry_narrow',
'railways:track_incomplete_bamboo_narrow',
'railways:track_incomplete_stripped_bamboo_narrow',
// Возможно включим позже
'railways:track_incomplete_tieless',
'railways:track_incomplete_tieless_narrow',
@ -122,4 +140,4 @@ global.RAIL_WAYS_DISABLED_ITEMS = [
'railways:conductor_vent',
'railways:jukeboxcart',
'railways:benchcart'
];
];