Merge branch 'main' into tier-move-grs

GTModpackTeam · Dec 14, 2023 · eefe124 · eefe124
2 parents 46e5cbf + aa9a55c
commit eefe124
Show file tree

Hide file tree

Showing 46 changed files with 3,577 additions and 6,938 deletions.
diff --git a/.github/workflows/preview.yml b/.github/workflows/preview.yml
@@ -26,10 +26,10 @@ jobs:
 
       - name: Download quest zip
         run: |
-          wget https://github.com/GTModpackTeam/gregtech-expert-2-questbook/archive/refs/heads/main.zip
-          unzip main.zip
-          mv -vf ./gregtech-expert-2-questbook-main/* ./overrides/config/ftbquests/
-          rm -rf ./gregtech-expert-2-questbook-main/ ./main.zip
+          wget -O questbook.zip https://github.com/GTModpackTeam/gregtech-expert-2-questbook/archive/refs/heads/preview.zip
+          unzip questbook.zip
+          mv -vf ./gregtech-expert-2-questbook-preview/* ./overrides/config/ftbquests/
+          rm -rf ./gregtech-expert-2-questbook-preview/ ./questbook.zip
 
       - name: Archive Release CF
         run: |

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -48,10 +48,10 @@ jobs:
 
       - name: Download quest zip
         run: |
-          wget https://github.com/GTModpackTeam/gregtech-expert-2-questbook/archive/refs/heads/main.zip
-          unzip main.zip
+          wget -O questbook.zip https://github.com/GTModpackTeam/gregtech-expert-2-questbook/archive/refs/heads/main.zip
+          unzip questbook.zip
           mv -vf ./gregtech-expert-2-questbook-main/* ./overrides/config/ftbquests/
-          rm -rf ./gregtech-expert-2-questbook-main/ ./main.zip
+          rm -rf ./gregtech-expert-2-questbook-main/ ./questbook.zip
 
       - name: Archive Release CF
         run: |

diff --git a/CHANGELOG_v2.md b/CHANGELOG_v2.md
@@ -1,3 +1,66 @@
+# v2.6.1
+## Modpack information
+- Fixed only the problem of not being able to start on the server.
+
+* * *
+
+# v2.6.0
+## 💣 Update Warning 💣
+- Make a backup of your world before updating.
+- Also the server is currently not bootable due to CEu issues. Please wait for a while until this is addressed :<
+
+## Modpack information
+- Updated the quest to CEu 2.7.4 standards.
+  - Thanks to @katatsumuri.pan for his support!!
+
+### Returned items
+- ME Import/Export Bus, ME Fluid Import/Export Bus, and ME Ore Dictionary Export Bus have been returned to the game.
+
+### For those using the Japanese lang
+- Since the Japanese translation was completed in time, the files in `./resources/gregtech/lang/en_jp.lang` should be deleted.
+
+## Update mods
+- GregTech CE: Unofficial
+- Gregicality Multiblocks
+- GregTech Food Option
+- GTExpert-Core
+- CraftPresence
+- AE2 Unofficial Extended Life
+- AE2 Fluid Crafting Rework
+- Neeve's AE2: Extended Life Additions
+- MixinBooter
+- ModularUI
+- Inventory Bogo Sorter
+- UntranslatedItems: AlsoFluids
+- Universal Tweaks
+- CraftTweaker
+
+## Move mods
+- RealBench -> RealBench: Nomi-CEu-Edition
+
+## Formally introduced from compatibility mods
+- AE2 Stuff
+
+## New machine(From GTExpert-Core)
+- Advanced Chemical Plant
+- Add Advanced Gas Collector
+
+## New recipes
+### AE2 Unofficial Extended Life
+- Craft of interface with NBT
+- ME Import Bus
+- ME Export Bus
+- ME Fluid Import Bus
+- ME Fluid Export Bus
+
+### AE Additions
+- ME Ore Dictionary Export Bus
+
+### AE2 Fluid Crafting Rework
+- Craft of interface with NBT
+
+* * *
+
 # v2.5.6
 ## Modpack information
 - They no longer have a piece of paper with inventory contents at the time of death. This change eliminates the odd bug in plugin servers like CatServer and Magma.
@@ -14,7 +77,7 @@
 ## Update mods
 - GregTech CE: Unofficial
 - GregTech Food Option
-- GTExpert2 Core Mod
+- GTExpert-Core
 - LoliASM
 - Modern Splash
 - CraftTweaker
@@ -30,7 +93,7 @@
 
 ## Move mods
 - Resource Loader -> TX Loader
-- Zen Utils -> GTExpert2 Core Mod
+- Zen Utils -> GTExpert-Core
 
 ## Update recipes
 ### AE2 Unofficial Extended Life
@@ -72,10 +135,11 @@
 - Inventory Bogo Sorter
 - CraftTweaker
 - Zen Utils
-- GTExpert2 Core Mod
+- GTExpert-Core
 - BisectHosting Server Integration Menu
 - LoliASM
 - MixinBooter
+- Entity Culling
 
 ## Add mod
 - RenderLib

diff --git a/README.md b/README.md
@@ -37,8 +37,6 @@
     - [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...?
-    - [AE2Sutff](https://www.curseforge.com/minecraft/mc-mods/ae2-stuff)
-        - You want to make AE wireless?
     - [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": 4786371,
+      "fileID": 4856895,
       "required": true
     },
     {
       "projectID": 632327,
-      "fileID": 4797903,
+      "fileID": 4856848,
       "required": true
     },
     {
@@ -66,7 +66,7 @@
     },
     {
       "projectID": 564858,
-      "fileID": 4701685,
+      "fileID": 4910674,
       "required": true
     },
     {
@@ -91,7 +91,7 @@
     },
     {
       "projectID": 570458,
-      "fileID": 4812257,
+      "fileID": 4851091,
       "required": true
     },
     {
@@ -140,8 +140,8 @@
       "required": true
     },
     {
-      "projectID": 237414,
-      "fileID": 2505261,
+      "projectID": 945503,
+      "fileID": 4941450,
       "required": true
     },
     {
@@ -166,7 +166,7 @@
     },
     {
       "projectID": 297038,
-      "fileID": 4752213,
+      "fileID": 4894684,
       "required": true
     },
     {
@@ -216,12 +216,12 @@
     },
     {
       "projectID": 477021,
-      "fileID": 4808666,
+      "fileID": 4904513,
       "required": true
     },
     {
       "projectID": 557242,
-      "fileID": 4799055,
+      "fileID": 4924179,
       "required": true
     },
     {
@@ -231,7 +231,7 @@
     },
     {
       "projectID": 239197,
-      "fileID": 4775347,
+      "fileID": 4933352,
       "required": true
     },
     {
@@ -521,7 +521,7 @@
     },
     {
       "projectID": 623955,
-      "fileID": 4804730,
+      "fileID": 4845148,
       "required": true
     },
     {
@@ -531,7 +531,7 @@
     },
     {
       "projectID": 705000,
-      "fileID": 4704976,
+      "fileID": 4929573,
       "required": true
     },
     {
@@ -591,7 +591,7 @@
     },
     {
       "projectID": 851103,
-      "fileID": 4820325,
+      "fileID": 4928166,
       "required": true
     },
     {
@@ -611,7 +611,7 @@
     },
     {
       "projectID": 884359,
-      "fileID": 4817142,
+      "fileID": 4883834,
       "required": true
     },
     {
@@ -621,7 +621,7 @@
     },
     {
       "projectID": 883600,
-      "fileID": 4817207,
+      "fileID": 4942862,
       "required": true
     },
     {
@@ -641,7 +641,7 @@
     },
     {
       "projectID": 409087,
-      "fileID": 4620881,
+      "fileID": 4923453,
       "required": true
     },
     {
@@ -658,6 +658,16 @@
       "projectID": 260824,
       "fileID": 2755798,
       "required": true
+    },
+    {
+      "projectID": 70496,
+      "fileID": 4675629,
+      "required": true
+    },
+    {
+      "projectID": 225194,
+      "fileID": 2491032,
+      "required": true
     }
   ],
   "overrides": "overrides"

diff --git a/modlist.html b/modlist.html
@@ -24,7 +24,7 @@
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/p455w0rds-library">p455w0rd's Library (by TheRealp455w0rd)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/bisecthosting-server-integration-menu-forge">BisectHosting Server Integration Menu [FORGE] (by BisectHosting)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/the-one-probe-community-edition">The One Probe Community Edition (by xuanyu)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/realbench">RealBench (by Prototik)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/realbench-nomi-ceu">RealBench: Nomi-CEu-Edition (by IntegerLimit_)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/ftb-ultimine-forge">FTB Ultimine (Forge) (by FTB)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/dank-null-no_rce">/dank/null/no_RCE/ (by jbredwards)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/better-advancements">Better Advancements (by way2muchnoise)</a></li>
@@ -127,4 +127,6 @@
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/nothirium">Nothirium (by meldexun)</a></li>
 <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>
 </ul>
diff --git a/...bansoukou/gregtech-1.12.2-2.8.2-beta/gregtech/loaders/recipe/VanillaOverrideRecipes.class b/...bansoukou/gregtech-1.12.2-2.8.2-beta/gregtech/loaders/recipe/VanillaOverrideRecipes.class
diff --git a/overrides/bansoukou/gregtechfoodoption-1.10.2/gregtechfoodoption/GregTechFoodOption.class b/overrides/bansoukou/gregtechfoodoption-1.10.2/gregtechfoodoption/GregTechFoodOption.class
diff --git a/...u/gregtechfoodoption-1.10.2/gregtechfoodoption/machines/farmer/MetaTileEntityFarmer.class b/...u/gregtechfoodoption-1.10.2/gregtechfoodoption/machines/farmer/MetaTileEntityFarmer.class
diff --git a/overrides/config/ChickenChunks.cfg b/overrides/config/ChickenChunks.cfg
@@ -5,9 +5,9 @@
 players
 {
 	#Forge gives everyone 12500 by default
-	DEFAULT=50
+	DEFAULT=0
 	#For server op's only.
-	OP=100
+	OP=0
 }
 
 #If set to false, players will have to be logged in for their chunkloaders to work.:Simply add <username>=<true|false>
@@ -20,7 +20,7 @@ allowoffline
 #Set to false to deny a player access to the chunk viewer
 allowchunkviewer
 {
-	DEFAULT=true
+	DEFAULT=false
 	OP=true
 }