feat: 4.2.4 update

src/config/AppliedEnergistics2/CustomRecipes.cfg

@@ -1,7 +1,7 @@
 # Configuration file
 
 cache {
-    S:digest=44035cd6b07e669d9a76a887d199124b
+    S:digest=80b6081c5c21a9231b0954a55ae8c2c6
 
     # Caching can save processing time, if there are a lot of items. [default: true]
     B:enableCache=true

src/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=1559770455194
+    S:lastCheck=1639430506918
 }
 
 

src/config/Mercurius.cfg

@@ -2,7 +2,7 @@
 
 general {
     S:modPack=SkyFactory4
-    S:modPackVersion=4.2.2
+    S:modPackVersion=4.2.4
     B:spammyLogs=false
 
     optout {
@@ -254,6 +254,7 @@ general {
             B:schematics=false
             B:shetiphiancore=false
             B:simplegenerators=false
+            B:simpletomb=false
             B:sky_orchards=false
             B:skybonsais=false
             B:skygrid=false
@@ -293,7 +294,6 @@ general {
             B:tipthescales=false
             B:toastcontrol=false
             B:togetherforever=false
-            B:tombstone=false
             B:topography=false
             B:torchmaster=false
             B:totemic=false

src/config/apotheosis/enchantments.cfg

@@ -1114,66 +1114,6 @@
 }
 
 
-"tombstone:magic_siphon" {
-    # The max level of this enchantment. [range: 1 ~ 127, default: 5]
-    I:"Max Level"=5
-
-    # A function to determine the max enchanting power.  The variable "x" is level.  See: https://github.com/uklimaschewski/EvalEx#usage-examples [default: ]
-    S:"Max Power Function"=
-
-    # The min level of this enchantment. [range: 1 ~ 127, default: 1]
-    I:"Min Level"=1
-
-    # A function to determine the min enchanting power. [default: ]
-    S:"Min Power Function"=
-}
-
-
-"tombstone:plague_bringer" {
-    # The max level of this enchantment. [range: 1 ~ 127, default: 5]
-    I:"Max Level"=5
-
-    # A function to determine the max enchanting power.  The variable "x" is level.  See: https://github.com/uklimaschewski/EvalEx#usage-examples [default: ]
-    S:"Max Power Function"=
-
-    # The min level of this enchantment. [range: 1 ~ 127, default: 1]
-    I:"Min Level"=1
-
-    # A function to determine the min enchanting power. [default: ]
-    S:"Min Power Function"=
-}
-
-
-"tombstone:shadow_step" {
-    # The max level of this enchantment. [range: 1 ~ 127, default: 15]
-    I:"Max Level"=15
-
-    # A function to determine the max enchanting power.  The variable "x" is level.  See: https://github.com/uklimaschewski/EvalEx#usage-examples [default: ]
-    S:"Max Power Function"=
-
-    # The min level of this enchantment. [range: 1 ~ 127, default: 1]
-    I:"Min Level"=1
-
-    # A function to determine the min enchanting power. [default: ]
-    S:"Min Power Function"=
-}
-
-
-"tombstone:soulbound" {
-    # The max level of this enchantment. [range: 1 ~ 127, default: 1]
-    I:"Max Level"=1
-
-    # A function to determine the max enchanting power.  The variable "x" is level.  See: https://github.com/uklimaschewski/EvalEx#usage-examples [default: ]
-    S:"Max Power Function"=
-
-    # The min level of this enchantment. [range: 1 ~ 127, default: 1]
-    I:"Min Level"=1
-
-    # A function to determine the min enchanting power. [default: ]
-    S:"Min Power Function"=
-}
-
-
 "walljump:doublejump" {
     # The max level of this enchantment. [range: 1 ~ 127, default: 4]
     I:"Max Level"=4

src/config/astralsorcery.cfg

@@ -293,6 +293,11 @@ machinery {
         I:VortexOffset=-4
     }
 
+    attunement-altar {
+        # Set this to 'false' to disable the timeout waiting for a player to attune. This can solve issues with players having high latency or a bad ingame performance. [default: true]
+        B:doAttunementTimeout=true
+    }
+
 }
 
 
@@ -783,6 +788,11 @@ ritual_effects {
     }
 
     mineralis {
+        # Defines the blockstates that may be replaced by generated ore from the ritual. format: <modid>:<name>:<meta> - Use meta -1 for wildcard [default: [minecraft:stone:0]]
+        S:ReplacementStates <
+            minecraft:stone:0
+         >
+
         # Defines the amount of block-positions the ritual can cache at max count [range: 1 ~ 4000, default: 2]
         I:mineralisCount=2
 

src/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], [bibliocraft:bibliocraft.readingench:5], [endercore:autosmelt:2], [endercore:xpboost:5], [tombstone:shadow_step:2], [tombstone:soulbound:2], [tombstone:magic_siphon:2], [tombstone:plague_bringer:2], [walljump:walljump:5], [walljump:doublejump:2], [walljump:speedboost:2], [yoyos:collecting:5], [matteroverdrive:overclock:10], [apotheosis:hell_infusion:1], [apotheosis:mounted_strike:2], [apotheosis:depth_miner:2], [apotheosis:stable_footing:2], [apotheosis:scavenger:1], [apotheosis:icy_thorns:2], [apotheosis:tempting:5], [apotheosis:shield_bash:2], [apotheosis:reflective:2], [apotheosis:knowledge:2], [apotheosis:splitting:2], [apotheosis:natures_blessing:2], [apotheosis:rebounding:2], [apotheosis:magic_protection:5], [apotheosis:capturing:1], [apotheosis:true_infinity:1], [astralsorcery:enchantment.as.nightvision:1], [astralsorcery:enchantment.as.smelting:1], [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.beheading:1], [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.reach:1], [cyclicmagic:enchantment.venom:10], [cyclicmagic:enchantment.waterwalking:1], [cyclicmagic:enchantment.expboost: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], [bibliocraft:bibliocraft.readingench:5], [endercore:xpboost:5], [endercore:autosmelt:2], [walljump:walljump:5], [walljump:doublejump:2], [walljump:speedboost:2], [yoyos:collecting:5], [matteroverdrive:overclock:10], [apotheosis:hell_infusion:1], [apotheosis:mounted_strike:2], [apotheosis:depth_miner:2], [apotheosis:stable_footing:2], [apotheosis:scavenger:1], [apotheosis:icy_thorns:2], [apotheosis:tempting:5], [apotheosis:shield_bash:2], [apotheosis:reflective:2], [apotheosis:knowledge:2], [apotheosis:splitting:2], [apotheosis:natures_blessing:2], [apotheosis:rebounding:2], [apotheosis:magic_protection:5], [apotheosis:capturing:1], [apotheosis:true_infinity:1], [astralsorcery:enchantment.as.nightvision:1], [astralsorcery:enchantment.as.smelting:1], [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.beheading:1], [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.reach:1], [cyclicmagic:enchantment.venom:10], [cyclicmagic:enchantment.waterwalking:1], [cyclicmagic:enchantment.expboost:1]]
     S:data <
         minecraft:protection:10
         minecraft:fire_protection:5
@@ -40,8 +40,6 @@ data {
         bibliocraft:bibliocraft.deathcompassench:1
         bibliocraft:bibliocraft.readingench:5
         matteroverdrive:overclock:10
-        tombstone:shadow_step:2
-        tombstone:soulbound:2
         yoyos:collecting:5
         astralsorcery:enchantment.as.nightvision:1
         astralsorcery:enchantment.as.smelting:1

src/config/chiselsandbits.cfg

@@ -233,8 +233,6 @@ crafting {
     B:org.cyclops.integrateddynamics.block.BlockMenrilLogFilled=true
     B:"org.cyclops.integrateddynamics.block.BlockMenrilPlanksConfig$1"=true
     B:org.dave.compactmachines3.block.BlockWallBreakable=true
-    B:ovh.corail.tombstone.block.BlockDarkMarble=true
-    B:ovh.corail.tombstone.block.BlockGraveMarble=true
     B:pokefenn.totemic.block.BlockCedarLog=true
     B:pokefenn.totemic.block.BlockCedarPlank=true
     B:rustic.common.blocks.BlockBase=true

src/config/codechicken/supporters.json

@@ -2,7 +2,8 @@
 	{
 		"mod" : "EnderStorage",
 		"supporters": [
-			"Blkdragon112"
+			"Blkdragon112",
+			"Pyrodogg"
 		]
 	},
 	{
@@ -22,7 +23,11 @@
 			"Ninja 5tyl3",
 			"Disalot",
 			"Gamer2313",
-			"Majorangejuice"
+			"Majorangejuice",
+			"Kadah",
+			"adeilt",
+			"Terkanil",
+			"Pandemonia",
 		]
 	},
 	{
@@ -34,12 +39,14 @@
 	{
 		"mod" : "Translocators",
 		"supporters": [
+			"Boyd Stephen Smith Jr."
 		]
 	}, 
 	{
 		"mod" : "ProjectRed",
 		"supporters" : [
-			"Jacob M"
+			"Jacob M",
+			"Darker Light"
 		]
 	}
 ]

src/config/defaultoptions/keybindings.txt

@@ -151,7 +151,6 @@ key_nei.options.keys.world.heal:0:NONE
 key_nei.options.keys.world.creative:0:NONE
 key_key.clipboardPaste:210:NONE
 key_key.toggle.schemui:22:NONE
-key_tombstone.message.knowledge_of_death:0:NONE
 key_key.craftingGrid:0:NONE
 key_key.journeymap.zoom_in:13:NONE
 key_key.journeymap.zoom_out:12:NONE

src/config/foamfix.cfg

@@ -16,6 +16,9 @@ client {
     # The maximum amount of levels of recursion for the deduplication process. Smaller values will deduplicate less data, but make the process run faster. [default: 9, range: 1-2147483647]
     I:deduplicateModelsMaxRecursion=6
 
+    # Step every X models on the progress bar while deduplicating baked models. [default: 1, range: 1-10000]
+    I:deduplicateModelsStepEvery=1
+
     # Disables texture animations. [default: false]
     B:disableTextureAnimations=false
 
@@ -28,6 +31,12 @@ client {
     # Remove unnecessary data from a pointlessly cached ModelLoader instance. [default: true]
     B:modelLoaderCleanup=true
 
+    # Faster/less memory-churning construction mechanism for ModelResourceLocation objects. Identified by malte0811 in FerriteCore - implemented in a distinct way. [default: true]
+    B:modelResourceLocationFastConstruct=true
+
+    # More optimized multipart model condition storage. Inspired by malte0811's research. [default: true]
+    B:smallModelConditions=true
+
     # Wipes the IModel cache after baking is finished. Saves a lot of RAM, as most IModels will not be reloaded. [default: true]
     B:wipeModelCache=true
 }
@@ -107,6 +116,10 @@ ghostbuster {
     # The amount of time FoamFix should wait for a world to be deemed non-unloaded. [default: 60, range: 10-3600]
     I:checkNonUnloadedWorldTimeout=120
 
+    # Custom patch rules. Format: 'className;methodName;accessAloadPos;posAloadPos;radius'. An AloadPos is the position of the argument in the method - 1 for the first one, 2 for the second one, ...; the radius determines how many blocks have to be around the method for no early return. Untested - please use with care.
+    S:customPatchRulesRadius <
+     >
+
     # Wrap ChunkProviderServers to be able to provide the /ghostbuster command for debugging ghost chunkloads. [default: false]
     B:enableDebuggingWrapper=false
 
@@ -115,6 +128,15 @@ ghostbuster {
 
     # Should beds be prevented from ghost chunkloading? [default: true]
     B:patchBeds=true
+
+    # Should BoP grass be prevented from ghost chunkloading? [default: true]
+    B:patchBopGrass=true
+
+    # Should farmland be prevented from ghost chunkloading? [default: true]
+    B:patchFarmland=true
+
+    # Should fluids be prevented from ghost chunkloading? [default: true]
+    B:patchFluids=true
     B:patchGrass=true
 
     # Should the /ghostbuster debugger show neighbor updates? [default: false]
@@ -131,6 +153,15 @@ launchwrapper {
 }
 
 
+network {
+    # Enable micro-optimizations to reduce network churn, inspired by the Velocity project and Krypton mod. [default: true]
+    B:microOptimizations=true
+
+    # Set the packet compression level, from 0 to 9. -1 preserves the default settings. [default: -1, range: -1-9]
+    I:packetCompressionLevel=-1
+}
+
+
 textures {
     # If false, disables any patches from this category. [default: true]
     B:enable=true

src/config/forge.cfg

@@ -108,7 +108,6 @@ version_checking {
     B:thermaldynamics=true
     B:thermalfoundation=true
     B:thermalinnovation=true
-    B:tombstone=true
     B:totemic=true
     B:translocators=true
     B:twilightforest=true

src/config/ichunutil.cfg

@@ -51,7 +51,7 @@ module {
             I:versionNotificationTypes=0
 
             # Don't change this.
-            I:versionSave=3
+            I:versionSave=13
         }
 
     }

src/config/incontrol/loot.json

@@ -1,12 +1,4 @@
 [
-  {
-    "mob": "withercrumbs:wither crumb",
-    "remove": "tombstone:scroll_of_knowledge"
-  },
-  {
-    "mob": "withercrumbs:wither crumb",
-    "remove": "tombstone:scroll_buff"
-  },
   {
     "mob": "withercrumbs:wither crumb",
     "remove": "minecraft:nether_star"

src/config/jei/itemBlacklist.cfg

@@ -1143,7 +1143,6 @@ advanced {
         extracells:pattern.fluid:uranium_238_fluoride_flibe;m=0
         thebetweenlands:bl_bucket:nickel;m=0
         tconstruct:tooltables:1:chisel:planks-acacia:9
-        tombstone:fake_fog
         tconstruct:tooltables:1:chisel:planks-acacia:7
         extracells:pattern.fluid:depleted_fuel_lecf_251;m=0
         tconstruct:tooltables:1:chisel:planks-acacia:8
@@ -1219,7 +1218,6 @@ advanced {
         tconstruct:tooltables:2:natura:redwood_logs:1
         horsepower:chopping_block:{textureBlock:{id:"sky_orchards:log_coal",Count:1b,Damage:0s}}
         forge:bucketfilled:fuel_lep_239_fluoride_flibe;
-        tombstone:soul
         extracells:pattern.fluid:fuel_hecf_251_fluoride;m=0
         conarm:leggings
         horsepower:chopping_block:{textureBlock:{id:"sky_orchards:log_gold",Count:1b,Damage:0s}}
@@ -2140,11 +2138,8 @@ advanced {
         forge:bucketfilled:fuel_lecm_245;
         ceramics:clay_bucket:bronze;m=0
         thebetweenlands:bl_bucket:slime;m=0
-        tombstone:advancement_002
-        tombstone:advancement_003
         ceramics:clay_bucket:fuel_lecf_251_fluoride;m=0
         thebetweenlands:bl_bucket:slime;m=1
-        tombstone:advancement_001
         forge:bucketfilled:depleted_fuel_hep_241;
         ceramics:clay_bucket:ender_pearl;m=0
         extracells:pattern.fluid:oxygen;m=0
@@ -2159,8 +2154,6 @@ advanced {
         ceramics:clay_bucket:emerald_nak;m=0
         ceramics:clay_bucket:ec.internal.iron;m=0
         forge:bucketfilled:emerald_nak_hot;
-        tombstone:advancement_004
-        tombstone:advancement_005
         forge:bucketfilled:corium;
         quark:glowstone_dust_block
         extracells:pattern.fluid:redstone;m=0

src/config/mputils/changelog.txt

@@ -2,6 +2,27 @@ Please report bugs to the issue tracker!!
 
 ---------------------------------------------------------------------
 
+4.2.4
+
+Note: As this update changes how the tombs work. Any old tombs from the previous mod would be lost. Ensure you have opened any graves before updating the pack. Use backups before if you have already opened the world into this update.
+
+Mods Added:
+* Simple Tomb (1.0.0)
+
+Mods Updated:
+* Astral Sorcery (1.10.24 -> 1.10.27)
+* Ceramics (1.3.7 -> 1.3.7b)
+* FoamFix (0.10.10 -> 0.10.14)
+* Primitive Crafting (1.4.3.6 -> 1.4.4.7)
+* TeslaCoreLib (1.0.17.25 -> 1.0.18.28)
+* Torchmaster (1.8.1.81 -> 1.8.5.0)
+* The Twilight Forest (3.10.1013 -> 3.11.1021)
+
+Mods Removed:
+* Tombstone: Revived
+
+---------------------------------------------------------------------
+
 4.2.3
 
 Bug Fixes:

src/config/simpletomb.cfg

@@ -0,0 +1,30 @@
+# Configuration file
+
+simpletomb {
+    # Whether to give a Grave Key item to the player on death.  Grave can be opened without they key, but the key will help the player locate the grave
+    B:key.given=true
+
+    # If a key is being dropped, will the player's display name be added to the tomb key item name
+    B:key.named=true
+
+    # If creative players can teleport to the tomb with the key, ignoring distance
+    B:teleport.creative=true
+
+    # When survival player is within this (straight line calculated) distance from the tomb, they can teleport to the tomb.  Set as zero (0) to disable survival TP feature.  Set as negative one (-1) to allow survival teleportation always and ignore the distance (within dimension)  
+    # Min: 1
+    # Max: 64
+    I:teleport.survival=16
+
+    # Whether to handle player death at all (false will disable almost the entire mod such as spawning the grave on death)
+    B:tomb.enabled=true
+
+    # The radius in which extra items should be hunted for and collected when a grave is spawned; set to zero (0) to disable
+    # Min: 0
+    # Max: 8
+    I:tomb.extra_items=2
+
+    # Whether to log the positions of players' graves to game (server) console
+    B:tomb.log_message=true
+}
+
+