diff --git a/config/jei/itemBlacklist.cfg b/config/jei/itemBlacklist.cfg index 127d23e18..1d0c8ef70 100644 --- a/config/jei/itemBlacklist.cfg +++ b/config/jei/itemBlacklist.cfg @@ -17,6 +17,7 @@ advanced { actuallyadditions:item_dust:4 actuallyadditions:item_dust:5 actuallyadditions:item_dust:6 + actuallyadditions:item_food:9 actuallyadditions:item_misc:17 advgenerators:gas_input advgenerators:generators_data_port @@ -903,6 +904,7 @@ advanced { cyclicmagic:block_miner cyclicmagic:exp_pylon cyclicmagic:glowing_helmet + cyclicmagic:milk cyclicmagic:poison danknull:dank_null_6 danknull:dank_null:6 @@ -3908,6 +3910,8 @@ advanced { harvestcraft:beanseeditem harvestcraft:chilipepperitem harvestcraft:chilipepperseeditem + harvestcraft:chocolatebaritem + harvestcraft:cocoapowderitem harvestcraft:coffeebeanitem harvestcraft:coffeeseeditem harvestcraft:grapeitem @@ -5166,6 +5170,7 @@ advanced { nuclearcraft:dust:2 nuclearcraft:dust:4 nuclearcraft:fission_computer_port + nuclearcraft:fluid_milk nuclearcraft:fuel_americium:0 nuclearcraft:fuel_americium:4 nuclearcraft:fuel_americium:8 @@ -5793,6 +5798,7 @@ advanced { openblocks:tank:mercury; openblocks:tank:methanol; openblocks:tank:mica; + openblocks:tank:milk_chocolate; openblocks:tank:milk; openblocks:tank:mirion; openblocks:tank:mithminite; diff --git a/scripts/do/omegapotion.zs b/scripts/do/omegapotion.zs index f9d9f8b92..3e53fe5a6 100644 --- a/scripts/do/omegapotion.zs +++ b/scripts/do/omegapotion.zs @@ -206,127 +206,127 @@ static potNameTag as IData[string] = { "randomthings:collapse" : [ 34, 0, 450], "randomthings:long_collapse" : [ 34, 0, 900], "randomthings:strong_collapse" : [ 34, 1, 300], - "quark:resilience" : [ 94, 0, 3600], - "quark:long_resilience" : [ 94, 0, 9600], - "quark:strong_resilience" : [ 94, 1, 1800], - "quark:danger_sight" : [ 96, 0, 3600], - "quark:long_danger_sight" : [ 96, 0, 9600], - "potioncore:love" : [ 97, 0, 1], - "potioncore:repair" : [ 98, 0, 3600], - "potioncore:long_repair" : [ 98, 0, 9600], - "potioncore:strong_repair" : [ 98, 1, 1800], - "potioncore:flight" : [ 99, 0, 3600], - "potioncore:long_flight" : [ 99, 0, 9600], - "potioncore:recoil" : [100, 0, 3600], - "potioncore:long_recoil" : [100, 0, 9600], - "potioncore:strong_recoil" : [100, 1, 1800], - "potioncore:broken_magic_shield" : [101, 0, 900], - "potioncore:long_broken_magic_shield" : [101, 0, 1800], - "potioncore:strong_broken_magic_shield" : [101, 1, 450], - "potioncore:iron_skin" : [102, 0, 3600], - "potioncore:long_iron_skin" : [102, 0, 9600], - "potioncore:strong_iron_skin" : [102, 1, 1800], - "potioncore:purity" : [103, 0, 3600], - "potioncore:long_purity" : [103, 0, 9600], - "potioncore:reach" : [104, 0, 3600], - "potioncore:long_reach" : [104, 0, 9600], - "potioncore:strong_reach" : [104, 1, 1800], - "potioncore:diamond_skin" : [105, 0, 3600], - "potioncore:long_diamond_skin" : [105, 0, 9600], - "potioncore:strong_diamond_skin" : [105, 1, 1800], - "potioncore:teleport" : [106, 0, 1], - "potioncore:strong_teleport" : [106, 1, 1], - "potioncore:teleport_surface" : [107, 0, 1], - "potioncore:magic_focus" : [108, 0, 3600], - "potioncore:long_magic_focus" : [108, 0, 9600], - "potioncore:strong_magic_focus" : [108, 1, 1800], - "potioncore:cure" : [109, 0, 1], - "potioncore:step_up" : [110, 0, 3600], - "potioncore:long_step_up" : [110, 0, 9600], - "potioncore:strong_step_up" : [110, 1, 1800], - "potioncore:drown" : [111, 0, 3600], - "potioncore:long_drown" : [111, 0, 9600], - "potioncore:teleport_spawn" : [112, 0, 600], - "potioncore:disorganization" : [113, 0, 1], - "potioncore:climb" : [114, 0, 3600], - "potioncore:long_climb" : [114, 0, 9600], - "potioncore:perplexity" : [115, 0, 3600], - "potioncore:long_perplexity" : [115, 0, 9600], - "potioncore:rust" : [116, 0, 3600], - "potioncore:long_rust" : [116, 0, 9600], - "potioncore:strong_rust" : [116, 1, 1800], - "potioncore:vulnerable" : [117, 0, 3600], - "potioncore:long_vulnerable" : [117, 0, 9600], - "potioncore:strong_vulnerable" : [117, 1, 1800], - "potioncore:explode" : [118, 0, 1], - "potioncore:strong_explode" : [118, 1, 1], - "potioncore:solid_core" : [119, 0, 3600], - "potioncore:long_solid_core" : [119, 0, 9600], - "potioncore:fire" : [120, 0, 1], - "potioncore:strong_fire" : [120, 1, 1], - "potioncore:lightning" : [121, 0, 1], - "potioncore:magic_inhibition" : [122, 0, 3600], - "potioncore:long_magic_inhibition" : [122, 0, 9600], - "potioncore:strong_magic_inhibition" : [122, 1, 1800], - "potioncore:chance" : [123, 0, 1], - "potioncore:strong_chance" : [123, 1, 1], - "potioncore:invert" : [124, 0, 1], - "potioncore:weight" : [125, 0, 3600], - "potioncore:long_weight" : [125, 0, 9600], - "potioncore:strong_weight" : [125, 1, 1800], - "potioncore:launch" : [126, 0, 1], - "potioncore:strong_launch" : [126, 1, 1], - "potioncore:dispel" : [127, 0, 1], - "potioncore:revival" : [128, 0, 3600], - "potioncore:long_revival" : [128, 0, 9600], - "potioncore:strong_revival" : [128, 1, 1800], - "potioncore:klutz" : [129, 0, 3600], - "potioncore:long_klutz" : [129, 0, 9600], - "potioncore:strong_klutz" : [129, 1, 1800], - "potioncore:bless" : [130, 0, 1], - "potioncore:strong_bless" : [130, 1, 1], - "potioncore:broken_armor" : [131, 0, 900], - "potioncore:long_broken_armor" : [131, 0, 1800], - "potioncore:strong_broken_armor" : [131, 1, 450], - "potioncore:magic_shield" : [132, 0, 3600], - "potioncore:long_magic_shield" : [132, 0, 9600], - "potioncore:strong_magic_shield" : [132, 1, 1800], - "potioncore:slow_fall" : [133, 0, 3600], - "potioncore:long_slow_fall" : [133, 0, 9600], - "potioncore:strong_slow_fall" : [133, 1, 1800], - "potioncore:antidote" : [134, 0, 3600], - "potioncore:long_antidote" : [134, 0, 9600], - "potioncore:spin" : [135, 0, 900], - "potioncore:long_spin" : [135, 0, 1800], - "potioncore:strong_spin" : [135, 1, 450], - "potioncore:curse" : [136, 0, 1], - "potioncore:strong_curse" : [136, 1, 1], - "potioncore:burst" : [137, 0, 1], - "potioncore:strong_burst" : [137, 1, 1], - "potioncore:archery" : [138, 0, 3600], - "potioncore:long_archery" : [138, 0, 9600], - "potioncore:strong_archery" : [138, 1, 1800], - "cyclicmagic:magnet" : [142, 0, 3600], - "cyclicmagic:ender" : [143, 0, 3600], - "cyclicmagic:waterwalk" : [144, 0, 3600], - "cyclicmagic:slowfall" : [145, 0, 3600], - "cyclicmagic:snow" : [146, 0, 3600], - "cyclicmagic:swim" : [147, 0, 3600], - "cyclicmagic:swim2" : [147, 1, 1800], - "cyclicmagic:bounce" : [148, 0, 3600], - "cyclicmagic:frostwalker" : [149, 0, 3600], - "cyclicmagic:butter" : [150, 0, 3600], - "cyclicmagic:butter2" : [150, 1, 1800], - "cyclicmagic:saturation" : [152, 0, 3600], - "extrautils2:xu2.doom" : [170, 0, 1200], - "extrautils2:xu2.gravity" : [171, 0, 1200], - "extrautils2:xu2.gravity.long" : [171, 0, 9600], - "extrautils2:xu2.second.chance" : [172, 0, 2400], - "extrautils2:xu2.greek.fire" : [173, 0, 2400], - "extrautils2:xu2.fizzy.lifting" : [174, 0, 600], - "extrautils2:xu2.relapse" : [175, 0, 9600], - "extrautils2:xu2.love" : [176, 0, 200], - "extrautils2:xu2.purging" : [177, 0, 0], + "quark:resilience" : [101, 0, 3600], + "quark:long_resilience" : [101, 0, 9600], + "quark:strong_resilience" : [101, 1, 1800], + "quark:danger_sight" : [103, 0, 3600], + "quark:long_danger_sight" : [103, 0, 9600], + "potioncore:love" : [104, 0, 1], + "potioncore:repair" : [105, 0, 3600], + "potioncore:long_repair" : [105, 0, 9600], + "potioncore:strong_repair" : [105, 1, 1800], + "potioncore:flight" : [106, 0, 3600], + "potioncore:long_flight" : [106, 0, 9600], + "potioncore:recoil" : [108, 0, 3600], + "potioncore:long_recoil" : [108, 0, 9600], + "potioncore:strong_recoil" : [108, 1, 1800], + "potioncore:broken_magic_shield" : [109, 0, 900], + "potioncore:long_broken_magic_shield" : [109, 0, 1800], + "potioncore:strong_broken_magic_shield" : [109, 1, 450], + "potioncore:iron_skin" : [110, 0, 3600], + "potioncore:long_iron_skin" : [110, 0, 9600], + "potioncore:strong_iron_skin" : [110, 1, 1800], + "potioncore:purity" : [111, 0, 3600], + "potioncore:long_purity" : [111, 0, 9600], + "potioncore:reach" : [112, 0, 3600], + "potioncore:long_reach" : [112, 0, 9600], + "potioncore:strong_reach" : [112, 1, 1800], + "potioncore:diamond_skin" : [113, 0, 3600], + "potioncore:long_diamond_skin" : [113, 0, 9600], + "potioncore:strong_diamond_skin" : [113, 1, 1800], + "potioncore:teleport" : [114, 0, 1], + "potioncore:strong_teleport" : [114, 1, 1], + "potioncore:teleport_surface" : [115, 0, 1], + "potioncore:magic_focus" : [116, 0, 3600], + "potioncore:long_magic_focus" : [116, 0, 9600], + "potioncore:strong_magic_focus" : [116, 1, 1800], + "potioncore:cure" : [117, 0, 1], + "potioncore:step_up" : [118, 0, 3600], + "potioncore:long_step_up" : [118, 0, 9600], + "potioncore:strong_step_up" : [118, 1, 1800], + "potioncore:drown" : [119, 0, 3600], + "potioncore:long_drown" : [119, 0, 9600], + "potioncore:teleport_spawn" : [120, 0, 600], + "potioncore:disorganization" : [121, 0, 1], + "potioncore:climb" : [122, 0, 3600], + "potioncore:long_climb" : [122, 0, 9600], + "potioncore:perplexity" : [123, 0, 3600], + "potioncore:long_perplexity" : [123, 0, 9600], + "potioncore:rust" : [124, 0, 3600], + "potioncore:long_rust" : [124, 0, 9600], + "potioncore:strong_rust" : [124, 1, 1800], + "potioncore:vulnerable" : [125, 0, 3600], + "potioncore:long_vulnerable" : [125, 0, 9600], + "potioncore:strong_vulnerable" : [125, 1, 1800], + "potioncore:explode" : [126, 0, 1], + "potioncore:strong_explode" : [126, 1, 1], + "potioncore:solid_core" : [127, 0, 3600], + "potioncore:long_solid_core" : [127, 0, 9600], + "potioncore:fire" : [128, 0, 1], + "potioncore:strong_fire" : [128, 1, 1], + "potioncore:lightning" : [129, 0, 1], + "potioncore:magic_inhibition" : [130, 0, 3600], + "potioncore:long_magic_inhibition" : [130, 0, 9600], + "potioncore:strong_magic_inhibition" : [130, 1, 1800], + "potioncore:chance" : [131, 0, 1], + "potioncore:strong_chance" : [131, 1, 1], + "potioncore:invert" : [132, 0, 1], + "potioncore:weight" : [133, 0, 3600], + "potioncore:long_weight" : [133, 0, 9600], + "potioncore:strong_weight" : [133, 1, 1800], + "potioncore:launch" : [134, 0, 1], + "potioncore:strong_launch" : [134, 1, 1], + "potioncore:dispel" : [135, 0, 1], + "potioncore:revival" : [136, 0, 3600], + "potioncore:long_revival" : [136, 0, 9600], + "potioncore:strong_revival" : [136, 1, 1800], + "potioncore:klutz" : [137, 0, 3600], + "potioncore:long_klutz" : [137, 0, 9600], + "potioncore:strong_klutz" : [137, 1, 1800], + "potioncore:bless" : [138, 0, 1], + "potioncore:strong_bless" : [138, 1, 1], + "potioncore:broken_armor" : [139, 0, 900], + "potioncore:long_broken_armor" : [139, 0, 1800], + "potioncore:strong_broken_armor" : [139, 1, 450], + "potioncore:magic_shield" : [140, 0, 3600], + "potioncore:long_magic_shield" : [140, 0, 9600], + "potioncore:strong_magic_shield" : [140, 1, 1800], + "potioncore:slow_fall" : [141, 0, 3600], + "potioncore:long_slow_fall" : [141, 0, 9600], + "potioncore:strong_slow_fall" : [141, 1, 1800], + "potioncore:antidote" : [142, 0, 3600], + "potioncore:long_antidote" : [142, 0, 9600], + "potioncore:spin" : [143, 0, 900], + "potioncore:long_spin" : [143, 0, 1800], + "potioncore:strong_spin" : [143, 1, 450], + "potioncore:curse" : [144, 0, 1], + "potioncore:strong_curse" : [144, 1, 1], + "potioncore:burst" : [145, 0, 1], + "potioncore:strong_burst" : [145, 1, 1], + "potioncore:archery" : [146, 0, 3600], + "potioncore:long_archery" : [146, 0, 9600], + "potioncore:strong_archery" : [146, 1, 1800], + "cyclicmagic:magnet" : [150, 0, 3600], + "cyclicmagic:ender" : [151, 0, 3600], + "cyclicmagic:waterwalk" : [152, 0, 3600], + "cyclicmagic:slowfall" : [153, 0, 3600], + "cyclicmagic:snow" : [154, 0, 3600], + "cyclicmagic:swim" : [155, 0, 3600], + "cyclicmagic:swim2" : [155, 1, 1800], + "cyclicmagic:bounce" : [156, 0, 3600], + "cyclicmagic:frostwalker" : [157, 0, 3600], + "cyclicmagic:butter" : [158, 0, 3600], + "cyclicmagic:butter2" : [158, 1, 1800], + "cyclicmagic:saturation" : [160, 0, 3600], + "extrautils2:xu2.doom" : [177, 0, 1200], + "extrautils2:xu2.gravity" : [178, 0, 1200], + "extrautils2:xu2.gravity.long" : [178, 0, 9600], + "extrautils2:xu2.second.chance" : [179, 0, 2400], + "extrautils2:xu2.greek.fire" : [180, 0, 2400], + "extrautils2:xu2.fizzy.lifting" : [181, 0, 600], + "extrautils2:xu2.relapse" : [182, 0, 9600], + "extrautils2:xu2.love" : [183, 0, 200], + "extrautils2:xu2.purging" : [184, 0, 0], } as IData[string]; /**/ diff --git a/scripts/requious/infinity_furnace.zs b/scripts/requious/infinity_furnace.zs index 31c5ae996..b8e35ee43 100644 --- a/scripts/requious/infinity_furnace.zs +++ b/scripts/requious/infinity_furnace.zs @@ -141,7 +141,7 @@ ${filtered.join('\n')}` }*/ -# Total Furnace recipes registered: 959 +# Total Furnace recipes registered: 949 # Filtered by JEI blacklist: 110 # Filtered manuallly (antidupe): 16 # Filtered by oredict: 177 @@ -159,13 +159,6 @@ infinFurnace(utils.get("actuallyadditions:item_misc", 20), utils.get("minecraft: infinFurnace(utils.get("actuallyadditions:item_misc", 21), utils.get("actuallyadditions:item_misc", 22)); ##infinFurnace(utils.get("advancedrocketry:productdust", 1), utils.get("advancedrocketry:productingot", 1)); ##infinFurnace(utils.get("advancedrocketry:productdust"), utils.get("advancedrocketry:productingot")); -infinFurnace(utils.get("animania:brown_egg", W), utils.get("animania:plain_omelette")); -infinFurnace(utils.get("animania:peacock_egg_blue", W), utils.get("animania:plain_omelette")); -infinFurnace(utils.get("animania:peacock_egg_white", W), utils.get("animania:plain_omelette")); -infinFurnace(utils.get("animania:raw_chevon", W), utils.get("animania:cooked_chevon")); -infinFurnace(utils.get("animania:raw_frog_legs", W), utils.get("animania:cooked_frog_legs")); -infinFurnace(utils.get("animania:raw_horse", W), utils.get("animania:cooked_horse")); -infinFurnace(utils.get("animania:raw_peacock", W), utils.get("animania:cooked_peacock")); infinFurnace(utils.get("appliedenergistics2:material", 2), utils.get("appliedenergistics2:material", 5)); infinFurnace(utils.get("appliedenergistics2:material", 3), utils.get("appliedenergistics2:material", 5)); infinFurnace(utils.get("appliedenergistics2:material", 4), utils.get("minecraft:bread")); @@ -349,13 +342,10 @@ infinFurnace(utils.get("iceandfire:frozen_grass", W), utils.get("minecraft:grass infinFurnace(utils.get("iceandfire:frozen_gravel", W), utils.get("minecraft:gravel")); infinFurnace(utils.get("iceandfire:frozen_splinters", W), utils.get("minecraft:stick", 0, 3)); infinFurnace(utils.get("iceandfire:frozen_stone", W), utils.get("minecraft:stone")); -infinFurnace(utils.get("iceandfire:hippogryph_egg", W), utils.get("betteranimalsplus:fried_egg")); -infinFurnace(utils.get("iceandfire:iceandfire.deathworm_egg", W), utils.get("betteranimalsplus:fried_egg")); -infinFurnace(utils.get("iceandfire:myrmex_desert_egg", W), utils.get("betteranimalsplus:fried_egg")); infinFurnace(utils.get("iceandfire:myrmex_desert_resin_block", W), utils.get("iceandfire:myrmex_desert_resin_glass")); -infinFurnace(utils.get("iceandfire:myrmex_jungle_egg", W), utils.get("betteranimalsplus:fried_egg")); infinFurnace(utils.get("iceandfire:myrmex_jungle_resin_block", W), utils.get("iceandfire:myrmex_jungle_resin_glass")); infinFurnace(utils.get("iceandfire:stymphalian_bird_feather", W), utils.get("thermalfoundation:material", 227)); +infinFurnace(utils.get("immersiveengineering:material", 7), utils.get("thermalfoundation:rockwool", 7)); ##infinFurnace(utils.get("immersiveengineering:material", 18), utils.get("immersiveengineering:material", 19)); ##infinFurnace(utils.get("immersiveengineering:metal", 14), utils.get("immersiveengineering:metal", 5)); #infinFurnace(utils.get("immersiveengineering:ore", 1), utils.get("thermalfoundation:material", 132)); @@ -693,7 +683,7 @@ infinFurnace(utils.get("minecraft:coal", W), utils.get("nuclearcraft:ingot", 8)) infinFurnace(utils.get("minecraft:cobblestone", W), utils.get("minecraft:stone")); infinFurnace(utils.get("minecraft:diamond_ore", W), utils.get("minecraft:diamond")); infinFurnace(utils.get("minecraft:dye", 3), utils.get("nuclearcraft:roasted_cocoa_beans")); -infinFurnace(utils.get("minecraft:egg", W), utils.get("animania:plain_omelette")); +infinFurnace(utils.get("minecraft:egg"), utils.get("betteranimalsplus:fried_egg")); infinFurnace(utils.get("minecraft:emerald_ore", W), utils.get("minecraft:emerald")); infinFurnace(utils.get("minecraft:fish", 1), utils.get("minecraft:cooked_fish", 1)); infinFurnace(utils.get("minecraft:fish"), utils.get("minecraft:cooked_fish"));