Skip to content

Commit

Permalink
Merge branch 'update/2.6.0' into tier-move-grs
Browse files Browse the repository at this point in the history
  • Loading branch information
tier940 committed Dec 1, 2023
2 parents 46e5cbf + f67ff42 commit f9fb294
Show file tree
Hide file tree
Showing 31 changed files with 3,142 additions and 442 deletions.
27 changes: 27 additions & 0 deletions CHANGELOG_v2.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,30 @@
# v2.6.0
## Update mods
- GregTech CE: Unofficial
- Gregicality Multiblocks
- GregTech Food Option
- GTExpert2 Core Mod
- CraftPresence
- AE2 Unofficial Extended Life
- AE2 Fluid Crafting Rework
- Neeve's AE2: Extended Life Additions
- MixinBooter
- ModularUI
- Inventory Bogo Sorter
- UntranslatedItems: AlsoFluids

## Formally introduced from compatibility mods
- AE2 Stuff

## New recipes
### AE2 Unofficial Extended Life
- Craft of interface with NBT

### 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.
Expand Down
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
34 changes: 22 additions & 12 deletions manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@
},
{
"projectID": 624243,
"fileID": 4786371,
"fileID": 4856895,
"required": true
},
{
"projectID": 632327,
"fileID": 4797903,
"fileID": 4856848,
"required": true
},
{
Expand Down Expand Up @@ -66,7 +66,7 @@
},
{
"projectID": 564858,
"fileID": 4701685,
"fileID": 4910674,
"required": true
},
{
Expand All @@ -91,7 +91,7 @@
},
{
"projectID": 570458,
"fileID": 4812257,
"fileID": 4851091,
"required": true
},
{
Expand Down Expand Up @@ -166,7 +166,7 @@
},
{
"projectID": 297038,
"fileID": 4752213,
"fileID": 4819654,
"required": true
},
{
Expand Down Expand Up @@ -216,12 +216,12 @@
},
{
"projectID": 477021,
"fileID": 4808666,
"fileID": 4904513,
"required": true
},
{
"projectID": 557242,
"fileID": 4799055,
"fileID": 4910613,
"required": true
},
{
Expand Down Expand Up @@ -386,7 +386,7 @@
},
{
"projectID": 419286,
"fileID": 4752579,
"fileID": 4835295,
"required": true
},
{
Expand Down Expand Up @@ -521,7 +521,7 @@
},
{
"projectID": 623955,
"fileID": 4804730,
"fileID": 4845148,
"required": true
},
{
Expand Down Expand Up @@ -591,7 +591,7 @@
},
{
"projectID": 851103,
"fileID": 4820325,
"fileID": 4911076,
"required": true
},
{
Expand All @@ -611,7 +611,7 @@
},
{
"projectID": 884359,
"fileID": 4817142,
"fileID": 4883834,
"required": true
},
{
Expand All @@ -621,7 +621,7 @@
},
{
"projectID": 883600,
"fileID": 4817207,
"fileID": 4905217,
"required": true
},
{
Expand Down Expand Up @@ -658,6 +658,16 @@
"projectID": 260824,
"fileID": 2755798,
"required": true
},
{
"projectID": 70496,
"fileID": 4675629,
"required": true
},
{
"projectID": 225194,
"fileID": 2491032,
"required": true
}
],
"overrides": "overrides"
Expand Down
2 changes: 2 additions & 0 deletions modlist.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
6 changes: 3 additions & 3 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=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>
Expand All @@ -20,7 +20,7 @@ allowoffline
#Set to false to deny a player access to the chunk viewer
allowchunkviewer
{
DEFAULT=true
DEFAULT=false
OP=true
}

Expand Down
44 changes: 44 additions & 0 deletions overrides/config/forestry/apiculture.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
# Configuration file

~CONFIG_VERSION: 3.0.0

beekeeping {
# The maximum number of flowers for hives to spawn nearby over time. [range: 0 ~ 1000, default: 20]
I:flowers.spawn=20

# Change the beekeeping mode. [default: NORMAL] [valid: [EASY, NORMAL, HARD, HARDCORE, INSANE]]
S:mode=NORMAL

# Percent chance of a second princess drop, for limited/skyblock maps. [range: 0.0 ~ 100.0, default: 0.0]
S:second.princess=0.0

# If true bees will pollinate leaves with themselves to speed up getting a homozgous genome. [default: false]
B:self.pollination=false

# The number of ticks per bee work cycle. [range: 250 ~ 850, default: 550]
I:ticks.work=550

hivedamage {
# The bees only attack the player if he starts to destroy the hive. [default: true]
B:onlyAfterAttack=true

# Whether bees can damage other entities than the player. [default: false]
B:onlyPlayers=false

# Whether bees can damage a player playing on peaceful mode. [default: false]
B:peaceful=false

# Whether bees can damage a player while they are underwater. [default: true]
B:underwater=true
}

}


species {
# Add species to blacklist identified by their uid, one per line. [default: ]
S:blacklist <
>
}


Loading

0 comments on commit f9fb294

Please sign in to comment.