Skip to content

Commit

Permalink
Merge pull request #366 from GTModpackTeam/update/v2.6.2
Browse files Browse the repository at this point in the history
  • Loading branch information
tier940 authored Dec 14, 2023
2 parents aa9a55c + 120b67b commit df16378
Show file tree
Hide file tree
Showing 5 changed files with 113 additions and 9 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG_v2.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
# v2.6.2
## Update mods
- GregTech CE: Unofficial
- GTExpert-Core
- Neeve's AE2: Extended Life Additions
- Roughly Enough IDs
- UntranslatedItems: AlsoFluids

* * *

# v2.6.1
## Modpack information
- Fixed only the problem of not being able to start on the server.
Expand Down
10 changes: 5 additions & 5 deletions manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@
},
{
"projectID": 557242,
"fileID": 4924179,
"fileID": 4951281,
"required": true
},
{
Expand Down Expand Up @@ -461,7 +461,7 @@
},
{
"projectID": 629017,
"fileID": 4505486,
"fileID": 4949840,
"required": true
},
{
Expand Down Expand Up @@ -591,7 +591,7 @@
},
{
"projectID": 851103,
"fileID": 4928166,
"fileID": 4956386,
"required": true
},
{
Expand All @@ -611,7 +611,7 @@
},
{
"projectID": 884359,
"fileID": 4883834,
"fileID": 4955559,
"required": true
},
{
Expand All @@ -621,7 +621,7 @@
},
{
"projectID": 883600,
"fileID": 4942862,
"fileID": 4948058,
"required": true
},
{
Expand Down
Binary file not shown.
8 changes: 4 additions & 4 deletions overrides/config/ChickenChunks.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
players
{
#Forge gives everyone 12500 by default
DEFAULT=0
DEFAULT=12500
#For server op's only.
OP=0
OP=12500
}

#If set to false, players will have to be logged in for their chunkloaders to work.:Simply add <username>=<true|false>
Expand All @@ -20,7 +20,7 @@ allowoffline
#Set to false to deny a player access to the chunk viewer
allowchunkviewer
{
DEFAULT=false
DEFAULT=true
OP=true
}

Expand All @@ -31,7 +31,7 @@ awayTimeout=0
lasersRenderHollow=false

#The maximum number of chunks per chunkloader
maxchunks=500
maxchunks=12500

#Enabling this lets OPs alter other player's chunkloaders. WARNING: If you change a chunkloader, you have no idea what may break/explode by not being chunkloaded.
op-interact=true
Expand Down
94 changes: 94 additions & 0 deletions overrides/scripts/normal/NAE2.zs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,26 @@ import mods.gtexpert.I18n;
########################################
# Items
########################################
# ME Storage Component
JEI.removeAndHide(<nae2:material:1>);
JEI.removeAndHide(<nae2:material:2>);
JEI.removeAndHide(<nae2:material:3>);
JEI.removeAndHide(<nae2:material:4>);
JEI.removeAndHide(<nae2:material:5>);
JEI.removeAndHide(<nae2:material:6>);
JEI.removeAndHide(<nae2:material:7>);
JEI.removeAndHide(<nae2:material:8>);

# ME Storage Cell
JEI.removeAndHide(<nae2:storage_cell_256k>);
JEI.removeAndHide(<nae2:storage_cell_1024k>);
JEI.removeAndHide(<nae2:storage_cell_4096k>);
JEI.removeAndHide(<nae2:storage_cell_16384k>);
JEI.removeAndHide(<nae2:storage_cell_fluid_256k>);
JEI.removeAndHide(<nae2:storage_cell_fluid_1024k>);
JEI.removeAndHide(<nae2:storage_cell_fluid_4096k>);
JEI.removeAndHide(<nae2:storage_cell_fluid_16384k>);

# ME Beam Former
recipes.remove(<nae2:part>);
recipes.addShaped(<nae2:part>, [
Expand Down Expand Up @@ -69,3 +89,77 @@ packer.recipeBuilder()
.duration(10)
.EUt(7)
.buildAndRegister();



########################################
# Blocks
########################################
# Crafting Storage
JEI.removeAndHide(<nae2:storage_crafting_256k>);
JEI.removeAndHide(<nae2:storage_crafting_1024k>);
JEI.removeAndHide(<nae2:storage_crafting_4096k>);
JEI.removeAndHide(<nae2:storage_crafting_16384k>);

# 4x Crafting Co-Processing Unit
recipes.remove(<nae2:coprocessor_4x>);
packer.recipeBuilder()
.inputs([
<appliedenergistics2:crafting_accelerator>,
<appliedenergistics2:material:36>
])
.outputs([<nae2:coprocessor_4x>])
.duration(10)
.EUt(7)
.buildAndRegister();
packer.recipeBuilder()
.inputs([<nae2:coprocessor_4x>])
.outputs([
<appliedenergistics2:crafting_accelerator>,
<appliedenergistics2:material:36>
])
.duration(10)
.EUt(7)
.buildAndRegister();

# 16x Crafting Co-Processing Unit
recipes.remove(<nae2:coprocessor_16x>);
packer.recipeBuilder()
.inputs([
<appliedenergistics2:crafting_accelerator>,
<appliedenergistics2:material:37>
])
.outputs([<nae2:coprocessor_16x>])
.duration(10)
.EUt(7)
.buildAndRegister();
packer.recipeBuilder()
.inputs([<nae2:coprocessor_16x>])
.outputs([
<appliedenergistics2:crafting_accelerator>,
<appliedenergistics2:material:37>
])
.duration(10)
.EUt(7)
.buildAndRegister();

# 64x Crafting Co-Processing Unit
recipes.remove(<nae2:coprocessor_64x>);
packer.recipeBuilder()
.inputs([
<appliedenergistics2:crafting_accelerator>,
<appliedenergistics2:material:38>
])
.outputs([<nae2:coprocessor_64x>])
.duration(10)
.EUt(7)
.buildAndRegister();
packer.recipeBuilder()
.inputs([<nae2:coprocessor_64x>])
.outputs([
<appliedenergistics2:crafting_accelerator>,
<appliedenergistics2:material:38>
])
.duration(10)
.EUt(7)
.buildAndRegister();

0 comments on commit df16378

Please sign in to comment.