diff --git a/changelog.md b/changelog.md index 981e347..a81aa47 100644 --- a/changelog.md +++ b/changelog.md @@ -1 +1 @@ -- Updated anti mob griefing \ No newline at end of file +- Updated mods \ No newline at end of file diff --git a/manifest.json b/manifest.json index b975ce6..f7f339c 100644 --- a/manifest.json +++ b/manifest.json @@ -71,7 +71,7 @@ }, { "projectID": 256247, - "fileID": 3204265, + "fileID": 3250486, "required": true }, { @@ -111,12 +111,12 @@ }, { "projectID": 272335, - "fileID": 3216456, + "fileID": 3249370, "required": true }, { "projectID": 419699, - "fileID": 3248258, + "fileID": 3254875, "required": true }, { @@ -136,7 +136,7 @@ }, { "projectID": 348521, - "fileID": 3235778, + "fileID": 3253620, "required": true }, { @@ -186,7 +186,7 @@ }, { "projectID": 287342, - "fileID": 3223141, + "fileID": 3259754, "required": true }, { @@ -201,12 +201,12 @@ }, { "projectID": 246640, - "fileID": 3203385, + "fileID": 3251398, "required": true }, { "projectID": 280441, - "fileID": 3153645, + "fileID": 3254087, "required": true }, { @@ -246,12 +246,12 @@ }, { "projectID": 281849, - "fileID": 3228145, + "fileID": 3256796, "required": true }, { "projectID": 239197, - "fileID": 3246320, + "fileID": 3258393, "required": true }, { @@ -260,13 +260,13 @@ "required": true }, { - "projectID": 268560, - "fileID": 3206392, + "projectID": 243076, + "fileID": 3196167, "required": true }, { - "projectID": 243076, - "fileID": 3196167, + "projectID": 268560, + "fileID": 3206392, "required": true }, { @@ -281,7 +281,7 @@ }, { "projectID": 422301, - "fileID": 3248281, + "fileID": 3256043, "required": true }, { @@ -305,13 +305,13 @@ "required": true }, { - "projectID": 242818, - "fileID": 3175750, + "projectID": 402924, + "fileID": 3197455, "required": true }, { - "projectID": 402924, - "fileID": 3197455, + "projectID": 242818, + "fileID": 3175750, "required": true }, { @@ -331,12 +331,12 @@ }, { "projectID": 266936, - "fileID": 3223206, + "fileID": 3254983, "required": true }, { "projectID": 69162, - "fileID": 3247581, + "fileID": 3249453, "required": true }, { @@ -346,7 +346,7 @@ }, { "projectID": 243121, - "fileID": 3221260, + "fileID": 3254368, "required": true }, { @@ -360,13 +360,13 @@ "required": true }, { - "projectID": 247560, - "fileID": 3247407, + "projectID": 353928, + "fileID": 3251169, "required": true }, { - "projectID": 353928, - "fileID": 3232394, + "projectID": 247560, + "fileID": 3247407, "required": true }, { @@ -386,7 +386,7 @@ }, { "projectID": 363363, - "fileID": 3219144, + "fileID": 3256613, "required": true }, { @@ -415,18 +415,18 @@ "required": true }, { - "projectID": 314904, - "fileID": 3038811, + "projectID": 250363, + "fileID": 3128555, "required": true }, { - "projectID": 250363, - "fileID": 3128555, + "projectID": 314904, + "fileID": 3038811, "required": true }, { "projectID": 314906, - "fileID": 3236808, + "fileID": 3248884, "required": true }, { diff --git a/overrides/config/cucumber-tags.json b/overrides/config/cucumber-tags.json index b12e72a..1b4bb3d 100644 --- a/overrides/config/cucumber-tags.json +++ b/overrides/config/cucumber-tags.json @@ -27,5 +27,6 @@ "forge:ingots/lead": "mekanism:ingot_lead", "forge:ingots/graphite": "null", "forge:ingots/uranium": "mekanism:ingot_uranium", - "forge:ingots/nickel": "thermal:nickel_ingot" + "forge:ingots/nickel": "thermal:nickel_ingot", + "forge:gems/apatite": "thermal:apatite" } \ No newline at end of file diff --git a/overrides/config/jei/recipe-category-sort-order.ini b/overrides/config/jei/recipe-category-sort-order.ini index 6bd17c1..eac1623 100644 --- a/overrides/config/jei/recipe-category-sort-order.ini +++ b/overrides/config/jei/recipe-category-sort-order.ini @@ -120,3 +120,6 @@ industrialforegoing:stonework_generate resourcefulbees:block_mutation thermal:rock_gen thermal:tree_extractor +camera:take_image +pneumaticcraft:heat_properties +pneumaticcraft:memory_essence diff --git a/overrides/config/mysticalagriculture-common.toml b/overrides/config/mysticalagriculture-common.toml index c71b0d4..3629d44 100644 --- a/overrides/config/mysticalagriculture-common.toml +++ b/overrides/config/mysticalagriculture-common.toml @@ -9,6 +9,8 @@ growthAcceleratorCooldown = 10 #Should the Ender Dragon drop essence when killed with an essence weapon? dragonDropsEssence = true + #Should right clicking on Farmland with an Essence create Essence Farmland? + essenceFarmlandConversion = true #Should the Wither drop essence when killed with an essence weapon? witherDropsEssence = true #Should crops have a chance of dropping a second seed when harvested? diff --git a/overrides/config/mysticalcustomization/configure-augments.json b/overrides/config/mysticalcustomization/configure-augments.json new file mode 100644 index 0000000..9e26dfe --- /dev/null +++ b/overrides/config/mysticalcustomization/configure-augments.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/overrides/config/pneumaticcraft-common.toml b/overrides/config/pneumaticcraft-common.toml index 3850744..61e3cf0 100644 --- a/overrides/config/pneumaticcraft-common.toml +++ b/overrides/config/pneumaticcraft-common.toml @@ -116,10 +116,13 @@ #Precision to which pressurizable item air levels are synced to client. Default of 10 is precise enough to show pressure to 1 decimal place, which is what is display in client tooltips & pneumatic armor HUD. Lower values will sync less precisely, reducing server->client network traffic. Values higher than 10 are not recommended (will cause extra network traffic for no benefit). #Range: 1 ~ 100 pressurizable_sync_precision = 10 + #The maximum distance that a Drone may teleport when it can't find a path to its destination. Default value of 0 means no limit. This is primarily intended to limit abuse of teleportation to other players on PvP servers, but may find other uses. Be careful about setting this value very low. + #Range: > 0 + max_drone_teleport_range = 0 #When set to true, the Kerosene Lamp's fake air blocks won't be registered and therefore removed from the world. Useful if this causes trouble (it shouldn't though) disable_kerosene_lamp_fake_air_block = false - #When set to true, Drones will not execute any program. This is useful to set to true when due to a bug Drones are lagging your server or crashing it. Please report the bug if you encounter it. - stop_drone_ai = false + #When set to true, Drones will not execute any program. This is useful to set to true when due to a bug Drones are lagging your server or crashing it. Please report any such bugs as a PneumaticCraft: Repressurized issue so it can be investigated. + stop_drone_ai = true #Don't remove a water source block when picking up (drones, liquid hoppers, gas lift) if it has at least two water source neighbours. This can reduce lag due to frequent block updates, and can also potentially make water import much faster. Set this to false if you want no-infinite-water rules in a world, or want to limit the speed of water importing to vanilla block update rates. dont_update_infinite_water_sources = true #How far will a drone go to find a Charging Station when it's low on air? Note: drones will teleport, possibly across the world to someone else's base, if this range is very large. @@ -128,6 +131,9 @@ #The minimum interval in ticks between which fluid tank contents should be synced to clients. Smaller values mean smoother visual tank updates, but more of a performance cost in terms of network syncing. Note that fluid tank sync packets are also only sent when a fluid tank changes by more than 1% of its capacity, or 1000mB, whichever is smaller. #Range: 1 ~ 100 fluid_tank_update_rate = 10 + #If a Drone has found a path, but gets stuck on a block along that path, it will teleport to its destination after this many ticks of being stuck. Set this to 0 to disable teleporting, which will likely leave the drone waiting there forever (or until it runs out of air). Note that getting stuck on a block is usually the fault of the mod that added the block (especially if the block has a non-full-cube shape), but if you encounter this behaviour, please report it as a PneumaticCraft: Repressurized issue so it can be investigated. + #Range: > 0 + stuck_drone_teleport_ticks = 20 ["Micromissile Properties"] #Base explosion damage (modified by missile setup) @@ -230,6 +236,9 @@ #Mekanism thermal resistance multiplier. Larger values mean slower heat transfer between Mekanism and PneumaticCraft blocks. #Range: 1.0 ~ 1.7976931348623157E308 mek_thermal_resistance_factor = 5.0 + #Volume boost multiplier for pressurizable items with the CoFH Holding enchantment; air volume is multiplied by (1 + level_of_holding_enchantment) x this value. Set to 0 to disallow pressurizable items by enchanted with the Holding enchantment at all. + #Range: 0.0 ~ 1.7976931348623157E308 + cofh_holding_multiplier = 1.0 #Mekanism <-> PneumaticCraft heat conversion efficiency. Set to 0 to disable Mekanism heat integration entirely. Note that Mekanism and PNC use a similar heat system, but scale things quite differently (Mekanism heaters produces a LOT of heat by PneumaticCraft standards), so conversion efficiency tuning is important for inter-mod balance. #Range: 0.0 ~ 2.0 mek_thermal_conversion_efficiency = 0.01 diff --git a/overrides/config/pneumaticcraft/thirdparty.cfg b/overrides/config/pneumaticcraft/thirdparty.cfg index 2fbb176..b2ee973 100644 --- a/overrides/config/pneumaticcraft/thirdparty.cfg +++ b/overrides/config/pneumaticcraft/thirdparty.cfg @@ -4,6 +4,7 @@ "botania": false, "theoneprobe": true, "mekanism": true, + "cofh_core": true, "immersiveengineering": true, "curios": true, "patchouli": true, diff --git a/overrides/config/quark-common.toml b/overrides/config/quark-common.toml index d88cd4c..bc22b03 100644 --- a/overrides/config/quark-common.toml +++ b/overrides/config/quark-common.toml @@ -127,6 +127,12 @@ Grate = true "Variant Bookshelves" = true + [building.cobblestone_bricks] + "Enable Basalt Bricks" = true + "Enable Netherrack Bricks" = true + "Enable Dirt Bricks" = true + "Enable Blackstone Bricks" = true + [building.rope] "Enable Dispenser Behavior" = true #Set to true to allow ropes to move Tile Entities even if Pistons Push TEs is disabled. @@ -503,9 +509,14 @@ [world.cave_crystal_underground_biome] #The chance that a crystal can grow, this is on average 1 in X world ticks, set to a higher value to make them grow slower. Minimum is 1, for every tick. Set to 0 to disable growth. "Cave Crystal Growth Chance" = 5 - "Crystals Grow In Lava" = false #Allowed values: [0,1] - "Crystal Spawn Chance" = 0.025 + "Crystal Chance" = 0.16 + #Allowed values: [0,1] + "Crystal Cluster On Sides Chance" = 0.6 + #Allowed values: [0,1] + "Crystal Cluster Chance" = 0.2 + #Allowed values: [0,1] + "Double Crystal Chance" = 0.2 "Crystals Craft Runes" = true [world.cave_crystal_underground_biome.biome_settings] @@ -1729,6 +1740,7 @@ "Pipe Speed" = 5 [experimental] + Shiba = false "Adjustable Chat" = false "Narrator Readout" = false "Overlay Shader" = false @@ -1759,6 +1771,23 @@ #Resets all villager discounts when zombified to prevent reducing prices to ridiculous levels "Nerf Villager Discount" = true + [experimental.shiba] + + [experimental.shiba.spawn_config] + #Allowed values: (0,) + "Spawn Weight" = 40 + #Allowed values: [1,) + "Min Group Size" = 1 + #Allowed values: [1,) + "Max Group Size" = 3 + + [experimental.shiba.spawn_config.biomes] + #Allowed values: [[none, taiga, extreme_hills, jungle, mesa, plains, savanna, + # icy, the_end, beach, forest, ocean, desert, river, swamp, + # mushroom, nether] + "Biome Categories" = ["extreme_hills"] + "Is Blacklist" = false + [experimental.overlay_shader] #Sets the name of the shader to load on a regular basis. This can load any shader the Camera module can (and requires the Camera module enabled to apply said logic). #Some useful shaders include 'desaturate', 'oversaturate', 'bumpy' diff --git a/overrides/config/rftoolsbase-common.toml b/overrides/config/rftoolsbase-common.toml index dbf7018..c669aa8 100644 --- a/overrides/config/rftoolsbase-common.toml +++ b/overrides/config/rftoolsbase-common.toml @@ -3,47 +3,47 @@ [worldgen] #Overworld - [worldgen.overworld] + [worldgen.nether] #Number of times to try generate the ore (set to 0 to disable) #Range: 0 ~ 256 - oreChances = 2 - #Max size of veins - #Range: 1 ~ 256 - oreVeinsize = 5 - #Min height - #Range: 0 ~ 256 - oreMin = 2 + oreChances = 8 #Max height #Range: 0 ~ 256 oreMax = 40 - - #Overworld - [worldgen.nether] - #Number of times to try generate the ore (set to 0 to disable) - #Range: 0 ~ 256 - oreChances = 8 #Max size of veins #Range: 1 ~ 256 oreVeinsize = 8 #Min height #Range: 0 ~ 256 oreMin = 2 - #Max height - #Range: 0 ~ 256 - oreMax = 40 #End [worldgen.end] #Number of times to try generate the ore (set to 0 to disable) #Range: 0 ~ 256 oreChances = 8 + #Max height + #Range: 0 ~ 256 + oreMax = 80 #Max size of veins #Range: 1 ~ 256 oreVeinsize = 10 #Min height #Range: 0 ~ 256 oreMin = 2 + + #Overworld + [worldgen.overworld] + #Number of times to try generate the ore (set to 0 to disable) + #Range: 0 ~ 256 + oreChances = 2 #Max height #Range: 0 ~ 256 - oreMax = 80 + oreMax = 40 + #Max size of veins + #Range: 1 ~ 256 + oreVeinsize = 5 + #Min height + #Range: 0 ~ 256 + oreMin = 2 diff --git a/overrides/config/serverconfigupdater-common.toml b/overrides/config/serverconfigupdater-common.toml index 63d9892..6a111f8 100644 --- a/overrides/config/serverconfigupdater-common.toml +++ b/overrides/config/serverconfigupdater-common.toml @@ -1,16 +1,16 @@ ["Add New Version"] - #Version Number. VersionNumbers are simple Integers. Use a number larger than the last version. - #Range: > 0 - newVersion = 1 #ModID's of the ServerConfigs that will be deleted when a world with a version lower than this version is loaded the first time. Comma Separated list. (ServerConfig without -server.toml) toDelete = "antimobgriefing,buildinggadgets,camera,chiselsandbits,cobblefordays,cofh_core,compactmachines,computercraft,corpse,curios,delivery,easy_villagers,extradisks,forge,ftbchunks,mcjtylib,morevanillalib,mysticalagriculture,pipez,refinedstorageaddons,refinedstorage,rftoolsbase,rftoolsbuilder,rftoolsutility,serverconfigupdater,sleeping_bags,storage4computercraft,thermal" + #Version Number. VersionNumbers are simple Integers. Use a number larger than the last version. + #Range: > 0 + newVersion = 0 ["File Deleter"] - #This is intended for deleting datapacks and/or craft tweaker scripts. The file will be deleted every launch if it exists! No access to saves or world folder. Specify the path to the file. Comma Separated List. Example: scripts/badscript.zs - filesToDelete = "" #By default Folders are only deleted if they are empty. Set to true to change that. deleteFoldersWithContent = false + #This is intended for deleting datapacks and/or craft tweaker scripts. The file will be deleted every launch if it exists! No access to saves or world folder. Specify the path to the file. Comma Separated List. Example: scripts/badscript.zs + filesToDelete = "" ["Version History"] #Editing these values will not affect any worlds that are already on that version. diff --git a/overrides/config/sophisticatedbackpacks-common.toml b/overrides/config/sophisticatedbackpacks-common.toml index 204c394..de72a51 100644 --- a/overrides/config/sophisticatedbackpacks-common.toml +++ b/overrides/config/sophisticatedbackpacks-common.toml @@ -258,6 +258,6 @@ equipWithArmor = true #Turns on/off addition of loot into backpacks addLoot = true - #Turns on/off a chance that the entity that wears backpack gets jukebox upgrade a plays a music disc. + #Turns on/off a chance that the entity that wears backpack gets jukebox upgrade and plays a music disc. playJukebox = true diff --git a/overrides/scripts/delivery.zs b/overrides/scripts/delivery.zs index eb1f5bc..ff8de87 100644 --- a/overrides/scripts/delivery.zs +++ b/overrides/scripts/delivery.zs @@ -72,60 +72,52 @@ craftingTable.addShaped("infinity_upgrade", , [ [, , ] ]); -craftingTable.removeByName("mekanism:basic_logistical_transporter"); -mods.jei.JEI.hideItem(); +craftingTable.removeByName("mekanism:transmitter/universal_cable/basic"); +craftingTable.removeByName("mekanism:transmitter/universal_cable/advanced"); +craftingTable.removeByName("mekanism:transmitter/universal_cable/elite"); +craftingTable.removeByName("mekanism:transmitter/universal_cable/ultimate"); + +craftingTable.removeByName("mekanism:transmitter/mechanical_pipe/basic"); +craftingTable.removeByName("mekanism:transmitter/mechanical_pipe/advanced"); +craftingTable.removeByName("mekanism:transmitter/mechanical_pipe/elite"); +craftingTable.removeByName("mekanism:transmitter/mechanical_pipe/ultimate"); + +craftingTable.removeByName("mekanism:transmitter/pressurized_tube/basic"); +craftingTable.removeByName("mekanism:transmitter/pressurized_tube/advanced"); +craftingTable.removeByName("mekanism:transmitter/pressurized_tube/elite"); +craftingTable.removeByName("mekanism:transmitter/pressurized_tube/ultimate"); + +craftingTable.removeByName("mekanism:transmitter/logistical_transporter/basic"); +craftingTable.removeByName("mekanism:transmitter/logistical_transporter/advanced"); +craftingTable.removeByName("mekanism:transmitter/logistical_transporter/elite"); +craftingTable.removeByName("mekanism:transmitter/logistical_transporter/ultimate"); -craftingTable.removeByName("mekanism:advanced_logistical_transporter"); +mods.jei.JEI.hideItem(); mods.jei.JEI.hideItem(); - -craftingTable.removeByName("mekanism:elite_logistical_transporter"); mods.jei.JEI.hideItem(); - -craftingTable.removeByName("mekanism:ultimate_logistical_transporter"); mods.jei.JEI.hideItem(); -craftingTable.removeByName("mekanism:restrictive_transporter"); -mods.jei.JEI.hideItem(); - -craftingTable.removeByName("mekanism:diversion_transporter"); -mods.jei.JEI.hideItem(); - -craftingTable.removeByName("mekanism:basic_mechanical_pipe"); mods.jei.JEI.hideItem(); - -craftingTable.removeByName("mekanism:advanced_mechanical_pipe"); mods.jei.JEI.hideItem(); - -craftingTable.removeByName("mekanism:elite_mechanical_pipe"); mods.jei.JEI.hideItem(); - -craftingTable.removeByName("mekanism:ultimate_mechanical_pipe"); mods.jei.JEI.hideItem(); -craftingTable.removeByName("mekanism:basic_universal_cable"); mods.jei.JEI.hideItem(); - -craftingTable.removeByName("mekanism:advanced_universal_cable"); mods.jei.JEI.hideItem(); - -craftingTable.removeByName("mekanism:elite_universal_cable"); mods.jei.JEI.hideItem(); - -craftingTable.removeByName("mekanism:ultimate_universal_cable"); mods.jei.JEI.hideItem(); -craftingTable.removeByName("mekanism:basic_pressurized_tube"); mods.jei.JEI.hideItem(); - -craftingTable.removeByName("mekanism:advanced_pressurized_tube"); mods.jei.JEI.hideItem(); - -craftingTable.removeByName("mekanism:elite_pressurized_tube"); mods.jei.JEI.hideItem(); - -craftingTable.removeByName("mekanism:ultimate_pressurized_tube"); mods.jei.JEI.hideItem(); +craftingTable.removeByName("mekanism:transmitter/restrictive_transporter"); +craftingTable.removeByName("mekanism:transmitter/diversion_transporter"); + +mods.jei.JEI.hideItem(); +mods.jei.JEI.hideItem(); + # Computercraft craftingTable.removeByName("computercraft:computer_command"); @@ -157,7 +149,6 @@ craftingTable.addShaped("pneumaticcraft.uv_light_box", ); craftingTable.removeByName("rftoolsutility:matter_booster"); mods.jei.JEI.hideItem(); -craftingTable.removeByName("rftoolsutility:destination_analyzer"); mods.jei.JEI.hideItem(); craftingTable.removeByName("rftoolsutility:matter_transmitter"); mods.jei.JEI.hideItem(); @@ -169,7 +160,6 @@ craftingTable.removeByName("rftoolsutility:charged_porter"); mods.jei.JEI.hideItem(); craftingTable.removeByName("rftoolsutility:advanced_charged_porter"); mods.jei.JEI.hideItem(); -craftingTable.removeByName("rftoolsutility:teleport_probe"); mods.jei.JEI.hideItem(); craftingTable.removeByName("rftoolsutility:simple_dialer");