diff --git a/.minecraft/config/byg/backups/last_working_configs_backup.zip b/.minecraft/config/byg/backups/last_working_configs_backup.zip index ab434aa..f2f81d8 100644 Binary files a/.minecraft/config/byg/backups/last_working_configs_backup.zip and b/.minecraft/config/byg/backups/last_working_configs_backup.zip differ diff --git a/.minecraft/config/cataclysm.toml b/.minecraft/config/cataclysm.toml index 698a3d5..86084fa 100644 --- a/.minecraft/config/cataclysm.toml +++ b/.minecraft/config/cataclysm.toml @@ -84,4 +84,6 @@ #Ignis's DamageCap #Range: 0 ~ 1000000 IgnisDamageCap = 20 + #Ignis's cracked block breaking ignore the MobGriefing + IgnisBlockBreaking = true diff --git a/.minecraft/config/computercraft-client.toml b/.minecraft/config/computercraft-client.toml index 97cf9ef..0251dff 100644 --- a/.minecraft/config/computercraft-client.toml +++ b/.minecraft/config/computercraft-client.toml @@ -7,4 +7,7 @@ monitor_renderer = "BEST" #entity limit, but may be extended if you wish to build larger monitors. #Range: 16 ~ 1024 monitor_distance = 64 +#The delay in seconds after which we'll notify about unhandled imports. Set to 0 to disable. +#Range: 0 ~ 60 +upload_nag_delay = 5 diff --git a/.minecraft/config/jei/ingredient-list-mod-sort-order.ini b/.minecraft/config/jei/ingredient-list-mod-sort-order.ini index e8ec8d1..baa551b 100644 --- a/.minecraft/config/jei/ingredient-list-mod-sort-order.ini +++ b/.minecraft/config/jei/ingredient-list-mod-sort-order.ini @@ -16,7 +16,6 @@ Majrusz's Enchantments Missing Wilds Naturalist Quark -Shroom Dealers! Supplementaries Waystones Another Furniture @@ -44,7 +43,13 @@ Sophisticated Backpacks Sophisticated Core Sophisticated Storage Storage Drawers -Straw Golem Tinkers' Construct Valhelsia Structures Void Totem +Advanced Peripherals +Botania +Castle in the sky +Chalk +Galosphere +More Peripherals +Secret Rooms 6 diff --git a/.minecraft/config/jei/recipe-category-sort-order.ini b/.minecraft/config/jei/recipe-category-sort-order.ini index 4ca3fb7..cb4f319 100644 --- a/.minecraft/config/jei/recipe-category-sort-order.ini +++ b/.minecraft/config/jei/recipe-category-sort-order.ini @@ -69,3 +69,13 @@ tconstruct:modifiers tconstruct:molding tconstruct:part_builder tconstruct:severing +botania:brewery +botania:elven_trade +botania:mana_pool +botania:marimorphosis +botania:orechid +botania:orechid_ignem +botania:petals +botania:pure_daisy +botania:runic_altar +botania:terra_plate diff --git a/.minecraft/config/smoothboot.json b/.minecraft/config/smoothboot.json index 1128ed9..b0d93de 100644 --- a/.minecraft/config/smoothboot.json +++ b/.minecraft/config/smoothboot.json @@ -1,13 +1,10 @@ { - "threadCount": { - "bootstrap": 1, - "main": 7 - }, - "threadPriority": { - "game": 5, - "bootstrap": 1, - "main": 1, - "io": 1, - "integratedServer": 5 - } + "bootstrapThreads": 1, + "mainThreads": 4, + "gamePriority": 5, + "integratedServerPriority": 5, + "bootstrapPriority": 1, + "mainPriority": 1, + "ioPriority": 1, + "modLoadingPriority": 1 } \ No newline at end of file diff --git a/.minecraft/config/sophisticatedcore-common.toml b/.minecraft/config/sophisticatedcore-common.toml index 28c0bd5..e2718e1 100644 --- a/.minecraft/config/sophisticatedcore-common.toml +++ b/.minecraft/config/sophisticatedcore-common.toml @@ -2,5 +2,5 @@ #Common Settings [common] #Disable / enable any items here (disables their recipes) - enabledItems = ["sophisticatedstorage:diamond_to_netherite_tier_upgrade|true", "sophisticatedbackpacks:void_upgrade|true", "sophisticatedstorage:barrel|true", "sophisticatedstorage:diamond_chest|true", "sophisticatedstorage:auto_blasting_upgrade|true", "sophisticatedbackpacks:advanced_pickup_upgrade|true", "sophisticatedbackpacks:jukebox_upgrade|true", "sophisticatedstorage:iron_barrel|true", "sophisticatedstorage:stack_upgrade_tier_1|true", "sophisticatedstorage:stack_upgrade_tier_2|true", "sophisticatedstorage:stack_upgrade_tier_3|true", "sophisticatedstorage:stack_upgrade_tier_4|true", "sophisticatedstorage:shulker_box|true", "sophisticatedbackpacks:smoking_upgrade|true", "sophisticatedbackpacks:everlasting_upgrade|true", "sophisticatedbackpacks:compacting_upgrade|true", "sophisticatedbackpacks:advanced_restock_upgrade|true", "sophisticatedstorage:iron_chest|true", "sophisticatedbackpacks:advanced_magnet_upgrade|true", "sophisticatedstorage:upgrade_base|true", "sophisticatedstorage:crafting_upgrade|true", "sophisticatedstorage:magnet_upgrade|true", "sophisticatedstorage:filter_upgrade|true", "sophisticatedbackpacks:advanced_tool_swapper_upgrade|true", "sophisticatedbackpacks:advanced_filter_upgrade|true", "sophisticatedstorage:iron_shulker_box|true", "sophisticatedbackpacks:advanced_feeding_upgrade|true", "sophisticatedbackpacks:diamond_backpack|true", "sophisticatedstorage:auto_smoking_upgrade|true", "sophisticatedbackpacks:inception_upgrade|true", "sophisticatedstorage:chest|true", "sophisticatedbackpacks:crafting_upgrade|true", "sophisticatedstorage:basic_to_iron_tier_upgrade|true", "sophisticatedstorage:blasting_upgrade|true", "sophisticatedstorage:gold_barrel|true", "sophisticatedbackpacks:xp_pump_upgrade|true", "sophisticatedbackpacks:tank_upgrade|true", "sophisticatedstorage:jukebox_upgrade|true", "sophisticatedstorage:pickup_upgrade|true", "sophisticatedbackpacks:pickup_upgrade|true", "sophisticatedbackpacks:auto_smoking_upgrade|true", "sophisticatedstorage:basic_tier_upgrade|true", "sophisticatedbackpacks:stack_upgrade_tier_4|true", "sophisticatedbackpacks:stack_upgrade_tier_3|true", "sophisticatedbackpacks:stack_upgrade_tier_1|true", "sophisticatedstorage:iron_to_gold_tier_upgrade|true", "sophisticatedstorage:smoking_upgrade|true", "sophisticatedstorage:auto_smelting_upgrade|true", "sophisticatedstorage:void_upgrade|true", "sophisticatedstorage:packing_tape|true", "sophisticatedstorage:gold_shulker_box|true", "sophisticatedbackpacks:auto_blasting_upgrade|true", "sophisticatedstorage:gold_chest|true", "sophisticatedstorage:smelting_upgrade|true", "sophisticatedstorage:netherite_shulker_box|true", "sophisticatedbackpacks:smelting_upgrade|true", "sophisticatedbackpacks:battery_upgrade|true", "sophisticatedstorage:diamond_barrel|true", "sophisticatedbackpacks:advanced_pump_upgrade|true", "sophisticatedstorage:controller|true", "sophisticatedbackpacks:filter_upgrade|true", "sophisticatedbackpacks:magnet_upgrade|true", "sophisticatedstorage:compacting_upgrade|true", "sophisticatedbackpacks:blasting_upgrade|true", "sophisticatedbackpacks:refill_upgrade|true", "sophisticatedbackpacks:deposit_upgrade|true", "sophisticatedstorage:advanced_filter_upgrade|true", "sophisticatedbackpacks:iron_backpack|true", "sophisticatedbackpacks:gold_backpack|true", "sophisticatedstorage:stonecutter_upgrade|true", "sophisticatedbackpacks:advanced_deposit_upgrade|true", "sophisticatedstorage:diamond_shulker_box|true", "sophisticatedstorage:advanced_void_upgrade|true", "sophisticatedbackpacks:advanced_void_upgrade|true", "sophisticatedstorage:gold_to_diamond_tier_upgrade|true", "sophisticatedbackpacks:restock_upgrade|true", "sophisticatedstorage:advanced_compacting_upgrade|true", "sophisticatedbackpacks:stonecutter_upgrade|true", "sophisticatedstorage:advanced_pickup_upgrade|true", "sophisticatedbackpacks:backpack|true", "sophisticatedbackpacks:pump_upgrade|true", "sophisticatedbackpacks:tool_swapper_upgrade|true", "sophisticatedbackpacks:feeding_upgrade|true", "sophisticatedstorage:feeding_upgrade|true", "sophisticatedbackpacks:netherite_backpack|true", "sophisticatedstorage:netherite_barrel|true", "sophisticatedstorage:netherite_chest|true", "sophisticatedstorage:pump_upgrade|true", "sophisticatedstorage:advanced_pump_upgrade|true", "sophisticatedstorage:xp_pump_upgrade|true", "sophisticatedstorage:debug_tool|true", "sophisticatedstorage:advanced_feeding_upgrade|true", "sophisticatedbackpacks:auto_smelting_upgrade|true", "sophisticatedstorage:storage_link|true", "sophisticatedbackpacks:stack_upgrade_tier_2|true", "sophisticatedstorage:advanced_magnet_upgrade|true", "sophisticatedbackpacks:upgrade_base|true", "sophisticatedstorage:storage_tool|true", "sophisticatedbackpacks:advanced_compacting_upgrade|true"] + enabledItems = ["sophisticatedstorage:diamond_to_netherite_tier_upgrade|true", "sophisticatedbackpacks:void_upgrade|true", "sophisticatedstorage:barrel|true", "sophisticatedstorage:diamond_chest|true", "sophisticatedstorage:auto_blasting_upgrade|true", "sophisticatedbackpacks:advanced_pickup_upgrade|true", "sophisticatedbackpacks:jukebox_upgrade|true", "sophisticatedstorage:iron_barrel|true", "sophisticatedstorage:stack_upgrade_tier_1|true", "sophisticatedstorage:stack_upgrade_tier_2|true", "sophisticatedstorage:stack_upgrade_tier_3|true", "sophisticatedstorage:stack_upgrade_tier_4|true", "sophisticatedstorage:shulker_box|true", "sophisticatedbackpacks:smoking_upgrade|true", "sophisticatedbackpacks:everlasting_upgrade|true", "sophisticatedbackpacks:compacting_upgrade|true", "sophisticatedbackpacks:advanced_restock_upgrade|true", "sophisticatedstorage:iron_chest|true", "sophisticatedbackpacks:advanced_magnet_upgrade|true", "sophisticatedstorage:upgrade_base|true", "sophisticatedstorage:crafting_upgrade|true", "sophisticatedstorage:magnet_upgrade|true", "sophisticatedstorage:filter_upgrade|true", "sophisticatedbackpacks:advanced_tool_swapper_upgrade|true", "sophisticatedbackpacks:advanced_filter_upgrade|true", "sophisticatedstorage:iron_shulker_box|true", "sophisticatedbackpacks:advanced_feeding_upgrade|true", "sophisticatedbackpacks:diamond_backpack|true", "sophisticatedstorage:auto_smoking_upgrade|true", "sophisticatedbackpacks:inception_upgrade|true", "sophisticatedstorage:chest|true", "sophisticatedbackpacks:crafting_upgrade|true", "sophisticatedstorage:basic_to_iron_tier_upgrade|true", "sophisticatedstorage:blasting_upgrade|true", "sophisticatedstorage:gold_barrel|true", "sophisticatedbackpacks:xp_pump_upgrade|true", "sophisticatedbackpacks:tank_upgrade|true", "sophisticatedstorage:jukebox_upgrade|true", "sophisticatedstorage:pickup_upgrade|true", "sophisticatedbackpacks:pickup_upgrade|true", "sophisticatedbackpacks:auto_smoking_upgrade|true", "sophisticatedstorage:basic_tier_upgrade|true", "sophisticatedbackpacks:stack_upgrade_tier_4|true", "sophisticatedbackpacks:stack_upgrade_tier_3|true", "sophisticatedbackpacks:stack_upgrade_tier_1|true", "sophisticatedstorage:iron_to_gold_tier_upgrade|true", "sophisticatedstorage:smoking_upgrade|true", "sophisticatedstorage:auto_smelting_upgrade|true", "sophisticatedstorage:void_upgrade|true", "sophisticatedstorage:packing_tape|true", "sophisticatedstorage:gold_shulker_box|true", "sophisticatedbackpacks:auto_blasting_upgrade|true", "sophisticatedstorage:gold_chest|true", "sophisticatedstorage:smelting_upgrade|true", "sophisticatedstorage:netherite_shulker_box|true", "sophisticatedbackpacks:smelting_upgrade|true", "sophisticatedbackpacks:battery_upgrade|true", "sophisticatedstorage:diamond_barrel|true", "sophisticatedbackpacks:advanced_pump_upgrade|true", "sophisticatedstorage:controller|true", "sophisticatedbackpacks:filter_upgrade|true", "sophisticatedbackpacks:magnet_upgrade|true", "sophisticatedstorage:compacting_upgrade|true", "sophisticatedbackpacks:blasting_upgrade|true", "sophisticatedbackpacks:refill_upgrade|true", "sophisticatedbackpacks:deposit_upgrade|true", "sophisticatedstorage:advanced_filter_upgrade|true", "sophisticatedbackpacks:iron_backpack|true", "sophisticatedbackpacks:gold_backpack|true", "sophisticatedstorage:stonecutter_upgrade|true", "sophisticatedbackpacks:advanced_deposit_upgrade|true", "sophisticatedstorage:diamond_shulker_box|true", "sophisticatedstorage:advanced_void_upgrade|true", "sophisticatedbackpacks:advanced_void_upgrade|true", "sophisticatedstorage:gold_to_diamond_tier_upgrade|true", "sophisticatedbackpacks:restock_upgrade|true", "sophisticatedstorage:advanced_compacting_upgrade|true", "sophisticatedbackpacks:stonecutter_upgrade|true", "sophisticatedstorage:advanced_pickup_upgrade|true", "sophisticatedbackpacks:backpack|true", "sophisticatedbackpacks:pump_upgrade|true", "sophisticatedbackpacks:tool_swapper_upgrade|true", "sophisticatedbackpacks:feeding_upgrade|true", "sophisticatedstorage:feeding_upgrade|true", "sophisticatedbackpacks:netherite_backpack|true", "sophisticatedstorage:netherite_barrel|true", "sophisticatedstorage:netherite_chest|true", "sophisticatedstorage:pump_upgrade|true", "sophisticatedstorage:advanced_pump_upgrade|true", "sophisticatedstorage:xp_pump_upgrade|true", "sophisticatedstorage:debug_tool|true", "sophisticatedstorage:advanced_feeding_upgrade|true", "sophisticatedbackpacks:auto_smelting_upgrade|true", "sophisticatedstorage:storage_link|true", "sophisticatedbackpacks:stack_upgrade_tier_2|true", "sophisticatedstorage:advanced_magnet_upgrade|true", "sophisticatedbackpacks:upgrade_base|true", "sophisticatedstorage:storage_tool|true", "sophisticatedbackpacks:advanced_compacting_upgrade|true", "sophisticatedstorage:limited_barrel_3|true", "sophisticatedstorage:limited_barrel_2|true", "sophisticatedstorage:limited_barrel_1|true", "sophisticatedstorage:limited_barrel_4|true", "sophisticatedstorage:limited_gold_barrel_1|true", "sophisticatedstorage:limited_gold_barrel_2|true", "sophisticatedstorage:limited_gold_barrel_3|true", "sophisticatedstorage:limited_gold_barrel_4|true", "sophisticatedstorage:limited_diamond_barrel_1|true", "sophisticatedstorage:limited_diamond_barrel_2|true", "sophisticatedstorage:limited_diamond_barrel_3|true", "sophisticatedstorage:limited_diamond_barrel_4|true", "sophisticatedstorage:limited_iron_barrel_4|true", "sophisticatedstorage:limited_iron_barrel_3|true", "sophisticatedstorage:limited_iron_barrel_2|true", "sophisticatedstorage:limited_iron_barrel_1|true", "sophisticatedstorage:limited_netherite_barrel_1|true", "sophisticatedstorage:limited_netherite_barrel_2|true", "sophisticatedstorage:limited_netherite_barrel_3|true", "sophisticatedstorage:limited_netherite_barrel_4|true"] diff --git a/.minecraft/config/sophisticatedstorage-common.toml b/.minecraft/config/sophisticatedstorage-common.toml index dd7767d..022fa65 100644 --- a/.minecraft/config/sophisticatedstorage-common.toml +++ b/.minecraft/config/sophisticatedstorage-common.toml @@ -391,3 +391,183 @@ #Range: 1 ~ 20 maxXpPointsPerMending = 5 + #Limited Barrel I Settings + [common.LimitedBarrelI] + #Multiplier that's used to calculate base slot limit + #Range: 1 ~ 256 + baseSlotLimitMultiplier = 32 + #Number of upgrade slots in the storage + #Range: 0 ~ 10 + upgradeSlotCount = 1 + + #Limited Iron Barrel I Settings + [common.LimitedIronBarrelI] + #Multiplier that's used to calculate base slot limit + #Range: 1 ~ 256 + baseSlotLimitMultiplier = 64 + #Number of upgrade slots in the storage + #Range: 0 ~ 10 + upgradeSlotCount = 1 + + #Limited Gold Barrel I Settings + [common.LimitedGoldBarrelI] + #Multiplier that's used to calculate base slot limit + #Range: 1 ~ 256 + baseSlotLimitMultiplier = 96 + #Number of upgrade slots in the storage + #Range: 0 ~ 10 + upgradeSlotCount = 2 + + #Limited Diamond Barrel I Settings + [common.LimitedDiamondBarrelI] + #Multiplier that's used to calculate base slot limit + #Range: 1 ~ 256 + baseSlotLimitMultiplier = 128 + #Number of upgrade slots in the storage + #Range: 0 ~ 10 + upgradeSlotCount = 3 + + #Limited Netherite Barrel I Settings + [common.LimitedNetheriteBarrelI] + #Multiplier that's used to calculate base slot limit + #Range: 1 ~ 256 + baseSlotLimitMultiplier = 160 + #Number of upgrade slots in the storage + #Range: 0 ~ 10 + upgradeSlotCount = 4 + + #Limited Barrel II Settings + [common.LimitedBarrelII] + #Multiplier that's used to calculate base slot limit + #Range: 1 ~ 256 + baseSlotLimitMultiplier = 16 + #Number of upgrade slots in the storage + #Range: 0 ~ 10 + upgradeSlotCount = 1 + + #Limited Iron Barrel II Settings + [common.LimitedIronBarrelII] + #Multiplier that's used to calculate base slot limit + #Range: 1 ~ 256 + baseSlotLimitMultiplier = 32 + #Number of upgrade slots in the storage + #Range: 0 ~ 10 + upgradeSlotCount = 1 + + #Limited Gold Barrel II Settings + [common.LimitedGoldBarrelII] + #Multiplier that's used to calculate base slot limit + #Range: 1 ~ 256 + baseSlotLimitMultiplier = 48 + #Number of upgrade slots in the storage + #Range: 0 ~ 10 + upgradeSlotCount = 2 + + #Limited Diamond Barrel II Settings + [common.LimitedDiamondBarrelII] + #Multiplier that's used to calculate base slot limit + #Range: 1 ~ 256 + baseSlotLimitMultiplier = 64 + #Number of upgrade slots in the storage + #Range: 0 ~ 10 + upgradeSlotCount = 3 + + #Limited Netherite Barrel II Settings + [common.LimitedNetheriteBarrelII] + #Multiplier that's used to calculate base slot limit + #Range: 1 ~ 256 + baseSlotLimitMultiplier = 80 + #Number of upgrade slots in the storage + #Range: 0 ~ 10 + upgradeSlotCount = 4 + + #Limited Barrel III Settings + [common.LimitedBarrelIII] + #Multiplier that's used to calculate base slot limit + #Range: 1 ~ 256 + baseSlotLimitMultiplier = 10 + #Number of upgrade slots in the storage + #Range: 0 ~ 10 + upgradeSlotCount = 1 + + #Limited Iron Barrel III Settings + [common.LimitedIronBarrelIII] + #Multiplier that's used to calculate base slot limit + #Range: 1 ~ 256 + baseSlotLimitMultiplier = 20 + #Number of upgrade slots in the storage + #Range: 0 ~ 10 + upgradeSlotCount = 1 + + #Limited Gold Barrel III Settings + [common.LimitedGoldBarrelIII] + #Multiplier that's used to calculate base slot limit + #Range: 1 ~ 256 + baseSlotLimitMultiplier = 30 + #Number of upgrade slots in the storage + #Range: 0 ~ 10 + upgradeSlotCount = 2 + + #Limited Diamond Barrel III Settings + [common.LimitedDiamondBarrelIII] + #Multiplier that's used to calculate base slot limit + #Range: 1 ~ 256 + baseSlotLimitMultiplier = 40 + #Number of upgrade slots in the storage + #Range: 0 ~ 10 + upgradeSlotCount = 3 + + #Limited Netherite Barrel III Settings + [common.LimitedNetheriteBarrelIII] + #Multiplier that's used to calculate base slot limit + #Range: 1 ~ 256 + baseSlotLimitMultiplier = 50 + #Number of upgrade slots in the storage + #Range: 0 ~ 10 + upgradeSlotCount = 4 + + #Limited Barrel IV Settings + [common.LimitedBarrelIV] + #Multiplier that's used to calculate base slot limit + #Range: 1 ~ 256 + baseSlotLimitMultiplier = 8 + #Number of upgrade slots in the storage + #Range: 0 ~ 10 + upgradeSlotCount = 1 + + #Limited Iron Barrel IV Settings + [common.LimitedIronBarrelIV] + #Multiplier that's used to calculate base slot limit + #Range: 1 ~ 256 + baseSlotLimitMultiplier = 16 + #Number of upgrade slots in the storage + #Range: 0 ~ 10 + upgradeSlotCount = 1 + + #Limited Gold Barrel IV Settings + [common.LimitedGoldBarrelIV] + #Multiplier that's used to calculate base slot limit + #Range: 1 ~ 256 + baseSlotLimitMultiplier = 24 + #Number of upgrade slots in the storage + #Range: 0 ~ 10 + upgradeSlotCount = 2 + + #Limited Diamond Barrel IV Settings + [common.LimitedDiamondBarrelIV] + #Multiplier that's used to calculate base slot limit + #Range: 1 ~ 256 + baseSlotLimitMultiplier = 32 + #Number of upgrade slots in the storage + #Range: 0 ~ 10 + upgradeSlotCount = 3 + + #Limited Netherite Barrel IV Settings + [common.LimitedNetheriteBarrelIV] + #Multiplier that's used to calculate base slot limit + #Range: 1 ~ 256 + baseSlotLimitMultiplier = 40 + #Number of upgrade slots in the storage + #Range: 0 ~ 10 + upgradeSlotCount = 4 + diff --git a/.minecraft/config/worldedit/worldedit.properties b/.minecraft/config/worldedit/worldedit.properties index a64cfe5..b9cf81e 100644 --- a/.minecraft/config/worldedit/worldedit.properties +++ b/.minecraft/config/worldedit/worldedit.properties @@ -1,5 +1,5 @@ #Don't put comments; they get removed -#Sun Oct 23 16:07:40 CDT 2022 +#Sat Dec 03 15:00:55 GMT 2022 max-super-pickaxe-size=5 use-inventory-creative-override=false use-inventory-override=false