Merge branch 'upstream-0.18.6.4' into 0.18.6.4-meatball

This commit is contained in:
Alexander
2026-08-18 13:12:03 +02:00
24 changed files with 4947 additions and 4775 deletions
+1 -1
View File
@@ -1,7 +1,7 @@
# Configuration file
cache {
S:digest=e1218516e7b5fa9f09772caa6fccf954
S:digest=5f85950e1633dd79cbdb0bd9c3ae2275
# Caching can save processing time, if there are a lot of items. [default: true]
B:enableCache=true
@@ -3,7 +3,7 @@
cache {
# Waits as many hours, until it checks again. [range: 0 ~ 168, default: 24]
I:interval=24
S:lastCheck=1786290257783
S:lastCheck=1786908628367
}
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -7,7 +7,7 @@
##########################################################################################################
data {
# [default: [minecraft:protection:10], [minecraft:fire_protection:5], [minecraft:feather_falling:5], [minecraft:blast_protection:2], [minecraft:projectile_protection:5], [minecraft:respiration:2], [minecraft:aqua_affinity:2], [minecraft:thorns:1], [minecraft:depth_strider:2], [minecraft:frost_walker:2], [minecraft:sharpness:10], [minecraft:smite:5], [minecraft:bane_of_arthropods:5], [minecraft:knockback:5], [minecraft:fire_aspect:2], [minecraft:looting:2], [minecraft:sweeping:2], [minecraft:efficiency:10], [minecraft:silk_touch:1], [minecraft:unbreaking:5], [minecraft:fortune:2], [minecraft:power:10], [minecraft:punch:2], [minecraft:flame:2], [minecraft:infinity:1], [minecraft:luck_of_the_sea:2], [minecraft:lure:2], [minecraft:mending:2], [draconicevolution:enchant_reaper:2], [railcraft:wrecking:2], [railcraft:implosion:2], [railcraft:destruction:1], [railcraft:smack:1], [extrautils2:xu.kaboomerang:10], [extrautils2:xu.zoomerang:10], [extrautils2:xu.burnerang:10], [extrautils2:xu.bladerang:10], [extrautils2:xu.boomereaperang:10], [randomthings:magnetic:1], [openblocks:explosive:2], [openblocks:last_stand:5], [openblocks:flim_flam:2], [projectred-expansion:electric_efficiency:2], [advancedrocketry:spacebreathing:10], [endercore:autosmelt:2], [endercore:xpboost:5], [tombstone:shadow_step:2], [tombstone:soulbound:2], [tombstone:magic_siphon:2], [tombstone:plague_bringer:2], [tombstone:blessing:2], [tombstone:curse_of_bones:2], [tombstone:spectral_conjurer:2], [enderio:witherarrow:5], [enderio:witherweapon:5], [enderio:soulbound:1], [enderio:repellent:1], [aerialaffinity:aerial_affinity:2], [aoa3:brace:1], [aoa3:intervention:1], [aoa3:archmage:1], [aoa3:sever:5], [aoa3:recharge:2], [aoa3:control:2], [aoa3:shell:5], [aoa3:crush:5], [aoa3:form:2], [ebwizardry:magic_sword:10], [ebwizardry:magic_bow:10], [ebwizardry:flaming_weapon:10], [ebwizardry:freezing_weapon:10], [ebwizardry:magic_protection:5], [ebwizardry:frost_protection:2], [ebwizardry:shock_protection:2], [bewitchment:magic_protection:1], [bibliocraft:bibliocraft.deathcompassench:1], [bibliocraft:bibliocraft.readingench:5], [divinerpg:rive:1], [divinerpg:aftershock:1], [mod_lavacow:poisonous:1], [mod_lavacow:lifesteal:1], [mod_lavacow:corrosive:1], [mod_lavacow:critical_boost:2], [mod_lavacow:dominion:1], [soulshardsrespawn:soul_stealer:5], [thaumictinkerer:ascentboost:2], [thaumictinkerer:pounce:1], [thaumictinkerer:shockwave:5], [thaumictinkerer:slowfall:1], [thaumictinkerer:finalstrike:2], [thaumictinkerer:valiance:5], [thaumictinkerer:vamprisim:2], [thaumictinkerer:dispersedstrikes:2], [thaumictinkerer:focusedstrikes:2], [thaumictinkerer:quickdraw:2], [thaumictinkerer:tunnel:5], [thaumictinkerer:shatter:5], [thaumictinkerer:desintegrate:5], [thaumictinkerer:autosmelt:5], [variegated:manabound:1], [woot:headhunter:2], [abyssalcraft:coralium:2], [abyssalcraft:dread:2], [abyssalcraft:light_pierce:10], [abyssalcraft:iron_wall:5], [abyssalcraft:sapping:5], [abyssalcraft:multi_rend:2], [cofhcore:holding:5], [cofhcore:insight:5], [cofhcore:leech:5], [cofhcore:multishot:5], [cofhcore:smashing:2], [cofhcore:smelting:2], [cofhcore:soulbound:5], [cofhcore:vorpal:2], [cyclicmagic:enchantment.autosmelt:2], [cyclicmagic:enchantment.excavation:1], [cyclicmagic:enchantment.launch:10], [cyclicmagic:enchantment.lifeleech:10], [cyclicmagic:enchantment.magnet:1], [cyclicmagic:enchantment.multishot:1], [cyclicmagic:enchantment.quickdraw:1], [cyclicmagic:enchantment.venom:10], [cyclicmagic:enchantment.waterwalking:1], [cyclicmagic:enchantment.expboost:1], [astralsorcery:enchantment.as.nightvision:1], [astralsorcery:enchantment.as.smelting:1], [simplyjetpacks:fuel_efficiency:1]]
# [default: [minecraft:protection:10], [minecraft:fire_protection:5], [minecraft:feather_falling:5], [minecraft:blast_protection:2], [minecraft:projectile_protection:5], [minecraft:respiration:2], [minecraft:aqua_affinity:2], [minecraft:thorns:1], [minecraft:depth_strider:2], [minecraft:frost_walker:2], [minecraft:sharpness:10], [minecraft:smite:5], [minecraft:bane_of_arthropods:5], [minecraft:knockback:5], [minecraft:fire_aspect:2], [minecraft:looting:2], [minecraft:sweeping:2], [minecraft:efficiency:10], [minecraft:silk_touch:1], [minecraft:unbreaking:5], [minecraft:fortune:2], [minecraft:power:10], [minecraft:punch:2], [minecraft:flame:2], [minecraft:infinity:1], [minecraft:luck_of_the_sea:2], [minecraft:lure:2], [minecraft:mending:2], [draconicevolution:enchant_reaper:2], [railcraft:wrecking:2], [railcraft:implosion:2], [railcraft:destruction:1], [railcraft:smack:1], [extrautils2:xu.kaboomerang:10], [extrautils2:xu.zoomerang:10], [extrautils2:xu.burnerang:10], [extrautils2:xu.bladerang:10], [extrautils2:xu.boomereaperang:10], [randomthings:magnetic:1], [openblocks:explosive:2], [openblocks:last_stand:5], [openblocks:flim_flam:2], [projectred-expansion:electric_efficiency:2], [advancedrocketry:spacebreathing:10], [endercore:xpboost:5], [endercore:autosmelt:2], [tombstone:shadow_step:2], [tombstone:soulbound:2], [tombstone:magic_siphon:2], [tombstone:plague_bringer:2], [tombstone:blessing:2], [tombstone:curse_of_bones:2], [tombstone:spectral_conjurer:2], [enderio:repellent:1], [enderio:soulbound:1], [enderio:witherarrow:5], [enderio:witherweapon:5], [aerialaffinity:aerial_affinity:2], [aoa3:brace:1], [aoa3:intervention:1], [aoa3:archmage:1], [aoa3:sever:5], [aoa3:recharge:2], [aoa3:control:2], [aoa3:shell:5], [aoa3:crush:5], [aoa3:form:2], [ebwizardry:magic_sword:10], [ebwizardry:magic_bow:10], [ebwizardry:flaming_weapon:10], [ebwizardry:freezing_weapon:10], [ebwizardry:magic_protection:5], [ebwizardry:frost_protection:2], [ebwizardry:shock_protection:2], [bewitchment:magic_protection:1], [bibliocraft:bibliocraft.deathcompassench:1], [bibliocraft:bibliocraft.readingench:5], [divinerpg:rive:1], [divinerpg:aftershock:1], [mod_lavacow:poisonous:1], [mod_lavacow:lifesteal:1], [mod_lavacow:corrosive:1], [mod_lavacow:critical_boost:2], [mod_lavacow:dominion:1], [soulshardsrespawn:soul_stealer:5], [thaumictinkerer:ascentboost:2], [thaumictinkerer:pounce:1], [thaumictinkerer:shockwave:5], [thaumictinkerer:slowfall:1], [thaumictinkerer:finalstrike:2], [thaumictinkerer:valiance:5], [thaumictinkerer:vamprisim:2], [thaumictinkerer:dispersedstrikes:2], [thaumictinkerer:focusedstrikes:2], [thaumictinkerer:quickdraw:2], [thaumictinkerer:tunnel:5], [thaumictinkerer:shatter:5], [thaumictinkerer:desintegrate:5], [thaumictinkerer:autosmelt:5], [variegated:manabound:1], [woot:headhunter:2], [abyssalcraft:coralium:2], [abyssalcraft:dread:2], [abyssalcraft:light_pierce:10], [abyssalcraft:iron_wall:5], [abyssalcraft:sapping:5], [abyssalcraft:multi_rend:2], [cofhcore:holding:5], [cofhcore:insight:5], [cofhcore:leech:5], [cofhcore:multishot:5], [cofhcore:smashing:2], [cofhcore:smelting:2], [cofhcore:soulbound:5], [cofhcore:vorpal:2], [cyclicmagic:enchantment.autosmelt:2], [cyclicmagic:enchantment.excavation:1], [cyclicmagic:enchantment.launch:10], [cyclicmagic:enchantment.lifeleech:10], [cyclicmagic:enchantment.magnet:1], [cyclicmagic:enchantment.multishot:1], [cyclicmagic:enchantment.quickdraw:1], [cyclicmagic:enchantment.venom:10], [cyclicmagic:enchantment.waterwalking:1], [cyclicmagic:enchantment.expboost:1], [astralsorcery:enchantment.as.nightvision:1], [astralsorcery:enchantment.as.smelting:1], [simplyjetpacks:fuel_efficiency:1]]
S:data <
minecraft:protection:10
minecraft:fire_protection:5
@@ -47,6 +47,7 @@
},
"1:10": {
"index:3": 1,
"optional:1": 1,
"requiredItems:9": {
"0:10": {
"Count:3": 1,
+1 -1
View File
@@ -1,5 +1,5 @@
# The buildcraft detailed configuration file. This contains a lot of miscellaneous options that have no affect on gameplay.
# You should refer to the BC source code for a detailed description of what these do. (https://github.com/BuildCraft/BuildCraft)
# This file will be overwritten every time that buildcraft starts, so don't change anything other than the values.
#Sun Aug 09 11:21:32 CDT 2026
#Sun Aug 16 16:17:58 CDT 2026
render.pipe.misc.inside.shade=0.725
+105
View File
@@ -0,0 +1,105 @@
# Configuration file
filters {
# Filter state for ESSENTIA_CELLS (storage buses): SHOW_ALL, SHOW_ONLY, or HIDE
S:bus_essentia_cells=SHOW_ALL
# Filter state for FLUID_CELLS (storage buses): SHOW_ALL, SHOW_ONLY, or HIDE
S:bus_fluid_cells=SHOW_ALL
# Filter state for GAS_CELLS (storage buses): SHOW_ALL, SHOW_ONLY, or HIDE
S:bus_gas_cells=SHOW_ALL
# Filter state for HAS_ITEMS (storage buses): SHOW_ALL, SHOW_ONLY, or HIDE
S:bus_has_items=SHOW_ALL
# Filter state for ITEM_CELLS (storage buses): SHOW_ALL, SHOW_ONLY, or HIDE
S:bus_item_cells=SHOW_ALL
# Filter state for PARTITIONED (storage buses): SHOW_ALL, SHOW_ONLY, or HIDE
S:bus_partitioned=SHOW_ALL
# Filter state for ESSENTIA_CELLS (cells): SHOW_ALL, SHOW_ONLY, or HIDE
S:cell_essentia_cells=SHOW_ALL
# Filter state for FLUID_CELLS (cells): SHOW_ALL, SHOW_ONLY, or HIDE
S:cell_fluid_cells=SHOW_ALL
# Filter state for GAS_CELLS (cells): SHOW_ALL, SHOW_ONLY, or HIDE
S:cell_gas_cells=SHOW_ALL
# Filter state for HAS_ITEMS (cells): SHOW_ALL, SHOW_ONLY, or HIDE
S:cell_has_items=SHOW_ALL
# Filter state for ITEM_CELLS (cells): SHOW_ALL, SHOW_ONLY, or HIDE
S:cell_item_cells=SHOW_ALL
# Filter state for PARTITIONED (cells): SHOW_ALL, SHOW_ONLY, or HIDE
S:cell_partitioned=SHOW_ALL
}
gui {
# Slot limit for storage bus content display: LIMIT_8, LIMIT_32, LIMIT_64, or UNLIMITED
S:busSlotLimit=UNLIMITED
# Slot limit for cell content display: LIMIT_8, LIMIT_32, LIMIT_64, or UNLIMITED
S:cellSlotLimit=UNLIMITED
# The last viewed network ID (0 = main network, other = subnet ID). Stored as string to support long values.
S:lastViewedNetworkId=0
# The last search filter text used in the Cell Terminal
S:searchFilter=
# Search filter mode: INVENTORY (search contents), PARTITION (search filters), MIXED (search both)
S:searchMode=MIXED
# The currently selected tab in the Cell Terminal GUI (0=Terminal, 1=Inventory, 2=Partition)
I:selectedTab=0
# Slot limit for subnet inventory content display: LIMIT_8, LIMIT_32, LIMIT_64, or UNLIMITED
S:subnetSlotLimit=LIMIT_64
# Subnet content visibility in each tab: DONT_SHOW, SHOW_FAVORITES, or SHOW_ALL
S:subnetVisibility=DONT_SHOW
# Terminal size style: SMALL (fixed 8 rows), TALL (expands to fill screen)
S:terminalStyle=SMALL
}
##########################################################################################################
# settings
#--------------------------------------------------------------------------------------------------------#
# User-configurable settings for Cell Terminal rendering and behavior.
##########################################################################################################
settings {
# Whether to automatically scale arrow text based on arrow's distance from camera.
# Arrows at the edge of view will have larger text for better readability.
B:adaptiveTextScale=true
# Maximum text scale multiplier (in percent) when using adaptive text scaling.
I:adaptiveTextScaleMaxPercent=200
# Minimum text scale multiplier (in percent) when using adaptive text scaling.
I:adaptiveTextScaleMinPercent=100
# Scale percentage for directional arrows pointing to distant highlights.
# Larger values make arrows bigger, smaller values make them smaller.
I:arrowScalePercent=100
# Duration (in seconds) for block highlighting when double-clicking entries.
# Higher values keep highlights visible longer.
I:highlightDuration=15
# Maximum distance (in blocks) from the player for block highlighting.
# Set to -1 for unlimited. Blocks beyond this distance will not be highlighted.
I:maxHighlightDistance=-1
# Scale percentage for distance text on directional arrows.
I:textScalePercent=100
}
+27
View File
@@ -91,6 +91,33 @@ misc {
}
##########################################################################################################
# network
#--------------------------------------------------------------------------------------------------------#
# Settings controlling how the Cell Terminal streams data from server to client.
##########################################################################################################
network {
# Enable delta updates: after the first full payload, send only changed entries.
# Greatly reduces bandwidth on large networks where most state is static between ticks.
# Disable to always send full payloads (useful for debugging desync issues).
B:enableDeltaUpdates=true
# Maximum payload size (in bytes) per network chunk packet.
# Larger values mean fewer round-trips but risk exceeding the engine's packet limit.
# Default 524288 (512 KiB) stays safely under vanilla's ~1 MiB hardcoded S2C cap.
# Lower this if you observe disconnects with messages like 'Payload may not be larger than'.
# Range: 4096 (4 KiB) - 10485760 (10 MiB).
I:maxChunkBytes=524288
# Minimum number of ticks between full data refreshes (20 ticks = 1 second).
# Throttles regen of storages/buses/subnets when many trigger events fire in quick succession.
# Lower for snappier updates, higher to reduce server load on large networks.
# Range: 1 - 200.
I:minRefreshIntervalTicks=10
}
##########################################################################################################
# polling
#--------------------------------------------------------------------------------------------------------#
+1 -1
View File
@@ -70,7 +70,7 @@ module {
I:versionNotificationTypes=0
# Don't change this.
I:versionSave=9
I:versionSave=16
}
}
+3 -3
View File
@@ -1459,7 +1459,7 @@
"mob": ["divinerpg:whale"],
"dimension": 0,
"mincount": {
"amount": 15,
"amount": 7,
"mob": ["divinerpg:whale"],
"perplayer": true
},
@@ -1470,7 +1470,7 @@
"mob": ["divinerpg:shark"],
"dimension": 0,
"mincount": {
"amount": 15,
"amount": 7,
"mob": ["divinerpg:shark"],
"perplayer": true
},
@@ -1481,7 +1481,7 @@
"mob": ["divinerpg:liopleurodon"],
"dimension": 0,
"mincount": {
"amount": 15,
"amount": 7,
"mob": ["divinerpg:liopleurodon"],
"perplayer": true
},
+3 -14
View File
@@ -579,6 +579,8 @@ world-288993849 {
world-310143583 {
# IF AND ONLY IF recipe bookmarks are enabled, allow autocrafting with them.
B:autocraftingEnabled=true
# Show the list of bookmarks next to open GUIs.
B:bookmarkOverlayEnabled=false
# Give items instead of showing the recipe.
@@ -589,7 +591,7 @@ world-310143583 {
# Hide and unhide ingredients by clicking them in the list.
B:editEnabled=false
S:filterText=kam axe
S:filterText=
# Show the list of ingredients next to open GUIs.
B:overlayEnabled=true
@@ -1228,26 +1230,13 @@ world1562412876 {
world1623671560 {
# IF AND ONLY IF recipe bookmarks are enabled, allow autocrafting with them.
B:autocraftingEnabled=true
# Show the list of bookmarks next to open GUIs.
B:bookmarkOverlayEnabled=true
# Give items instead of showing the recipe.
B:cheatItemsEnabled=false
# Default item to use to fill up fluids when clicking on a fluid ingredient in the menu, (format: item_name@meta)
S:defaultFluidContainerItem=
# Hide and unhide ingredients by clicking them in the list.
B:editEnabled=false
S:filterText=kam axe
# Show the list of ingredients next to open GUIs.
B:overlayEnabled=true
# IF AND ONLY IF recipe bookmarks are enabled, allow autocrafting with them.
B:recipeBookmarksEnabled=true
}
+2 -2
View File
@@ -1,5 +1,5 @@
#Splash screen properties
#Sun Aug 09 11:19:05 CDT 2026
#Sun Aug 16 16:15:20 CDT 2026
background=0xBFBFBF
memoryGood=0x00091A
font=0x960826
@@ -9,8 +9,8 @@ memoryLow=0x00091A
rotate=false
memoryWarn=0x00091A
showMemory=true
enabled=true
bar=0x00091A
enabled=true
resourcePackPath=resources
logoOffset=0
forgeTexture=fml\:textures/gui/forge.png
Binary file not shown.