update with upstream

config/ZenUtils.cfg

@@ -1,7 +1,26 @@
 # Configuration file
 
 general {
+    # Allow insertion of zs execution during mod loading stage
+    # Format: scriptLoaderName;modid;stageMarker;before|after
+    # Valid stage marker: C (Construction) H (Preinit) I (Init) J (Postinit) A (Available)
+    # Example: custom;mekanism;J;before -> runs `#loader custom` scripts before mekanism runs its code on post-initialization stage
+    # Note: 
+    # 1. On construction stage and preinit stage before crafttweaker, only native methods are available
+    # 2. Many recipe modifications are staged. For example, scripts are loaded on init, but recipe modifications for crafting table and furnace are staged on postinit
+    #    It means recipe modifications MAY NOT be executed after their loading stage
+    #    ZenUtils will re-execute crafttweaker recipe modifications after all custom script load entrypoint on POSTINIT, but other crafttweaker addons not
+    S:customScriptEntrypoint <
+        lateAddTC;modtweaker;A;after
+     >
+
+    # Enable mixinzs. Default: false
     B:enableMixin=true
+
+    # Enable RandomTickEvent. It patches hotspot random tick code, which may produce performance loss. Do not enable it if you don't need it. Default: false
     B:enableRandomTickEvent=false
+
+    # Enable fast script loading. Note: If enabled, ONLY PREPROCESSORS AT SCRIPT HEADER ARE EFFECTIVE. (except mixin scripts) Default: false
+    B:fastScriptLoading=false
 }
 

config/thaumcraftfix/patches/thaumic_energistics.json

@@ -0,0 +1,36 @@
+[
+    {
+        "key": "ARCANEASSEMBLER",
+        "ops": [
+            {
+                "op": "move",
+                "from": "stages/0/required_craft",
+                "path": "stages/0/required_item"
+            }
+        ]
+    },
+    {
+        "key": "ARCANEINSCRIBER",
+        "ops": [
+            {
+                "op": "move",
+                "from": "stages/0/required_craft",
+                "path": "stages/0/required_item"
+            }
+        ]
+    }
+    {
+        "key": "KNOWLEDGECORE",
+        "ops": [
+            {
+                "op": "remove",
+                "path": "stages/0/required_craft"
+            },
+            {
+                "op": "replace",
+                "path": "stages/0/required_item/0",
+                "value": "contenttweaker:complex_gearbox"
+            }
+        ]
+    }
+]

config/unidict/UniDict.cfg

@@ -245,6 +245,7 @@ resources {
         minecraft:gold_ingot_from_block
         minecraft:gold_ingot_from_nuggets
         minecraft:gold_block
+        immersiveengineering:compat/plate_thaumium_brass
      >
 
     # Recipe names that you want to be removed.
@@ -267,4 +268,3 @@ resources {
     B:treatRecipeToRemoveAsRegex=false
 }
 
-