Merge branch 'develop'

GTModpackTeam · Sep 7, 2023 · fe4236d · fe4236d
2 parents 57886dc + 5382a4a
commit fe4236d
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 26 deletions.
diff --git a/CHANGELOG_v2.md b/CHANGELOG_v2.md
@@ -1,3 +1,25 @@
+# v2.5.4
+# Update mods
+- AE2 Unofficial Extended Life
+- AE2 Fluid Crafting Rework
+- GTExpert-Core
+- MixinBooter
+- File Director
+
+# Doungrade mod
+- ModularUI
+
+## Fix recipes
+### AE2 Unofficial Extended Life
+- Extended Processing Fluid Pattern Terminal
+
+### GTExpert-Core
+- Axe of the Wyvern
+- Pickaxe of the Wyvern
+- Shovel of the Wyvern
+
+* * *
+
 # v2.5.3
 ## Modpack information
 ### To update an existing profile without creating a new profile.

diff --git a/manifest.json b/manifest.json
@@ -26,7 +26,7 @@
     },
     {
       "projectID": 624243,
-      "fileID": 4692436,
+      "fileID": 4635658,
       "required": true
     },
     {
@@ -51,7 +51,7 @@
     },
     {
       "projectID": 650242,
-      "fileID": 4445251,
+      "fileID": 4733347,
       "required": true
     },
     {
@@ -91,7 +91,7 @@
     },
     {
       "projectID": 570458,
-      "fileID": 4688138,
+      "fileID": 4724395,
       "required": true
     },
     {
@@ -391,7 +391,7 @@
     },
     {
       "projectID": 419286,
-      "fileID": 4591146,
+      "fileID": 4699275,
       "required": true
     },
     {
@@ -526,7 +526,7 @@
     },
     {
       "projectID": 623955,
-      "fileID": 4720084,
+      "fileID": 4733637,
       "required": true
     },
     {
@@ -596,7 +596,7 @@
     },
     {
       "projectID": 851103,
-      "fileID": 4723934,
+      "fileID": 4742717,
       "required": true
     },
     {
@@ -616,7 +616,7 @@
     },
     {
       "projectID": 884359,
-      "fileID": 4680560,
+      "fileID": 4738926,
       "required": true
     },
     {

diff --git a/overrides/config/gregtechfoodoption.cfg b/overrides/config/gregtechfoodoption.cfg
@@ -24,7 +24,7 @@ general {
         B:deleteBreadRecipe=true
 
         # Force chains to be harder? (Most of the content of the hard chains will still exist, but less efficient and easier routes will exist without this configuration.)
-        B:makeChainsHarder=false
+        B:makeChainsHarder=true
         B:mineralWaterChain=true
         B:popcornChain=true
         B:potatoProcessingChain=true

diff --git a/overrides/config/gtexpert.cfg b/overrides/config/gtexpert.cfg
@@ -12,6 +12,10 @@ general {
         # CEu's nerfWoodCrafting to true to reflect.
         # Default: false
         B:moreNerfWoodCrafting=true
+
+        # Raising Terracotta Grinding from ULV to MV.
+        # Default: false
+        B:nerfTerracottaCrafting=false
     }
 
     "ae2 integration" {

diff --git a/overrides/scripts/normal/AE2FluidCraftingRework.zs b/overrides/scripts/normal/AE2FluidCraftingRework.zs
@@ -120,7 +120,7 @@ assembler.recipeBuilder()
     .EUt(1920)
     .buildAndRegister();
 
-# Extended Processing Fluid Pattrern Terminal
+# Extended Processing Fluid Pattern Terminal
 recipes.remove(<ae2fc:part_fluid_pattern_ex_terminal>);
 recipes.addShaped(<ae2fc:part_fluid_pattern_ex_terminal>, [
     [<ore:craftingToolScrewdriver>, <ae2fc:part_fluid_pattern_terminal>, <ore:craftingToolSoftHammer>],
@@ -135,7 +135,7 @@ recipes.addShaped(<ae2fc:part_fluid_pattern_ex_terminal>, [
 assembler.recipeBuilder()
     .inputs([
         <appliedenergistics2:material:24>,
-        <appliedenergistics2:part:340>,
+        <ae2fc:part_fluid_pattern_terminal>,
         <appliedenergistics2:material:52>,
         <metaitem:screwStainlessSteel>,
         <metaitem:plateStainlessSteel>

diff --git a/overrides/scripts/tools.zs b/overrides/scripts/tools.zs
@@ -12,28 +12,18 @@ var minecraft as IItemStack[] = [
     <minecraft:wooden_sword>,
     <minecraft:wooden_shovel>,
     <minecraft:wooden_pickaxe>,
-    <minecraft:wooden_axe>,
-    <minecraft:wooden_hoe>,
     <minecraft:stone_sword>,
     <minecraft:stone_shovel>,
     <minecraft:stone_pickaxe>,
-    <minecraft:stone_axe>,
-    <minecraft:stone_hoe>,
     <minecraft:iron_sword>,
     <minecraft:iron_shovel>,
     <minecraft:iron_pickaxe>,
-    <minecraft:iron_axe>,
-    <minecraft:iron_hoe>,
     <minecraft:golden_sword>,
     <minecraft:golden_shovel>,
     <minecraft:golden_pickaxe>,
-    <minecraft:golden_axe>,
-    <minecraft:golden_hoe>,
     <minecraft:diamond_sword>,
     <minecraft:diamond_shovel>,
-    <minecraft:diamond_pickaxe>,
-    <minecraft:diamond_axe>,
-    <minecraft:diamond_hoe>
+    <minecraft:diamond_pickaxe>
 ];
 for tool in minecraft {
     tool.maxDamage = 1;
@@ -50,13 +40,9 @@ var ae2 as IItemStack[] = [
     <appliedenergistics2:certus_quartz_sword>,
     <appliedenergistics2:certus_quartz_spade>,
     <appliedenergistics2:certus_quartz_pickaxe>,
-    <appliedenergistics2:certus_quartz_axe>,
-    <appliedenergistics2:certus_quartz_hoe>,
     <appliedenergistics2:nether_quartz_sword>,
     <appliedenergistics2:nether_quartz_spade>,
-    <appliedenergistics2:nether_quartz_pickaxe>,
-    <appliedenergistics2:nether_quartz_axe>,
-    <appliedenergistics2:nether_quartz_hoe>
+    <appliedenergistics2:nether_quartz_pickaxe>
 ];
 for tool in ae2 {
     JEI.removeAndHide(tool);