diff --git a/config/geneticsresequenced-server.toml b/config/geneticsresequenced-server.toml index 274b120e..67c40ecf 100644 --- a/config/geneticsresequenced-server.toml +++ b/config/geneticsresequenced-server.toml @@ -23,6 +23,12 @@ antifieldBlockRadius = 25 #How many times slower should the Advanced Incubator be when it's at low temperature? Default is 120, which makes it take a full Minecraft day (excluding Overclockers) #Range: > 1 incubatorLowTempTickFactor = 120 + #How much should each Overclocker decrease the success rate of GMO recipes? Equation is `decreasedChance = geneChance * (1 - (overclockerCount * incubatorOverclockerChanceDecrease))` + #Range: 0.0 ~ 1.0 + incubatorOverclockerChanceDecrease = 0.1 + #How much should each Chorus Fruit increase the success rate of GMO recipes? Equation is `finalChance = decreasedChance + #Range: 0.0 ~ 1.0 + incubatorChorusFruitChanceIncrease = 0.1 [genes] #List of genes to disable. diff --git a/config/inventoryessentials-common.toml b/config/inventoryessentials-common.toml index e8f9598f..23653980 100644 --- a/config/inventoryessentials-common.toml +++ b/config/inventoryessentials-common.toml @@ -2,6 +2,3 @@ forceClientImplementation = false #Should space-clicking move all items even if an empty slot was clicked? allowBulkTransferAllOnEmptySlot = false -#You can now go into your Controls and unbind the respective Inventory Essentials keys instead! -whereDidTheConfigsGo = true - diff --git a/config/jade/plugins.json b/config/jade/plugins.json index 41161bea..d3d98377 100644 --- a/config/jade/plugins.json +++ b/config/jade/plugins.json @@ -114,6 +114,9 @@ "waystones": { "waystone": true }, + "corpse": { + "corpse": true + }, "cookingforblockheads": { "fridge": true, "oven": true, diff --git a/config/jade/sort-order.json b/config/jade/sort-order.json index eed87ca6..56894b2a 100644 --- a/config/jade/sort-order.json +++ b/config/jade/sort-order.json @@ -18,6 +18,7 @@ "cookingforblockheads:oven": null, "cookingforblockheads:sink": null, "cookingforblockheads:toaster": null, + "corpse:corpse": null, "entangled:entangled_block_component": null, "framedblocks:framed_block_generic": null, "framedblocks:framed_item_frame": null, diff --git a/config/jei/ingredient-list-mod-sort-order.ini b/config/jei/ingredient-list-mod-sort-order.ini index 23cfbfea..1b37f584 100644 --- a/config/jei/ingredient-list-mod-sort-order.ini +++ b/config/jei/ingredient-list-mod-sort-order.ini @@ -79,3 +79,8 @@ Macaw's Furniture Macaw's Roofs Macaw's Windows PneumaticCraft: Repressurized +Ars Elemental +Small Ships +Sophisticated Backpacks +Sophisticated Core +Sophisticated Storage diff --git a/config/jei/ingredient-list-type-sort-order.ini b/config/jei/ingredient-list-type-sort-order.ini index 924f3c57..6a4f0c4b 100644 --- a/config/jei/ingredient-list-type-sort-order.ini +++ b/config/jei/ingredient-list-type-sort-order.ini @@ -1,8 +1,4 @@ net.minecraft.world.item.ItemStack -mekanism.api.chemical.gas.GasStack -mekanism.api.chemical.infuse.InfusionStack -mekanism.api.chemical.pigment.PigmentStack -mekanism.api.chemical.slurry.SlurryStack net.neoforged.neoforge.fluids.FluidStack it.zerono.mods.extremereactors.api.coolant.Coolant it.zerono.mods.extremereactors.api.coolant.Vapor diff --git a/config/jei/recipe-category-sort-order.ini b/config/jei/recipe-category-sort-order.ini index 3bd7bd9f..ed35d6bb 100644 --- a/config/jei/recipe-category-sort-order.ini +++ b/config/jei/recipe-category-sort-order.ini @@ -10,69 +10,9 @@ minecraft:smithing minecraft:smoking minecraft:stonecutting cookingforblockheads:cow_jar -farmingforblockheads:market jei:information justenoughprofessions:professions -occultism:crushing -occultism:miner -occultism:ritual -occultism:spirit_fire -theurgy:accumulation -theurgy:calcination -theurgy:digestion -theurgy:distillation -theurgy:fermentation -theurgy:incubation -theurgy:liquefaction -theurgy:reformation justdirethings:goo_spread_recipe -modern_industrialization:assembler -modern_industrialization:bronze_compressor -modern_industrialization:bronze_cutting_machine -modern_industrialization:bronze_furnace -modern_industrialization:bronze_macerator -modern_industrialization:bronze_mixer -modern_industrialization:centrifuge -modern_industrialization:chemical_reactor -modern_industrialization:coke_oven -modern_industrialization:distillation_tower -modern_industrialization:distillery -modern_industrialization:electric_blast_furnace_cupronickel_coil -modern_industrialization:electric_blast_furnace_kanthal_coil -modern_industrialization:electric_compressor -modern_industrialization:electric_cutting_machine -modern_industrialization:electric_furnace -modern_industrialization:electric_macerator -modern_industrialization:electric_mixer -modern_industrialization:electric_packer -modern_industrialization:electric_quarry -modern_industrialization:electric_unpacker -modern_industrialization:electric_wiremill -modern_industrialization:electrolyzer -modern_industrialization:fluid_fuels -modern_industrialization:forge_hammer -modern_industrialization:fusion_reactor -modern_industrialization:heat_exchanger -modern_industrialization:implosion_compressor -modern_industrialization:multiblock_shapes -modern_industrialization:neutron_interaction -modern_industrialization:oil_drilling_rig -modern_industrialization:polarizer -modern_industrialization:pressurizer -modern_industrialization:steam_blast_furnace -modern_industrialization:steam_quarry -modern_industrialization:steel_compressor -modern_industrialization:steel_cutting_machine -modern_industrialization:steel_furnace -modern_industrialization:steel_macerator -modern_industrialization:steel_mixer -modern_industrialization:steel_packer -modern_industrialization:steel_unpacker -modern_industrialization:steel_wiremill -modern_industrialization:thermal_interaction -modern_industrialization:vacuum_freezer -the_bumblezone:queen_color_randomizer_trades -the_bumblezone:queen_trades jei_mekanism_multiblocks:multiblock.mekanism.boiler jei_mekanism_multiblocks:multiblock.mekanism.dynamic_tank jei_mekanism_multiblocks:multiblock.mekanism.evaporation_plant @@ -81,7 +21,6 @@ jei_mekanism_multiblocks:multiblock.mekanism.sps jei_mekanism_multiblocks:multiblock.mekanismgenerators.fission_reactor jei_mekanism_multiblocks:multiblock.mekanismgenerators.fusion_reactor jei_mekanism_multiblocks:multiblock.mekanismgenerators.turbine -justenoughbreeding:breeding bigreactors:fluidizer_fluidmixing bigreactors:fluidizer_solid bigreactors:fluidizer_solidmixing @@ -93,38 +32,17 @@ bigreactors:jei_vaporizations bigreactors:jei_vaporsmappings bigreactors:reactantsreactions bigreactors:reprocessor -framedblocks:framing_saw ftbquests:loot_crate ftbquests:quest -jumbofurnace:jumbo_furnace_upgrade -jumbofurnace:jumbo_smelting -tiab:resource_generator justdirethings:fluid_drop_recipe chipped:workbench functionalstorage:dissolution -jearchaeology:brush -jearchaeology:sniff ars_nouveau:armor_upgrade ars_nouveau:crush ars_nouveau:enchanting_apparatus ars_nouveau:enchantment_apparatus ars_nouveau:glyph_recipe ars_nouveau:imbuement -productivetrees:log_stripping -productivetrees:sawmill -productivetrees:tree_fruiting -productivetrees:tree_pollination -extended_industrialization:fluid_fertilizers -modern_industrialization:bronze_bending_machine -modern_industrialization:bronze_composter -modern_industrialization:electric_alloy_smelter -modern_industrialization:electric_bending_machine -modern_industrialization:electric_canning_machine -modern_industrialization:electric_composter -modern_industrialization:steel_alloy_smelter -modern_industrialization:steel_bending_machine -modern_industrialization:steel_canning_machine -modern_industrialization:steel_composter evilcraftcompat:blood_infuser evilcraftcompat:environmental_accumulator evilcraftcompat:sanguinary_environmental_accumulator @@ -149,3 +67,6 @@ pneumaticcraft:yeast_crafting minecraft:block minecraft:fluid minecraft:item +ars_elemental:armor_upgrade +ars_elemental:netherite_upgrade +justdirethings:ore_to_resource diff --git a/config/justdirethings-common.toml b/config/justdirethings-common.toml index cb1d7d0f..34783b28 100644 --- a/config/justdirethings-common.toml +++ b/config/justdirethings-common.toml @@ -180,3 +180,8 @@ phase = true #epicarrow epicarrow = true + +#Goo settings +[goo] + #Can goo randomly die, needing to be revived by right clicking with an item? + goo_can_die = true diff --git a/config/lighty/base.config b/config/lighty/base.config index 9c25f902..79160256 100644 --- a/config/lighty/base.config +++ b/config/lighty/base.config @@ -1,5 +1,6 @@ lighty.auto_on=false lighty.farm_growth_threshold=8 +lighty.show_skylight_level=true lighty.auto_on.item=minecraft:torch lighty.last_used_mode=lighty:carpet_mode lighty.block_threshold=0 diff --git a/config/modernfix-mixins.properties b/config/modernfix-mixins.properties index f64ed8ff..9f07a0dd 100644 --- a/config/modernfix-mixins.properties +++ b/config/modernfix-mixins.properties @@ -44,6 +44,7 @@ # mixin.perf.cache_model_materials=true # (default) # mixin.perf.cache_profile_texture_url=true # (default) # mixin.perf.cache_strongholds=true # (default) +# mixin.perf.chunk_meshing=true # (default) # mixin.perf.clear_mixin_classinfo=false # (default) # mixin.perf.compact_bit_storage=true # (default) # mixin.perf.datapack_reload_exceptions=true # (default) @@ -53,6 +54,7 @@ # mixin.perf.deduplicate_wall_shapes=true # (default) # mixin.perf.dynamic_entity_renderers=false # (default) # mixin.perf.dynamic_resources=false # (default) +# mixin.perf.dynamic_resources.ctm=true # (default) # mixin.perf.dynamic_sounds=true # (default) # mixin.perf.dynamic_structure_manager=true # (default) # mixin.perf.faster_item_rendering=false # (default) diff --git a/config/relics/relics/amphibian_boot.yaml b/config/relics/relics/amphibian_boot.yaml new file mode 100644 index 00000000..a1bef30a --- /dev/null +++ b/config/relics/relics/amphibian_boot.yaml @@ -0,0 +1,128 @@ +abilitiesData: + abilities: + swimming: + # Highest level to which the ability can be upgraded + maxLevel: 10 + # Relic level at which the ability becomes unlocked + requiredLevel: 0 + # Number of leveling points needed to increase the ability level + requiredPoints: 1 + stats: + speed: + # Maximum base value of the stat. A random value within this range is assigned when the relic is first created + maxInitialValue: 0.01 + # Maximum threshold value for the stat, representing hard limits that cannot be surpassed through ability level upgrades or other methods + maxThresholdValue: 1.7976931348623157E308 + # Minimum base value of the stat. A random value within this range is assigned when the relic is first created + minInitialValue: 0.005 + # Minimum threshold value for the stat, representing hard limits that cannot be surpassed through ability level upgrades or other methods + minThresholdValue: 4.9E-324 + # Modifier applied to the base value of the stat, depending on the [upgradeOperation] parameter. + upgradeModifier: 0.25 + # Type of mathematical operation used to calculate the stat's value based on the ability level. Supported operations include: + # MULTIPLY_BASE: x + ((x * y) * z), + # MULTIPLY_TOTAL: x * (y + 1)^z, + # ADD: x + (y * z). + # + # ...where x - Base stat value, y - Value of [upgradeModifier], z - Current relic level + upgradeOperation: MULTIPLY_BASE + duration: + # Maximum base value of the stat. A random value within this range is assigned when the relic is first created + maxInitialValue: 35.0 + # Maximum threshold value for the stat, representing hard limits that cannot be surpassed through ability level upgrades or other methods + maxThresholdValue: 1.7976931348623157E308 + # Minimum base value of the stat. A random value within this range is assigned when the relic is first created + minInitialValue: 15.0 + # Minimum threshold value for the stat, representing hard limits that cannot be surpassed through ability level upgrades or other methods + minThresholdValue: 4.9E-324 + # Modifier applied to the base value of the stat, depending on the [upgradeOperation] parameter. + upgradeModifier: 0.2 + # Type of mathematical operation used to calculate the stat's value based on the ability level. Supported operations include: + # MULTIPLY_BASE: x + ((x * y) * z), + # MULTIPLY_TOTAL: x * (y + 1)^z, + # ADD: x + (y * z). + # + # ...where x - Base stat value, y - Value of [upgradeModifier], z - Current relic level + upgradeOperation: MULTIPLY_BASE + slipping: + # Highest level to which the ability can be upgraded + maxLevel: 10 + # Relic level at which the ability becomes unlocked + requiredLevel: 0 + # Number of leveling points needed to increase the ability level + requiredPoints: 1 + stats: + speed: + # Maximum base value of the stat. A random value within this range is assigned when the relic is first created + maxInitialValue: 0.01 + # Maximum threshold value for the stat, representing hard limits that cannot be surpassed through ability level upgrades or other methods + maxThresholdValue: 1.7976931348623157E308 + # Minimum base value of the stat. A random value within this range is assigned when the relic is first created + minInitialValue: 0.005 + # Minimum threshold value for the stat, representing hard limits that cannot be surpassed through ability level upgrades or other methods + minThresholdValue: 4.9E-324 + # Modifier applied to the base value of the stat, depending on the [upgradeOperation] parameter. + upgradeModifier: 0.15 + # Type of mathematical operation used to calculate the stat's value based on the ability level. Supported operations include: + # MULTIPLY_BASE: x + ((x * y) * z), + # MULTIPLY_TOTAL: x * (y + 1)^z, + # ADD: x + (y * z). + # + # ...where x - Base stat value, y - Value of [upgradeModifier], z - Current relic level + upgradeOperation: MULTIPLY_BASE + duration: + # Maximum base value of the stat. A random value within this range is assigned when the relic is first created + maxInitialValue: 25.0 + # Maximum threshold value for the stat, representing hard limits that cannot be surpassed through ability level upgrades or other methods + maxThresholdValue: 1.7976931348623157E308 + # Minimum base value of the stat. A random value within this range is assigned when the relic is first created + minInitialValue: 15.0 + # Minimum threshold value for the stat, representing hard limits that cannot be surpassed through ability level upgrades or other methods + minThresholdValue: 4.9E-324 + # Modifier applied to the base value of the stat, depending on the [upgradeOperation] parameter. + upgradeModifier: 0.15 + # Type of mathematical operation used to calculate the stat's value based on the ability level. Supported operations include: + # MULTIPLY_BASE: x + ((x * y) * z), + # MULTIPLY_TOTAL: x * (y + 1)^z, + # ADD: x + (y * z). + # + # ...where x - Base stat value, y - Value of [upgradeModifier], z - Current relic level + upgradeOperation: MULTIPLY_BASE + gills: + # Highest level to which the ability can be upgraded + maxLevel: 10 + # Relic level at which the ability becomes unlocked + requiredLevel: 0 + # Number of leveling points needed to increase the ability level + requiredPoints: 1 + stats: + chance: + # Maximum base value of the stat. A random value within this range is assigned when the relic is first created + maxInitialValue: 0.1 + # Maximum threshold value for the stat, representing hard limits that cannot be surpassed through ability level upgrades or other methods + maxThresholdValue: 1.7976931348623157E308 + # Minimum base value of the stat. A random value within this range is assigned when the relic is first created + minInitialValue: 0.01 + # Minimum threshold value for the stat, representing hard limits that cannot be surpassed through ability level upgrades or other methods + minThresholdValue: 4.9E-324 + # Modifier applied to the base value of the stat, depending on the [upgradeOperation] parameter. + upgradeModifier: 0.35 + # Type of mathematical operation used to calculate the stat's value based on the ability level. Supported operations include: + # MULTIPLY_BASE: x + ((x * y) * z), + # MULTIPLY_TOTAL: x * (y + 1)^z, + # ADD: x + (y * z). + # + # ...where x - Base stat value, y - Value of [upgradeModifier], z - Current relic level + upgradeOperation: MULTIPLY_BASE +levelingData: + # Amount of experience required to level up to relic level 1 + initialCost: 100 + # Maximum level of the relic + maxLevel: 10 + # Increment in experience required for each subsequent level of the relic + step: 100 +lootData: + # List of key-value pairs where the key is a textual identifier for the loot table (supporting regular expressions) and the value represents the probability of generating the relic within the specified bounds + entries: + '[\w]+:chests\/[\w_\/]*(water|ocean|river|(?