Consolidating Development: 0.9.x (#846)
Signed-off-by: Pyritie <pyritie@gmail.com> Signed-off-by: TomPlop <tomdidome@gmail.com> Co-authored-by: Pyritie <Pyritie@gmail.com> Co-authored-by: Redeix <brayden.j.m.ford@gmail.com> Co-authored-by: TomPlop <tomdidome@gmail.com> Co-authored-by: aidie8 <aidenvanzuilen@gmail.com> Co-authored-by: Xikaro <os.valerievich@ya.ru> Co-authored-by: Xikaro <55663835+Xikaro@users.noreply.github.com> Co-authored-by: Zleub <debray.arnaud@gmail.com>
This commit is contained in:
Nebby
GitHub
parent
528672e95b
commit
d4c80a4b61
2192 changed files with 104647 additions and 53190 deletions
|
|
@ -5,69 +5,7 @@
|
|||
* у которых должны быть удалены тэги и они должны быть скрыты в REI.
|
||||
*/
|
||||
global.TFC_DISABLED_ITEMS = [
|
||||
// Blocks
|
||||
'tfc:metal/block/bismuth',
|
||||
'tfc:metal/block/bismuth_bronze',
|
||||
'tfc:metal/block/black_bronze',
|
||||
'tfc:metal/block/bronze',
|
||||
'tfc:metal/block/brass',
|
||||
'tfc:metal/block/copper',
|
||||
'tfc:metal/block/gold',
|
||||
'tfc:metal/block/nickel',
|
||||
'tfc:metal/block/rose_gold',
|
||||
'tfc:metal/block/silver',
|
||||
'tfc:metal/block/tin',
|
||||
'tfc:metal/block/zinc',
|
||||
'tfc:metal/block/sterling_silver',
|
||||
'tfc:metal/block/wrought_iron',
|
||||
'tfc:metal/block/cast_iron',
|
||||
'tfc:metal/block/steel',
|
||||
'tfc:metal/block/black_steel',
|
||||
'tfc:metal/block/blue_steel',
|
||||
'tfc:metal/block/red_steel',
|
||||
|
||||
// Stairs
|
||||
'tfc:metal/block/bismuth_stairs',
|
||||
'tfc:metal/block/bismuth_bronze_stairs',
|
||||
'tfc:metal/block/black_bronze_stairs',
|
||||
'tfc:metal/block/bronze_stairs',
|
||||
'tfc:metal/block/brass_stairs',
|
||||
'tfc:metal/block/copper_stairs',
|
||||
'tfc:metal/block/gold_stairs',
|
||||
'tfc:metal/block/nickel_stairs',
|
||||
'tfc:metal/block/rose_gold_stairs',
|
||||
'tfc:metal/block/silver_stairs',
|
||||
'tfc:metal/block/tin_stairs',
|
||||
'tfc:metal/block/zinc_stairs',
|
||||
'tfc:metal/block/sterling_silver_stairs',
|
||||
'tfc:metal/block/wrought_iron_stairs',
|
||||
'tfc:metal/block/cast_iron_stairs',
|
||||
'tfc:metal/block/steel_stairs',
|
||||
'tfc:metal/block/black_steel_stairs',
|
||||
'tfc:metal/block/blue_steel_stairs',
|
||||
'tfc:metal/block/red_steel_stairs',
|
||||
|
||||
// Slabs
|
||||
'tfc:metal/block/bismuth_slab',
|
||||
'tfc:metal/block/bismuth_bronze_slab',
|
||||
'tfc:metal/block/black_bronze_slab',
|
||||
'tfc:metal/block/bronze_slab',
|
||||
'tfc:metal/block/brass_slab',
|
||||
'tfc:metal/block/copper_slab',
|
||||
'tfc:metal/block/gold_slab',
|
||||
'tfc:metal/block/nickel_slab',
|
||||
'tfc:metal/block/rose_gold_slab',
|
||||
'tfc:metal/block/silver_slab',
|
||||
'tfc:metal/block/tin_slab',
|
||||
'tfc:metal/block/zinc_slab',
|
||||
'tfc:metal/block/sterling_silver_slab',
|
||||
'tfc:metal/block/wrought_iron_slab',
|
||||
'tfc:metal/block/cast_iron_slab',
|
||||
'tfc:metal/block/steel_slab',
|
||||
'tfc:metal/block/black_steel_slab',
|
||||
'tfc:metal/block/blue_steel_slab',
|
||||
'tfc:metal/block/red_steel_slab',
|
||||
|
||||
|
||||
// Ingots
|
||||
"tfc:metal/ingot/bismuth",
|
||||
"tfc:metal/ingot/bismuth_bronze",
|
||||
|
|
@ -77,9 +15,6 @@ global.TFC_DISABLED_ITEMS = [
|
|||
"tfc:metal/ingot/sterling_silver",
|
||||
"tfc:metal/ingot/wrought_iron",
|
||||
"tfc:metal/ingot/steel",
|
||||
"tfc:metal/ingot/black_steel",
|
||||
"tfc:metal/ingot/red_steel",
|
||||
"tfc:metal/ingot/blue_steel",
|
||||
"tfc:metal/ingot/brass",
|
||||
"tfc:metal/ingot/nickel",
|
||||
"tfc:metal/ingot/silver",
|
||||
|
|
@ -98,15 +33,11 @@ global.TFC_DISABLED_ITEMS = [
|
|||
"tfc:metal/double_ingot/sterling_silver",
|
||||
"tfc:metal/double_ingot/wrought_iron",
|
||||
"tfc:metal/double_ingot/steel",
|
||||
"tfc:metal/double_ingot/black_steel",
|
||||
"tfc:metal/double_ingot/red_steel",
|
||||
"tfc:metal/double_ingot/blue_steel",
|
||||
"tfc:metal/double_ingot/brass",
|
||||
"tfc:metal/double_ingot/nickel",
|
||||
"tfc:metal/double_ingot/silver",
|
||||
"tfc:metal/double_ingot/tin",
|
||||
"tfc:metal/double_ingot/zinc",
|
||||
"tfc:metal/double_ingot/cast_iron",
|
||||
"tfc:metal/double_ingot/copper",
|
||||
"tfc:metal/double_ingot/gold",
|
||||
|
||||
|
|
@ -357,44 +288,6 @@ global.TFC_DISABLED_ITEMS = [
|
|||
'tfc:metal/scythe/blue_steel',
|
||||
'tfc:metal/scythe_blade/blue_steel',
|
||||
|
||||
// Ores
|
||||
'tfc:ore/poor_native_copper',
|
||||
'tfc:ore/normal_native_copper',
|
||||
'tfc:ore/rich_native_copper',
|
||||
'tfc:ore/poor_native_gold',
|
||||
'tfc:ore/normal_native_gold',
|
||||
'tfc:ore/rich_native_gold',
|
||||
'tfc:ore/poor_hematite',
|
||||
'tfc:ore/normal_hematite',
|
||||
'tfc:ore/rich_hematite',
|
||||
'tfc:ore/rich_tetrahedrite',
|
||||
'tfc:ore/normal_tetrahedrite',
|
||||
'tfc:ore/poor_tetrahedrite',
|
||||
'tfc:ore/rich_sphalerite',
|
||||
'tfc:ore/normal_sphalerite',
|
||||
'tfc:ore/poor_sphalerite',
|
||||
'tfc:ore/rich_limonite',
|
||||
'tfc:ore/normal_limonite',
|
||||
'tfc:ore/poor_limonite',
|
||||
'tfc:ore/rich_magnetite',
|
||||
'tfc:ore/normal_magnetite',
|
||||
'tfc:ore/poor_magnetite',
|
||||
'tfc:ore/rich_malachite',
|
||||
'tfc:ore/normal_malachite',
|
||||
'tfc:ore/poor_malachite',
|
||||
'tfc:ore/rich_garnierite',
|
||||
'tfc:ore/normal_garnierite',
|
||||
'tfc:ore/poor_garnierite',
|
||||
'tfc:ore/rich_bismuthinite',
|
||||
'tfc:ore/normal_bismuthinite',
|
||||
'tfc:ore/poor_bismuthinite',
|
||||
'tfc:ore/rich_cassiterite',
|
||||
'tfc:ore/normal_cassiterite',
|
||||
'tfc:ore/poor_cassiterite',
|
||||
'tfc:ore/rich_native_silver',
|
||||
'tfc:ore/normal_native_silver',
|
||||
'tfc:ore/poor_native_silver',
|
||||
|
||||
// Gems
|
||||
'tfc:gem/amethyst',
|
||||
'tfc:gem/diamond',
|
||||
|
|
@ -421,7 +314,6 @@ global.TFC_DISABLED_ITEMS = [
|
|||
'tfc:ore/cryolite',
|
||||
'tfc:ore/saltpeter',
|
||||
'tfc:ore/borax',
|
||||
'tfc:ore/sylvite',
|
||||
'tfc:ore/bituminous_coal',
|
||||
'tfc:ore/lignite',
|
||||
'tfc:ore/halite',
|
||||
|
|
@ -582,6 +474,8 @@ global.TFC_DISABLED_ITEMS = [
|
|||
|
||||
// Windmill Blades
|
||||
"tfc:windmill_blade",
|
||||
"tfc:rustic_windmill_blade",
|
||||
"tfc:lattice_windmill_blade",
|
||||
"tfc:orange_windmill_blade",
|
||||
"tfc:magenta_windmill_blade",
|
||||
"tfc:light_blue_windmill_blade",
|
||||
|
|
@ -656,6 +550,9 @@ global.TFC_DISABLED_ITEMS = [
|
|||
'tfc:crankshaft',
|
||||
'tfc:hand_wheel_base',
|
||||
'tfc:hand_wheel',
|
||||
'tfc:blank_disc',
|
||||
'tfc:sandpaper',
|
||||
'tfc:brass_mechanisms'
|
||||
];
|
||||
|
||||
/**
|
||||
|
|
@ -999,9 +896,8 @@ global.TFC_QUERN_POWDER_RECIPE_COMPONENTS = [
|
|||
{ input: '#forge:dusts/borax', output: '4x tfc:powder/flux', name: 'flux_powder' },
|
||||
{ input: '#forge:dusts/soda_ash', output: '4x tfc:powder/soda_ash', name: 'soda_ash' },
|
||||
{ input: 'gtceu:charcoal_dust', output: '2x tfc:powder/charcoal', name: 'charcoal' },
|
||||
{ input: 'gtceu:raw_graphite', output: 'gtceu:graphite_dust', name: 'raw_graphite_to_dust' },
|
||||
{ input: 'gtceu:poor_raw_graphite', output: '5x gtceu:tiny_graphite_dust', name: 'poor_raw_graphite_to_dust' },
|
||||
{ input: 'gtceu:rich_raw_graphite', output: '2x gtceu:graphite_dust', name: 'rich_graphite_to_dust' },
|
||||
{ input: 'tfc:ore/sylvite', output: '4x tfc:powder/sylvite', name: 'sylvite' },
|
||||
{ input: 'firmalife:ore/small_chromite', output: 'gtceu:small_chromite_dust', name: 'chromite' }
|
||||
];
|
||||
|
||||
global.TFC_QUERN_GRAIN_RECIPE_COMPONENTS = [
|
||||
|
|
@ -1041,41 +937,41 @@ global.TFC_FURNACE_BREAD_RECIPE_COMPONENTS = [
|
|||
];
|
||||
|
||||
global.TFC_GREENHOUSE_FRUIT_RECIPE_COMPONENTS = [
|
||||
{ input: 'tfc:plant/cherry_sapling', fluid_amount: 8000, output: '3x tfc:food/cherry', name: 'cherry' },
|
||||
{ input: 'tfc:plant/green_apple_sapling', fluid_amount: 8000, output: '3x tfc:food/green_apple', name: 'green_apple' },
|
||||
{ input: 'tfc:plant/lemon_sapling', fluid_amount: 8000, output: '3x tfc:food/lemon', name: 'lemon' },
|
||||
{ input: 'tfc:plant/olive_sapling', fluid_amount: 8000, output: '3x tfc:food/olive', name: 'olive' },
|
||||
{ input: 'tfc:plant/orange_sapling', fluid_amount: 8000, output: '3x tfc:food/orange', name: 'orange' },
|
||||
{ input: 'tfc:plant/peach_sapling', fluid_amount: 8000, output: '3x tfc:food/peach', name: 'peach' },
|
||||
{ input: 'tfc:plant/plum_sapling', fluid_amount: 8000, output: '3x tfc:food/plum', name: 'plum' },
|
||||
{ input: 'tfc:plant/red_apple_sapling', fluid_amount: 8000, output: '3x tfc:food/red_apple', name: 'red_apple' },
|
||||
{ input: 'tfc:plant/banana_sapling', fluid_amount:8000, output: '3x tfc:food/banana', name: 'banana' },
|
||||
{ input: 'tfc:plant/cherry_sapling', fluid_amount: 8000, output: '32x tfc:food/cherry', name: 'cherry' },
|
||||
{ input: 'tfc:plant/green_apple_sapling', fluid_amount: 8000, output: '32x tfc:food/green_apple', name: 'green_apple' },
|
||||
{ input: 'tfc:plant/lemon_sapling', fluid_amount: 8000, output: '32x tfc:food/lemon', name: 'lemon' },
|
||||
{ input: 'tfc:plant/olive_sapling', fluid_amount: 8000, output: '32x tfc:food/olive', name: 'olive' },
|
||||
{ input: 'tfc:plant/orange_sapling', fluid_amount: 8000, output: '32x tfc:food/orange', name: 'orange' },
|
||||
{ input: 'tfc:plant/peach_sapling', fluid_amount: 8000, output: '32x tfc:food/peach', name: 'peach' },
|
||||
{ input: 'tfc:plant/plum_sapling', fluid_amount: 8000, output: '32x tfc:food/plum', name: 'plum' },
|
||||
{ input: 'tfc:plant/red_apple_sapling', fluid_amount: 8000, output: '32x tfc:food/red_apple', name: 'red_apple' },
|
||||
{ input: 'tfc:plant/banana_sapling', fluid_amount:8000, output: '32x tfc:food/banana', name: 'banana' },
|
||||
];
|
||||
|
||||
global.TFC_GREENHOUSE_VEGETABLE_RECIPE_COMPONENTS = [
|
||||
{ input: 'tfc:seeds/barley', fluid_amount: 4000, output: '3x tfc:food/barley', name: 'barley' },
|
||||
{ input: 'tfc:seeds/oat', fluid_amount: 4000, output: '3x tfc:food/oat', name: 'oat' },
|
||||
{ input: 'tfc:seeds/rye', fluid_amount: 4000, output: '3x tfc:food/rye', name: 'rye' },
|
||||
{ input: 'tfc:seeds/maize', fluid_amount: 4000, output: '3x tfc:food/maize', name: 'maize' },
|
||||
{ input: 'tfc:seeds/wheat', fluid_amount: 4000, output: '3x tfc:food/wheat', name: 'wheat' },
|
||||
{ input: 'tfc:seeds/rice', fluid_amount: 4000, output: '3x tfc:food/rice', name: 'rice' },
|
||||
{ input: 'tfc:seeds/beet', fluid_amount: 4000, output: '3x tfc:food/beet', name: 'beet' },
|
||||
{ input: 'tfc:seeds/cabbage', fluid_amount: 4000, output: '3x tfc:food/cabbage', name: 'cabbage' },
|
||||
{ input: 'tfc:seeds/carrot', fluid_amount: 4000, output: '3x tfc:food/carrot', name: 'carrot' },
|
||||
{ input: 'tfc:seeds/green_bean', fluid_amount: 4000, output: '3x tfc:food/green_bean', name: 'green_bean' },
|
||||
{ input: 'tfc:seeds/garlic', fluid_amount: 4000, output: '3x tfc:food/garlic', name: 'garlic' },
|
||||
{ input: 'tfc:seeds/potato', fluid_amount: 4000, output: '3x tfc:food/potato', name: 'potato' },
|
||||
{ input: 'tfc:seeds/onion', fluid_amount: 4000, output: '3x tfc:food/onion', name: 'onion' },
|
||||
{ input: 'tfc:seeds/soybean', fluid_amount: 4000, output: '3x tfc:food/soybean', name: 'soybean' },
|
||||
{ input: 'tfc:seeds/squash', fluid_amount: 4000, output: '3x tfc:food/squash', name: 'squash' },
|
||||
{ input: 'tfc:seeds/sugarcane', fluid_amount: 4000, output: '3x tfc:food/sugarcane', name: 'sugarcane' },
|
||||
{ input: 'tfc:seeds/tomato', fluid_amount: 4000, output: '3x tfc:food/tomato', name: 'tomato' },
|
||||
{ input: 'tfc:seeds/jute', fluid_amount: 4000, output: '3x tfc:jute', name: 'jute' },
|
||||
{ input: 'tfc:seeds/papyrus', fluid_amount: 4000, output: '3x tfc:papyrus', name: 'papyrus' },
|
||||
{ input: 'tfc:seeds/pumpkin', fluid_amount: 4000, output: '3x tfc:pumpkin', name: 'pumpkin' },
|
||||
{ input: 'tfc:seeds/melon', fluid_amount: 4000, output: '3x tfc:melon', name: 'melon' },
|
||||
{ input: 'tfc:seeds/red_bell_pepper', fluid_amount: 4000, output: '3x tfc:food/red_bell_pepper', name: 'red_bell_pepper' },
|
||||
{ input: 'tfc:seeds/yellow_bell_pepper', fluid_amount: 4000, output: '3x tfc:food/yellow_bell_pepper', name: 'yellow_bell_pepper' },
|
||||
{ input: '8x tfc:seeds/barley', fluid_amount: 4000, output: '24x tfc:food/barley', name: 'barley' },
|
||||
{ input: '8x tfc:seeds/oat', fluid_amount: 4000, output: '24x tfc:food/oat', name: 'oat' },
|
||||
{ input: '8x tfc:seeds/rye', fluid_amount: 4000, output: '24x tfc:food/rye', name: 'rye' },
|
||||
{ input: '8x tfc:seeds/maize', fluid_amount: 4000, output: '24x tfc:food/maize', name: 'maize' },
|
||||
{ input: '8x tfc:seeds/wheat', fluid_amount: 4000, output: '24x tfc:food/wheat', name: 'wheat' },
|
||||
{ input: '8x tfc:seeds/rice', fluid_amount: 4000, output: '24x tfc:food/rice', name: 'rice' },
|
||||
{ input: '8x tfc:seeds/beet', fluid_amount: 4000, output: '24x tfc:food/beet', name: 'beet' },
|
||||
{ input: '8x tfc:seeds/cabbage', fluid_amount: 4000, output: '24x tfc:food/cabbage', name: 'cabbage' },
|
||||
{ input: '8x tfc:seeds/carrot', fluid_amount: 4000, output: '24x tfc:food/carrot', name: 'carrot' },
|
||||
{ input: '8x tfc:seeds/green_bean', fluid_amount: 4000, output: '24x tfc:food/green_bean', name: 'green_bean' },
|
||||
{ input: '8x tfc:seeds/garlic', fluid_amount: 4000, output: '24x tfc:food/garlic', name: 'garlic' },
|
||||
{ input: '8x tfc:seeds/potato', fluid_amount: 4000, output: '24x tfc:food/potato', name: 'potato' },
|
||||
{ input: '8x tfc:seeds/onion', fluid_amount: 4000, output: '24x tfc:food/onion', name: 'onion' },
|
||||
{ input: '8x tfc:seeds/soybean', fluid_amount: 4000, output: '24x tfc:food/soybean', name: 'soybean' },
|
||||
{ input: '8x tfc:seeds/squash', fluid_amount: 4000, output: '24x tfc:food/squash', name: 'squash' },
|
||||
{ input: '8x tfc:seeds/sugarcane', fluid_amount: 4000, output: '24x tfc:food/sugarcane', name: 'sugarcane' },
|
||||
{ input: '8x tfc:seeds/tomato', fluid_amount: 4000, output: '24x tfc:food/tomato', name: 'tomato' },
|
||||
{ input: '8x tfc:seeds/jute', fluid_amount: 4000, output: '24x tfc:jute', name: 'jute' },
|
||||
{ input: '8x tfc:seeds/papyrus', fluid_amount: 4000, output: '24x tfc:papyrus', name: 'papyrus' },
|
||||
{ input: '8x tfc:seeds/pumpkin', fluid_amount: 4000, output: '24x tfc:pumpkin', name: 'pumpkin' },
|
||||
{ input: '8x tfc:seeds/melon', fluid_amount: 4000, output: '24x tfc:melon', name: 'melon' },
|
||||
{ input: '8x tfc:seeds/red_bell_pepper', fluid_amount: 4000, output: '24x tfc:food/red_bell_pepper', name: 'red_bell_pepper' },
|
||||
{ input: '8x tfc:seeds/yellow_bell_pepper', fluid_amount: 4000, output: '24x tfc:food/yellow_bell_pepper', name: 'yellow_bell_pepper' },
|
||||
];
|
||||
|
||||
global.TFC_GREENHOUSE_BERRY_RECIPE_COMPONENTS = [
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue