From 4c42af62835331f8ba91b37b29dca18d739c042d Mon Sep 17 00:00:00 2001 From: sainagh Date: Sun, 5 Nov 2023 13:14:38 -0800 Subject: [PATCH] Some fixes --- config/AppliedEnergistics2/VersionChecker.cfg | 2 +- config/InvTweaks.cfg | 2 +- config/astralsorcery/amulet_enchantments.cfg | 2 +- config/betterquesting/DefaultQuests.json | 20 ++++++++++++++++++- config/buildcraft/detailed.properties | 2 +- config/ichunutil.cfg | 2 +- config/jei/worldSettings.cfg | 16 +++++++-------- .../machinery/thaumic_replicator.json | 14 +++---------- config/splash.properties | 4 ++-- scripts/BlackHoleBosses.zs | 2 +- scripts/ModularMeteoricBefaller.zs | 6 +++--- 11 files changed, 41 insertions(+), 31 deletions(-) diff --git a/config/AppliedEnergistics2/VersionChecker.cfg b/config/AppliedEnergistics2/VersionChecker.cfg index 1f2ccfbe..9a10cfcf 100644 --- a/config/AppliedEnergistics2/VersionChecker.cfg +++ b/config/AppliedEnergistics2/VersionChecker.cfg @@ -3,7 +3,7 @@ cache { # Waits as many hours, until it checks again. [range: 0 ~ 168, default: 24] I:interval=24 - S:lastCheck=1699123526575 + S:lastCheck=1699215301326 } diff --git a/config/InvTweaks.cfg b/config/InvTweaks.cfg index 44fa23be..1e3394bb 100644 --- a/config/InvTweaks.cfg +++ b/config/InvTweaks.cfg @@ -1,6 +1,6 @@ #Inventory Tweaks Configuration #(Regarding shortcuts, all key names can be found at: http://legacy.lwjgl.org/javadoc/org/lwjgl/input/Keyboard.html) -#Sat Nov 04 15:33:06 PDT 2023 +#Sun Nov 05 12:19:22 PST 2023 enableMiddleClick=true showChestButtons=true enableSortingOnPickup=false diff --git a/config/astralsorcery/amulet_enchantments.cfg b/config/astralsorcery/amulet_enchantments.cfg index 2e66f199..76ebedf3 100644 --- a/config/astralsorcery/amulet_enchantments.cfg +++ b/config/astralsorcery/amulet_enchantments.cfg @@ -7,7 +7,7 @@ ########################################################################################################## data { - # [default: [minecraft:protection:10], [minecraft:fire_protection:5], [minecraft:feather_falling:5], [minecraft:blast_protection:2], [minecraft:projectile_protection:5], [minecraft:respiration:2], [minecraft:aqua_affinity:2], [minecraft:thorns:1], [minecraft:depth_strider:2], [minecraft:frost_walker:2], [minecraft:sharpness:10], [minecraft:smite:5], [minecraft:bane_of_arthropods:5], [minecraft:knockback:5], [minecraft:fire_aspect:2], [minecraft:looting:2], [minecraft:sweeping:2], [minecraft:efficiency:10], [minecraft:silk_touch:1], [minecraft:unbreaking:5], [minecraft:fortune:2], [minecraft:power:10], [minecraft:punch:2], [minecraft:flame:2], [minecraft:infinity:1], [minecraft:luck_of_the_sea:2], [minecraft:lure:2], [minecraft:mending:2], [draconicevolution:enchant_reaper:2], [railcraft:wrecking:2], [railcraft:implosion:2], [railcraft:destruction:1], [railcraft:smack:1], [extrautils2:xu.kaboomerang:10], [extrautils2:xu.zoomerang:10], [extrautils2:xu.burnerang:10], [extrautils2:xu.bladerang:10], [extrautils2:xu.boomereaperang:10], [randomthings:magnetic:1], [openblocks:explosive:2], [openblocks:last_stand:5], [openblocks:flim_flam:2], [projectred-expansion:electric_efficiency:2], [advancedrocketry:spacebreathing:10], [endercore:xpboost:5], [endercore:autosmelt:2], [tombstone:shadow_step:2], [tombstone:soulbound:2], [tombstone:magic_siphon:2], [tombstone:plague_bringer:2], [tombstone:blessing:2], [tombstone:curse_of_bones:2], [enderio:witherarrow:5], [enderio:repellent:1], [enderio:witherweapon:5], [enderio:soulbound:1], [aerialaffinity:aerial_affinity:2], [aoa3:brace:1], [aoa3:intervention:1], [aoa3:archmage:1], [aoa3:sever:5], [aoa3:recharge:2], [aoa3:control:2], [aoa3:shell:5], [aoa3:crush:5], [aoa3:form:2], [ebwizardry:magic_sword:10], [ebwizardry:magic_bow:10], [ebwizardry:flaming_weapon:10], [ebwizardry:freezing_weapon:10], [ebwizardry:magic_protection:5], [ebwizardry:frost_protection:2], [ebwizardry:shock_protection:2], [bewitchment:magic_protection:1], [bibliocraft:bibliocraft.deathcompassench:1], [bibliocraft:bibliocraft.readingench:5], [divinerpg:rive:1], [divinerpg:aftershock:1], [mod_lavacow:poisonous:1], [mod_lavacow:lifesteal:1], [mod_lavacow:corrosive:1], [soulshardsrespawn:soul_stealer:5], [variegated:manabound:1], [woot:headhunter:2], [abyssalcraft:coralium:2], [abyssalcraft:dread:2], [abyssalcraft:light_pierce:10], [abyssalcraft:iron_wall:5], [abyssalcraft:sapping:5], [abyssalcraft:multi_rend:2], [cofhcore:holding:5], [cofhcore:insight:5], [cofhcore:leech:5], [cofhcore:multishot:5], [cofhcore:smashing:2], [cofhcore:smelting:2], [cofhcore:soulbound:5], [cofhcore:vorpal:2], [cyclicmagic:enchantment.autosmelt:2], [cyclicmagic:enchantment.excavation:1], [cyclicmagic:enchantment.launch:10], [cyclicmagic:enchantment.lifeleech:10], [cyclicmagic:enchantment.magnet:1], [cyclicmagic:enchantment.multishot:1], [cyclicmagic:enchantment.quickdraw:1], [cyclicmagic:enchantment.venom:10], [cyclicmagic:enchantment.waterwalking:1], [cyclicmagic:enchantment.expboost:1], [astralsorcery:enchantment.as.nightvision:1], [astralsorcery:enchantment.as.smelting:1], [simplyjetpacks:fuel_efficiency:1]] + # [default: [minecraft:protection:10], [minecraft:fire_protection:5], [minecraft:feather_falling:5], [minecraft:blast_protection:2], [minecraft:projectile_protection:5], [minecraft:respiration:2], [minecraft:aqua_affinity:2], [minecraft:thorns:1], [minecraft:depth_strider:2], [minecraft:frost_walker:2], [minecraft:sharpness:10], [minecraft:smite:5], [minecraft:bane_of_arthropods:5], [minecraft:knockback:5], [minecraft:fire_aspect:2], [minecraft:looting:2], [minecraft:sweeping:2], [minecraft:efficiency:10], [minecraft:silk_touch:1], [minecraft:unbreaking:5], [minecraft:fortune:2], [minecraft:power:10], [minecraft:punch:2], [minecraft:flame:2], [minecraft:infinity:1], [minecraft:luck_of_the_sea:2], [minecraft:lure:2], [minecraft:mending:2], [draconicevolution:enchant_reaper:2], [railcraft:wrecking:2], [railcraft:implosion:2], [railcraft:destruction:1], [railcraft:smack:1], [extrautils2:xu.kaboomerang:10], [extrautils2:xu.zoomerang:10], [extrautils2:xu.burnerang:10], [extrautils2:xu.bladerang:10], [extrautils2:xu.boomereaperang:10], [randomthings:magnetic:1], [openblocks:explosive:2], [openblocks:last_stand:5], [openblocks:flim_flam:2], [projectred-expansion:electric_efficiency:2], [advancedrocketry:spacebreathing:10], [endercore:autosmelt:2], [endercore:xpboost:5], [tombstone:shadow_step:2], [tombstone:soulbound:2], [tombstone:magic_siphon:2], [tombstone:plague_bringer:2], [tombstone:blessing:2], [tombstone:curse_of_bones:2], [enderio:repellent:1], [enderio:soulbound:1], [enderio:witherweapon:5], [enderio:witherarrow:5], [aerialaffinity:aerial_affinity:2], [aoa3:brace:1], [aoa3:intervention:1], [aoa3:archmage:1], [aoa3:sever:5], [aoa3:recharge:2], [aoa3:control:2], [aoa3:shell:5], [aoa3:crush:5], [aoa3:form:2], [ebwizardry:magic_sword:10], [ebwizardry:magic_bow:10], [ebwizardry:flaming_weapon:10], [ebwizardry:freezing_weapon:10], [ebwizardry:magic_protection:5], [ebwizardry:frost_protection:2], [ebwizardry:shock_protection:2], [bewitchment:magic_protection:1], [bibliocraft:bibliocraft.deathcompassench:1], [bibliocraft:bibliocraft.readingench:5], [divinerpg:rive:1], [divinerpg:aftershock:1], [mod_lavacow:poisonous:1], [mod_lavacow:lifesteal:1], [mod_lavacow:corrosive:1], [soulshardsrespawn:soul_stealer:5], [variegated:manabound:1], [woot:headhunter:2], [abyssalcraft:coralium:2], [abyssalcraft:dread:2], [abyssalcraft:light_pierce:10], [abyssalcraft:iron_wall:5], [abyssalcraft:sapping:5], [abyssalcraft:multi_rend:2], [cofhcore:holding:5], [cofhcore:insight:5], [cofhcore:leech:5], [cofhcore:multishot:5], [cofhcore:smashing:2], [cofhcore:smelting:2], [cofhcore:soulbound:5], [cofhcore:vorpal:2], [cyclicmagic:enchantment.autosmelt:2], [cyclicmagic:enchantment.excavation:1], [cyclicmagic:enchantment.launch:10], [cyclicmagic:enchantment.lifeleech:10], [cyclicmagic:enchantment.magnet:1], [cyclicmagic:enchantment.multishot:1], [cyclicmagic:enchantment.quickdraw:1], [cyclicmagic:enchantment.venom:10], [cyclicmagic:enchantment.waterwalking:1], [cyclicmagic:enchantment.expboost:1], [astralsorcery:enchantment.as.nightvision:1], [astralsorcery:enchantment.as.smelting:1], [simplyjetpacks:fuel_efficiency:1]] S:data < minecraft:protection:10 minecraft:fire_protection:5 diff --git a/config/betterquesting/DefaultQuests.json b/config/betterquesting/DefaultQuests.json index 9ad1b76d..214d3078 100644 --- a/config/betterquesting/DefaultQuests.json +++ b/config/betterquesting/DefaultQuests.json @@ -142506,7 +142506,25 @@ }, "questID:3": 1967, "rewards:9": {}, - "tasks:9": {} + "tasks:9": { + "0:10": { + "autoConsume:1": 0, + "consume:1": 0, + "groupDetect:1": 0, + "ignoreNBT:1": 0, + "index:3": 0, + "partialMatch:1": 1, + "requiredItems:9": { + "0:10": { + "Count:3": 1, + "Damage:2": 0, + "OreDict:8": "", + "id:8": "mowziesmobs:wrought_helmet" + } + }, + "taskID:8": "bq_standard:retrieval" + } + } }, "1939:10": { "preRequisites:11": [ diff --git a/config/buildcraft/detailed.properties b/config/buildcraft/detailed.properties index ddcaa50d..ebca3c5a 100644 --- a/config/buildcraft/detailed.properties +++ b/config/buildcraft/detailed.properties @@ -1,5 +1,5 @@ # The buildcraft detailed configuration file. This contains a lot of miscellaneous options that have no affect on gameplay. # You should refer to the BC source code for a detailed description of what these do. (https://github.com/BuildCraft/BuildCraft) # This file will be overwritten every time that buildcraft starts, so don't change anything other than the values. -#Sat Nov 04 15:31:27 PDT 2023 +#Sun Nov 05 12:17:46 PST 2023 render.pipe.misc.inside.shade=0.725 diff --git a/config/ichunutil.cfg b/config/ichunutil.cfg index 66dc5307..c2ef4994 100644 --- a/config/ichunutil.cfg +++ b/config/ichunutil.cfg @@ -70,7 +70,7 @@ module { I:versionNotificationTypes=0 # Don't change this. - I:versionSave=4 + I:versionSave=5 } } diff --git a/config/jei/worldSettings.cfg b/config/jei/worldSettings.cfg index 70fd295a..72647487 100644 --- a/config/jei/worldSettings.cfg +++ b/config/jei/worldSettings.cfg @@ -723,18 +723,11 @@ world382006890 { world411737388 { - # Show the list of bookmarks next to open GUIs. B:bookmarkOverlayEnabled=false B:cheatItemsEnabled=false - - # Default item to use to fill up fluids when clicking on a fluid ingredient in the menu, (format: item_name@meta) S:defaultFluidContainerItem= - - # Hide and unhide ingredients by clicking them in the list. B:editEnabled=false S:filterText=@contenttwe - - # Show the list of ingredients next to open GUIs. B:overlayEnabled=true } @@ -897,11 +890,18 @@ world856673306 { world922450129 { + # Show the list of bookmarks next to open GUIs. B:bookmarkOverlayEnabled=false B:cheatItemsEnabled=false + + # Default item to use to fill up fluids when clicking on a fluid ingredient in the menu, (format: item_name@meta) S:defaultFluidContainerItem= + + # Hide and unhide ingredients by clicking them in the list. B:editEnabled=false - S:filterText= + S:filterText=replica + + # Show the list of ingredients next to open GUIs. B:overlayEnabled=true } diff --git a/config/modularmachinery/machinery/thaumic_replicator.json b/config/modularmachinery/machinery/thaumic_replicator.json index 843333cc..358e84be 100644 --- a/config/modularmachinery/machinery/thaumic_replicator.json +++ b/config/modularmachinery/machinery/thaumic_replicator.json @@ -99,14 +99,6 @@ "twilightforest:castle_brick@0" ] }, - { - "x": 0, - "y": 4, - "z": 1, - "elements": [ - "modularmachinery:blockaspectproviderinput@0" - ] - }, { "x": -1, "y": 1, @@ -176,7 +168,7 @@ "y": 0, "z": 2, "elements": [ - "twilightforest:castle_brick@0" + "modularmachinery:blockaspectproviderinput@0" ] }, { @@ -184,7 +176,7 @@ "y": 0, "z": 1, "elements": [ - "modularmachinery:generalized_input_fluid" + "generalized_output_fluid" ] }, { @@ -288,7 +280,7 @@ "y": 1, "z": 2, "elements": [ - "modularmachinery:blockfluidinputhatch" + "generalized_input_fluid" ] } ]} \ No newline at end of file diff --git a/config/splash.properties b/config/splash.properties index 159af69f..c8e5204d 100644 --- a/config/splash.properties +++ b/config/splash.properties @@ -1,5 +1,5 @@ #Splash screen properties -#Sat Nov 04 15:26:50 PDT 2023 +#Sun Nov 05 12:13:49 PST 2023 background=0xBFBFBF memoryGood=0x00091A font=0x960826 @@ -9,8 +9,8 @@ memoryLow=0x00091A rotate=false memoryWarn=0x00091A showMemory=true -enabled=true bar=0x00091A +enabled=true resourcePackPath=resources logoOffset=0 forgeTexture=fml\:textures/gui/forge.png diff --git a/scripts/BlackHoleBosses.zs b/scripts/BlackHoleBosses.zs index e2b0967e..e74e75b2 100644 --- a/scripts/BlackHoleBosses.zs +++ b/scripts/BlackHoleBosses.zs @@ -27,7 +27,7 @@ mods.thaumcraft.Infusion.registerRecipe("makeakathartoscore", "", , 80, [*666, *500, *300], , -[, , +[, , , , , , , ]); diff --git a/scripts/ModularMeteoricBefaller.zs b/scripts/ModularMeteoricBefaller.zs index c273ce90..1b2f0554 100644 --- a/scripts/ModularMeteoricBefaller.zs +++ b/scripts/ModularMeteoricBefaller.zs @@ -12,9 +12,9 @@ recipes.addShaped(, [, , ]]); recipes.addShaped(, -[[, , ], -[, , ], -[, , ]]); +[[, , ], +[, , ], +[, , ]]); val befaller1 = RecipeBuilder.newBuilder("befaller1","meteoric_befaller",1200); // befaller1.addAspectInput("stellae",50);