From 1baf8ced6f84f011ebf8c53c49311e14b1c00769 Mon Sep 17 00:00:00 2001 From: Krutoy242 Date: Sat, 3 Feb 2024 15:58:42 +0300 Subject: [PATCH] =?UTF-8?q?chore:=20=F0=9F=A7=B1=20automatic=20files=20cha?= =?UTF-8?q?nges?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/jei/itemBlacklist.cfg | 4 +- scripts/do/omegapotion.zs | 248 +++++++++++++++++------------------ 2 files changed, 126 insertions(+), 126 deletions(-) diff --git a/config/jei/itemBlacklist.cfg b/config/jei/itemBlacklist.cfg index 8beb10266..0253bea2c 100644 --- a/config/jei/itemBlacklist.cfg +++ b/config/jei/itemBlacklist.cfg @@ -1123,6 +1123,7 @@ advanced { enderio:item_soul_vial:Questing Ram enderio:item_soul_vial:Rabbit enderio:item_soul_vial:Rainbow Fairy + enderio:item_soul_vial:Rainbow Fairy enderio:item_soul_vial:Rainbow Slime enderio:item_soul_vial:Rainbow Sprout enderio:item_soul_vial:Rat @@ -3088,7 +3089,6 @@ advanced { forestry:refractory:zirconium; forestry:resources:1 forestry:resources:2 - forestry:serum_ge forestry:wood_pulp forge:bucketfilled:crude_steel; forge:bucketfilled:energetic_silver; @@ -5202,7 +5202,7 @@ advanced { tconevo:metal:41 tconevo:metal:43 tconevo:metal:44 - tconstruct:clay_cast:0: + tconstruct:clay_cast tconstruct:edible:5 tconstruct:rack:0 tconstruct:rack:0:minecraft:wooden_slab:0 diff --git a/scripts/do/omegapotion.zs b/scripts/do/omegapotion.zs index 38261746c..041a2bb47 100644 --- a/scripts/do/omegapotion.zs +++ b/scripts/do/omegapotion.zs @@ -200,130 +200,130 @@ static potNameTag as IData[string] = { 'cofhcore:unluck3' : [ 27, 2, 450], 'cofhcore:unluck3+' : [ 27, 2, 1200], 'cofhcore:unluck4' : [ 27, 3, 360], - 'randomthings:collapse' : [ 34, 0, 450], - 'randomthings:long_collapse' : [ 34, 0, 900], - 'randomthings:strong_collapse' : [ 34, 1, 300], - '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], + 'randomthings:collapse' : [ 52, 0, 450], + 'randomthings:long_collapse' : [ 52, 0, 900], + 'randomthings:strong_collapse' : [ 52, 1, 300], + 'quark:resilience' : [ 88, 0, 3600], + 'quark:long_resilience' : [ 88, 0, 9600], + 'quark:strong_resilience' : [ 88, 1, 1800], + 'quark:danger_sight' : [ 90, 0, 3600], + 'quark:long_danger_sight' : [ 90, 0, 9600], + 'potioncore:love' : [ 99, 0, 1], + 'potioncore:repair' : [100, 0, 3600], + 'potioncore:long_repair' : [100, 0, 9600], + 'potioncore:strong_repair' : [100, 1, 1800], + 'potioncore:flight' : [101, 0, 3600], + 'potioncore:long_flight' : [101, 0, 9600], + 'potioncore:recoil' : [102, 0, 3600], + 'potioncore:long_recoil' : [102, 0, 9600], + 'potioncore:strong_recoil' : [102, 1, 1800], + 'potioncore:broken_magic_shield' : [103, 0, 900], + 'potioncore:long_broken_magic_shield' : [103, 0, 1800], + 'potioncore:strong_broken_magic_shield' : [103, 1, 450], + 'potioncore:iron_skin' : [104, 0, 3600], + 'potioncore:long_iron_skin' : [104, 0, 9600], + 'potioncore:strong_iron_skin' : [104, 1, 1800], + 'potioncore:purity' : [105, 0, 3600], + 'potioncore:long_purity' : [105, 0, 9600], + 'potioncore:reach' : [106, 0, 3600], + 'potioncore:long_reach' : [106, 0, 9600], + 'potioncore:strong_reach' : [106, 1, 1800], + 'potioncore:diamond_skin' : [107, 0, 3600], + 'potioncore:long_diamond_skin' : [107, 0, 9600], + 'potioncore:strong_diamond_skin' : [107, 1, 1800], + 'potioncore:teleport' : [108, 0, 1], + 'potioncore:strong_teleport' : [108, 1, 1], + 'potioncore:teleport_surface' : [109, 0, 1], + 'potioncore:magic_focus' : [110, 0, 3600], + 'potioncore:long_magic_focus' : [110, 0, 9600], + 'potioncore:strong_magic_focus' : [110, 1, 1800], + 'potioncore:cure' : [111, 0, 1], + 'potioncore:step_up' : [112, 0, 3600], + 'potioncore:long_step_up' : [112, 0, 9600], + 'potioncore:strong_step_up' : [112, 1, 1800], + 'potioncore:drown' : [113, 0, 3600], + 'potioncore:long_drown' : [113, 0, 9600], + 'potioncore:teleport_spawn' : [114, 0, 600], + 'potioncore:disorganization' : [115, 0, 1], + 'potioncore:climb' : [116, 0, 3600], + 'potioncore:long_climb' : [116, 0, 9600], + 'potioncore:perplexity' : [117, 0, 3600], + 'potioncore:long_perplexity' : [117, 0, 9600], + 'potioncore:rust' : [118, 0, 3600], + 'potioncore:long_rust' : [118, 0, 9600], + 'potioncore:strong_rust' : [118, 1, 1800], + 'potioncore:vulnerable' : [119, 0, 3600], + 'potioncore:long_vulnerable' : [119, 0, 9600], + 'potioncore:strong_vulnerable' : [119, 1, 1800], + 'potioncore:explode' : [120, 0, 1], + 'potioncore:strong_explode' : [120, 1, 1], + 'potioncore:solid_core' : [121, 0, 3600], + 'potioncore:long_solid_core' : [121, 0, 9600], + 'potioncore:fire' : [122, 0, 1], + 'potioncore:strong_fire' : [122, 1, 1], + 'potioncore:lightning' : [123, 0, 1], + 'potioncore:magic_inhibition' : [124, 0, 3600], + 'potioncore:long_magic_inhibition' : [124, 0, 9600], + 'potioncore:strong_magic_inhibition' : [124, 1, 1800], + 'potioncore:chance' : [125, 0, 1], + 'potioncore:strong_chance' : [125, 1, 1], + 'potioncore:invert' : [126, 0, 1], + 'potioncore:weight' : [127, 0, 3600], + 'potioncore:long_weight' : [127, 0, 9600], + 'potioncore:strong_weight' : [127, 1, 1800], + 'potioncore:launch' : [128, 0, 1], + 'potioncore:strong_launch' : [128, 1, 1], + 'potioncore:dispel' : [129, 0, 1], + 'potioncore:revival' : [130, 0, 3600], + 'potioncore:long_revival' : [130, 0, 9600], + 'potioncore:strong_revival' : [130, 1, 1800], + 'potioncore:klutz' : [131, 0, 3600], + 'potioncore:long_klutz' : [131, 0, 9600], + 'potioncore:strong_klutz' : [131, 1, 1800], + 'potioncore:bless' : [132, 0, 1], + 'potioncore:strong_bless' : [132, 1, 1], + 'potioncore:broken_armor' : [133, 0, 900], + 'potioncore:long_broken_armor' : [133, 0, 1800], + 'potioncore:strong_broken_armor' : [133, 1, 450], + 'potioncore:magic_shield' : [134, 0, 3600], + 'potioncore:long_magic_shield' : [134, 0, 9600], + 'potioncore:strong_magic_shield' : [134, 1, 1800], + 'potioncore:slow_fall' : [135, 0, 3600], + 'potioncore:long_slow_fall' : [135, 0, 9600], + 'potioncore:strong_slow_fall' : [135, 1, 1800], + 'potioncore:antidote' : [136, 0, 3600], + 'potioncore:long_antidote' : [136, 0, 9600], + 'potioncore:spin' : [137, 0, 900], + 'potioncore:long_spin' : [137, 0, 1800], + 'potioncore:strong_spin' : [137, 1, 450], + 'potioncore:curse' : [138, 0, 1], + 'potioncore:strong_curse' : [138, 1, 1], + 'potioncore:burst' : [139, 0, 1], + 'potioncore:strong_burst' : [139, 1, 1], + 'potioncore:archery' : [140, 0, 3600], + 'potioncore:long_archery' : [140, 0, 9600], + 'potioncore:strong_archery' : [140, 1, 1800], + 'cyclicmagic:magnet' : [145, 0, 3600], + 'cyclicmagic:ender' : [146, 0, 3600], + 'cyclicmagic:waterwalk' : [147, 0, 3600], + 'cyclicmagic:slowfall' : [148, 0, 3600], + 'cyclicmagic:snow' : [149, 0, 3600], + 'cyclicmagic:swim' : [150, 0, 3600], + 'cyclicmagic:swim2' : [150, 1, 1800], + 'cyclicmagic:bounce' : [151, 0, 3600], + 'cyclicmagic:frostwalker' : [152, 0, 3600], + 'cyclicmagic:butter' : [153, 0, 3600], + 'cyclicmagic:butter2' : [153, 1, 1800], + 'cyclicmagic:saturation' : [155, 0, 3600], + 'extrautils2:xu2.doom' : [185, 0, 1200], + 'extrautils2:xu2.gravity' : [186, 0, 1200], + 'extrautils2:xu2.gravity.long' : [186, 0, 9600], + 'extrautils2:xu2.second.chance' : [187, 0, 2400], + 'extrautils2:xu2.greek.fire' : [188, 0, 2400], + 'extrautils2:xu2.fizzy.lifting' : [189, 0, 600], + 'extrautils2:xu2.relapse' : [190, 0, 9600], + 'extrautils2:xu2.love' : [191, 0, 200], + 'extrautils2:xu2.purging' : [192, 0, 0], } as IData[string]; /**/