Skip to content

Commit 7135061

Browse files
authored
Merge pull request #2539 from TerraFirmaGreg-Team/dev
Release: 0.11.13
2 parents cfdc2b1 + 65e39bf commit 7135061

File tree

501 files changed

+14224
-2616
lines changed

Some content is hidden

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

501 files changed

+14224
-2616
lines changed

CHANGELOG.md

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,51 @@
33
## Unreleased
44
### Changes
55
### Bug fixes
6+
7+
## [0.11.13] - 28-12-2025
8+
### Breaking Changes
9+
- The LCR recipe for BTX fuel now requires circuit 24, to fix a recipe conflict (#2515) @TomPlop
10+
- Loose stones now compress into cobblestone (without any mortar) and vice versa. So if you're currently using gravel to store your loose stones, uncraft them before updating. (#809) @Pyritie
11+
### Changes
12+
- Added casting molds for small gears, nuggets, and rods (#2470) @glitchplaysgames714
13+
- Added some new illages to the hot and dry, and cold and dry climates of the world! @MVG31
14+
- Added some mossy cobblestone to the beneath @Pyritie
15+
- Hardened non-TFC rocks are now craftable (#2447) @glitchplaysgames714
16+
- Magma blocks are now hot to hold @Pyritie
17+
- Added a recipe to craft old gregtech facades into ones with a new texture @Pyritie
18+
- Fluid sources of alcohol and milks are no longer placeable, so you can't drink from them infinitely any more @bigtho80
19+
- Added TFC scraping knives (#2494) @glitchplaysgames714
20+
- Changed the ambient sounds in the Beneath, added some to the moon and mars @Pyritie
21+
- Tweaked the ambient sounds in the overworld @Pyritie
22+
- Apatite, Tricalcium phosphate, rock salt, potassium sulfate, and ammonium chloride dusts now count as crop fertiliser (#2501) @Xtrial-01
23+
- Added quern recipes for gems into dust @Pyritie
24+
- Added recipes for smoke bombs, pet treats, and disguise kits, and added swapper pearls to the loot tables of various endermen @Pyritie
25+
- Added a little saltpeter to cassiterite veins @Pyritie
26+
- Removed the cleanroom requirement for level emitters since they were also craftable in a crafting grid (#2529) @Jeuvke
27+
- Overhauled photographic film development @Pyritie
28+
- Lowered the temperature of gas fuels and their related gases/fluids @Pyritie
29+
- Added drink effects to wines, ethanol, and methanol @Pyritie
30+
### Bug fixes
31+
- Fix for food stacking everywhere! @Mqrius
32+
- Fixed the grappling hook crashing and sending you to the void if you use it while travelling between dimensions (#2514) @Mqrius
33+
- Fixed some curving press tool head recipes being cheaper than intended (#2478) @Pyritie
34+
- Fixed some bastion chests being empty @Pyritie
35+
- Fixed overlapping durability numbers on the curio HUD (#2484) @glitchplaysgames714
36+
- Fixed a potential crash involving the refrigerator @Redeix
37+
- Fixed the evaporation tower requiring an input hatch even for recipes that don't have a fluid input @glitchplaysgames714
38+
- Fixed loot tables for ore indicator buds @Pyritie
39+
- Fixed the new gas fuels being usable on other planets (#2515) @TomPlop
40+
- Fixed hot ingots melting packed ice into water sources @Mqrius
41+
- Fixed inconsistent recipes for metal bars, now they all use the anvil or stonecutter. Also added recycling for them all @Pyritie
42+
- Various quest fixes and improvements @thederpysockdude123
43+
- Added a missing dependency that fixes the rnr roads' crazy acceleration @Pyritie
44+
- Fixed not being able to use aged alcohols to make vinegar (#2519) @Pyritie
45+
- Fix some forge fuels not having the right tag to actually be used as forge fuels @Pyritie
646
### Translation updates
47+
- Chinese (simplified) @jmecn
48+
- Ukranian @MetEnBouldry
49+
- Spanish @NikoNeko17
50+
- Turkish @MVG31
751

852
## [0.11.12] - 19-12-2025
953
### Changes

config/InventoryHUD/curios.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"clothes_hat": {
3-
"x": 20,
3+
"x": 30,
44
"y": 98,
55
"enabled": true,
66
"halign": "LEFT",
@@ -63,7 +63,7 @@
6363
"valign": "BOTTOM"
6464
},
6565
"clothes_torso": {
66-
"x": 20,
66+
"x": 30,
6767
"y": 80,
6868
"enabled": true,
6969
"halign": "LEFT",
@@ -98,14 +98,14 @@
9898
"valign": "TOP"
9999
},
100100
"clothes_pants": {
101-
"x": 20,
101+
"x": 30,
102102
"y": 62,
103103
"enabled": true,
104104
"halign": "LEFT",
105105
"valign": "BOTTOM"
106106
},
107107
"clothes_socks": {
108-
"x": 20,
108+
"x": 30,
109109
"y": 44,
110110
"enabled": true,
111111
"halign": "LEFT",

config/ambientsounds-client.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -202,9 +202,9 @@
202202
"animal": {
203203
"animal": 1,
204204
"bird": {
205-
"bird": 1,
206-
"bird_day": 1,
207-
"bird_night": 1
205+
"bird": 0.5,
206+
"bird_day": 0.5,
207+
"bird_night": 0.5
208208
},
209209
"cicadas": 1,
210210
"cricket": {
@@ -215,7 +215,7 @@
215215
},
216216
"cave": 1,
217217
"weather": 1,
218-
"wind": 1
218+
"wind": 0.65
219219
},
220220
"fade-volume": 0.005,
221221
"fade-pitch": 0.005,

config/crash_assistant/config.toml

Lines changed: 253 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,253 @@
1+
2+
#General settings of Crash Assistant mod.
3+
[general]
4+
#Link which will be opened in browser on request_help_button pressed.
5+
#If equals CHANGE_ME, will open Forge/NeoForge/Fabric/Quilt discord link. Names of communities/channels also will be used not from config, but according to this link.
6+
#Must start with 'https://' or 'www.'
7+
help_link = "https://github.com/TerraFirmaGreg-Team/Modpack-Modern/issues"
8+
#Anyways log will be uploaded to mclo.gs, but with this option you can wrap link to gnomebot.dev for better formatting.
9+
#If help_link equals 'CHANGE_ME', this value will be ignored and gnomebot.dev used.
10+
#Supported values: mclo.gs / gnomebot.dev
11+
upload_to = "gnomebot.dev"
12+
#Show gui on minecraft crashed on modloading and FML error screen displayed.
13+
show_on_fml_error_screen = true
14+
#Close old CrashAssistantApp if it's still running when starting a new instance of Minecraft, to avoid confusing player with window from old crash.
15+
kill_old_app = true
16+
#If options.txt doesn't exist, the default language will be used.
17+
default_lang = "en_us"
18+
#By default, crash assistant will get the value for the current language from the overrides folder, then from the jar.
19+
#By changing this option, it will first try to get it from the current overrides, then (if no override exists for this language)
20+
#from the override for the language specified here, and only then from the jar language.
21+
#Use "NONE" to disable this feature. Or language key, like "en_us" to enable it.
22+
priority_lang_for_overrides = "NONE"
23+
#By changing this value you can disable creating "crash_assistant_localization_overrides" folder and placing "README.md" file there.
24+
generate_localization_overrides_folder_with_readme = true
25+
#By default our process is scanning for terminated processes(they can appear with delay) and after finish of scan enabling upload buttons.
26+
#This option can prevent this and enable individual upload buttons immediately after crash.
27+
#However can confuse users and make them clicking individual upload buttons instead of Upload All Button.
28+
prevent_upload_buttons_delay = false
29+
#Before uploading the first log, requires the user to accept the privacy policy.
30+
#Disabling this option may be illegal in some countries if you are modpack creator. Disable at your own risk.
31+
enable_privacy_policy_acceptance = true
32+
#Unfortunately mclogs censoring ip-like versions as has no way to determine if it's version or IP.
33+
#This will prevent this by replacing dot's in them to dot-like symbol.
34+
#Anti censoring only versions, IP's are kept censored.
35+
enable_mclogs_anti_ip_like_version_censorer = true
36+
#Prevents creating "crash_assistant" folder in the logs folder.
37+
#So this option prevents our app logging at all.
38+
#HIGHLY UNRECOMMENDED to disable! Contains many useful info.
39+
prevent_generating_crash_assistant_app_logs = false
40+
#Generates "logs/stderr_stream.log" with stderr stream.
41+
#Since many launchers are not saving this info, which is extremely helpful for debugging some crashes.
42+
#As only where crash reason is present. Keeps original stream untouched, just logs it to a file.
43+
generate_own_launcher_log = true
44+
#Here you can change priority for logs.
45+
#For example if you want crash report to be shown earlier than latest.log in the available logs list.
46+
#Supported values: https://github.com/KostromDan/Crash-Assistant/blob/1.19-1.20.1/app/src/main/java/dev/kostromdan/mods/crash_assistant/app/logs_analyser/LogType.java
47+
#Usage: ["CRASH_REPORT", "LOG"]
48+
logs_priority_overrides = []
49+
#List of blacklisted log files (checked with startswith()). This files won't show in GUI logs list.
50+
blacklisted_logs = []
51+
52+
#A simplified GUI that hides the logs list until the user opts into Expert Mode.
53+
[simple_mode]
54+
#If enabled, the GUI starts in simple mode with logs hidden and a single "Show Logs (Expert Mode)" button.
55+
#Disabled by default.
56+
enabled = false
57+
#If true, modpack creators always see the Expert Mode with logs visible, even if simple mode is enabled.
58+
prevent_for_modpack_creators = true
59+
#If true, hides the mod list changes section while simple mode is active.
60+
hide_modlist_section = false
61+
62+
#Here you can change text of lang placeHolders.
63+
#Also you can change any text in lang files.
64+
#You don't need to modify jar. You can change it in config/crash_assistant/lang. For more info read README.md file located where.
65+
[text]
66+
#$CONFIG.text.support_name$ in lang files will be replaced with this value.
67+
#For example this placeHolder used in: "Request help in the $CONFIG.text.support_name$"
68+
support_name = "TFG Github"
69+
#$CONFIG.text.support_place$ in lang files will be replaced with this value.
70+
support_place = "the text boxes after pressing the green New Issue button"
71+
#$CONFIG.text.modpack_name$ in lang files will be replaced with this value.
72+
#For example this placeHolder used in: "Oops, $CONFIG.text.modpack_name$ crashed!"
73+
#Supports Better Compatibility Checker integration. You can use $BCC.modpackName$, $BCC.modpackVersion$, etc and it will be replaced with value from BCC config.
74+
modpack_name = "TerraFirmaGreg"
75+
76+
#Settings of message generated by Upload all button
77+
[generated_message]
78+
#Add ### prefix before filename.
79+
#This can prevent too small, hard to hit on mobile links.
80+
h3_prefix = true
81+
#Replaces "\n" separator between logs to " | " to make message vertically smaller.
82+
one_line_logs = true
83+
#Adds line in log list about this Intel processor can be corrupted.
84+
intel_corrupted_notification = true
85+
#If the modpack is created for a non-English-speaking audience, сhange this to the language the modpack is designed for.
86+
#This lang will be used only for generating message by "Upload all..." button.Do not modify this value if there's a chance that the generated message will be sent to English-speaking communities.
87+
generated_msg_lang = "en_us"
88+
#This text will be under "$CONFIG.text.modpack_name$ crashed!" in generated message by Upload all button.
89+
#You can include:
90+
# * some form, which users should fill out.
91+
# * additional information like Minecraft version, etc.
92+
text_under_crashed = ""
93+
#With this option you can notify user about something related with posting generated message.
94+
#For example if they need to fill some option from "text_under_crashed", etc.
95+
#Supports html formatting, placeholders.
96+
#Leave empty to prevent showing this warning message.
97+
warning_after_upload_all_button_press = ""
98+
#Puts problematic frame from hs_err to message.
99+
put_problematic_frame_to_message = true
100+
#Puts analysis result(names of crash reasons) to message, instead of just count.
101+
put_analysis_result_to_message = true
102+
#Color modified mods count/analysis in msg with ANSI.
103+
#Can be needed to be disabled if issues are reported to something not supporting ANSI codeblocks, like GitHub.
104+
color_message = true
105+
106+
#Settings of links copied by Upload and copy link buttons
107+
[copied_links]
108+
#With this option, you can customize how single links from individual upload buttons are copied, there
109+
#log of small size was uploaded to a single link.
110+
#For example, leave just $LINK$ to copy just link.
111+
single_link = "$LOG_NAME$$FILE_NAME$: $LINK$"
112+
#With this option, you can customize how links from individual upload buttons are copied, there
113+
#log was split to the 2 parts (head and tail, due to too large size for single upload), but user only decided to copy only one of them (not message with both).
114+
single_link_split = "$LOG_NAME$$FILE_NAME$($HEAD_OR_TAIL$): $LINK$ $TOO_BIG_REASONS$"
115+
#With this option, you can customize how links from individual upload buttons are copied, there
116+
#log was split to the 2 parts (head and tail, due to too large size for single upload), but user decided to copy message with both.
117+
both_links_split = "$LOG_NAME$[$FILE_NAME$ <TOLOWER>$MSG_LANG.gui.split_log_dialog_head$</TOLOWER>](<$LINK_FIRST_LINES$>) / [<TOLOWER>$MSG_LANG.gui.split_log_dialog_tail$</TOLOWER>](<$LINK_LAST_LINES$>) $TOO_BIG_REASONS$"
118+
#If enabled, disables the head/tail selection dialog for split logs on individual uploads and always copies message with both links.
119+
skip_split_dialog = false
120+
121+
#Settings of modlist feature.
122+
#Adds in generated msg block about which mods modpack user added/removed/updated.
123+
#Also you can see diff by running '/crash_assistant modlist diff' command.
124+
[modpack_modlist]
125+
#Enable feature.
126+
enabled = true
127+
#nicknames of players, who considered as modpack creator.
128+
#Only this players can overwrite modlist.json
129+
#If this feature is enabled and this array is empty, will be appended with nickname of current player.
130+
#-----------------------------------------------------------------------------------------------------
131+
#Warning! This is not displayed anywhere, it's just tech param used for modlist feature to work correctly.
132+
#Here must be actual nicknames of people who work with the modpack and publishing releases!
133+
#-----------------------------------------------------------------------------------------------------
134+
modpack_creators = ["Pyritie", "Exception", "Xikaro", "Redeix", "Nebby", "GameStar", "TomTomTom"]
135+
#If enabled, modlist.json will be overwritten on every launch(first tick of TitleScreen),
136+
#then game is launched by modpack creator.
137+
#So you won't forget to save it before publishing.
138+
#If you want to save manually: disable this and use '/crash_assistant modlist save' command.
139+
auto_update = true
140+
#If enabled, will add resourcepacks to modlist.json
141+
#After filename where will be ' (resourcepack)' suffix.
142+
add_resourcepacks = false
143+
#If enabled, will add modloader jar name to modlist, to easily track if user changed version of modloader.
144+
add_modloader_jar_name = true
145+
#If enabled, will add generated modlist.txt, with names of all mods / modids / mixin configs / jarjar mods info to logs.
146+
add_modlist_txt_as_log = true
147+
148+
#Settings of too many changes warning feature.
149+
#Notifies end users of the modpack and saying they made too many changes to the modpack.
150+
#Not displayed to the modpack creators.
151+
[too_many_changes_warning]
152+
#Set to the positive integer to enable feature. Set to negative integer to disable.
153+
#How many changes end user should make for warning to be displayed.
154+
count = -1
155+
#With this option, you can select the formulation of this warning, currently supported:
156+
# - NOTIFY: Just saying to the end user that what they made many changes and adding random mods or clicking
157+
#the "Update All" button is not a good idea without proper testing. It is expected to crash.
158+
# - DROP_SUPPORT: Saying what you are not providing support for that amount of changes, suggesting the end user to
159+
#re-install modpack or they are on their own with that amount of changes.
160+
formulation_type = "NOTIFY"
161+
162+
#Settings of analysis feature.
163+
#Analysing logs for most common reasons of crashes and displaying recommendations with fixes.
164+
[analysis]
165+
#Enable feature.
166+
enabled = true
167+
#Here you can disable some Analysis by class names.
168+
#List of them can be found here: dev.kostromdan.mods.crash_assistant.app.logs_analyser.crash_reasons
169+
#For example "Create6Addons"
170+
blacklisted_reasons = []
171+
172+
#Settings of analysis tools feature.
173+
#Here you can enable disable showing some analysis tools fot end user.
174+
[analysis_tools]
175+
#Enable feature.
176+
enabled = true
177+
#Here you can disable some Analysis tools by class names.
178+
#List of them can be found here: dev.kostromdan.mods.crash_assistant.app.gui.analysis
179+
#For example "MCreatorModDetectorGUI"
180+
blacklisted_tools = []
181+
182+
#Settings of '/crash_assistant crash' command feature.
183+
[crash_command]
184+
#Enable feature.
185+
enabled = true
186+
#To ensure the user really wants to crash the game, the command needs to be run again within this amount of seconds.
187+
#Set to <= 0 to disable the confirmation.
188+
seconds = 10
189+
190+
#Settings of notifying about intel corrupted processors.
191+
[intel_corrupted]
192+
#Enable feature.
193+
enabled = true
194+
195+
[greeting]
196+
#You don't need to touch this option.
197+
#On first world join of modpack creator if set to false shows greeting, then self enables.
198+
shown_greeting = true
199+
200+
#You can customise GUI with this options.
201+
[gui_customisation]
202+
#Will hide Upload All Button from GUI.
203+
disable_upload_all_button = false
204+
#Append comment text with notice about sending screenshot of this gui tells nothing to modpack creators.
205+
show_dont_send_screenshot_of_gui_notice = true
206+
#Animate border to request user attention even more.
207+
screenshot_of_gui_notice_animated_border = true
208+
#You can make Upload All Button bigger/smaller to request user attention.
209+
#Default Swing font size is 12, Default for this button in crash assistant is 16.
210+
#Not recommended to set it more than 16, as it will affect the increase of GUI size because all text won't fit.
211+
upload_all_button_font_size = 16
212+
#Same as upload_all_button_font_size, but for Request Help button.
213+
request_help_button_font_size = 16
214+
#Same as upload_all_button_font_size, but for the Simple Mode toggle button.
215+
simple_mode_button_font_size = 16
216+
#You can change Upload All Button color to request user attention.
217+
#format is "R_G_B", range is 0-255, for example "255_0_0" is red color. Use "default" to use default swing color.
218+
#Default for this button is "0_178_0" (dark green color).
219+
upload_all_button_foreground_color = "0_178_0"
220+
#Same as upload_all_button_foreground_color, but for Request Help button.
221+
#Default for this button is "0_0_178" (dark blue color).
222+
request_help_button_foreground_color = "0_0_178"
223+
#Same as upload_all_button_foreground_color, but for the Simple Mode toggle button.
224+
simple_mode_button_foreground_color = "0_0_178"
225+
#Same as upload_all_button_font_size, but for Auto-Fix button (in integrated GPU warning).
226+
auto_fix_button_font_size = 16
227+
#Same as upload_all_button_foreground_color, but for Auto-Fix button (in integrated GPU warning).
228+
#Default for this button is "0_178_0" (dark green color).
229+
auto_fix_button_foreground_color = "0_178_0"
230+
#Path to a modpack logo to display in the top of the GUI.
231+
#Path is relative to the Minecraft instance folder. Leave empty to disable.
232+
modpack_logo_path = "kubejs/assets/tfg/textures/gui/tfg_logo_icon_outline_white_sr_456p.gif"
233+
#If true, the logo will be larger, Replacing a some of `don't send screenshot` notice.
234+
#If false, it will be smaller and logo will be end right where the `don't send screenshot` notice starts.
235+
#You should try both, but most likely:
236+
#- If you have some long text in the discord description, you will love the small one.
237+
#- If the text is short, you will love the large one.
238+
modpack_logo_large_mode = false
239+
#Limit modpack logo height. Default is -1, which means it's calculated automatically.
240+
#By default, this should not be needed. But if you have heavily customized GUI or using
241+
#a rectangle logo instead of square, you may want to decrease its size, so this option could be needed in such case.
242+
limit_modpack_logo_height = -1
243+
#This option would be needed only if you limited modpack logo height.
244+
#Otherwise, the logo will consume all available horizontal space.
245+
#If true, the logo will be centered. If false, it will be aligned to the top.
246+
modpack_logo_aligned_center = true
247+
248+
#Checks crash_assistant compatibility with other incompatible mods.
249+
#Highly unrecommended to disable!
250+
[compatibility]
251+
#Enable feature.
252+
enabled = true
253+

0 commit comments

Comments
 (0)