Skip to content

Commit 5d29114

Browse files
authored
Merge pull request #2561 from TerraFirmaGreg-Team/dev
Release: 0.11.14
2 parents 7135061 + 0942a98 commit 5d29114

File tree

116 files changed

+6461
-2919
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

116 files changed

+6461
-2919
lines changed

.gitignore

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ defaultconfigs/ftbranks/players.snbt
6464

6565
/.bobby/
6666
/.mixin.out/
67+
/tacz/tacz_default_gun
6768
/classOut
6869
/backups
6970
/profileImage
@@ -91,6 +92,7 @@ defaultconfigs/ftbranks/players.snbt
9192
/chiselsandbits
9293
/gtceu/prospection_cache
9394
/data
95+
/ESM
9496

9597
# Client data
9698
bansoukou
@@ -115,6 +117,8 @@ optionsshaders.txt
115117
OpenComputersMod-*
116118
hei_bookmarks.ini
117119
icon.png
120+
EffekseerNativeForJava.dll
121+
libEffekseerNativeForJava.so
118122

119123
# Server data
120124
# .pakku/server-overrides/libraries
@@ -125,6 +129,6 @@ icon.png
125129
# .pakku/server-overrides/mods
126130
# .pakku/server-overrides/user_jvm_args.txt
127131

128-
/tacz/tacz_default_gun
129-
EffekseerNativeForJava.dll
130-
libEffekseerNativeForJava.so
132+
133+
134+
Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
{
2+
// Allow the creation of backups automatically
3+
"enabled": true,
4+
// Permission level to use the /backup command
5+
"command_permission_level": 3,
6+
// Only send backup status to server ops
7+
"notify_op_only": true,
8+
// Don't send backup status at all
9+
"do_not_notify": true,
10+
/* Backup retention mode. Valid Modes: MAX_BACKUPS, TIERED
11+
Note: TIERED mode is an experimental feature, Use at your own risk.
12+
*/
13+
"retention_mode": "MAX_BACKUPS",
14+
// Applies to retention_mode:MAX_BACKUPS, Sets the maximum number of backups to keep
15+
"max_backups": 3,
16+
// Applies to retention_mode:TIERED, The latest x number of backups will be retained
17+
"keep_latest": 3,
18+
// Applies to retention_mode:TIERED, Sets number of hourly backups to keep
19+
"keep_hourly": 1,
20+
// Applies to retention_mode:TIERED, Sets number of daily backups to keep
21+
"keep_daily": 1,
22+
// Applies to retention_mode:TIERED, Sets number of weekly backups to keep
23+
"keep_weekly": 1,
24+
// Applies to retention_mode:TIERED, Sets number of monthly backups to keep
25+
"keep_monthly": 1,
26+
/* This is done with an implementation of cron from the Quartz java library.
27+
More info here
28+
(http://www.cronmaker.com)
29+
*/
30+
"backup_cron": "0 15 10 * * ? *",
31+
// Time between manual backups using the command
32+
"manual_backups_time": 0,
33+
// Only run a backup if a player has been online since the last backup
34+
"only_if_players_been_online": true,
35+
// Additional directories to include in backup
36+
"additional_directories": [],
37+
/* Additional files and directories to include in backup.
38+
Can specify a file name, path relative to server directory or wildcard file path
39+
Examples: (All file paths are relative to server root)
40+
fileName.txt Any/all file named "fileName.txt"
41+
folder/file.txt Exact file path
42+
folder/ Everything in this folder
43+
path/starts/with* Any files who's path starts with
44+
*path/ends/with.txt Any files who's path ends with
45+
*path/contains* Any files who's path contains
46+
*/
47+
"additional_files": [],
48+
// Display file size in backup message
49+
"display_file_size": false,
50+
// backup location
51+
"backup_location": ".",
52+
// Specify the backup format. Valid options are ZIP and DIRECTORY
53+
"backup_format": "ZIP",
54+
// Minimum free disk space in MB. If a backup's creation would leave less than this amount of disk space remaining, the backup will be aborted.
55+
"minimum_free_space": 51200,
56+
// If the previous backup failed due to lack of space, the oldest backup will be deleted to free space.
57+
"free_space_if_needed": true,
58+
/* Specify files or folders to be excluded.
59+
Can specify a file name, path relative to server directory or wildcard file path
60+
Examples: (All file paths are relative to server root)
61+
fileName.txt Any/all file named "fileName.txt"
62+
folder/file.txt Exact file path
63+
folder/ Everything in this folder
64+
path/starts/with* Any files who's path starts with
65+
*path/ends/with.txt Any files who's path ends with
66+
*path/contains* Any files who's path contains
67+
*/
68+
"excluded": [
69+
"DistantHorizons.sqlite"
70+
],
71+
// The dimension used when creating backup preview image, specify "all" to enable automatic detection of primary dimension (can be very slow)
72+
"preview_dimension": "minecraft:overworld"
73+
}

CHANGELOG.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,27 @@
33
## Unreleased
44
### Changes
55
### Bug fixes
6+
### Translation updates
7+
8+
## [0.11.14] - 31-12-2025
9+
### Changes
10+
- Change energy acceptor to use a machine hull instead of a converter. (#2553) @thederpysockdude123
11+
- Update ExtendedAE package name in InvTweaks exclusions. (#2556) @FakeDomi
12+
- Pickled eggs can now be used in sandwiches (#2551) @Pyritie
13+
- Changed small gear mold capacity from 288 to 144mb (#2544) @JeanRdSz
14+
- Create Depots now count as forge insulation, so a basin can output directly onto one @Pyritie
15+
### Mod updates
16+
- New [Greate changelog](https://github.com/GreateBeyondTheHorizon/Greate/releases/tag/0.0.59)
17+
- New [Firmalife changelog](https://github.com/eerussianguy/firmalife/releases/tag/v2.1.25)
18+
### Bug fixes
19+
- Fixed issue where the arc furnace was generating annealed copper nuggets out of nothing @BlueBoat29
20+
- Fixed recipe conflict between Rimmed Blunt Bullet and 45-70 Bullet (#2545) @BlueBoat29
21+
- Fixed cake recipes returning nothing in a food processor (#2558) @Pyritie
22+
- Fixed a crash when generating chunks sometimes @Satherov
23+
### Translation updates
24+
- Chinese (simplified) @jmecn
25+
- Chinese (traditional) @CrazyO9
26+
- Russian @Petr211071
627

728
## [0.11.13] - 28-12-2025
829
### Breaking Changes

config/ae2/client.json

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
"enableFacadesInJEI": true,
66
"enableFacadeRecipesInJEI_comment": "Show facade recipes in JEI for supported blocks",
77
"enableFacadeRecipesInJEI": true,
8+
"exposeInventoryToEmi_comment": "Expose the full network inventory to EMI, which might cause performance problems.",
9+
"exposeInventoryToEmi": false,
810
"enableEffects": true,
911
"useTerminalUseLargeFont": false,
1012
"useColoredCraftingStatus": true,
@@ -16,10 +18,33 @@
1618
"showPlacementPreview": true,
1719
"notifyForFinishedCraftingJobs_comment": "Show toast when long-running crafting jobs finish.",
1820
"notifyForFinishedCraftingJobs": true,
21+
"fancyPatternTooltips_comment": "Show fancy tooltips for encoded patterns.",
22+
"fancyPatternTooltips": true,
1923
"clearGridOnClose_comment": "Automatically clear the crafting/encoding grid when closing the terminal",
2024
"clearGridOnClose": false,
2125
"terminalMargin_comment": "The vertical margin to apply when sizing terminals. Used to make room for centered item mod search bars",
22-
"terminalMargin": 25
26+
"terminalMargin": 25,
27+
"autoPauseTerminal_comment": "Pause the terminal exactly like when pressing shift, except done automatically",
28+
"autoPauseTerminal": false
29+
},
30+
"widgetNumbers": {
31+
"_comment": "Number button values in the level emitter config panel and the craft order amount picker",
32+
"widgetNumberBase1_comment": "Value of the first button when not pressing shift or ctrl",
33+
"widgetNumberBase1": 1,
34+
"widgetNumberBase2_comment": "Value of the second button when not pressing shift or ctrl",
35+
"widgetNumberBase2": 10,
36+
"widgetNumberBase3_comment": "Value of the third button when not pressing shift or ctrl",
37+
"widgetNumberBase3": 100,
38+
"widgetNumberBase4_comment": "Value of the fourth button when not pressing shift or ctrl",
39+
"widgetNumberBase4": 1000,
40+
"widgetNumberAlt1_comment": "Value of the first button when pressing shift or ctrl",
41+
"widgetNumberAlt1": 1,
42+
"widgetNumberAlt2_comment": "Value of the second button when pressing shift or ctrl",
43+
"widgetNumberAlt2": 16,
44+
"widgetNumberAlt3_comment": "Value of the third button when pressing shift or ctrl",
45+
"widgetNumberAlt3": 32,
46+
"widgetNumberAlt4_comment": "Value of the fourth button when pressing shift or ctrl",
47+
"widgetNumberAlt4": 64
2348
},
2449
"terminals": {
2550
"terminalStyle": "small",

config/ae2/common.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
"tinyTntBlockDamage": true,
88
"channels_comment": "Changes the channel capacity that cables provide in AE2.",
99
"channels": "default",
10+
"controllerLength_comment": "Maximum length for AE controllers",
11+
"controllerLength": 11,
1012
"spatialAnchorEnableRandomTicks_comment": "Whether Spatial Anchors should force random chunk ticks and entity spawning.",
1113
"spatialAnchorEnableRandomTicks": true
1214
},

config/alltheleaks.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"preventSearchIgnoredItems": false,
33
"ingredientDedupe": false,
4-
"resourceLocationDedupe": false
4+
"resourceLocationDedupe": false,
5+
"debugItemStackModifications": false,
6+
"logIntervalInMinutes": 10,
7+
"showSummaryOnDebugScreen": true,
8+
"memoryUsageWarningPercentage": 90,
9+
"debugThreadsStuck": false
510
}

config/ambientsounds-client.json

Lines changed: 43 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
},
99
"dimensions": {
1010
"abyssalcraft": 1,
11+
"ad_astra_mars": 1,
12+
"ad_astra_mercury": 1,
13+
"ad_astra_venus": 1,
1114
"betweenlands": 1,
1215
"cave": 1,
1316
"end": 1,
@@ -17,14 +20,21 @@
1720
"nether": 1,
1821
"surface": 1,
1922
"twilightforest": 1,
20-
"void": 1,
21-
"ad_astra": 1
23+
"void": 1
2224
},
2325
"regions": {
2426
"abyssalcraft_dark": {
2527
"overall": 1,
2628
"suspense.suspense": 1
2729
},
30+
"ad_astra_mars_wind": {
31+
"overall": 1,
32+
"wind.light-wind": 1
33+
},
34+
"ad_astra_mercury_unknown": {
35+
"overall": 1,
36+
"suspense.suspense": 1
37+
},
2838
"end_unknown": {
2939
"overall": 1,
3040
"suspense.suspense": 1
@@ -49,7 +59,8 @@
4959
"overall": 1,
5060
"beach": 1,
5161
"seagull": 1,
52-
"seagull-long": 1
62+
"seagull-long": 1,
63+
"ocean": 1
5364
},
5465
"cave_ambience": {
5566
"overall": 1,
@@ -86,11 +97,17 @@
8697
},
8798
"forest_cold": {
8899
"overall": 1,
89-
"crow": 1
100+
"bird-ambience": 1,
101+
"crow": 1,
102+
"owl": 1,
103+
"wolf": 1,
104+
"long-wolf": 1
90105
},
91106
"forest": {
92107
"overall": 1,
93-
"bird-ambience": 1,
108+
"bird-warm": 1,
109+
"cricket": 1,
110+
"cricket-warm-night": 1,
94111
"owl": 1
95112
},
96113
"forest_roofed": {
@@ -115,6 +132,10 @@
115132
"bird-ambience-jungle": 1,
116133
"bird-ambience-jungle-night": 1
117134
},
135+
"lake": {
136+
"overall": 1,
137+
"ocean": 1
138+
},
118139
"mesa": {
119140
"overall": 1,
120141
"wind-mesa": 1
@@ -157,6 +178,10 @@
157178
"overall": 1,
158179
"wind.light-wind": 1
159180
},
181+
"snow": {
182+
"overall": 1,
183+
"wind.light-wind": 1
184+
},
160185
"space": {
161186
"overall": 1
162187
},
@@ -182,7 +207,10 @@
182207
},
183208
"taiga": {
184209
"overall": 1,
185-
"bird-ambience-huge": 1
210+
"bird-ambience-huge": 1,
211+
"crow": 1,
212+
"wolf": 1,
213+
"long-wolf": 1
186214
},
187215
"underwater": {
188216
"overall": 1,
@@ -193,6 +221,15 @@
193221
"overall": 1,
194222
"underworld": 1
195223
},
224+
"venus": {
225+
"overall": 1,
226+
"cricket": 1,
227+
"cricket-night": 1,
228+
"cicadas": 1,
229+
"cicadas-desert": 1,
230+
"cicadas-night": 1,
231+
"cricket-warm-night": 1
232+
},
196233
"warden": {
197234
"overall": 1,
198235
"warden": 1
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
2+
[power]
3+
#Energy consumed per round of ammo retrieved from an ammo box, default: 1000.0
4+
#Range: 0.0 ~ 1.7976931348623157E308
5+
AmmoBoxUsePowerPerAmmo = 1000.0
6+
7+
[jei]
8+
#Modify the recipe content displayed in JEI, Normally, there is no need to disable this
9+
#When creating custom modpacks, disable this if fake recipes remain after deleting the default crafting recipes
10+
JeiRecipeDisplayCorrection = true
11+

0 commit comments

Comments
 (0)