Merge pull request #367 from GTModpackTeam/update/v2.6.3

GTModpackTeam · Dec 18, 2023 · 618c03c · 618c03c
2 parents df16378 + da58c1c
commit 618c03c
Show file tree

Hide file tree

Showing 7 changed files with 167 additions and 35 deletions.
diff --git a/CHANGELOG_v2.md b/CHANGELOG_v2.md
@@ -1,3 +1,22 @@
+# v2.6.3
+## Modpack information
+- Fixed a bug that prevented ACP and AGC recipe execution from working.
+  - Thanks to @MrKono, @kenji_red for his support!!
+- Some RTM Alloy quest have been fixed.
+  - Thanks to @MrKono for his support!!
+- Adjusted, added or moved the overall quest description.
+
+## Update mods
+- AE2 Unofficial Extended Life
+- GregTech CE: Unofficial
+- MixinBooter
+- ModularUI
+- CraftTweaker
+- Inventory Bogo Sorter
+- GTExpert-Core
+
+* * *
+
 # v2.6.2
 ## Update mods
 - GregTech CE: Unofficial

diff --git a/README.md b/README.md
@@ -36,7 +36,7 @@
         - For those who want to live a hardcore life.
     - [Compact Machines](https://www.curseforge.com/minecraft/mc-mods/compact-machines)
         - For those who want to build a minimalist factory.
-        - I think practicality starts with EV...?
+        - I think practicality starts with MV...?
     - [Flux Networks](https://www.curseforge.com/minecraft/mc-mods/flux-networks)
         - You want to make RF wireless?
     - [ME Capability Adapter](https://www.curseforge.com/minecraft/mc-mods/capability-adapter)

diff --git a/manifest.json b/manifest.json
@@ -26,12 +26,12 @@
     },
     {
       "projectID": 624243,
-      "fileID": 4856895,
+      "fileID": 4961380,
       "required": true
     },
     {
       "projectID": 632327,
-      "fileID": 4856848,
+      "fileID": 4951607,
       "required": true
     },
     {
@@ -91,7 +91,7 @@
     },
     {
       "projectID": 570458,
-      "fileID": 4851091,
+      "fileID": 4961400,
       "required": true
     },
     {
@@ -221,7 +221,7 @@
     },
     {
       "projectID": 557242,
-      "fileID": 4951281,
+      "fileID": 4965457,
       "required": true
     },
     {
@@ -231,7 +231,7 @@
     },
     {
       "projectID": 239197,
-      "fileID": 4933352,
+      "fileID": 4961707,
       "required": true
     },
     {
@@ -386,7 +386,7 @@
     },
     {
       "projectID": 419286,
-      "fileID": 4752579,
+      "fileID": 4835295,
       "required": true
     },
     {
@@ -591,7 +591,7 @@
     },
     {
       "projectID": 851103,
-      "fileID": 4956386,
+      "fileID": 4966238,
       "required": true
     },
     {

diff --git a/modlist.html b/modlist.html
@@ -128,5 +128,5 @@
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/hesperus">燐/Hesperus (by kappa_maintainer)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/wireless-redstone-cbe">Wireless Redstone CBE (by covers1624)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/bdlib">BdLib (by bdew)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/ae2-stuff/">AE2 Stuff (by bdew)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/ae2-stuff">AE2 Stuff (by bdew)</a></li>
 </ul>
diff --git a/overrides/config/Universal Tweaks - Bugfixes.cfg b/overrides/config/Universal Tweaks - Bugfixes.cfg
@@ -110,7 +110,7 @@ general {
         B:"Max Player Health"=true
 
         # Fixes mounts and boats sometimes disappearing after dismounting
-        B:"Mount Desync"=true
+        B:"Mount Desync"=false
 
         # Fixes saturation depleting in peaceful mode
         B:"Player Saturation"=true
@@ -127,7 +127,7 @@ general {
         "entity desync" {
             # Fixes entity motion desyncs most notable with arrows and thrown items
             # Incompatible with Immersive Vehicles
-            B:"[1] Entity Desync Toggle"=true
+            B:"[1] Entity Desync Toggle"=false
 
             # Syntax:  modid:entity
             # Example: minecraft:minecart

diff --git a/overrides/config/compactmachines3/settings.cfg b/overrides/config/compactmachines3/settings.cfg
@@ -0,0 +1,59 @@
+# Configuration file
+
+compatibility {
+    # Forces water to vaporize inside Compact Machines. Used for Forever Stranded: Lost Souls. [default: false]
+    B:doesWaterVaporize=false
+}
+
+
+internal {
+    # Dimension used for machines. Do not change this unless it is somehow conflicting! [range: -2147483648 ~ 2147483647, default: 144]
+    I:dimensionId=144
+
+    # Dimension type used for machines. Do not change this unless it is somehow conflicting! [range: -2147483648 ~ 2147483647, default: 144]
+    I:dimensionTypeId=144
+
+    # Whether the interior of all Compact Machines should be chunk loaded always. Otherwise they will only chunkload when the CM itself is chunkloaded. [default: false]
+    B:forceLoadChunks=true
+}
+
+
+machines {
+    # Allow players to enter machines with other means than the PSD [default: true]
+    B:allowEnteringWithoutPSD=true
+
+    # Allow hostile creatures to spawn inside of machines [default: true]
+    B:allowHostileSpawns=true
+
+    # Allow peaceful creatures to spawn inside of machines [default: true]
+    B:allowPeacefulSpawns=true
+
+    # Whether players can respawn inside of Compact Machines, i.e. place beds and sleep there [default: true]
+    B:allowRespawning=true
+
+    # Update the machine view GUI every n ticks. Set to 0 to disable. Lower values decrease performance significantly! [range: 0 ~ 2147483647, default: 20]
+    I:autoUpdateRate=20
+
+    # Block players from leaving the Compact Machine they should currently be in [default: true]
+    B:keepPlayersInside=true
+
+    # Client-side option, might give a performance boost when opening a Machine GUI [default: true]
+    B:renderLivingEntitiesInGUI=true
+
+    # Client-side option, might give a performance boost when opening a Machine GUI [default: true]
+    B:renderTileEntitiesInGUI=true
+
+    # How often to try spawning entities inside of machines in ticks [range: 1 ~ 2147483647, default: 1200]
+    I:spawnRate=1200
+}
+
+
+miniaturization {
+    # Maximum size the field projectors can cover [range: 5 ~ 20, default: 15]
+    I:maximumCraftingAreaSize=20
+
+    # Maximum age in ticks in which an item is valid for acting as a catalyst [range: 20 ~ 2147483647, default: 60]
+    I:maximumCraftingCatalystAge=60
+}
+
+
diff --git a/overrides/scripts/specific/CompactMachines.zs b/overrides/scripts/specific/CompactMachines.zs
@@ -14,8 +14,8 @@ JEI.removeAndHide(<compactmachines3:fieldprojector>);
 recipes.removeByRecipeName("compactmachines3:psd");
 recipes.addShaped(<compactmachines3:psd>, [
     [null, <metaitem:cover.screen>, null],
-    [<metaitem:emitter.mv>, <minecraft:book>, <metaitem:emitter.mv>],
-    [null, <ore:circuitMv>, null]
+    [<metaitem:emitter.lv>, <minecraft:book>, <metaitem:emitter.lv>],
+    [null, <ore:circuitLv>, null]
 ]);
 
 # Tunnel
@@ -27,7 +27,7 @@ assembler.recipeBuilder()
     ])
     .outputs([<compactmachines3:tunneltool> * 4])
     .duration(100)
-    .EUt(120)
+    .EUt(30)
     .buildAndRegister();
 
 # Redstone Tunnel
@@ -38,7 +38,7 @@ assembler.recipeBuilder()
     ])
     .outputs([<compactmachines3:redstonetunneltool> * 4])
     .duration(100)
-    .EUt(120)
+    .EUt(30)
     .buildAndRegister();
 
 
@@ -49,72 +49,126 @@ assembler.recipeBuilder()
 # Compact Machine Wall
 recipes.addShaped(<compactmachines3:wallbreakable> * 8, [
     [<metaitem:frameSteel>, <metaitem:frameSteel>, <metaitem:frameSteel>],
-    [<metaitem:frameSteel>, <metaitem:sensor.mv>, <metaitem:frameSteel>],
+    [<metaitem:frameSteel>, <metaitem:sensor.lv>, <metaitem:frameSteel>],
     [<metaitem:frameSteel>, <metaitem:frameSteel>, <metaitem:frameSteel>]
 ]);
 
 # Tiny Compact Machine
-assembler.recipeBuilder()
+packer.recipeBuilder()
     .inputs([
         <compactmachines3:wallbreakable> * 8,
-        <metaitem:field.generator.mv>
+        <gtexpert:meta_item_1:17>
     ])
-    .outputs([<compactmachines3:machine>])
+    .outputs([<compactmachines3:machine:0>])
     .duration(200)
-    .EUt(120)
+    .EUt(7)
+    .buildAndRegister();
+packer.recipeBuilder()
+    .inputs([<compactmachines3:machine:0>])
+    .outputs([
+        <compactmachines3:wallbreakable> * 8,
+        <gtexpert:meta_item_1:17>
+    ])
+    .duration(10)
+    .EUt(7)
     .buildAndRegister();
 
 # Small Compact Machine
-assembler.recipeBuilder()
+packer.recipeBuilder()
     .inputs([
         <compactmachines3:wallbreakable> * 16,
-        <metaitem:field.generator.hv>
+        <metaitem:field.generator.lv>
     ])
     .outputs([<compactmachines3:machine:1>])
     .duration(200)
-    .EUt(480)
+    .EUt(30)
+    .buildAndRegister();
+packer.recipeBuilder()
+    .inputs([<compactmachines3:machine:1>])
+    .outputs([
+        <compactmachines3:wallbreakable> * 16,
+        <metaitem:field.generator.lv>
+    ])
+    .duration(10)
+    .EUt(7)
     .buildAndRegister();
 
 # Normal Compact Machine
-assembler.recipeBuilder()
+packer.recipeBuilder()
     .inputs([
         <compactmachines3:wallbreakable> * 24,
-        <metaitem:field.generator.ev>
+        <metaitem:field.generator.mv>
     ])
     .outputs([<compactmachines3:machine:2>])
     .duration(200)
-    .EUt(1920)
+    .EUt(120)
+    .buildAndRegister();
+packer.recipeBuilder()
+    .inputs([<compactmachines3:machine:2>])
+    .outputs([
+        <compactmachines3:wallbreakable> * 24,
+        <metaitem:field.generator.mv>
+    ])
+    .duration(10)
+    .EUt(7)
     .buildAndRegister();
 
 # Large Compact Machine
-assembler.recipeBuilder()
+packer.recipeBuilder()
     .inputs([
         <compactmachines3:wallbreakable> * 32,
-        <metaitem:field.generator.iv>
+        <metaitem:field.generator.hv>
     ])
     .outputs([<compactmachines3:machine:3>])
     .duration(200)
-    .EUt(7680)
+    .EUt(480)
+    .buildAndRegister();
+packer.recipeBuilder()
+    .inputs([<compactmachines3:machine:3>])
+    .outputs([
+        <compactmachines3:wallbreakable> * 32,
+        <metaitem:field.generator.hv>
+    ])
+    .duration(10)
+    .EUt(7)
     .buildAndRegister();
 
 # Giant Compact Machine
-assembler.recipeBuilder()
+packer.recipeBuilder()
     .inputs([
         <compactmachines3:wallbreakable> * 40,
-        <metaitem:field.generator.luv>
+        <metaitem:field.generator.ev>
     ])
     .outputs(<compactmachines3:machine:4>)
     .duration(200)
-    .EUt(30720)
+    .EUt(1920)
+    .buildAndRegister();
+packer.recipeBuilder()
+    .inputs([<compactmachines3:machine:4>])
+    .outputs([
+        <compactmachines3:wallbreakable> * 40,
+        <metaitem:field.generator.ev>
+    ])
+    .duration(10)
+    .EUt(7)
     .buildAndRegister();
 
 # Maximum Compact Machine
-assembler.recipeBuilder()
+packer.recipeBuilder()
     .inputs([
         <compactmachines3:wallbreakable> * 48,
-        <metaitem:field.generator.zpm>
+        <metaitem:field.generator.iv>
     ])
     .outputs(<compactmachines3:machine:5>)
     .duration(200)
-    .EUt(122880)
+    .EUt(7680)
+    .buildAndRegister();
+packer.recipeBuilder()
+    .inputs([<compactmachines3:machine:5>])
+    .outputs([
+        <compactmachines3:wallbreakable> * 48,
+        <metaitem:field.generator.iv>
+    ])
+    .duration(10)
+    .EUt(7)
     .buildAndRegister();