Merge pull request #2539 from TerraFirmaGreg-Team/dev

Release: 0.11.13
2025-12-29 12:38:56 +05:00 · 2025-12-29 12:38:56 +05:00 · 7135061e49
commit 7135061e49
parent cfdc2b17b0 65e39bf4fe
501 changed files with 14240 additions and 2632 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -3,7 +3,51 @@
 ## Unreleased
 ### Changes
 ### Bug fixes
+
+## [0.11.13] - 28-12-2025
+### Breaking Changes
+- The LCR recipe for BTX fuel now requires circuit 24, to fix a recipe conflict (#2515) @TomPlop
+- 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
+### Changes
+- Added casting molds for small gears, nuggets, and rods (#2470) @glitchplaysgames714
+- Added some new illages to the hot and dry, and cold and dry climates of the world! @MVG31
+- Added some mossy cobblestone to the beneath @Pyritie
+- Hardened non-TFC rocks are now craftable (#2447) @glitchplaysgames714
+- Magma blocks are now hot to hold @Pyritie
+- Added a recipe to craft old gregtech facades into ones with a new texture @Pyritie
+- Fluid sources of alcohol and milks are no longer placeable, so you can't drink from them infinitely any more @bigtho80
+- Added TFC scraping knives (#2494) @glitchplaysgames714
+- Changed the ambient sounds in the Beneath, added some to the moon and mars @Pyritie
+- Tweaked the ambient sounds in the overworld @Pyritie
+- Apatite, Tricalcium phosphate, rock salt, potassium sulfate, and ammonium chloride dusts now count as crop fertiliser (#2501) @Xtrial-01
+- Added quern recipes for gems into dust @Pyritie
+- Added recipes for smoke bombs, pet treats, and disguise kits, and added swapper pearls to the loot tables of various endermen @Pyritie
+- Added a little saltpeter to cassiterite veins @Pyritie
+- Removed the cleanroom requirement for level emitters since they were also craftable in a crafting grid (#2529) @Jeuvke
+- Overhauled photographic film development @Pyritie
+- Lowered the temperature of gas fuels and their related gases/fluids @Pyritie
+- Added drink effects to wines, ethanol, and methanol @Pyritie
+### Bug fixes
+- Fix for food stacking everywhere! @Mqrius
+- Fixed the grappling hook crashing and sending you to the void if you use it while travelling between dimensions (#2514) @Mqrius
+- Fixed some curving press tool head recipes being cheaper than intended (#2478) @Pyritie
+- Fixed some bastion chests being empty @Pyritie
+- Fixed overlapping durability numbers on the curio HUD (#2484) @glitchplaysgames714
+- Fixed a potential crash involving the refrigerator @Redeix
+- Fixed the evaporation tower requiring an input hatch even for recipes that don't have a fluid input @glitchplaysgames714
+- Fixed loot tables for ore indicator buds @Pyritie
+- Fixed the new gas fuels being usable on other planets (#2515) @TomPlop
+- Fixed hot ingots melting packed ice into water sources @Mqrius
+- Fixed inconsistent recipes for metal bars, now they all use the anvil or stonecutter. Also added recycling for them all @Pyritie
+- Various quest fixes and improvements @thederpysockdude123
+- Added a missing dependency that fixes the rnr roads' crazy acceleration @Pyritie
+- Fixed not being able to use aged alcohols to make vinegar (#2519) @Pyritie
+- Fix some forge fuels not having the right tag to actually be used as forge fuels @Pyritie
 ### Translation updates
+- Chinese (simplified) @jmecn
+- Ukranian @MetEnBouldry
+- Spanish @NikoNeko17
+- Turkish @MVG31

 ## [0.11.12] - 19-12-2025
 ### Changes
--- a/config/InventoryHUD/curios.json
+++ b/config/InventoryHUD/curios.json
@ -1,6 +1,6 @@
 {
    "clothes_hat": {
-        "x": 20,
+        "x": 30,
        "y": 98,
        "enabled": true,
        "halign": "LEFT",
@ -63,7 +63,7 @@
        "valign": "BOTTOM"
    },
    "clothes_torso": {
-        "x": 20,
+        "x": 30,
        "y": 80,
        "enabled": true,
        "halign": "LEFT",
@ -98,14 +98,14 @@
        "valign": "TOP"
    },
    "clothes_pants": {
-        "x": 20,
+        "x": 30,
        "y": 62,
        "enabled": true,
        "halign": "LEFT",
        "valign": "BOTTOM"
    },
    "clothes_socks": {
-        "x": 20,
+        "x": 30,
        "y": 44,
        "enabled": true,
        "halign": "LEFT",
--- a/config/ambientsounds-client.json
+++ b/config/ambientsounds-client.json
@ -202,9 +202,9 @@
    "animal": {
      "animal": 1,
      "bird": {
-        "bird": 1,
-        "bird_day": 1,
-        "bird_night": 1
+        "bird": 0.5,
+        "bird_day": 0.5,
+        "bird_night": 0.5
      },
      "cicadas": 1,
      "cricket": {
@ -215,7 +215,7 @@
    },
    "cave": 1,
    "weather": 1,
-    "wind": 1
+    "wind": 0.65
  },
  "fade-volume": 0.005,
  "fade-pitch": 0.005,
--- a/config/crash_assistant/config.toml
+++ b/config/crash_assistant/config.toml
@ -0,0 +1,253 @@
+
+#General settings of Crash Assistant mod.
+[general]
+	#Link which will be opened in browser on request_help_button pressed.
+	#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.
+	#Must start with 'https://' or 'www.'
+	help_link = "https://github.com/TerraFirmaGreg-Team/Modpack-Modern/issues"
+	#Anyways log will be uploaded to mclo.gs, but with this option you can wrap link to gnomebot.dev for better formatting.
+	#If help_link equals 'CHANGE_ME', this value will be ignored and gnomebot.dev used.
+	#Supported values: mclo.gs / gnomebot.dev
+	upload_to = "gnomebot.dev"
+	#Show gui on minecraft crashed on modloading and FML error screen displayed.
+	show_on_fml_error_screen = true
+	#Close old CrashAssistantApp if it's still running when starting a new instance of Minecraft, to avoid confusing player with window from old crash.
+	kill_old_app = true
+	#If options.txt doesn't exist, the default language will be used.
+	default_lang = "en_us"
+	#By default, crash assistant will get the value for the current language from the overrides folder, then from the jar.
+	#By changing this option, it will first try to get it from the current overrides, then (if no override exists for this language)
+	#from the override for the language specified here, and only then from the jar language.
+	#Use "NONE" to disable this feature. Or language key, like "en_us" to enable it.
+	priority_lang_for_overrides = "NONE"
+	#By changing this value you can disable creating "crash_assistant_localization_overrides" folder and placing "README.md" file there.
+	generate_localization_overrides_folder_with_readme = true
+	#By default our process is scanning for terminated processes(they can appear with delay) and after finish of scan enabling upload buttons.
+	#This option can prevent this and enable individual upload buttons immediately after crash.
+	#However can confuse users and make them clicking individual upload buttons instead of Upload All Button.
+	prevent_upload_buttons_delay = false
+	#Before uploading the first log, requires the user to accept the privacy policy.
+	#Disabling this option may be illegal in some countries if you are modpack creator. Disable at your own risk.
+	enable_privacy_policy_acceptance = true
+	#Unfortunately mclogs censoring ip-like versions as has no way to determine if it's version or IP.
+	#This will prevent this by replacing dot's in them to dot-like symbol.
+	#Anti censoring only versions, IP's are kept censored.
+	enable_mclogs_anti_ip_like_version_censorer = true
+	#Prevents creating "crash_assistant" folder in the logs folder.
+	#So this option prevents our app logging at all.
+	#HIGHLY UNRECOMMENDED to disable! Contains many useful info.
+	prevent_generating_crash_assistant_app_logs = false
+	#Generates "logs/stderr_stream.log" with stderr stream.
+	#Since many launchers are not saving this info, which is extremely helpful for debugging some crashes.
+	#As only where crash reason is present. Keeps original stream untouched, just logs it to a file.
+	generate_own_launcher_log = true
+	#Here you can change priority for logs.
+	#For example if you want crash report to be shown earlier than latest.log in the available logs list.
+	#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
+	#Usage: ["CRASH_REPORT", "LOG"]
+	logs_priority_overrides = []
+	#List of blacklisted log files (checked with startswith()). This files won't show in GUI logs list.
+	blacklisted_logs = []
+
+#A simplified GUI that hides the logs list until the user opts into Expert Mode.
+[simple_mode]
+	#If enabled, the GUI starts in simple mode with logs hidden and a single "Show Logs (Expert Mode)" button.
+	#Disabled by default.
+	enabled = false
+	#If true, modpack creators always see the Expert Mode with logs visible, even if simple mode is enabled.
+	prevent_for_modpack_creators = true
+	#If true, hides the mod list changes section while simple mode is active.
+	hide_modlist_section = false
+
+#Here you can change text of lang placeHolders.
+#Also you can change any text in lang files.
+#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.
+[text]
+	#$CONFIG.text.support_name$ in lang files will be replaced with this value.
+	#For example this placeHolder used in: "Request help in the $CONFIG.text.support_name$"
+	support_name = "TFG Github"
+	#$CONFIG.text.support_place$ in lang files will be replaced with this value.
+	support_place = "the text boxes after pressing the green New Issue button"
+	#$CONFIG.text.modpack_name$ in lang files will be replaced with this value.
+	#For example this placeHolder used in: "Oops, $CONFIG.text.modpack_name$ crashed!"
+	#Supports Better Compatibility Checker integration. You can use $BCC.modpackName$, $BCC.modpackVersion$, etc and it will be replaced with value from BCC config.
+	modpack_name = "TerraFirmaGreg"
+
+#Settings of message generated by Upload all button
+[generated_message]
+	#Add ### prefix before filename.
+	#This can prevent too small, hard to hit on mobile links.
+	h3_prefix = true
+	#Replaces "\n" separator between logs to "   |   " to make message vertically smaller.
+	one_line_logs = true
+	#Adds line in log list about this Intel processor can be corrupted.
+	intel_corrupted_notification = true
+	#If the modpack is created for a non-English-speaking audience, сhange this to the language the modpack is designed for.
+	#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.
+	generated_msg_lang = "en_us"
+	#This text will be under "$CONFIG.text.modpack_name$ crashed!" in generated message by Upload all button.
+	#You can include:
+	#   * some form, which users should fill out.
+	#   * additional information like Minecraft version, etc.
+	text_under_crashed = ""
+	#With this option you can notify user about something related with posting generated message.
+	#For example if they need to fill some option from "text_under_crashed", etc.
+	#Supports html formatting, placeholders.
+	#Leave empty to prevent showing this warning message.
+	warning_after_upload_all_button_press = ""
+	#Puts problematic frame from hs_err to message.
+	put_problematic_frame_to_message = true
+	#Puts analysis result(names of crash reasons) to message, instead of just count.
+	put_analysis_result_to_message = true
+	#Color modified mods count/analysis in msg with ANSI.
+	#Can be needed to be disabled if issues are reported to something not supporting ANSI codeblocks, like GitHub.
+	color_message = true
+
+#Settings of links copied by Upload and copy link buttons
+[copied_links]
+	#With this option, you can customize how single links from individual upload buttons are copied, there
+	#log of small size was uploaded to a single link.
+	#For example, leave just $LINK$ to copy just link.
+	single_link = "$LOG_NAME$$FILE_NAME$: $LINK$"
+	#With this option, you can customize how links from individual upload buttons are copied, there
+	#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).
+	single_link_split = "$LOG_NAME$$FILE_NAME$($HEAD_OR_TAIL$): $LINK$ $TOO_BIG_REASONS$"
+	#With this option, you can customize how links from individual upload buttons are copied, there
+	#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.
+	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$"
+	#If enabled, disables the head/tail selection dialog for split logs on individual uploads and always copies message with both links.
+	skip_split_dialog = false
+
+#Settings of modlist feature.
+#Adds in generated msg block about which mods modpack user added/removed/updated.
+#Also you can see diff by running '/crash_assistant modlist diff' command.
+[modpack_modlist]
+	#Enable feature.
+	enabled = true
+	#nicknames of players, who considered as modpack creator.
+	#Only this players can overwrite modlist.json
+	#If this feature is enabled and this array is empty, will be appended with nickname of current player.
+	#-----------------------------------------------------------------------------------------------------
+	#Warning! This is not displayed anywhere, it's just tech param used for modlist feature to work correctly.
+	#Here must be actual nicknames of people who work with the modpack and publishing releases!
+	#-----------------------------------------------------------------------------------------------------
+	modpack_creators = ["Pyritie", "Exception", "Xikaro", "Redeix", "Nebby", "GameStar", "TomTomTom"]
+	#If enabled, modlist.json will be overwritten on every launch(first tick of TitleScreen),
+	#then game is launched by modpack creator.
+	#So you won't forget to save it before publishing.
+	#If you want to save manually: disable this and use '/crash_assistant modlist save' command.
+	auto_update = true
+	#If enabled, will add resourcepacks to modlist.json
+	#After filename where will be ' (resourcepack)' suffix.
+	add_resourcepacks = false
+	#If enabled, will add modloader jar name to modlist, to easily track if user changed version of modloader.
+	add_modloader_jar_name = true
+	#If enabled, will add generated modlist.txt, with names of all mods / modids / mixin configs / jarjar mods info to logs.
+	add_modlist_txt_as_log = true
+
+#Settings of too many changes warning feature.
+#Notifies end users of the modpack and saying they made too many changes to the modpack.
+#Not displayed to the modpack creators.
+[too_many_changes_warning]
+	#Set to the positive integer to enable feature. Set to negative integer to disable.
+	#How many changes end user should make for warning to be displayed.
+	count = -1
+	#With this option, you can select the formulation of this warning, currently supported:
+	#   - NOTIFY: Just saying to the end user that what they made many changes and adding random mods or clicking
+	#the "Update All" button is not a good idea without proper testing. It is expected to crash.
+	#   - DROP_SUPPORT: Saying what you are not providing support for that amount of changes, suggesting the end user to
+	#re-install modpack or they are on their own with that amount of changes.
+	formulation_type = "NOTIFY"
+
+#Settings of analysis feature.
+#Analysing logs for most common reasons of crashes and displaying recommendations with fixes.
+[analysis]
+	#Enable feature.
+	enabled = true
+	#Here you can disable some Analysis by class names.
+	#List of them can be found here: dev.kostromdan.mods.crash_assistant.app.logs_analyser.crash_reasons
+	#For example "Create6Addons"
+	blacklisted_reasons = []
+
+#Settings of analysis tools feature.
+#Here you can enable disable showing some analysis tools fot end user.
+[analysis_tools]
+	#Enable feature.
+	enabled = true
+	#Here you can disable some Analysis tools by class names.
+	#List of them can be found here: dev.kostromdan.mods.crash_assistant.app.gui.analysis
+	#For example "MCreatorModDetectorGUI"
+	blacklisted_tools = []
+
+#Settings of '/crash_assistant crash' command feature.
+[crash_command]
+	#Enable feature.
+	enabled = true
+	#To ensure the user really wants to crash the game, the command needs to be run again within this amount of seconds.
+	#Set to <= 0 to disable the confirmation.
+	seconds = 10
+
+#Settings of notifying about intel corrupted processors.
+[intel_corrupted]
+	#Enable feature.
+	enabled = true
+
+[greeting]
+	#You don't need to touch this option.
+	#On first world join of modpack creator if set to false shows greeting, then self enables.
+	shown_greeting = true
+
+#You can customise GUI with this options.
+[gui_customisation]
+	#Will hide Upload All Button from GUI.
+	disable_upload_all_button = false
+	#Append comment text with notice about sending screenshot of this gui tells nothing to modpack creators.
+	show_dont_send_screenshot_of_gui_notice = true
+	#Animate border to request user attention even more.
+	screenshot_of_gui_notice_animated_border = true
+	#You can make Upload All Button bigger/smaller to request user attention.
+	#Default Swing font size is 12, Default for this button in crash assistant is 16.
+	#Not recommended to set it more than 16, as it will affect the increase of GUI size because all text won't fit.
+	upload_all_button_font_size = 16
+	#Same as upload_all_button_font_size, but for Request Help button.
+	request_help_button_font_size = 16
+	#Same as upload_all_button_font_size, but for the Simple Mode toggle button.
+	simple_mode_button_font_size = 16
+	#You can change Upload All Button color to request user attention.
+	#format is "R_G_B", range is 0-255, for example "255_0_0" is red color. Use "default" to use default swing color.
+	#Default for this button is "0_178_0" (dark green color).
+	upload_all_button_foreground_color = "0_178_0"
+	#Same as upload_all_button_foreground_color, but for Request Help button.
+	#Default for this button is "0_0_178" (dark blue color).
+	request_help_button_foreground_color = "0_0_178"
+	#Same as upload_all_button_foreground_color, but for the Simple Mode toggle button.
+	simple_mode_button_foreground_color = "0_0_178"
+	#Same as upload_all_button_font_size, but for Auto-Fix button (in integrated GPU warning).
+	auto_fix_button_font_size = 16
+	#Same as upload_all_button_foreground_color, but for Auto-Fix button (in integrated GPU warning).
+	#Default for this button is "0_178_0" (dark green color).
+	auto_fix_button_foreground_color = "0_178_0"
+	#Path to a modpack logo to display in the top of the GUI.
+	#Path is relative to the Minecraft instance folder. Leave empty to disable.
+	modpack_logo_path = "kubejs/assets/tfg/textures/gui/tfg_logo_icon_outline_white_sr_456p.gif"
+	#If true, the logo will be larger, Replacing a some of `don't send screenshot` notice.
+	#If false, it will be smaller and logo will be end right where the `don't send screenshot` notice starts.
+	#You should try both, but most likely:
+	#- If you have some long text in the discord description, you will love the small one.
+	#- If the text is short, you will love the large one.
+	modpack_logo_large_mode = false
+	#Limit modpack logo height. Default is -1, which means it's calculated automatically.
+	#By default, this should not be needed. But if you have heavily customized GUI or using
+	#a rectangle logo instead of square, you may want to decrease its size, so this option could be needed in such case. 
+	limit_modpack_logo_height = -1
+	#This option would be needed only if you limited modpack logo height.
+	#Otherwise, the logo will consume all available horizontal space.
+	#If true, the logo will be centered. If false, it will be aligned to the top. 
+	modpack_logo_aligned_center = true
+
+#Checks crash_assistant compatibility with other incompatible mods.
+#Highly unrecommended to disable!
+[compatibility]
+	#Enable feature.
+	enabled = true
+
--- a/config/crash_assistant/crash_assistant_localization_overrides/README.md
+++ b/config/crash_assistant/crash_assistant_localization_overrides/README.md
@ -0,0 +1,56 @@
+# Localizing and Customizing Crash Assistant
+
+Hello, localizers and modpack creators!
+
+This guide explains how to contribute new translations to the mod and how to customize the text for your own modpack.
+
+## Contributing New Translations
+
+We welcome contributions for new languages or improvements to existing ones!
+
+To contribute, please create a **Pull Request** on our official GitHub repository with your new or modified language
+files.
+
+* **GitHub Repository:**
+  [https://github.com/KostromDan/Crash-Assistant/](https://github.com/KostromDan/Crash-Assistant/)
+* **Language File Location:** The source files are located at
+  `common_config/src/main/resources/crash_assistant_localization` in the repository.
+
+---
+
+## Customizing Text for Your Modpack
+
+If you want to change any text in the mod for your modpack, please **do not edit the JAR file directly**. Instead, use
+the built-in override system.
+
+### How to Override Text
+
+1. Navigate to the `config/crash_assistant/crash_assistant_localization_overrides/` directory in your Minecraft
+   instance.
+2. Create a JSON file named after the language you want to modify (e.g., `en_us.json`, `ru_ru.json`, etc.).
+3. Inside this file, you only need to add the keys and values for the text you wish to change. Any key you define here
+   will take precedence over the default text packed inside the mod.
+
+This method is perfect for tweaking a few lines of text or even adding a completely new, unsupported language to your
+modpack.
+
+### Priority Language Overrides
+
+You can use the `general.priority_lang_for_overrides` config option to specify a primary language for your custom text.
+
+* **How it works:** If you set this option to `"en_us"`, any custom text you place in the `en_us.json` override file
+  will be used as the default for **all other languages**, unless a specific override for that key exists in their
+  respective language files (e.g., in `de_de.json`). This is useful for ensuring your custom messages appear
+  consistently for all users, regardless of their selected language.
+
+### Configuration Options
+
+* You can prevent the `crash_assistant_localization_overrides` folder and this README file from being generated by
+  setting `general.generate_localization_overrides_folder_with_readme` to `false`.
+
+### ⚠️ Important Warning
+
+Standard Minecraft localization methods, such as **resource packs** or scripting mods like **KubeJS**,
+**will not work**. Crash Assistant uses its own internal system to load language files to ensure it can display
+messages correctly, even when the main game has crashed or hasn't fully loaded.
+Please use the override folder as described above.
--- a/config/crash_assistant/modlist.json
+++ b/config/crash_assistant/modlist.json
--- a/config/crash_assistant/problematic_mods_config.json
+++ b/config/crash_assistant/problematic_mods_config.json
@ -0,0 +1,2 @@
+{
+}
--- a/config/enhancedvisuals-client.json
+++ b/config/enhancedvisuals-client.json
@ -65,7 +65,7 @@
      }
    },
    "sand": {
-      "enabled": true,
+      "enabled": false,
      "opacity": 1.0,
      "duration": {
        "min": 100,
--- a/config/ftbquests/quests/chapter_groups.snbt
+++ b/config/ftbquests/quests/chapter_groups.snbt
@ -2,6 +2,7 @@
 	chapter_groups: [
 		{ id: "19428C6E7A36D463", title: "{quests.groups.tips}" }
 		{ id: "31B01EAD21CA863A", title: "{quests.groups.technological_help}" }
+		{ id: "36FC51ACEF38D994", title: "{quests.groups.space_survival}" }
 		{ id: "3C4612A920658A7E", title: "{quests.groups.primitive}" }
 		{ id: "44D0F3E5067B5AB8", title: "{quests.groups.voltaic_age}" }
 		{ id: "21D975CEBDE06BA9", title: "{quests.groups.space_age}" }
--- a/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt
+++ b/config/ftbquests/quests/chapters/ev__extreme_voltage.snbt
@ -161,8 +161,11 @@
 			y: -2.0d
 		}
 		{
-			dependencies: ["4EA8888B12D75BF1"]
-			dependency_requirement: "all_started"
+			dependencies: [
+				"4EA8888B12D75BF1"
+				"00004BE1D77EA003"
+			]
+			dependency_requirement: "one_completed"
 			description: ["{quests.extreme_voltage.tunsgten_line_step_1.desc}"]
 			icon: "gtceu:tungstic_acid_dust"
 			id: "04682CD04FE0A56E"
@ -188,15 +191,21 @@
 		{
 			dependencies: ["4EA8888B12D75BF1"]
 			dependency_requirement: "all_started"
-			description: [""]
+			description: [
+				"{quests.extreme_voltage.assembler.desc.1}"
+				"{@pagebreak}"
+				"{quests.extreme_voltage.assembler.desc.2}"
+			]
 			id: "601088B7920140B2"
 			shape: "octagon"
 			size: 2.0d
+			subtitle: "{quests.extreme_voltage.assembler.subtitle}"
 			tasks: [{
 				id: "2B895EE3AD917E30"
 				item: "gtceu:ev_assembler"
 				type: "item"
 			}]
+			title: "{quests.extreme_voltage.assembler.title}"
 			x: -0.75d
 			y: 3.0d
 		}
--- a/config/ftbquests/quests/chapters/mars.snbt
+++ b/config/ftbquests/quests/chapters/mars.snbt
@ -0,0 +1,584 @@
+{
+	default_hide_dependency_lines: false
+	default_quest_shape: ""
+	filename: "mars"
+	group: "36FC51ACEF38D994"
+	icon: "ad_astra:mars_globe"
+	id: "671B872DCEFCA5DD"
+	order_index: 1
+	quest_links: [ ]
+	quests: [
+		{
+			description: [
+				"{quests.extreme_voltage.mars.desc.1}"
+				"{@pagebreak}"
+				"{quests.extreme_voltage.mars.desc.2}"
+				"{@pagebreak}"
+				"{quests.extreme_voltage.mars.desc.3}"
+			]
+			id: "1777E6C81C8353D5"
+			shape: "octagon"
+			size: 3.0d
+			subtitle: "{quests.extreme_voltage.mars.subtitle}"
+			tasks: [{
+				dimension: "ad_astra:mars"
+				icon: "ad_astra:mars_globe"
+				id: "4A794ADEE7A89594"
+				title: "{quests.extreme_voltage.mars.task}"
+				type: "dimension"
+			}]
+			title: "{quests.extreme_voltage.mars.title}"
+			x: 13.5d
+			y: -8.0d
+		}
+		{
+			dependencies: ["1777E6C81C8353D5"]
+			dependency_requirement: "one_completed"
+			description: ["{quests.space_survival.semiheavy_ammoniacal_water.desc}"]
+			icon: "tfg:semiheavy_ammoniacal_water_bucket"
+			id: "4259CD4F819806AB"
+			subtitle: "{quests.space_survival.semiheavy_ammoniacal_water.subtitle}"
+			tasks: [{
+				id: "1221D18D1C6690BD"
+				item: "tfg:semiheavy_ammoniacal_water_bucket"
+				type: "item"
+			}]
+			title: "{quests.space_survival.semiheavy_ammoniacal_water.title}"
+			x: 15.0d
+			y: -6.5d
+		}
+		{
+			dependencies: ["1777E6C81C8353D5"]
+			description: ["{quests.space_survival.mars_islands.desc}"]
+			icon: "tfg:grass/rusticus_mycelium"
+			id: "5AC5AAB9B3758E30"
+			subtitle: "{quests.space_survival.mars_islands.subtitle}"
+			tasks: [{
+				id: "019AC4216D25FA19"
+				type: "checkmark"
+			}]
+			title: "{quests.space_survival.mars_islands.title}"
+			x: 13.5d
+			y: -4.0d
+		}
+		{
+			dependencies: ["1777E6C81C8353D5"]
+			description: ["{quests.space_survival.mars_desert.desc}"]
+			id: "70F93982FC045A08"
+			subtitle: "{quests.space_survival.mars_desert.subtitle}"
+			tasks: [{
+				biome: "tfg:mars/martian_deep_desert"
+				icon: "minecraft:red_sand"
+				id: "4935048F5603F79B"
+				title: "{quests.space_survival.mars_desert.task}"
+				type: "biome"
+			}]
+			title: "{quests.space_survival.mars_desert.title}"
+			x: 10.0d
+			y: -8.0d
+		}
+		{
+			dependencies: ["70F93982FC045A08"]
+			description: ["{quests.space_survival.sandworm.desc}"]
+			icon: "sandworm_mod:sandworm_tooth"
+			id: "62A5111836CB4D37"
+			optional: true
+			shape: "heart"
+			subtitle: "{quests.space_survival.sandworm.subtitle}"
+			tasks: [
+				{
+					id: "028ACAA581D97577"
+					item: "sandworm_mod:sandworm_tooth"
+					type: "item"
+				}
+				{
+					id: "5F74F03288BDE713"
+					item: "sandworm_mod:thumper"
+					optional_task: true
+					type: "item"
+				}
+			]
+			title: "{quests.space_survival.sandworm.title}"
+			x: 9.0d
+			y: -8.0d
+		}
+		{
+			dependencies: [
+				"70F93982FC045A08"
+				"2F711C064635EF2D"
+			]
+			dependency_requirement: "one_completed"
+			description: ["{quests.space_survival.spice.desc}"]
+			icon: "tfg:spice"
+			id: "0CA5B715B76E4A5B"
+			shape: "hexagon"
+			size: 1.5d
+			subtitle: "{quests.space_survival.spice.subtitle}"
+			tasks: [{
+				icon: "tfg:spice"
+				id: "00C333C49F5BBFC2"
+				observe_type: 0
+				timer: 0L
+				title: "{quests.space_survival.spice.task}"
+				to_observe: "tfg:spice"
+				type: "observation"
+			}]
+			title: "{quests.space_survival.spice.title}"
+			x: 10.0d
+			y: -6.0d
+		}
+		{
+			dependencies: ["1777E6C81C8353D5"]
+			description: ["{quests.space_survival.mars_poles.desc}"]
+			icon: "tfg:mars_ice"
+			id: "3768570EC6535DBB"
+			subtitle: "{quests.space_survival.mars_poles.subtitle}"
+			tasks: [{
+				id: "677DF79B4DE1D571"
+				type: "checkmark"
+			}]
+			title: "{quests.space_survival.mars_poles.title}"
+			x: 17.0d
+			y: -8.0d
+		}
+		{
+			dependencies: ["5AC5AAB9B3758E30"]
+			description: ["{quests.space_survival.heavy_ammoniacal_water.desc}"]
+			icon: "tfg:heavy_ammoniacal_water_bucket"
+			id: "204DDAFEA40C0146"
+			subtitle: "{quests.space_survival.heavy_ammoniacal_water.subtitle}"
+			tasks: [{
+				id: "33C86463603C272D"
+				item: "tfg:heavy_ammoniacal_water_bucket"
+				type: "item"
+			}]
+			title: "{quests.space_survival.heavy_ammoniacal_water.title}"
+			x: 15.0d
+			y: -4.0d
+		}
+		{
+			dependencies: ["00E2E32B33A65301"]
+			description: ["{quests.space_survival.glacian_wool.desc}"]
+			id: "0967CE7F5DFF5CF6"
+			subtitle: "{quests.space_survival.glacian_wool.subtitle}"
+			tasks: [{
+				count: 7L
+				id: "2713B99184310ED3"
+				item: "tfg:glacian_wool"
+				type: "item"
+			}]
+			title: "{quests.space_survival.glacian_wool.title}"
+			x: 17.0d
+			y: -6.0d
+		}
+		{
+			dependencies: ["5AC5AAB9B3758E30"]
+			description: ["{quests.space_survival.soarer.desc}"]
+			guide_page: "tfc:field_guide tfc:tfg_tips/space_fauna 20"
+			icon: "wan_ancient_beasts:soarer_egg"
+			id: "2F711C064635EF2D"
+			optional: true
+			shape: "heart"
+			subtitle: "{quests.space_survival.soarer.subtitle}"
+			tasks: [{
+				icon: "wan_ancient_beasts:soarer_egg"
+				id: "30A4901728CBF789"
+				observe_type: 5
+				timer: 0L
+				title: "{quests.space_survival.soarer.task}"
+				to_observe: "wan_ancient_beasts:soarer"
+				type: "observation"
+			}]
+			title: "{quests.space_survival.soarer.title}"
+			x: 10.0d
+			y: -4.0d
+		}
+		{
+			dependencies: ["5AC5AAB9B3758E30"]
+			description: ["{quests.space_survival.sniffer_or_wraptor.desc}"]
+			guide_page: "tfc:field_guide tfc:tfg_tips/space_fauna 11"
+			id: "5F0D553D08A5985C"
+			subtitle: "{quests.space_survival.sniffer_or_wraptor.subtitle}"
+			tasks: [
+				{
+					icon: "minecraft:sniffer_egg"
+					id: "6339BB0940C0BE77"
+					observe_type: 5
+					timer: 0L
+					title: "{quests.space_survival.sniffer_or_wraptor.task_1}"
+					to_observe: "tfg:sniffer"
+					type: "observation"
+				}
+				{
+					icon: "species:wraptor_egg"
+					id: "76B6F02F4DCFC4A0"
+					observe_type: 5
+					timer: 0L
+					title: "{quests.space_survival.sniffer_or_wraptor.task_2}"
+					to_observe: "tfg:wraptor"
+					type: "observation"
+				}
+			]
+			title: "{quests.space_survival.sniffer_or_wraptor.title}"
+			x: 10.0d
+			y: -2.0d
+		}
+		{
+			dependencies: ["3768570EC6535DBB"]
+			description: ["{quests.space_survival.glacian_ram.desc}"]
+			guide_page: "tfc:field_guide tfc:tfg_tips/space_fauna 15"
+			id: "00E2E32B33A65301"
+			subtitle: "{quests.space_survival.glacian_ram.subtitle}"
+			tasks: [{
+				icon: "ad_astra:glacian_ram_spawn_egg"
+				id: "20B88332B3FED126"
+				observe_type: 5
+				timer: 0L
+				title: "{quests.space_survival.glacian_ram.task}"
+				to_observe: "tfg:glacian_ram"
+				type: "observation"
+			}]
+			title: "{quests.space_survival.glacian_ram.title}"
+			x: 17.0d
+			y: -7.0d
+		}
+		{
+			dependencies: ["5AC5AAB9B3758E30"]
+			description: ["{quests.space_survival.mars_tapping.desc}"]
+			id: "155F421FC2F39C3C"
+			subtitle: "{quests.space_survival.mars_tapping.subtitle}"
+			tasks: [
+				{
+					icon: "beneath:wood/log/crimson"
+					id: "5C76478F563CE947"
+					observe_type: 1
+					timer: 0L
+					to_observe: "#tfc:crimson_logs"
+					type: "observation"
+				}
+				{
+					icon: "beneath:wood/log/warped"
+					id: "2D46DA77329E9F66"
+					observe_type: 1
+					timer: 0L
+					to_observe: "#tfc:warped_logs"
+					type: "observation"
+				}
+			]
+			title: "{quests.space_survival.mars_tapping.title}"
+			x: 15.5d
+			y: -2.0d
+		}
+		{
+			dependencies: ["5AC5AAB9B3758E30"]
+			description: ["{quests.space_survival.mars_crops.desc}"]
+			guide_page: "tfc:field_guide tfc:tfg_tips/space_crops"
+			id: "52E45601E8575846"
+			subtitle: "{quests.space_survival.mars_crops.subtitle}"
+			tasks: [{
+				id: "72E35CA3CF29585B"
+				item: {
+					Count: 1
+					id: "ftbfiltersystem:smart_filter"
+					tag: {
+						"ftbfiltersystem:filter": "or(item(betterend:amber_root_seeds)item(betterend:blossom_berry_seeds)item(betterend:cave_pumpkin_plant_seeds)item(betterend:chorus_mushroom_seeds)item(betterend:shadow_berry_seeds)item(betterend:bolux_mushroom_seeds))"
+					}
+				}
+				title: "{quests.space_survival.mars_crops.task}"
+				type: "item"
+			}]
+			title: "{quests.space_survival.mars_crops.title}"
+			x: 13.5d
+			y: -1.5d
+		}
+		{
+			dependencies: ["0967CE7F5DFF5CF6"]
+			description: ["{quests.space_survival.t2_space_suit.desc}"]
+			id: "6D7ADBBCEF5770B6"
+			shape: "hexagon"
+			size: 1.5d
+			subtitle: "{quests.space_survival.t2_space_suit.subtitle}"
+			tasks: [
+				{
+					id: "0D11FBA73B54918F"
+					item: {
+						Count: 1
+						id: "ad_astra:netherite_space_helmet"
+						tag: {
+							Damage: 0
+						}
+					}
+					type: "item"
+				}
+				{
+					id: "04A7D0429E419846"
+					item: {
+						Count: 1
+						id: "ad_astra:netherite_space_suit"
+						tag: {
+							Damage: 0
+						}
+					}
+					type: "item"
+				}
+				{
+					id: "608858DB0AEA4378"
+					item: {
+						Count: 1
+						id: "ad_astra:netherite_space_pants"
+						tag: {
+							Damage: 0
+						}
+					}
+					type: "item"
+				}
+				{
+					id: "5BC5195C7775137C"
+					item: {
+						Count: 1
+						id: "ad_astra:netherite_space_boots"
+						tag: {
+							Damage: 0
+						}
+					}
+					type: "item"
+				}
+			]
+			title: "{quests.space_survival.t2_space_suit.title}"
+			x: 17.0d
+			y: 0.5d
+		}
+		{
+			dependencies: ["5F0D553D08A5985C"]
+			dependency_requirement: "one_completed"
+			description: ["{quests.space_survival.mineral_rich_wool.desc}"]
+			id: "75DE44FFAC51DD60"
+			subtitle: "{quests.space_survival.mineral_rich_wool.subtitle}"
+			tasks: [{
+				id: "4295E3343126DFEF"
+				item: {
+					Count: 1
+					id: "ftbfiltersystem:smart_filter"
+					tag: {
+						"ftbfiltersystem:filter": "ftbfiltersystem:item_tag(tfg:mineral_rich_wool)"
+					}
+				}
+				title: "Any #tfg:mineral_rich_wool"
+				type: "item"
+			}]
+			title: "{quests.space_survival.mineral_rich_wool.title}"
+			x: 10.0d
+			y: -1.0d
+		}
+		{
+			dependencies: ["75DE44FFAC51DD60"]
+			description: ["{quests.space_survival.aes_insulation.desc}"]
+			id: "14710D52AE1732FD"
+			shape: "hexagon"
+			size: 1.5d
+			subtitle: "{quests.space_survival.aes_insulation.subtitle}"
+			tasks: [{
+				id: "44970A2CAF24030A"
+				item: "tfg:mli_shielding"
+				type: "item"
+			}]
+			title: "{quests.space_survival.aes_insulation.title}"
+			x: 10.0d
+			y: 0.5d
+		}
+		{
+			dependencies: [
+				"52E45601E8575846"
+				"5F0D553D08A5985C"
+			]
+			description: ["{quests.space_survival.bulbkin_pie.desc}"]
+			icon: {
+				Count: 1
+				ForgeCaps: {
+					"tfc:food": {
+						creationDate: -2L
+						foodData: {
+							dairy: 0.0f
+							decay: 0.0f
+							food: 0
+							fruit: 0.0f
+							grain: 0.0f
+							meat: 0.0f
+							sat: 0.0f
+							veg: 0.0f
+							water: 0.0f
+						}
+						ingredients: [ ]
+						traits: [ ]
+					}
+				}
+				id: "tfg:food/cooked_dino_nugget"
+			}
+			id: "1AC201876984D248"
+			optional: true
+			shape: "heart"
+			size: 1.5d
+			subtitle: "{quests.space_survival.bulbkin_pie.subtitle}"
+			tasks: [
+				{
+					id: "5F863BCE6DAA30D6"
+					item: {
+						Count: 1
+						id: "ftbfiltersystem:smart_filter"
+						tag: {
+							"ftbfiltersystem:filter": "or(item(betterend:cave_pumpkin_pie))"
+						}
+					}
+					type: "item"
+				}
+				{
+					id: "0B5E81AEEDFE0B7A"
+					item: {
+						Count: 1
+						ForgeCaps: {
+							"tfc:food": {
+								creationDate: -2L
+								foodData: {
+									dairy: 0.0f
+									decay: 0.0f
+									food: 0
+									fruit: 0.0f
+									grain: 0.0f
+									meat: 0.0f
+									sat: 0.0f
+									veg: 0.0f
+									water: 0.0f
+								}
+								ingredients: [ ]
+								traits: [ ]
+							}
+						}
+						id: "tfg:food/cooked_dino_nugget"
+					}
+					type: "item"
+				}
+			]
+			title: "{quests.space_survival.bulbkin_pie.title}"
+			x: 13.5d
+			y: 0.0d
+		}
+		{
+			dependencies: ["155F421FC2F39C3C"]
+			description: ["{quests.space_survival.iodine.desc}"]
+			id: "00202200344F3456"
+			subtitle: "{quests.space_survival.iodine.subtitle}"
+			tasks: [{
+				id: "0F811696C5BB0AA5"
+				item: "gtceu:iodine_dust"
+				type: "item"
+			}]
+			title: "{quests.space_survival.iodine.title}"
+			x: 15.5d
+			y: -1.0d
+		}
+		{
+			dependencies: ["5AC5AAB9B3758E30"]
+			description: ["{quests.space_survival.surfer.desc}"]
+			guide_page: "tfc:field_guide tfc:tfg_tips/space_fauna 17"
+			id: "43EBECA48E341C47"
+			optional: true
+			shape: "heart"
+			subtitle: "{quests.space_survival.surfer.subtitle}"
+			tasks: [{
+				icon: "wan_ancient_beasts:surfer_egg"
+				id: "7D1D6851ABB1B5E7"
+				observe_type: 5
+				timer: 0L
+				title: "{quests.space_survival.surfer.task}"
+				to_observe: "tfg:surfer"
+				type: "observation"
+			}]
+			title: "{quests.space_survival.surfer.title}"
+			x: 10.0d
+			y: -3.0d
+		}
+		{
+			dependencies: ["5F0D553D08A5985C"]
+			dependency_requirement: "one_completed"
+			description: ["{quests.space_survival.mars_nest.desc}"]
+			id: "63F1FC03DC3198AB"
+			optional: true
+			shape: "heart"
+			subtitle: "{quests.space_survival.mars_nest.subtitle}"
+			tasks: [{
+				id: "71BA5426AA25BED0"
+				item: {
+					Count: 1
+					id: "ftbfiltersystem:smart_filter"
+					tag: {
+						"ftbfiltersystem:filter": "or(item(tfg:large_nest_box)item(tfg:large_nest_box_warped))"
+					}
+				}
+				title: "{quests.space_survival.mars_nest.task}"
+				type: "item"
+			}]
+			title: "{quests.space_survival.mars_nest.title}"
+			x: 9.0d
+			y: -2.0d
+		}
+		{
+			dependencies: ["6D7ADBBCEF5770B6"]
+			description: ["{quests.space_survival.venus.desc}"]
+			id: "5F3B9E4565922E77"
+			shape: "octagon"
+			size: 3.0d
+			subtitle: "{quests.space_survival.venus.subtitle}"
+			tasks: [{
+				dimension: "ad_astra:venus"
+				icon: "ad_astra:venus_globe"
+				id: "40A3104927F366FF"
+				type: "dimension"
+			}]
+			title: "{quests.space_survival.venus.title}"
+			x: 10.5d
+			y: 4.5d
+		}
+		{
+			dependencies: ["6D7ADBBCEF5770B6"]
+			description: ["{quests.space_survival.mercury.desc}"]
+			id: "5F937028722EB4C6"
+			shape: "octagon"
+			size: 3.0d
+			subtitle: "{quests.space_survival.mercury.subtitle}"
+			tasks: [{
+				dimension: "ad_astra:mercury"
+				icon: "ad_astra:mercury_globe"
+				id: "7B5C6F856AE2380E"
+				type: "dimension"
+			}]
+			title: "{quests.space_survival.mercury.title}"
+			x: 16.5d
+			y: 4.5d
+		}
+		{
+			dependencies: ["1777E6C81C8353D5"]
+			description: ["{quests.space_survival.mars_shields.desc}"]
+			id: "6E757133FA00C40D"
+			optional: true
+			shape: "heart"
+			subtitle: "{quests.space_survival.mars_shields.subtitle}"
+			tasks: [{
+				id: "603BD6E2915EB75B"
+				item: {
+					Count: 1
+					id: "ftbfiltersystem:smart_filter"
+					tag: {
+						"ftbfiltersystem:filter": "or(item(species:ricoshield)item(wan_ancient_beasts:reinforced_shield)item(endermanoverhaul:corrupted_shield))"
+					}
+				}
+				title: "{quests.space_survival.mras_shields.task}"
+				type: "item"
+			}]
+			title: "{quests.space_survival.mars_shields.title}"
+			x: 12.0d
+			y: -6.5d
+		}
+	]
+	subtitle: ["{quests.mars.subtitle}"]
+	title: "{quests.mars}"
+}
--- a/config/ftbquests/quests/chapters/space_survival.snbt
+++ b/config/ftbquests/quests/chapters/space_survival.snbt
@ -1,21 +1,10 @@
 {
 	default_hide_dependency_lines: false
 	default_quest_shape: ""
-	filename: "space_survival"
-	group: "19428C6E7A36D463"
-	icon: {
-		Count: 1
-		id: "ad_astra:tier_1_rocket"
-		tag: {
-			BotariumData: {
-				StoredFluids: [{
-					Amount: 0L
-					Fluid: "minecraft:empty"
-				}]
-			}
-		}
-	}
-	id: "671B872DCEFCA5DD"
+	filename: "moon"
+	group: "36FC51ACEF38D994"
+	icon: "ad_astra:moon_globe"
+	id: "5AB29618BD995CF0"
 	images: [
 		{
 			alpha: 150
@ -115,10 +104,10 @@
 			y: -8.0d
 		}
 	]
-	order_index: 4
+	order_index: 0
 	quest_links: [
 		{
-			id: "62E455D8BAA50151"
+			id: "7372A22303CF751A"
 			linked_quest: "00A2566109144D7F"
 			shape: "octagon"
 			size: 3.0d
@ -126,13 +115,13 @@
 			y: -3.0d
 		}
 		{
-			id: "168AECC70E7A9302"
+			id: "440BBB64384A9ECD"
 			linked_quest: "038B204DAC9C863D"
 			x: -4.0d
 			y: -5.5d
 		}
 		{
-			id: "652DC031E6BEF58B"
+			id: "17C857D222995604"
 			linked_quest: "3FBDC8552F7D8008"
 			shape: "none"
 			size: 2.0d
@ -140,25 +129,25 @@
 			y: -8.0d
 		}
 		{
-			id: "57EEF4CC674B1C3B"
+			id: "2A631E133FEB54A9"
 			linked_quest: "6752CC523D38A214"
 			x: -5.5d
 			y: -5.5d
 		}
 		{
-			id: "52ABE7722ABB3281"
+			id: "25F53D39F1EEAC02"
 			linked_quest: "0585527D1854628B"
 			x: -1.0d
 			y: 1.0d
 		}
 		{
-			id: "44E5362EDCDE6A5C"
+			id: "6032382FF4E3A440"
 			linked_quest: "3AEAB1930F4CC034"
 			x: -1.0d
 			y: 2.0d
 		}
 		{
-			id: "1EABB6DEF6179357"
+			id: "1E65B1AC5F11948C"
 			linked_quest: "7CA3A5EFE3D5B688"
 			x: -1.0d
 			y: 3.0d
@ -721,577 +710,7 @@
 			x: 3.0d
 			y: -4.0d
 		}
-		{
-			description: [
-				"{quests.extreme_voltage.mars.desc.1}"
-				"{@pagebreak}"
-				"{quests.extreme_voltage.mars.desc.2}"
-				"{@pagebreak}"
-				"{quests.extreme_voltage.mars.desc.3}"
-			]
-			id: "1777E6C81C8353D5"
-			shape: "octagon"
-			size: 3.0d
-			subtitle: "{quests.extreme_voltage.mars.subtitle}"
-			tasks: [{
-				dimension: "ad_astra:mars"
-				icon: "ad_astra:mars_globe"
-				id: "4A794ADEE7A89594"
-				title: "{quests.extreme_voltage.mars.task}"
-				type: "dimension"
-			}]
-			title: "{quests.extreme_voltage.mars.title}"
-			x: 13.5d
-			y: -8.0d
-		}
-		{
-			dependencies: ["1777E6C81C8353D5"]
-			dependency_requirement: "one_completed"
-			description: ["{quests.space_survival.semiheavy_ammoniacal_water.desc}"]
-			icon: "tfg:semiheavy_ammoniacal_water_bucket"
-			id: "4259CD4F819806AB"
-			subtitle: "{quests.space_survival.semiheavy_ammoniacal_water.subtitle}"
-			tasks: [{
-				id: "1221D18D1C6690BD"
-				item: "tfg:semiheavy_ammoniacal_water_bucket"
-				type: "item"
-			}]
-			title: "{quests.space_survival.semiheavy_ammoniacal_water.title}"
-			x: 15.0d
-			y: -6.5d
-		}
-		{
-			dependencies: ["1777E6C81C8353D5"]
-			description: ["{quests.space_survival.mars_islands.desc}"]
-			icon: "tfg:grass/rusticus_mycelium"
-			id: "5AC5AAB9B3758E30"
-			subtitle: "{quests.space_survival.mars_islands.subtitle}"
-			tasks: [{
-				id: "019AC4216D25FA19"
-				type: "checkmark"
-			}]
-			title: "{quests.space_survival.mars_islands.title}"
-			x: 13.5d
-			y: -4.0d
-		}
-		{
-			dependencies: ["1777E6C81C8353D5"]
-			description: ["{quests.space_survival.mars_desert.desc}"]
-			id: "70F93982FC045A08"
-			subtitle: "{quests.space_survival.mars_desert.subtitle}"
-			tasks: [{
-				biome: "tfg:mars/martian_deep_desert"
-				icon: "minecraft:red_sand"
-				id: "4935048F5603F79B"
-				title: "{quests.space_survival.mars_desert.task}"
-				type: "biome"
-			}]
-			title: "{quests.space_survival.mars_desert.title}"
-			x: 10.0d
-			y: -8.0d
-		}
-		{
-			dependencies: ["70F93982FC045A08"]
-			description: ["{quests.space_survival.sandworm.desc}"]
-			icon: "sandworm_mod:sandworm_tooth"
-			id: "62A5111836CB4D37"
-			optional: true
-			shape: "heart"
-			subtitle: "{quests.space_survival.sandworm.subtitle}"
-			tasks: [
-				{
-					id: "028ACAA581D97577"
-					item: "sandworm_mod:sandworm_tooth"
-					type: "item"
-				}
-				{
-					id: "5F74F03288BDE713"
-					item: "sandworm_mod:thumper"
-					optional_task: true
-					type: "item"
-				}
-			]
-			title: "{quests.space_survival.sandworm.title}"
-			x: 9.0d
-			y: -8.0d
-		}
-		{
-			dependencies: [
-				"70F93982FC045A08"
-				"2F711C064635EF2D"
-			]
-			dependency_requirement: "one_completed"
-			description: ["{quests.space_survival.spice.desc}"]
-			icon: "tfg:spice"
-			id: "0CA5B715B76E4A5B"
-			shape: "hexagon"
-			size: 1.5d
-			subtitle: "{quests.space_survival.spice.subtitle}"
-			tasks: [{
-				icon: "tfg:spice"
-				id: "00C333C49F5BBFC2"
-				observe_type: 0
-				timer: 0L
-				title: "{quests.space_survival.spice.task}"
-				to_observe: "tfg:spice"
-				type: "observation"
-			}]
-			title: "{quests.space_survival.spice.title}"
-			x: 10.0d
-			y: -6.0d
-		}
-		{
-			dependencies: ["1777E6C81C8353D5"]
-			description: ["{quests.space_survival.mars_poles.desc}"]
-			icon: "tfg:mars_ice"
-			id: "3768570EC6535DBB"
-			subtitle: "{quests.space_survival.mars_poles.subtitle}"
-			tasks: [{
-				id: "677DF79B4DE1D571"
-				type: "checkmark"
-			}]
-			title: "{quests.space_survival.mars_poles.title}"
-			x: 17.0d
-			y: -8.0d
-		}
-		{
-			dependencies: ["5AC5AAB9B3758E30"]
-			description: ["{quests.space_survival.heavy_ammoniacal_water.desc}"]
-			icon: "tfg:heavy_ammoniacal_water_bucket"
-			id: "204DDAFEA40C0146"
-			subtitle: "{quests.space_survival.heavy_ammoniacal_water.subtitle}"
-			tasks: [{
-				id: "33C86463603C272D"
-				item: "tfg:heavy_ammoniacal_water_bucket"
-				type: "item"
-			}]
-			title: "{quests.space_survival.heavy_ammoniacal_water.title}"
-			x: 15.0d
-			y: -4.0d
-		}
-		{
-			dependencies: ["00E2E32B33A65301"]
-			description: ["{quests.space_survival.glacian_wool.desc}"]
-			id: "0967CE7F5DFF5CF6"
-			subtitle: "{quests.space_survival.glacian_wool.subtitle}"
-			tasks: [{
-				count: 7L
-				id: "2713B99184310ED3"
-				item: "tfg:glacian_wool"
-				type: "item"
-			}]
-			title: "{quests.space_survival.glacian_wool.title}"
-			x: 17.0d
-			y: -6.0d
-		}
-		{
-			dependencies: ["5AC5AAB9B3758E30"]
-			description: ["{quests.space_survival.soarer.desc}"]
-			guide_page: "tfc:field_guide tfc:tfg_tips/space_fauna 20"
-			icon: "wan_ancient_beasts:soarer_egg"
-			id: "2F711C064635EF2D"
-			optional: true
-			shape: "heart"
-			subtitle: "{quests.space_survival.soarer.subtitle}"
-			tasks: [{
-				icon: "wan_ancient_beasts:soarer_egg"
-				id: "30A4901728CBF789"
-				observe_type: 5
-				timer: 0L
-				title: "{quests.space_survival.soarer.task}"
-				to_observe: "wan_ancient_beasts:soarer"
-				type: "observation"
-			}]
-			title: "{quests.space_survival.soarer.title}"
-			x: 10.0d
-			y: -4.0d
-		}
-		{
-			dependencies: ["5AC5AAB9B3758E30"]
-			description: ["{quests.space_survival.sniffer_or_wraptor.desc}"]
-			guide_page: "tfc:field_guide tfc:tfg_tips/space_fauna 11"
-			id: "5F0D553D08A5985C"
-			subtitle: "{quests.space_survival.sniffer_or_wraptor.subtitle}"
-			tasks: [
-				{
-					icon: "minecraft:sniffer_egg"
-					id: "6339BB0940C0BE77"
-					observe_type: 5
-					timer: 0L
-					title: "{quests.space_survival.sniffer_or_wraptor.task_1}"
-					to_observe: "tfg:sniffer"
-					type: "observation"
-				}
-				{
-					icon: "species:wraptor_egg"
-					id: "76B6F02F4DCFC4A0"
-					observe_type: 5
-					timer: 0L
-					title: "{quests.space_survival.sniffer_or_wraptor.task_2}"
-					to_observe: "tfg:wraptor"
-					type: "observation"
-				}
-			]
-			title: "{quests.space_survival.sniffer_or_wraptor.title}"
-			x: 10.0d
-			y: -2.0d
-		}
-		{
-			dependencies: ["3768570EC6535DBB"]
-			description: ["{quests.space_survival.glacian_ram.desc}"]
-			guide_page: "tfc:field_guide tfc:tfg_tips/space_fauna 15"
-			id: "00E2E32B33A65301"
-			subtitle: "{quests.space_survival.glacian_ram.subtitle}"
-			tasks: [{
-				icon: "ad_astra:glacian_ram_spawn_egg"
-				id: "20B88332B3FED126"
-				observe_type: 5
-				timer: 0L
-				title: "{quests.space_survival.glacian_ram.task}"
-				to_observe: "tfg:glacian_ram"
-				type: "observation"
-			}]
-			title: "{quests.space_survival.glacian_ram.title}"
-			x: 17.0d
-			y: -7.0d
-		}
-		{
-			dependencies: ["5AC5AAB9B3758E30"]
-			description: ["{quests.space_survival.mars_tapping.desc}"]
-			id: "155F421FC2F39C3C"
-			subtitle: "{quests.space_survival.mars_tapping.subtitle}"
-			tasks: [
-				{
-					icon: "beneath:wood/log/crimson"
-					id: "5C76478F563CE947"
-					observe_type: 1
-					timer: 0L
-					to_observe: "#tfc:crimson_logs"
-					type: "observation"
-				}
-				{
-					icon: "beneath:wood/log/warped"
-					id: "2D46DA77329E9F66"
-					observe_type: 1
-					timer: 0L
-					to_observe: "#tfc:warped_logs"
-					type: "observation"
-				}
-			]
-			title: "{quests.space_survival.mars_tapping.title}"
-			x: 15.5d
-			y: -2.0d
-		}
-		{
-			dependencies: ["5AC5AAB9B3758E30"]
-			description: ["{quests.space_survival.mars_crops.desc}"]
-			guide_page: "tfc:field_guide tfc:tfg_tips/space_crops"
-			id: "52E45601E8575846"
-			subtitle: "{quests.space_survival.mars_crops.subtitle}"
-			tasks: [{
-				id: "72E35CA3CF29585B"
-				item: {
-					Count: 1
-					id: "ftbfiltersystem:smart_filter"
-					tag: {
-						"ftbfiltersystem:filter": "or(item(betterend:amber_root_seeds)item(betterend:blossom_berry_seeds)item(betterend:cave_pumpkin_plant_seeds)item(betterend:chorus_mushroom_seeds)item(betterend:shadow_berry_seeds)item(betterend:bolux_mushroom_seeds))"
-					}
-				}
-				title: "{quests.space_survival.mars_crops.task}"
-				type: "item"
-			}]
-			title: "{quests.space_survival.mars_crops.title}"
-			x: 13.5d
-			y: -1.5d
-		}
-		{
-			dependencies: ["0967CE7F5DFF5CF6"]
-			description: ["{quests.space_survival.t2_space_suit.desc}"]
-			id: "6D7ADBBCEF5770B6"
-			shape: "hexagon"
-			size: 1.5d
-			subtitle: "{quests.space_survival.t2_space_suit.subtitle}"
-			tasks: [
-				{
-					id: "0D11FBA73B54918F"
-					item: {
-						Count: 1
-						id: "ad_astra:netherite_space_helmet"
-						tag: {
-							Damage: 0
-						}
-					}
-					type: "item"
-				}
-				{
-					id: "04A7D0429E419846"
-					item: {
-						Count: 1
-						id: "ad_astra:netherite_space_suit"
-						tag: {
-							Damage: 0
-						}
-					}
-					type: "item"
-				}
-				{
-					id: "608858DB0AEA4378"
-					item: {
-						Count: 1
-						id: "ad_astra:netherite_space_pants"
-						tag: {
-							Damage: 0
-						}
-					}
-					type: "item"
-				}
-				{
-					id: "5BC5195C7775137C"
-					item: {
-						Count: 1
-						id: "ad_astra:netherite_space_boots"
-						tag: {
-							Damage: 0
-						}
-					}
-					type: "item"
-				}
-			]
-			title: "{quests.space_survival.t2_space_suit.title}"
-			x: 17.0d
-			y: 0.5d
-		}
-		{
-			dependencies: ["5F0D553D08A5985C"]
-			dependency_requirement: "one_completed"
-			description: ["{quests.space_survival.mineral_rich_wool.desc}"]
-			id: "75DE44FFAC51DD60"
-			subtitle: "{quests.space_survival.mineral_rich_wool.subtitle}"
-			tasks: [{
-				id: "4295E3343126DFEF"
-				item: {
-					Count: 1
-					id: "ftbfiltersystem:smart_filter"
-					tag: {
-						"ftbfiltersystem:filter": "ftbfiltersystem:item_tag(tfg:mineral_rich_wool)"
-					}
-				}
-				title: "Any #tfg:mineral_rich_wool"
-				type: "item"
-			}]
-			title: "{quests.space_survival.mineral_rich_wool.title}"
-			x: 10.0d
-			y: -1.0d
-		}
-		{
-			dependencies: ["75DE44FFAC51DD60"]
-			description: ["{quests.space_survival.aes_insulation.desc}"]
-			id: "14710D52AE1732FD"
-			shape: "hexagon"
-			size: 1.5d
-			subtitle: "{quests.space_survival.aes_insulation.subtitle}"
-			tasks: [{
-				id: "44970A2CAF24030A"
-				item: "tfg:mli_shielding"
-				type: "item"
-			}]
-			title: "{quests.space_survival.aes_insulation.title}"
-			x: 10.0d
-			y: 0.5d
-		}
-		{
-			dependencies: [
-				"52E45601E8575846"
-				"5F0D553D08A5985C"
-			]
-			description: ["{quests.space_survival.bulbkin_pie.desc}"]
-			icon: {
-				Count: 1
-				ForgeCaps: {
-					"tfc:food": {
-						creationDate: -2L
-						foodData: {
-							dairy: 0.0f
-							decay: 0.0f
-							food: 0
-							fruit: 0.0f
-							grain: 0.0f
-							meat: 0.0f
-							sat: 0.0f
-							veg: 0.0f
-							water: 0.0f
-						}
-						ingredients: [ ]
-						traits: [ ]
-					}
-				}
-				id: "tfg:food/cooked_dino_nugget"
-			}
-			id: "1AC201876984D248"
-			optional: true
-			shape: "heart"
-			size: 1.5d
-			subtitle: "{quests.space_survival.bulbkin_pie.subtitle}"
-			tasks: [
-				{
-					id: "5F863BCE6DAA30D6"
-					item: {
-						Count: 1
-						id: "ftbfiltersystem:smart_filter"
-						tag: {
-							"ftbfiltersystem:filter": "or(item(betterend:cave_pumpkin_pie))"
-						}
-					}
-					type: "item"
-				}
-				{
-					id: "0B5E81AEEDFE0B7A"
-					item: {
-						Count: 1
-						ForgeCaps: {
-							"tfc:food": {
-								creationDate: -2L
-								foodData: {
-									dairy: 0.0f
-									decay: 0.0f
-									food: 0
-									fruit: 0.0f
-									grain: 0.0f
-									meat: 0.0f
-									sat: 0.0f
-									veg: 0.0f
-									water: 0.0f
-								}
-								ingredients: [ ]
-								traits: [ ]
-							}
-						}
-						id: "tfg:food/cooked_dino_nugget"
-					}
-					type: "item"
-				}
-			]
-			title: "{quests.space_survival.bulbkin_pie.title}"
-			x: 13.5d
-			y: 0.0d
-		}
-		{
-			dependencies: ["155F421FC2F39C3C"]
-			description: ["{quests.space_survival.iodine.desc}"]
-			id: "00202200344F3456"
-			subtitle: "{quests.space_survival.iodine.subtitle}"
-			tasks: [{
-				id: "0F811696C5BB0AA5"
-				item: "gtceu:iodine_dust"
-				type: "item"
-			}]
-			title: "{quests.space_survival.iodine.title}"
-			x: 15.5d
-			y: -1.0d
-		}
-		{
-			dependencies: ["5AC5AAB9B3758E30"]
-			description: ["{quests.space_survival.surfer.desc}"]
-			guide_page: "tfc:field_guide tfc:tfg_tips/space_fauna 17"
-			id: "43EBECA48E341C47"
-			optional: true
-			shape: "heart"
-			subtitle: "{quests.space_survival.surfer.subtitle}"
-			tasks: [{
-				icon: "wan_ancient_beasts:surfer_egg"
-				id: "7D1D6851ABB1B5E7"
-				observe_type: 5
-				timer: 0L
-				title: "{quests.space_survival.surfer.task}"
-				to_observe: "tfg:surfer"
-				type: "observation"
-			}]
-			title: "{quests.space_survival.surfer.title}"
-			x: 10.0d
-			y: -3.0d
-		}
-		{
-			dependencies: ["5F0D553D08A5985C"]
-			dependency_requirement: "one_completed"
-			description: ["{quests.space_survival.mars_nest.desc}"]
-			id: "63F1FC03DC3198AB"
-			optional: true
-			shape: "heart"
-			subtitle: "{quests.space_survival.mars_nest.subtitle}"
-			tasks: [{
-				id: "71BA5426AA25BED0"
-				item: {
-					Count: 1
-					id: "ftbfiltersystem:smart_filter"
-					tag: {
-						"ftbfiltersystem:filter": "or(item(tfg:large_nest_box)item(tfg:large_nest_box_warped))"
-					}
-				}
-				title: "{quests.space_survival.mars_nest.task}"
-				type: "item"
-			}]
-			title: "{quests.space_survival.mars_nest.title}"
-			x: 9.0d
-			y: -2.0d
-		}
-		{
-			dependencies: ["6D7ADBBCEF5770B6"]
-			description: ["{quests.space_survival.venus.desc}"]
-			id: "5F3B9E4565922E77"
-			shape: "octagon"
-			size: 3.0d
-			subtitle: "{quests.space_survival.venus.subtitle}"
-			tasks: [{
-				dimension: "ad_astra:venus"
-				icon: "ad_astra:venus_globe"
-				id: "40A3104927F366FF"
-				type: "dimension"
-			}]
-			title: "{quests.space_survival.venus.title}"
-			x: 10.5d
-			y: 4.5d
-		}
-		{
-			dependencies: ["6D7ADBBCEF5770B6"]
-			description: ["{quests.space_survival.mercury.desc}"]
-			id: "5F937028722EB4C6"
-			shape: "octagon"
-			size: 3.0d
-			subtitle: "{quests.space_survival.mercury.subtitle}"
-			tasks: [{
-				dimension: "ad_astra:mercury"
-				icon: "ad_astra:mercury_globe"
-				id: "7B5C6F856AE2380E"
-				type: "dimension"
-			}]
-			title: "{quests.space_survival.mercury.title}"
-			x: 18.0d
-			y: 4.5d
-		}
-		{
-			dependencies: ["1777E6C81C8353D5"]
-			description: ["{quests.space_survival.mars_shields.desc}"]
-			id: "6E757133FA00C40D"
-			optional: true
-			shape: "heart"
-			subtitle: "{quests.space_survival.mars_shields.subtitle}"
-			tasks: [{
-				id: "603BD6E2915EB75B"
-				item: {
-					Count: 1
-					id: "ftbfiltersystem:smart_filter"
-					tag: {
-						"ftbfiltersystem:filter": "or(item(species:ricoshield)item(wan_ancient_beasts:reinforced_shield)item(endermanoverhaul:corrupted_shield))"
-					}
-				}
-				title: "{quests.space_survival.mras_shields.task}"
-				type: "item"
-			}]
-			title: "{quests.space_survival.mars_shields.title}"
-			x: 12.0d
-			y: -6.5d
-		}
 	]
-	subtitle: ["{quests.space_survival.subtitle}"]
-	title: "{quests.space_survival}"
+	subtitle: ["{quests.moon.subtitle}"]
+	title: "{quests.moon}"
 }
--- a/config/ftbquests/quests/chapters/mv__medium_voltage.snbt
+++ b/config/ftbquests/quests/chapters/mv__medium_voltage.snbt
@ -1033,6 +1033,9 @@
 				"{quests.medium_voltage.mv_fluid_rig.desc.3}"
 				"{@pagebreak}"
 				"{quests.medium_voltage.mv_fluid_rig.desc.4}"
+				"{@pagebreak}"
+				"{quests.medium_voltage.mv_fluid_rig.desc.5}"
+				"{image:tfg:textures/quests/prospector_gui.png width:200 height:120 align:center}"
 			]
 			icon: "gtceu:mv_fluid_drilling_rig"
 			id: "05ADBAE5B6F38956"
--- a/config/ftbquests/quests/chapters/ore_processing.snbt
+++ b/config/ftbquests/quests/chapters/ore_processing.snbt
@ -202,7 +202,13 @@
 		{
 			id: "50BB4A87A144C6CD"
 			linked_quest: "2814C6FA71B07C95"
-			x: 12.0d
+			x: 12.5d
+			y: -0.5d
+		}
+		{
+			id: "6F65BC54BA5491ED"
+			linked_quest: "04682CD04FE0A56E"
+			x: 11.5d
 			y: -0.5d
 		}
 	]
--- a/config/ftbquests/quests/chapters/progression.snbt
+++ b/config/ftbquests/quests/chapters/progression.snbt
@ -12,7 +12,7 @@
 		}
 	}
 	id: "28EBC0FF82EFD94B"
-	order_index: 5
+	order_index: 4
 	quest_links: [
 		{
 			id: "77A0335E38D755CA"
--- a/config/ftbquests/quests/chapters/questssteam_age.snbt
+++ b/config/ftbquests/quests/chapters/questssteam_age.snbt
@ -19,7 +19,7 @@
 		{
 			id: "39027CF4DC307D33"
 			linked_quest: "5E186CD5E83BFDF0"
-			x: -29.0d
+			x: -28.5d
 			y: 2.0d
 		}
 		{
@ -40,7 +40,7 @@
 			linked_quest: "48A8E3210B2BAE1C"
 			shape: "octagon"
 			size: 2.0d
-			x: -29.0d
+			x: -28.5d
 			y: 0.0d
 		}
 		{
@ -53,7 +53,7 @@
 		{
 			id: "65E0B13E245D2E5F"
 			linked_quest: "379F434116632A89"
-			x: -25.0d
+			x: -26.0d
 			y: 1.0d
 		}
 		{
@ -79,7 +79,7 @@
 			]
 			description: ["{quests.steam_age.basic_millstone.desc}"]
 			id: "48C1E980F7D64317"
-			size: 1.5d
+			size: 1.0d
 			subtitle: "{quests.steam_age.basic_millstone.subtitle}"
 			tasks: [{
 				id: "486DE7D228F3589B"
@ -87,7 +87,7 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.basic_millstone.title}"
-			x: -19.5d
+			x: -20.5d
 			y: 0.0d
 		}
 		{
@ -105,12 +105,16 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.horse_crank.title}"
-			x: -23.5d
+			x: -24.5d
 			y: -2.0d
 		}
 		{
 			dependencies: ["7B045998769930F0"]
-			description: ["{quests.steam_age.helve_hammer.desc}"]
+			description: [
+				"{quests.steam_age.helve_hammer.desc.1}"
+				"{@pagebreak}"
+				"{quests.steam_age.helve_hammer.desc.2}"
+			]
 			id: "611EB6284CA7119C"
 			size: 1.0d
 			subtitle: "{quests.steam_age.helve_hammer.subtitle}"
@ -120,7 +124,7 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.helve_hammer.title}"
-			x: -19.5d
+			x: -20.5d
 			y: -4.0d
 		}
 		{
@ -148,7 +152,7 @@
 				}
 			]
 			title: "{quests.steam_age.basic_greate.title}"
-			x: -19.5d
+			x: -20.5d
 			y: -2.0d
 		}
 		{
@ -1173,7 +1177,7 @@
 				}
 			]
 			title: "{quests.steam_age.create_tools.title}"
-			x: -21.5d
+			x: -22.5d
 			y: -4.0d
 		}
 		{
@ -1247,6 +1251,7 @@
 			dependencies: ["1059288C22CB56BB"]
 			dependency_requirement: "one_completed"
 			description: ["{quests.steam_age.poor_paths.desc}"]
+			icon: "tfc:dirt/loam"
 			id: "6356072A435EFE81"
 			optional: true
 			shape: "diamond"
@ -1286,13 +1291,14 @@
 				}
 			]
 			title: "{quests.steam_age.poor_paths.title}"
-			x: -25.0d
+			x: -26.0d
 			y: -3.5d
 		}
 		{
 			dependencies: ["1059288C22CB56BB"]
 			dependency_requirement: "one_completed"
 			description: ["{quests.steam_age.normal_paths.desc}"]
+			icon: "tfc:grass_path/silty_loam"
 			id: "494E81202B0F36A7"
 			optional: true
 			shape: "diamond"
@ -1337,7 +1343,7 @@
 				}
 			]
 			title: "{quests.steam_age.normal_paths.title}"
-			x: -25.5d
+			x: -26.5d
 			y: -2.0d
 		}
 		{
@ -1347,6 +1353,7 @@
 			]
 			dependency_requirement: "one_completed"
 			description: ["{quests.steam_age.good_paths.desc}"]
+			icon: "rnr:rock/sett_road/granite"
 			id: "52A82511A64B0A5B"
 			optional: true
 			shape: "diamond"
@ -1394,7 +1401,7 @@
 				}
 			]
 			title: "{quests.steam_age.good_paths.title}"
-			x: -25.0d
+			x: -26.0d
 			y: -0.5d
 		}
 		{
@ -1454,7 +1461,7 @@
 				type: "item"
 			}]
 			title: "{quests.metal_age.bronze_goodies.title}"
-			x: -21.5d
+			x: -22.5d
 			y: -2.0d
 		}
 		{
@ -1641,7 +1648,7 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.basic_mech_press.title}"
-			x: -17.5d
+			x: -18.5d
 			y: -2.0d
 		}
 		{
@ -1718,6 +1725,36 @@
 			x: -12.0d
 			y: 13.0d
 		}
+		{
+			dependencies: ["0D0D461AE3A3F7BF"]
+			description: ["{quests.steam_age.multiblock_tank.desc}"]
+			icon: "gtceu:wooden_multiblock_tank"
+			id: "636B13A7B9755F2A"
+			optional: true
+			shape: "heart"
+			subtitle: "{quests.steam_age.multiblock_tank.subtitle}"
+			tasks: [
+				{
+					id: "0522DC5B9C4560B3"
+					item: "gtceu:wooden_multiblock_tank"
+					type: "item"
+				}
+				{
+					count: 24L
+					id: "6AE2B07A7FEA130F"
+					item: { Count: 24, id: "gtceu:wood_wall" }
+					type: "item"
+				}
+				{
+					id: "1580633542EB6DFB"
+					item: "gtceu:wooden_tank_valve"
+					type: "item"
+				}
+			]
+			title: "{quests.steam_age.multiblock_tank.title}"
+			x: -16.5d
+			y: -2.0d
+		}
 	]
 	subtitle: ["{quests.steam_age.subtitle}"]
 	title: "{quests.steam_age}"
--- a/config/ftbquests/quests/chapters/queststfc_tips.snbt
+++ b/config/ftbquests/quests/chapters/queststfc_tips.snbt
@ -1104,6 +1104,7 @@
 							"ftbfiltersystem:filter": "or(custom(HasPreservation/tfc:wood_grilled)custom(HasPreservation/firmaciv:oven_baked))"
 						}
 					}
+					optional_task: true
 					title: "{quests.tfg_tips.cook_meat.task.1}"
 					type: "item"
 				}
@ -1116,9 +1117,15 @@
 							"ftbfiltersystem:filter": "or(item(tfc:wrought_iron_grill)item(firmalife:cured_oven_top))"
 						}
 					}
+					optional_task: true
 					title: "{quests.tfg_tips.cook_meat.task.2}"
 					type: "item"
 				}
+				{
+					id: "3277299EE8419365"
+					title: "{quests.tasktype.checkmark}"
+					type: "checkmark"
+				}
 			]
 			title: "{quests.tfg_tips.cook_meat.title}"
 			x: 5.0d
--- a/config/ftbquests/quests/chapters/queststfg.snbt
+++ b/config/ftbquests/quests/chapters/queststfg.snbt
@ -5,6 +5,14 @@
 	group: "19428C6E7A36D463"
 	icon: "tfg:terra_firma_greg"
 	id: "5DD2C08324B24805"
+	images: [{
+		height: 2.0d
+		image: "tfg:textures/gui/tfg_logo_title_4181x688_with_shadow.png"
+		rotation: 0.0d
+		width: 12.15406976744186d
+		x: 0.0d
+		y: -3.0d
+	}]
 	order_index: 0
 	quest_links: [ ]
 	quests: [
--- a/config/ftbquests/quests/chapters/tips__tools.snbt
+++ b/config/ftbquests/quests/chapters/tips__tools.snbt
@ -5,15 +5,6 @@
 	group: "19428C6E7A36D463"
 	icon: "create:white_toolbox"
 	id: "254D02A31AA8EB49"
-	images: [{
-		color: 16762887
-		height: 2.0d
-		image: "ftbquests:block/barrier_open"
-		rotation: 0.0d
-		width: 2.0d
-		x: -10.5d
-		y: 2.0d
-	}]
 	order_index: 3
 	quest_links: [
 		{
@ -1404,7 +1395,7 @@
 			}]
 			title: "{quests.tfg_tips.trowel.title}"
 			x: -6.5d
-			y: 8.5d
+			y: 9.0d
 		}
 		{
 			dependencies: ["150B7C5CD152E1BA"]
@ -1425,8 +1416,8 @@
 				type: "item"
 			}]
 			title: "{quests.tfg_tips.fishing_net.title}"
-			x: -3.0d
-			y: 7.0d
+			x: -2.5d
+			y: 7.5d
 		}
 		{
 			dependencies: ["150B7C5CD152E1BA"]
@ -1447,7 +1438,7 @@
 			}]
 			title: "{quests.tfg_tips.cane.title}"
 			x: -2.5d
-			y: 8.5d
+			y: 9.0d
 		}
 		{
 			dependencies: ["72B3EA6588E18CCC"]
@ -1891,12 +1882,12 @@
 			id: "15AD11C9C5249AAF"
 			subtitle: "{quests.tfg_tips.camera_attachments.subtitle}"
 			tasks: [{
-				id: "79F9084E031CFAF3"
+				id: "4DD87BA6E5997784"
 				item: {
 					Count: 1
 					id: "ftbfiltersystem:smart_filter"
 					tag: {
-						"ftbfiltersystem:filter": "or(item(minecraft:redstone_lamp)item(minecraft:spyglass))"
+						"ftbfiltersystem:filter": "or(item(minecraft:spyglass)item_tag(exposure:flashes))"
 					}
 				}
 				title: "{quests.tfg_tips.camera_attachments.task}"
@ -2005,23 +1996,6 @@
 			x: -8.0d
 			y: 2.0d
 		}
-		{
-			dependencies: ["7A200766AAC1EE19"]
-			description: ["{quests.tfg_tips.grapple_repair.desc}"]
-			icon: "createdeco:decal_warning"
-			id: "1F93C858F1D02F7C"
-			shape: "none"
-			size: 2.0d
-			subtitle: "{quests.tfg_tips.grapple_repair.subtitle}"
-			tasks: [{
-				id: "1269BD886B07619D"
-				title: "{quests.tasktype.checkmark}"
-				type: "checkmark"
-			}]
-			title: "{quests.tfg_tips.grapple_repair.title}"
-			x: -10.5d
-			y: 2.0d
-		}
 		{
 			dependencies: ["6C64C20FF5DF972A"]
 			description: ["{quests.tfg_tips.grapple_length.desc}"]
@ -2072,7 +2046,7 @@
 			y: 0.0d
 		}
 		{
-			dependencies: ["1F93C858F1D02F7C"]
+			dependencies: ["7A200766AAC1EE19"]
 			description: [
 				"{quests.tfg_tips.grapple_upgrades.desc.1}"
 				"{@pagebreak}"
@ -2289,8 +2263,8 @@
 				type: "item"
 			}]
 			title: "{quests.tfg_tips.digger_helmet.title}"
-			x: -6.0d
-			y: 7.0d
+			x: -6.5d
+			y: 7.5d
 		}
 		{
 			dependencies: ["72B3EA6588E18CCC"]
@ -2888,7 +2862,28 @@
 				type: "item"
 			}]
 			title: "{quests.tfg_tips.feeding_troughs.title}"
-			x: -4.5d
+			x: -5.5d
+			y: 6.5d
+		}
+		{
+			dependencies: ["150B7C5CD152E1BA"]
+			description: ["{quests.tfg_tips.scraping_knives.desc}"]
+			id: "2301E2248A3560C8"
+			subtitle: "{quests.tfg_tips.scraping_knives.subtitle}"
+			tasks: [{
+				id: "193C47D8A2AD2265"
+				item: {
+					Count: 1
+					id: "ftbfiltersystem:smart_filter"
+					tag: {
+						"ftbfiltersystem:filter": "or(item_tag(tfcscraping:scraping_knives))"
+					}
+				}
+				title: "{quests.tfg_tips.scraping_knives.task}"
+				type: "item"
+			}]
+			title: "{quests.tfg_tips.scraping_knives.title}"
+			x: -3.5d
 			y: 6.5d
 		}
 	]
--- a/defaultconfigs/create-server.toml
+++ b/defaultconfigs/create-server.toml
@ -489,7 +489,7 @@
 	#.
 	#Maximum length of track that can be placed as one batch or turn.
 	#Range: 16 ~ 128
-	maxTrackPlacementLength = 32
+	maxTrackPlacementLength = 128
 	#.
 	#Maximum length of a Train Stations' assembly track.
 	#Range: > 5
--- a/defaultconfigs/greate-server.toml
+++ b/defaultconfigs/greate-server.toml
@ -7,54 +7,9 @@ fanSpeedMultiplier = 0.75
 #Parameters and abilities of Greate's kinetic mechanisms
 [kinetics]

-	#.
-	#.
-	#Fine tune settings related to belts
-	[kinetics.belts]
-
-		#.
-		#.
-		#Rubber Belt Settings
-		[kinetics.belts.rubber]
-			#.
-			#Maximum length in blocks of rubber mechanical belts
-			#Range: > 5
-			rubberMaxBeltLength = 20
-
-		#.
-		#Silicone Rubber Belt Settings
-		[kinetics.belts.silicone]
-			#.
-			#Maximum length in blocks of silicone mechanical belts
-			#Range: > 5
-			siliconeMaxBeltLength = 25
-
-		#.
-		#Polyethylene Belt Settings
-		[kinetics.belts.polyethylene]
-			#.
-			#Maximum length in blocks of polyethylene mechanical belts
-			#Range: > 5
-			polyethyleneMaxBeltLength = 30
-
-		#.
-		#Polytetrafluoroethylene Belt Settings
-		[kinetics.belts.polytetrafluoroethylene]
-			#.
-			#Maximum length in blocks of polytetrafluoroethylene mechanical belts
-			#Range: > 5
-			polytetrafluoroethyleneMaxBeltLength = 35
-
-		#.
-		#Polybenzimidazole Belt Settings
-		[kinetics.belts.polybenzimidazole]
-			#.
-			#Maximum length in blocks of polybenzimidazole mechanical belts
-			#Range: > 5
-			polybenzimidazoleMaxBeltLength = 40
-
 	[kinetics.stressValues]

+		#.
 		#.
 		#Fine tune the kinetic stats of individual components
 		[kinetics.stressValues.v2]
@ -64,7 +19,6 @@ fanSpeedMultiplier = 0.75
 			[kinetics.stressValues.v2.impact]

 				[kinetics.stressValues.v2.impact.andesite_alloy]
-					rubber_belt_andesite_alloy = 0.0
 					andesite_alloy_shaft = 0.0
 					andesite_encased_andesite_alloy_shaft = 0.0
 					brass_encased_andesite_alloy_shaft = 0.0
@ -82,9 +36,9 @@ fanSpeedMultiplier = 0.75
 					andesite_alloy_millstone = 0.5
 					andesite_alloy_mechanical_saw = 0.5
 					andesite_alloy_mechanical_pump = 0.5
+					andesite_alloy_belt = 0.0

 				[kinetics.stressValues.v2.impact.steel]
-					rubber_belt_steel = 0.0
 					steel_shaft = 0.0
 					andesite_encased_steel_shaft = 0.0
 					brass_encased_steel_shaft = 0.0
@ -105,7 +59,6 @@ fanSpeedMultiplier = 0.75
 					tungsten_steel_gearbox = 0.0
 					tungsten_steel_crushing_wheel = 3.0
 					brass_encased_tungsten_steel_shaft = 0.0
-					silicone_rubber_belt_stainless_steel = 0.0
 					andesite_encased_large_tungsten_steel_cogwheel = 0.0
 					andesite_encased_tungsten_steel_cogwheel = 0.0
 					stainless_steel_mechanical_saw = 4.0
@ -127,7 +80,6 @@ fanSpeedMultiplier = 0.75
 					tungsten_steel_millstone = 3.0
 					brass_encased_stainless_steel_shaft = 0.0
 					tungsten_steel_mechanical_press = 6.0
-					polyethylene_belt_tungsten_steel = 0.0
 					tungsten_steel_shaft = 0.0
 					stainless_steel_mechanical_mixer = 2.0
 					andesite_encased_stainless_steel_cogwheel = 0.0
@ -140,7 +92,6 @@ fanSpeedMultiplier = 0.75
 					tungsten_steel_mechanical_pump = 3.0

 				[kinetics.stressValues.v2.impact.aluminium]
-					silicone_rubber_belt_aluminium = 0.0
 					aluminium_shaft = 0.0
 					andesite_encased_aluminium_shaft = 0.0
 					brass_encased_aluminium_shaft = 0.0
@ -160,7 +111,6 @@ fanSpeedMultiplier = 0.75
 					aluminium_mechanical_pump = 1.5

 				[kinetics.stressValues.v2.impact.stainless_steel]
-					silicone_rubber_belt_stainless_steel = 0.0
 					stainless_steel_shaft = 0.0
 					andesite_encased_stainless_steel_shaft = 0.0
 					brass_encased_stainless_steel_shaft = 0.0
@ -180,7 +130,6 @@ fanSpeedMultiplier = 0.75
 					stainless_steel_mechanical_pump = 2.0

 				[kinetics.stressValues.v2.impact.titanium]
-					polyethylene_belt_titanium = 0.0
 					titanium_shaft = 0.0
 					andesite_encased_titanium_shaft = 0.0
 					brass_encased_titanium_shaft = 0.0
@ -200,7 +149,6 @@ fanSpeedMultiplier = 0.75
 					titanium_mechanical_pump = 2.5

 				[kinetics.stressValues.v2.impact.tungsten_steel]
-					polyethylene_belt_tungsten_steel = 0.0
 					tungsten_steel_shaft = 0.0
 					andesite_encased_tungsten_steel_shaft = 0.0
 					brass_encased_tungsten_steel_shaft = 0.0
@ -220,7 +168,6 @@ fanSpeedMultiplier = 0.75
 					tungsten_steel_mechanical_pump = 3.0

 				[kinetics.stressValues.v2.impact.rhodium_plated_palladium]
-					polytetrafluoroethylene_belt_rhodium_plated_palladium = 0.0
 					rhodium_plated_palladium_shaft = 0.0
 					andesite_encased_rhodium_plated_palladium_shaft = 0.0
 					brass_encased_rhodium_plated_palladium_shaft = 0.0
@ -240,7 +187,6 @@ fanSpeedMultiplier = 0.75
 					rhodium_plated_palladium_mechanical_pump = 3.5

 				[kinetics.stressValues.v2.impact.naquadah_alloy]
-					polytetrafluoroethylene_belt_naquadah_alloy = 0.0
 					naquadah_alloy_shaft = 0.0
 					andesite_encased_naquadah_alloy_shaft = 0.0
 					brass_encased_naquadah_alloy_shaft = 0.0
@ -260,7 +206,6 @@ fanSpeedMultiplier = 0.75
 					naquadah_alloy_mechanical_pump = 4.0

 				[kinetics.stressValues.v2.impact.darmstadtium]
-					polybenzimidazole_belt_darmstadtium = 0.0
 					darmstadtium_shaft = 0.0
 					andesite_encased_darmstadtium_shaft = 0.0
 					brass_encased_darmstadtium_shaft = 0.0
@ -280,7 +225,6 @@ fanSpeedMultiplier = 0.75
 					darmstadtium_mechanical_pump = 4.5

 				[kinetics.stressValues.v2.impact.neutronium]
-					polybenzimidazole_belt_neutronium = 0.0
 					neutronium_shaft = 0.0
 					andesite_encased_neutronium_shaft = 0.0
 					brass_encased_neutronium_shaft = 0.0
--- a/kubejs/assets/ad_astra/lang/uk_ua.json
+++ b/kubejs/assets/ad_astra/lang/uk_ua.json
@ -1,6 +1,7 @@
 {
  "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.",
  "block.ad_astra.oxygen_distributor": "Розподілювач повітря",
+  "block.ad_astra.infernal_spire_block": "Пекельний шпиль",
  "block.ad_astra.moon_sand": "Місячний пісок",
  "block.ad_astra.moon_stone": "Необроблений Анортозит",
  "block.ad_astra.moon_cobblestone": "Анортоцитовий кругляк",
--- a/kubejs/assets/ae2/lang/uk_ua.json
+++ b/kubejs/assets/ae2/lang/uk_ua.json
@ -2,5 +2,22 @@
  "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.",
  "gui.ae2.inWorldCraftingPresses": "Пресформи для крафту здобуваються шляхом руйнування Таємничого куба. Таємничі куби розташовані в центрі метеоритів, які можна знайти на Місяці.",
  "gui.advanced_ae.AdvPatternProvider": "",
-  "gui.expandedae.exp_pattern_provider": ""
+  "gui.expandedae.exp_pattern_provider": "",
+  "item.ae2.sky_dust": "Пил сувіту",
+  "block.ae2.sky_stone_block": "Необроблений сувіт",
+  "block.ae2.sky_stone_stairs": "Сувітові сходи",
+  "block.ae2.sky_stone_wall": "Сувітова стіна",
+  "block.ae2.sky_stone_slab": "Сувітова плита",
+  "block.ae2.smooth_sky_stone_block": "Гладкий сувіт",
+  "block.ae2.smooth_sky_stone_stairs": "Сувітові гладкі сходи",
+  "block.ae2.smooth_sky_stone_wall": "Сувітова гладка стіна",
+  "block.ae2.smooth_sky_stone_slab": "Сувітова гладка плита",
+  "block.ae2.sky_stone_brick": "Сувітові цеглини",
+  "block.ae2.sky_stone_brick_stairs": "Сувітові цегляні сходи",
+  "block.ae2.sky_stone_brick_wall": "Сувітова цегляна стіна",
+  "block.ae2.sky_stone_brick_slab": "Сувітова цегляна плита",
+  "block.ae2.sky_stone_small_brick": "Сувітові дрібні цеглини",
+  "block.ae2.sky_stone_small_brick_stairs": "Сувітові дрібноцегляні сходи",
+  "block.ae2.sky_stone_small_brick_wall": "Сувітова дрібноцегляна стіна",
+  "block.ae2.sky_stone_small_brick_slab": "Сувітова дрібноцегляна плита"
 }
--- a/kubejs/assets/ambientsounds/basic/blockgroups/grass.json
+++ b/kubejs/assets/ambientsounds/basic/blockgroups/grass.json
@ -0,0 +1,6 @@
+[
+	"tfc:grass/loam",
+	"tfc:grass/silty_loam",
+	"tfc:grass/sandy_loam",
+	"tfc:grass/silt"
+]
--- a/kubejs/assets/ambientsounds/basic/blockgroups/ice.json
+++ b/kubejs/assets/ambientsounds/basic/blockgroups/ice.json
@ -0,0 +1,8 @@
+[
+    "minecraft:ice",
+    "minecraft:packed_ice",
+    "minecraft:frosted_ice",
+    "minecraft:blue_ice",
+    "tfc:sea_ice",
+    "tfc:ice_pile"
+]
--- a/kubejs/assets/ambientsounds/basic/blockgroups/log.json
+++ b/kubejs/assets/ambientsounds/basic/blockgroups/log.json
@ -0,0 +1,9 @@
+[
+    "tfc:wood/log/oak",
+    "tfc:wood/log/birch",
+    "tfc:wood/log/chestnut",
+    "tfc:wood/log/maple",
+    "tfc:wood/log/sequoia",
+    "tfc:wood/log/sycamore",
+    "afc:wood/log/cypress"
+]
--- a/kubejs/assets/ambientsounds/basic/blockgroups/log_cold.json
+++ b/kubejs/assets/ambientsounds/basic/blockgroups/log_cold.json
@ -0,0 +1,7 @@
+[
+    "tfc:wood/log/pine",
+    "tfc:wood/log/douglas_fir",
+    "tfc:wood/log/ash",
+    "tfc:wood/log/spruce",
+    "tfc:wood/log/aspen"
+]
--- a/kubejs/assets/ambientsounds/basic/blockgroups/log_jungle.json
+++ b/kubejs/assets/ambientsounds/basic/blockgroups/log_jungle.json
@ -0,0 +1,7 @@
+[
+    "tfc:wood/log/kapok",
+    "tfc:wood/log/rosewood",
+    "afc:wood/log/mahogany",
+    "afc:wood/log/tualang",
+    "afc:wood/log/hevea"
+]
--- a/kubejs/assets/ambientsounds/basic/blockgroups/log_warm.json
+++ b/kubejs/assets/ambientsounds/basic/blockgroups/log_warm.json
@ -0,0 +1,9 @@
+[
+    "tfc:wood/log/blackwood",
+    "tfc:wood/log/acacia",
+    "tfc:wood/log/palm",
+    "afc:wood/log/ironwood",
+    "afc:wood/log/ipe",
+    "afc:wood/log/baobab",
+    "afc:wood/log/teak"
+]
--- a/kubejs/assets/ambientsounds/basic/blockgroups/sand.json
+++ b/kubejs/assets/ambientsounds/basic/blockgroups/sand.json
@ -0,0 +1,12 @@
+[
+	"tfc:sand/white",
+	"tfc:sand/yellow",
+	"tfc:sand/red",
+	"tfc:sand/brown",
+	"tfc:sand/green",
+	"tfc:sand/pink",
+	"tfc:sand/black",
+	"ad_astra:moon_sand",
+	"ad_astra:mars_sand",
+	"ad_astra:venus_sand"
+]
--- a/kubejs/assets/ambientsounds/basic/blockgroups/snow.json
+++ b/kubejs/assets/ambientsounds/basic/blockgroups/snow.json
@ -0,0 +1,5 @@
+[
+	"minecraft:snow",
+	"minecraft:snow_block",
+	"tfc:snow_pile"
+]
--- a/kubejs/assets/ambientsounds/basic/blockgroups/water.json
+++ b/kubejs/assets/ambientsounds/basic/blockgroups/water.json
@ -0,0 +1,6 @@
+[
+    "minecraft:water",
+    "tfc:fluid/river_water",
+    "tfc:fluid/salt_water",
+    "tfg:fluid/semiheavy_ammoniacal_water"
+]
--- a/kubejs/assets/ambientsounds/basic/dimensions/ad_astra_mars.json
+++ b/kubejs/assets/ambientsounds/basic/dimensions/ad_astra_mars.json
@ -1,12 +1,10 @@
 {
-	"name": "ad_astra",
+	"name": "ad_astra_mars",
 	"dimension-names": [
-		"mars",
-		"venus",
-		"glacio"
+		"mars"
 	],
 	"biome-selector": {
-		"always": false
+		"always": true
 	},
 	"regions": [
 		{
--- a/kubejs/assets/ambientsounds/basic/dimensions/ad_astra_mercury.json
+++ b/kubejs/assets/ambientsounds/basic/dimensions/ad_astra_mercury.json
@ -0,0 +1,20 @@
+{
+    "name": "ad_astra_orbit",
+    "dimension-names": [
+        "mercury"
+    ],
+    "rain": false,
+    "storm": false,
+    "biome-selector": {
+        "always": false
+    },
+    "regions": [
+        {
+            "name": "unknown",
+            "volume": 0.3,
+            "sound-collections": [
+                "suspense"
+            ]
+        }
+    ]
+}
--- a/kubejs/assets/ambientsounds/basic/dimensions/ad_astra_venus.json
+++ b/kubejs/assets/ambientsounds/basic/dimensions/ad_astra_venus.json
@ -0,0 +1,11 @@
+{
+    "name": "ad_astra_venus",
+    "dimension-names": [
+        "venus"
+    ],
+    "biome-selector": {
+        "always": true
+    },
+    "regions": [
+    ]
+}
--- a/kubejs/assets/ambientsounds/basic/features/snow.json
+++ b/kubejs/assets/ambientsounds/basic/features/snow.json
@ -0,0 +1,9 @@
+{
+    "name": "snow",
+    "groups": [
+        "snow"
+    ],
+    "low-count": 20,
+    "low-weight": 0.1,
+    "high-weight": 0.3
+}
--- a/kubejs/assets/ambientsounds/basic/features/tree_cold.json
+++ b/kubejs/assets/ambientsounds/basic/features/tree_cold.json
@ -0,0 +1,19 @@
+{
+    "name": "tree",
+    "and": [
+        {
+            "groups": [
+                "leave"
+            ],
+            "low-count": 5,
+            "high-count": 30
+        },
+        {
+            "groups": [
+                "log_cold"
+            ],
+            "low-count": 3,
+            "high-count": 10
+        }
+    ]
+}
--- a/kubejs/assets/ambientsounds/basic/features/tree_jungle.json
+++ b/kubejs/assets/ambientsounds/basic/features/tree_jungle.json
@ -0,0 +1,19 @@
+{
+    "name": "tree",
+    "and": [
+        {
+            "groups": [
+                "leave"
+            ],
+            "low-count": 5,
+            "high-count": 30
+        },
+        {
+            "groups": [
+                "log_jungle"
+            ],
+            "low-count": 3,
+            "high-count": 10
+        }
+    ]
+}
--- a/kubejs/assets/ambientsounds/basic/features/tree_warm.json
+++ b/kubejs/assets/ambientsounds/basic/features/tree_warm.json
@ -0,0 +1,19 @@
+{
+    "name": "tree",
+    "and": [
+        {
+            "groups": [
+                "leave"
+            ],
+            "low-count": 5,
+            "high-count": 30
+        },
+        {
+            "groups": [
+                "log_warm"
+            ],
+            "low-count": 3,
+            "high-count": 10
+        }
+    ]
+}
--- a/kubejs/assets/ambientsounds/basic/regions/beach.json
+++ b/kubejs/assets/ambientsounds/basic/regions/beach.json
@ -0,0 +1,50 @@
+{
+	"name": "beach",
+	"biomes": [
+		"shore",
+		"tidal_flats"
+	],
+	"sounds": [
+		{
+			"name": "beach",
+			"files": [
+				"ambientsounds:water.beach"
+			],
+			"volume": 0.1
+		},
+		{
+			"name": "seagull",
+			"category": "bird_day",
+			"files": [
+				"ambientsounds:animals.seagull"
+			],
+			"volume": 0.4,
+			"pause": {
+				"min": 750,
+				"max": 1000
+			}
+		},
+		{
+			"name": "seagull-long",
+			"category": "bird_day",
+			"files": [
+				"ambientsounds:animals.seagull-long"
+			],
+			"length": {
+				"min": 30,
+				"max": 600
+			},
+			"pause": {
+				"min": 750,
+				"max": 1000
+			}
+		},
+		{
+			"name": "ocean",
+			"files": [
+				"ambientsounds:water.ocean"
+			],
+			"volume": 0.2
+		}
+	]
+}
--- a/kubejs/assets/ambientsounds/basic/regions/forest.cold.json
+++ b/kubejs/assets/ambientsounds/basic/regions/forest.cold.json
@ -0,0 +1,87 @@
+{
+    "name": "forest.cold",
+    "features": [
+        "tree"
+    ],
+    "bad-regions": [
+        "rain"
+    ],
+    "regions": [
+        "surface"
+    ],
+    "temperature": {
+        "max": 0.5
+    },
+    "sounds": [
+        {
+            "name": "bird-ambience",
+            "files": [
+                "ambientsounds:animals.bird-ambience1",
+                "ambientsounds:animals.bird-ambience2",
+                "ambientsounds:animals.bird-ambience3",
+                "ambientsounds:animals.bird-ambience4",
+                "ambientsounds:animals.bird-ambience5",
+                "ambientsounds:animals.bird-ambience6",
+                "ambientsounds:animals.bird-ambience7",
+                "ambientsounds:animals.bird-ambience8",
+                "ambientsounds:animals.bird-ambience9",
+                "ambientsounds:animals.bird-ambience10",
+                "ambientsounds:animals.bird-ambience11"
+            ],
+            "length": {
+                "min": 2000,
+                "max": 3000
+            },
+            "transition": 400,
+            "category": "bird_day"
+        },
+        {
+            "name": "crow",
+            "category": "bird",
+            "files": [
+                "ambientsounds:animals.crow"
+            ],
+            "pause": {
+                "min": 800,
+                "max": 4000
+            },
+            "day": 1,
+            "night": 0.2
+        },
+        {
+            "name": "owl",
+            "files": [
+                "ambientsounds:animals.owl"
+            ],
+            "pause": {
+                "min": 100,
+                "max": 500
+            },
+            "category": "bird_night"
+        },
+        {
+            "name": "wolf",
+            "category": "animal",
+            "files": [
+                "ambientsounds:animals.wolf"
+            ],
+            "pause": {
+                "min": 100,
+                "max": 600
+            },
+            "day": 0
+        },
+        {
+            "name": "long-wolf",
+            "category": "animal",
+            "files": [
+                "ambientsounds:animals.long-wolf"
+            ],
+            "pause": {
+                "min": 12000,
+                "max": 72000
+            },
+            "day": 0
+        }
+    ]
+}
--- a/kubejs/assets/ambientsounds/basic/regions/forest.json
+++ b/kubejs/assets/ambientsounds/basic/regions/forest.json
@ -0,0 +1,82 @@
+{
+    "name": "forest",
+    "features": [
+        "tree_warm"
+    ],
+    "bad-regions": [
+        "taiga",
+        "forest.roofed",
+        "jungle",
+        "rain"
+    ],
+    "variants": [
+        {
+            "regions": [
+                "surface"
+            ]
+        },
+        {
+            "regions": [
+                "swamp"
+            ],
+            "volume": 0.3
+        }
+    ],
+    "sounds": [
+        {
+            "name": "bird-warm",
+            "category": "bird_day",
+            "files": [
+                "ambientsounds:animals.bird-ambience-warm1",
+                "ambientsounds:animals.bird-ambience-warm2"
+            ],
+            "length": {
+                "min": 2000,
+                "max": 3000
+            },
+            "overall-raining": false
+        },
+        {
+            "name": "cricket",
+            "category": "cricket_day",
+            "files": [
+                "ambientsounds:animals.cricket",
+                "ambientsounds:animals.cricket2",
+                "ambientsounds:animals.cricket3"
+            ],
+            "overall-raining": false,
+            "length": {
+                "min": 1000,
+                "max": 1500
+            },
+            "transition": 100,
+            "volume": 0.25
+        },
+        {
+            "name": "cricket-warm-night",
+            "category": "cricket_night",
+            "files": [
+                "ambientsounds:animals.cricket-warm-night",
+                "ambientsounds:animals.cricket-warm-night2"
+            ],
+            "overall-raining": false,
+            "length": {
+                "min": 1000,
+                "max": 1500
+            },
+            "transition": 100,
+            "volume": 0.3
+        },
+        {
+            "name": "owl",
+            "files": [
+                "ambientsounds:animals.owl"
+            ],
+            "pause": {
+                "min": 100,
+                "max": 500
+            },
+            "category": "bird_night"
+        }
+    ]
+}
--- a/kubejs/assets/ambientsounds/basic/regions/grass.json
+++ b/kubejs/assets/ambientsounds/basic/regions/grass.json
@ -0,0 +1,73 @@
+{
+    "name": "grass",
+    "features": [
+        "grass"
+    ],
+    "bad-regions": [
+        "plains",
+        "savanna",
+        "swamp",
+        "ocean",
+        "jungle",
+        "rain",
+        "forest",
+        "forest.cold",
+        "taiga",
+        "snow"
+    ],
+    "bad-biomes": [
+        "river",
+        "lake",
+        "mountain_lake",
+        "old_mountain_lake",
+        "oceanic_mountain_lake",
+        "plateau_lake",
+        "ocean",
+        "ocean_reef",
+        "deep_ocean",
+        "deep_ocean_trench"
+    ],
+    "sounds": [
+        {
+            "name": "cricket",
+            "category": "cricket_day",
+            "files": [
+                "ambientsounds:animals.cricket",
+                "ambientsounds:animals.cricket2",
+                "ambientsounds:animals.cricket3"
+            ],
+            "overall-raining": false,
+            "length": {
+                "min": 1000,
+                "max": 1500
+            },
+            "transition": 100,
+            "volume": 0.05
+        },
+        {
+            "name": "cricket-night",
+            "category": "cricket_night",
+            "files": [
+                "ambientsounds:animals.cricket-night",
+                "ambientsounds:animals.cricket-night2",
+                "ambientsounds:animals.cricket-night3",
+                "ambientsounds:animals.cricket-night4"
+            ],
+            "overall-raining": false,
+            "length": {
+                "min": 1000,
+                "max": 1500
+            },
+            "transition": 100,
+            "volume": 0.05
+        },
+        {
+            "name": "cicadas-night",
+            "category": "cicadas",
+            "files": [
+                "ambientsounds:animals.cicadas-night"
+            ],
+            "time": "day"
+        }
+    ]
+}
--- a/kubejs/assets/ambientsounds/basic/regions/highland.json
+++ b/kubejs/assets/ambientsounds/basic/regions/highland.json
@ -0,0 +1,40 @@
+{
+	"name": "highland",
+	"biomes": [
+		"old_mountains",
+		"old_mountain_lake",
+		"oceanic_mountains",
+		"oceanic_mountain_lake",
+		"martian_mountains",
+		"rusticus_edge",
+		"amber_edge",
+		"sangnum_edge"
+	],
+	"sounds": [
+		{
+			"name": "heavy-wind",
+			"category": "wind",
+			"files": [
+				"ambientsounds:wind.heavy-wind"
+			],
+			"air": {
+				"min": 0.6
+			},
+			"volume": 0.5
+		},
+		{
+			"name": "wind-in-leaves",
+			"category": "wind",
+			"files": [
+				"ambientsounds:wind.wind-in-leaves"
+			],
+			"air": {
+				"min": 0.6
+			},
+			"features": [
+				"tree"
+			],
+			"volume": 0.5
+		}
+	]
+}
--- a/kubejs/assets/ambientsounds/basic/regions/jungle.json
+++ b/kubejs/assets/ambientsounds/basic/regions/jungle.json
@ -0,0 +1,54 @@
+{
+    "name": "jungle",
+    "features": [
+        "wood_jungle"
+    ],
+    "bad-biomes": [
+        "mountain_lake",
+        "old_mountain_lake",
+        "oceanic_mountain_lake",
+        "plateau_lake",
+        "ocean",
+        "ocean_reef",
+        "deep_ocean",
+        "deep_ocean_trench",
+        "rain"
+    ],
+    "sounds": [
+        {
+            "name": "cricket-jungle",
+            "category": "cricket_day",
+            "files": [
+                "ambientsounds:animals.cricket-jungle"
+            ]
+        },
+        {
+            "name": "cricket-jungle-night",
+            "category": "cricket_night",
+            "files": [
+                "ambientsounds:animals.cricket-jungle-night"
+            ]
+        },
+        {
+            "name": "bird-ambience-jungle",
+            "category": "bird_day",
+            "files": [
+                "ambientsounds:animals.bird-ambience-jungle",
+                "ambientsounds:animals.bird-ambience-jungle2"
+            ]
+        },
+        {
+            "name": "bird-ambience-jungle-night",
+            "category": "bird_night",
+            "files": [
+                "ambientsounds:animals.bird-ambience-jungle-night",
+                "ambientsounds:animals.bird-ambience-jungle-night2"
+            ],
+            "length": {
+                "min": 1500,
+                "max": 2000
+            },
+            "transition": 200
+        }
+    ]
+}
--- a/kubejs/assets/ambientsounds/basic/regions/lake.json
+++ b/kubejs/assets/ambientsounds/basic/regions/lake.json
@ -0,0 +1,26 @@
+{
+	"name": "lake",
+	"biomes": [
+		"river",
+		"lake",
+		"mountain_lake",
+		"old_mountain_lake",
+		"oceanic_mountain_lake",
+		"plateau_lake",
+		"volcanic_mountain_lake",
+		"volcanic_oceanic_mountain_lake",
+		"martian_river"
+	],
+	"features": [
+		"water"
+	],
+	"sounds": [
+		{
+			"name": "ocean",
+			"files": [
+				"ambientsounds:water.ocean"
+			],
+			"volume": 0.4
+		}
+	]
+}
--- a/kubejs/assets/ambientsounds/basic/regions/mesa.json
+++ b/kubejs/assets/ambientsounds/basic/regions/mesa.json
@ -0,0 +1,24 @@
+{
+	"name": "mesa",
+	"biomes": [
+		"mountains",
+		"mountain_lake",
+		"volcanic_mountains",
+		"volcanic_mountain_lake",
+		"volcanic_oceanic_mountains",
+		"volcanic_oceanic_mountain_lake",
+		"martian_deep_desert",
+		"martian_dunes",
+		"martian_dune_edge",
+		"jagged_tablelands"
+	],
+	"sounds": [
+		{
+			"name": "wind-mesa",
+			"category": "wind",
+			"files": [
+				"ambientsounds:wind.mesa"
+			]
+		}
+	]
+}
--- a/kubejs/assets/ambientsounds/basic/regions/ocean.json
+++ b/kubejs/assets/ambientsounds/basic/regions/ocean.json
@ -0,0 +1,22 @@
+{
+	"name": "ocean",
+	"biomes": [
+		"ocean",
+		"ocean_reef"
+	],
+	"features": [
+		"water"
+	],
+	"sound-collections": [
+		"wind"
+	],
+	"sounds": [
+		{
+			"name": "ocean",
+			"files": [
+				"ambientsounds:water.ocean"
+			],
+			"volume": 0.1
+		}
+	]
+}
--- a/kubejs/assets/ambientsounds/basic/regions/ocean_deep.json
+++ b/kubejs/assets/ambientsounds/basic/regions/ocean_deep.json
@ -0,0 +1,32 @@
+{
+    "name": "ocean",
+    "biomes": [
+        "deep_ocean",
+        "deep_ocean_trench"
+    ],
+    "features": [
+        "ocean"
+    ],
+    "underwater": {
+        "min": 0.01,
+        "fade": 4
+    },
+    "mute": 0.1,
+    "mute-priority": 10,
+    "sounds": [
+        {
+            "name": "whale",
+            "category": "animal",
+            "pause": {
+                "min": 100,
+                "max": 1000
+            },
+            "features": [
+                "ocean"
+            ],
+            "files": [
+                "ambientsounds:animals.whale"
+            ]
+        }
+    ]
+}
--- a/kubejs/assets/ambientsounds/basic/regions/plains.json
+++ b/kubejs/assets/ambientsounds/basic/regions/plains.json
@ -0,0 +1,72 @@
+{
+    "name": "plains",
+    "features": [
+        "grass"
+    ],
+    "bad-regions": [
+        "ocean",
+        "forest",
+        "savanna",
+        "swamp",
+        "highland",
+        "nether",
+        "rain",
+        "taiga",
+        "snow"
+    ],
+    "biomes": [
+        "lake",
+        "plains",
+        "highlands",
+        "hills",
+        "old_mountains",
+        "rolling_hills",
+        "plateau",
+        "plateau_lake"
+    ],
+    "sounds": [
+        {
+            "name": "cricket",
+            "category": "cricket_day",
+            "files": [
+                "ambientsounds:animals.cricket",
+                "ambientsounds:animals.cricket2",
+                "ambientsounds:animals.cricket3"
+            ],
+            "overall-raining": false,
+            "length": {
+                "min": 1000,
+                "max": 1500
+            },
+            "transition": 100,
+            "volume": 0.3
+        },
+        {
+            "name": "cricket-night",
+            "category": "cricket_night",
+            "files": [
+                "ambientsounds:animals.cricket-night",
+                "ambientsounds:animals.cricket-night2",
+                "ambientsounds:animals.cricket-night3",
+                "ambientsounds:animals.cricket-night4",
+                "ambientsounds:animals.cricket-night5"
+            ],
+            "overall-raining": false,
+            "length": {
+                "min": 1000,
+                "max": 1500
+            },
+            "transition": 100,
+            "volume": 0.3
+        },
+        {
+            "name": "cicadas-night",
+            "category": "cicadas",
+            "files": [
+                "ambientsounds:animals.cicadas-night"
+            ],
+            "time": "night",
+            "volume": 0.3
+        }
+    ]
+}
--- a/kubejs/assets/ambientsounds/basic/regions/savanna.json
+++ b/kubejs/assets/ambientsounds/basic/regions/savanna.json
@ -0,0 +1,125 @@
+{
+    "name": "savanna",
+    "bad-regions": [
+        "rain",
+        "snow"
+    ],
+    "biomes": [
+        "badlands",
+        "canyons",
+        "inverted_canyons",
+        "low_canyons"
+    ],
+    "sounds": [
+        {
+            "name": "cricket",
+            "category": "cricket_day",
+            "files": [
+                "ambientsounds:animals.cricket",
+                "ambientsounds:animals.cricket2",
+                "ambientsounds:animals.cricket3"
+            ],
+            "overall-raining": false,
+            "length": {
+                "min": 1000,
+                "max": 1500
+            },
+            "transition": 100,
+            "volume": 0.25
+        },
+        {
+            "name": "cicadas",
+            "category": "cicadas",
+            "files": [
+                "ambientsounds:animals.cicadas"
+            ],
+            "overall-raining": false,
+            "day": 0.15,
+            "night": 0.01,
+            "length": {
+                "min": 100,
+                "max": 300
+            },
+            "pause": {
+                "min": 100,
+                "max": 600
+            }
+        },
+        {
+            "name": "cicadas-desert",
+            "category": "cicadas",
+            "files": [
+                "ambientsounds:animals.cicadas-desert1",
+                "ambientsounds:animals.cicadas-desert2"
+            ],
+            "overall-raining": false,
+            "special-biomes": {
+                "temperature": {
+                    "min": 0.8
+                }
+            },
+            "day": 1,
+            "night": 0,
+            "length": {
+                "min": 400,
+                "max": 900
+            },
+            "pause": {
+                "min": 500,
+                "max": 1000
+            }
+        },
+        {
+            "name": "cricket-warm-night",
+            "category": "cricket_night",
+            "files": [
+                "ambientsounds:animals.cricket-warm-night",
+                "ambientsounds:animals.cricket-warm-night2"
+            ],
+            "overall-raining": false,
+            "length": {
+                "min": 1000,
+                "max": 1500
+            },
+            "transition": 100,
+            "volume": 0.3
+        },
+        {
+            "name": "wolf",
+            "category": "animal",
+            "files": [
+                "ambientsounds:animals.wolf"
+            ],
+            "pause": {
+                "min": 100,
+                "max": 600
+            },
+            "day": 0
+        },
+        {
+            "name": "long-wolf",
+            "category": "animal",
+            "files": [
+                "ambientsounds:animals.long-wolf"
+            ],
+            "pause": {
+                "min": 12000,
+                "max": 72000
+            },
+            "day": 0
+        },
+        {
+            "name": "bird-warm",
+            "category": "bird_day",
+            "files": [
+                "ambientsounds:animals.bird-ambience-warm1",
+                "ambientsounds:animals.bird-ambience-warm2"
+            ],
+            "length": {
+                "min": 2000,
+                "max": 3000
+            },
+            "overall-raining": false
+        }
+    ]
+}
--- a/kubejs/assets/ambientsounds/basic/regions/snow.json
+++ b/kubejs/assets/ambientsounds/basic/regions/snow.json
@ -0,0 +1,9 @@
+{
+	"name": "snow",
+	"features": [
+		"snow"
+	],
+	"sound-collections": [
+		"wind"
+	]
+}
--- a/kubejs/assets/ambientsounds/basic/regions/swamp.json
+++ b/kubejs/assets/ambientsounds/basic/regions/swamp.json
@ -0,0 +1,72 @@
+{
+    "name": "swamp",
+    "bad-regions": [
+        "rain",
+        "snow"
+    ],
+    "biomes": [
+        "salt_marsh",
+        "lowlands"
+    ],
+    "sounds": [
+        {
+            "name": "cricket-swamp",
+            "category": "cricket_day",
+            "files": [
+                "ambientsounds:animals.cricket-swamp"
+            ],
+            "volume": 0.3,
+            "overall-raining": false
+        },
+        {
+            "name": "cricket-warm-night",
+            "category": "cricket_night",
+            "files": [
+                "ambientsounds:animals.cricket-warm-night",
+                "ambientsounds:animals.cricket-warm-night2"
+            ],
+            "overall-raining": false,
+            "length": {
+                "min": 1000,
+                "max": 1500
+            },
+            "transition": 100,
+            "volume": 0.3
+        },
+        {
+            "name": "frog",
+            "category": "animal",
+            "files": [
+                "ambientsounds:animals.frog1",
+                "ambientsounds:animals.frog2"
+            ],
+            "pause": {
+                "min": 100,
+                "max": 750
+            },
+            "day": 0.05,
+            "night": 0.15
+        },
+        {
+            "name": "mouring_dove",
+            "category": "animal",
+            "files": [
+                "ambientsounds:animals.mouring_dove"
+            ],
+            "features": [
+                "tree"
+            ],
+            "pause": {
+                "min": 100,
+                "max": 400
+            },
+            "time": {
+                "5": 0,
+                "6": 1,
+                "8": 1,
+                "9": 0
+            },
+            "volume": 0.14
+        }
+    ]
+}
--- a/kubejs/assets/ambientsounds/basic/regions/taiga.json
+++ b/kubejs/assets/ambientsounds/basic/regions/taiga.json
@ -0,0 +1,73 @@
+{
+    "name": "taiga",
+    "features": [
+        "tree_cold"
+    ],
+    "bad-regions": [
+        "rain"
+    ],
+    "bad-biomes": [
+        "mountain_lake",
+        "old_mountain_lake",
+        "oceanic_mountain_lake",
+        "plateau_lake",
+        "ocean",
+        "ocean_reef",
+        "deep_ocean",
+        "deep_ocean_trench",
+        "rain"
+    ],
+    "sounds": [
+        {
+            "name": "bird-ambience-huge",
+            "category": "bird_day",
+            "files": [
+                "ambientsounds:animals.bird-ambience-huge1",
+                "ambientsounds:animals.bird-ambience-huge2",
+                "ambientsounds:animals.bird-ambience-huge3"
+            ],
+            "length": {
+                "min": 2000,
+                "max": 3000
+            },
+            "transition": 400
+        },
+        {
+            "name": "crow",
+            "category": "bird",
+            "files": [
+                "ambientsounds:animals.crow"
+            ],
+            "pause": {
+                "min": 800,
+                "max": 4000
+            },
+            "day": 1,
+            "night": 0.2
+        },
+        {
+            "name": "wolf",
+            "category": "animal",
+            "files": [
+                "ambientsounds:animals.wolf"
+            ],
+            "pause": {
+                "min": 100,
+                "max": 600
+            },
+            "day": 0
+        },
+        {
+            "name": "long-wolf",
+            "category": "animal",
+            "files": [
+                "ambientsounds:animals.long-wolf"
+            ],
+            "pause": {
+                "min": 12000,
+                "max": 72000
+            },
+            "day": 0
+        }
+    ]
+}
--- a/kubejs/assets/ambientsounds/basic/regions/venus.json
+++ b/kubejs/assets/ambientsounds/basic/regions/venus.json
@ -0,0 +1,112 @@
+{
+    "name": "venus",
+    "bad-regions": [
+        "rain"
+    ],
+    "biomes": [
+        "arachnoids",
+        "stromatolite_beach",
+        "fractured_pools",
+        "geysers",
+        "salt_flats",
+        "sulfuric_ravine",
+        "fumaroles"
+    ],
+    "sounds": [
+        {
+            "name": "cricket",
+            "category": "cricket_day",
+            "files": [
+                "ambientsounds:animals.cricket",
+                "ambientsounds:animals.cricket2",
+                "ambientsounds:animals.cricket3"
+            ],
+            "overall-raining": false,
+            "length": {
+                "min": 1000,
+                "max": 1500
+            },
+            "transition": 100,
+            "volume": 0.25
+        },
+        {
+            "name": "cricket-night",
+            "category": "cricket_night",
+            "files": [
+                "ambientsounds:animals.cricket-night",
+                "ambientsounds:animals.cricket-night2",
+                "ambientsounds:animals.cricket-night3",
+                "ambientsounds:animals.cricket-night4"
+            ],
+            "overall-raining": false,
+            "length": {
+                "min": 1000,
+                "max": 1500
+            },
+            "transition": 100,
+            "volume": 0.05
+        },
+        {
+            "name": "cicadas",
+            "category": "cicadas",
+            "files": [
+                "ambientsounds:animals.cicadas"
+            ],
+            "overall-raining": false,
+            "day": 0.15,
+            "night": 0.01,
+            "length": {
+                "min": 100,
+                "max": 300
+            },
+            "pause": {
+                "min": 100,
+                "max": 600
+            }
+        },
+        {
+            "name": "cicadas-desert",
+            "category": "cicadas",
+            "files": [
+                "ambientsounds:animals.cicadas-desert1",
+                "ambientsounds:animals.cicadas-desert2"
+            ],
+            "overall-raining": false,
+            "day": 1,
+            "night": 0,
+            "length": {
+                "min": 400,
+                "max": 900
+            },
+            "pause": {
+                "min": 500,
+                "max": 1000
+            }
+        },
+        {
+            "name": "cicadas-night",
+            "category": "cicadas",
+            "files": [
+                "ambientsounds:animals.cicadas-night"
+            ],
+            "overall-raining": false,
+            "day": 0,
+            "night": 1
+        },
+        {
+            "name": "cricket-warm-night",
+            "category": "cricket_night",
+            "files": [
+                "ambientsounds:animals.cricket-warm-night",
+                "ambientsounds:animals.cricket-warm-night2"
+            ],
+            "overall-raining": false,
+            "length": {
+                "min": 1000,
+                "max": 1500
+            },
+            "transition": 100,
+            "volume": 0.3
+        }
+    ]
+}
--- a/kubejs/assets/beneath/lang/ua_ua.json
+++ b/kubejs/assets/beneath/lang/ua_ua.json
@ -0,0 +1,30 @@
+{
+  "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.",
+  "block.beneath.blackstone_pebble": "Розсипний Піроксеніт",
+  "block.beneath.blackstone_aqueduct": "Акведук із Піроксеніту",
+  "block.beneath.loose_blackstone": "Розсипний Піроксеніт",
+  "block.beneath.ore.nether_cursecoal": "Антрацитова Руда",
+  "block.beneath.ore.nether_cursecoal.prospected": "Антрацит",
+  "block.beneath.cursecoal_pile": "Купа Антрациту",
+  "block.beneath.ore.blackstone_sylvite": "Руда Сильвіну",
+  "block.beneath.crackrack": "Кератофір",
+  "block.beneath.soul_clay": "Брудна Глина",
+  "block.beneath.wood.log.crimson": "Багряний стовбур",
+  "block.beneath.wood.stripped_log.crimson": "Обтесаний багряний стовбур",
+  "block.beneath.wood.wood.crimson": "Багряні гіфи",
+  "block.beneath.wood.stripped_wood.crimson": "Обтесані багряні гіфи",
+  "block.beneath.wood.fallen_leaves.crimson": "Занепала червона ламела",
+  "block.beneath.wood.leaves.crimson": "Багряна пластинка",
+  "block.beneath.wood.log.warped": "Химерний стовбур",
+  "block.beneath.wood.stripped_log.warped": "Обтесаний химерний стовбур",
+  "block.beneath.wood.wood.warped": "Химерні гіфи",
+  "block.beneath.wood.stripped_wood.warped": "Обтесані химерні гіфи",
+  "block.beneath.wood.fallen_leaves.warped": "Занепала химерна ламела",
+  "block.beneath.wood.leaves.warped": "Химерна пластинка",
+  "block.beneath.ancient_altar": "Піроксенітовий постамент",
+  "item.beneath.cursed_hide": "Лавостійка Шкіра",
+  "item.beneath.blackstone_brick": "Цегла з Піроксеніту",
+  "item.beneath.cursecoal": "Антрацит",
+  "item.beneath.crackrack_rock": "Кератофірна Гірська Порода",
+  "item.beneath.loose_blackstone": "Розсипний Піроксеніт"
+}
--- a/kubejs/assets/betterend/blockstates/hydralux.json
+++ b/kubejs/assets/betterend/blockstates/hydralux.json
@ -1,14 +0,0 @@
-{
-	"variants": {
-		"shape=flower_big_bottom":  [
-			{ "model": "betterend:block/hydralux_flower_big_1_bottom" },
-			{ "model": "betterend:block/hydralux_flower_big_2_bottom" },
-			{ "model": "betterend:block/hydralux_flower_big_3_bottom" }
-		],
-		"shape=flower_big_top":  { "model": "betterend:block/hydralux_flower_big_top" },
-		"shape=flower_small_bottom":  { "model": "betterend:block/hydralux_flower_small_bottom" },
-		"shape=flower_small_top":  { "model": "betterend:block/hydralux_flower_small_top" },
-		"shape=vine":  { "model": "betterend:block/hydralux_vine" },
-		"shape=roots":  { "model": "betterend:block/hydralux_roots" }
-	}
-}
--- a/kubejs/assets/betterend/blockstates/hydralux_large.json
+++ b/kubejs/assets/betterend/blockstates/hydralux_large.json
@ -0,0 +1,13 @@
+{
+	"variants": {
+		"height=0": { "model": "betterend:block/hydralux_vine_bottom" },
+		"height=1": { "model": "betterend:block/hydralux_vine" },
+		"height=2": [
+			{ "model": "betterend:block/hydralux_flower_big_1_bottom" },
+			{ "model": "betterend:block/hydralux_flower_big_2_bottom" },
+			{ "model": "betterend:block/hydralux_flower_big_3_bottom" }
+		],
+		"height=3": { "model": "betterend:block/hydralux_flower_big_top" },
+		"height=4": { "model": "" }
+	}
+}
--- a/kubejs/assets/betterend/blockstates/hydralux_sapling.json
+++ b/kubejs/assets/betterend/blockstates/hydralux_sapling.json
@ -1,8 +1,10 @@
 {
    "variants": {
-        "age=0":    { "model": "betterend:block/hydralux_sapling_1" },
-        "age=1":    { "model": "betterend:block/hydralux_sapling_2" },
-        "age=2":    { "model": "betterend:block/hydralux_sapling_3" },
-        "age=3":    { "model": "betterend:block/hydralux_sapling_4" }
+        "": [
+            { "model": "betterend:block/hydralux_sapling_1" },
+            { "model": "betterend:block/hydralux_sapling_2" },
+            { "model": "betterend:block/hydralux_sapling_3" },
+            { "model": "betterend:block/hydralux_sapling_4" }
+        ]
    }
 }
--- a/kubejs/assets/betterend/blockstates/hydralux_small.json
+++ b/kubejs/assets/betterend/blockstates/hydralux_small.json
@ -0,0 +1,9 @@
+{
+	"variants": {
+		"height=0": { "model": "betterend:block/hydralux_vine_bottom" },
+		"height=1": { "model": "betterend:block/hydralux_vine" },
+		"height=2": { "model": "betterend:block/hydralux_flower_small_bottom" },
+		"height=3": { "model": "betterend:block/hydralux_flower_small_top" },
+		"height=4": { "model": "" }
+	}
+}
--- a/kubejs/assets/betterend/lang/uk_ua.json
+++ b/kubejs/assets/betterend/lang/uk_ua.json
@ -14,6 +14,7 @@
  "block.betterend.bolux_mushroom": "Колонія грибів Болукса",
  "block.betterend.bolux_mushroom_wild": "Дика колонія грибів Болукса",
  "block.betterend.bolux_mushroom_dead": "Мертва колонія грибів Болукса",
+  "block.betterend.brimstone": "Брімстоун",
  "block.betterend.bushy_grass": "Новаграс",
  "block.betterend.bulb_moss": "Ламповий мох",
  "block.betterend.cave_bush": "Карминова Ламель",
@ -45,13 +46,20 @@
  "block.betterend.filalux_wings": "Крила Філалюкса",
  "block.betterend.flamaea": "Гриб Фламаеа",
  "block.betterend.flammalix": "Гриб Фламмалікс",
+  "block.betterend.flavolite": "Необроблений леуцитит",
+  "block.betterend.flavolite_bricks": "Леуцититові цеглини",
+  "block.betterend.flavolite_pillar": "Леуцититовий стовп",
+  "block.betterend.flavolite_polished": "Полірований леуцитит",
+  "block.betterend.flavolite_tiles": "Леуцититові плитки",
  "block.betterend.fracturn": "Фрактурн",
  "block.betterend.glacian_hymenophore": "Гіменофор Ґлаціана",
  "block.betterend.globulagus": "Глобулагус",
+  "block.betterend.hydrothermal_vent": "Термальний жерло",
  "block.betterend.hydralux": "Гідралюкс",
  "block.betterend.hydralux_sapling": "Паросток Гідралюкса",
  "block.betterend.inflexia": "Інфлексія",
  "block.betterend.lacugrove": "Водорості Лакугроув",
+  "block.betterend.lacugrove_bark": "Необроблений адакіт",
  "block.betterend.lamellarium": "Ламелларіум",
  "block.betterend.lanceleaf": "Ланцелист",
  "block.betterend.lanceleaf_small": "Кинджал списолистий",
@ -59,6 +67,7 @@
  "block.betterend.lucernia_leaves": "Ламель Люцернії",
  "block.betterend.lucernia_leaves_fallen": "Мала Ламель Люцернії",
  "block.betterend.lucernia_outer_leaves": "Гіфи Люцернії",
+  "block.betterend.lucernia_bark": "Диявольський шпиль",
  "block.betterend.lutebus": "Лутебус",
  "block.betterend.magnula": "Магнула",
  "block.betterend.nightshade_moss": "Мох Нокс",
@ -68,11 +77,23 @@
  "block.betterend.rubinea": "Рубінеа",
  "block.betterend.ruscus": "Трава Рускус",
  "block.betterend.salteago": "Сальтеаго",
+  "block.betterend.sandy_jadestone": "Необроблений лампроїт",
+  "block.betterend.sandy_jadestone_bricks": "Лампроїтові цеглини",
+  "block.betterend.sandy_jadestone_pillar": "Лампроїтовий стовп",
+  "block.betterend.sandy_jadestone_polished": "Полірований лампроїт",
+  "block.betterend.sandy_jadestone_tiles": "Лампроїтові плитки",
  "block.betterend.selagine": "Селагіна",
  "block.betterend.shadow_berry": "Ягоди Нокс",
  "block.betterend.shadow_berry_wild": "Дикі ягоди Нокс",
  "block.betterend.shadow_berry_dead": "Мертві ягоди Нокс",
  "block.betterend.small_amaranita_mushroom": "Малий гриб Амаранита",
+  "block.betterend.sulphur_crystal": "Сірчаний кристал",
+  "block.betterend.sulphuric_rock": "Необроблений ігнімбрит",
+  "block.betterend.sulphuric_rock_bricks": "Ігнімбритові цеглини",
+  "block.betterend.sulphuric_rock_pillar": "Ігнімбритовий стовп",
+  "block.betterend.sulphuric_rock_polished": "Полірований ігнімбрит",
+  "block.betterend.sulphuric_rock_tiles": "Ігнімбритові плитки",
+  "block.betterend.tube_worm": "Трубчастий хробак",
  "block.betterend.twisted_moss": "Химерний мох",
  "block.betterend.twisted_umbrella_moss": "Химерний парасольковий мох",
  "block.betterend.twisted_umbrella_moss_tall": "Химерний парасольковий мох",
--- a/kubejs/assets/betterend/models/block/hydralux_sapling_1.json
+++ b/kubejs/assets/betterend/models/block/hydralux_sapling_1.json
@ -1,6 +1,6 @@
 {
 	"parent": "minecraft:block/cross",
 	"textures": {
-		"texture": "betterend:block/hydralux_sapling_1"
+		"cross": "betterend:block/hydralux_sapling_1"
 	}
 }
--- a/kubejs/assets/betterend/models/block/hydralux_sapling_2.json
+++ b/kubejs/assets/betterend/models/block/hydralux_sapling_2.json
@ -1,6 +1,6 @@
 {
 	"parent": "minecraft:block/cross",
 	"textures": {
-		"texture": "betterend:block/hydralux_sapling_2"
+		"cross": "betterend:block/hydralux_sapling_2"
 	}
 }
--- a/kubejs/assets/betterend/models/block/hydralux_sapling_3.json
+++ b/kubejs/assets/betterend/models/block/hydralux_sapling_3.json
@ -1,6 +1,6 @@
 {
 	"parent": "minecraft:block/cross",
 	"textures": {
-		"texture": "betterend:block/hydralux_sapling_3"
+		"cross": "betterend:block/hydralux_sapling_3"
 	}
 }
--- a/kubejs/assets/betterend/models/block/hydralux_sapling_4.json
+++ b/kubejs/assets/betterend/models/block/hydralux_sapling_4.json
@ -1,6 +1,6 @@
 {
 	"parent": "minecraft:block/cross",
 	"textures": {
-		"texture": "betterend:block/hydralux_sapling_4"
+		"cross": "betterend:block/hydralux_sapling_4"
 	}
 }
--- a/kubejs/assets/betterend/models/block/hydralux_vine.json
+++ b/kubejs/assets/betterend/models/block/hydralux_vine.json
@ -1,6 +1,6 @@
 {
 	"parent": "minecraft:block/cross",
 	"textures": {
-		"texture": "betterend:block/hydralux_vine"
+		"cross": "betterend:block/hydralux_vine"
 	}
 }
--- a/kubejs/assets/betterend/models/block/hydralux_vine_bottom.json
+++ b/kubejs/assets/betterend/models/block/hydralux_vine_bottom.json
--- a/kubejs/assets/betterend/models/item/hydralux_large.json
+++ b/kubejs/assets/betterend/models/item/hydralux_large.json
@ -0,0 +1,6 @@
+{
+	"parent": "item/generated",
+	"textures": {
+		"layer0": "betterend:block/hydralux_sapling_4"
+	}
+}
--- a/kubejs/assets/betterend/models/item/hydralux_small.json
+++ b/kubejs/assets/betterend/models/item/hydralux_small.json
@ -0,0 +1,6 @@
+{
+	"parent": "item/generated",
+	"textures": {
+		"layer0": "betterend:block/hydralux_sapling_2"
+	}
+}
--- a/kubejs/assets/create/lang/uk_ua.json
+++ b/kubejs/assets/create/lang/uk_ua.json
@ -1,6 +1,8 @@
 {
  "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.",
  "block.create.netherite_backtank": "Рюкзак із синьої сталі",
+  "block.create.shadow_casing": "Обшивка з чорної сталі",
+  "block.create.refined_radiance_casing": "Світна обшивка",
  "block.create.industrial_iron_block": "Промисловий Сталевий Блок",
  "block.create.weathered_iron_block": "Блок Вивітреної Сталі",
  "block.create.industrial_iron_window": "Промислове сталеве вікно",
--- a/kubejs/assets/emi/index/stacks/hidden.json
+++ b/kubejs/assets/emi/index/stacks/hidden.json
@ -1,5 +1,6 @@
 {
 	"removed": [
-		"item:gtceu:sus_record"
+		"item:gtceu:sus_record",
+		"expatternprovider:fishbig"
 	]
 }
--- a/kubejs/assets/emi/recipe/filters/categories.json
+++ b/kubejs/assets/emi/recipe/filters/categories.json
@ -42,12 +42,6 @@
        {
            "category": "gtceu:ore_vein_diagram"
        },
-        {
-            "category": "create:automatic_shaped"
-        },
-        {
-            "category": "create:automatic_shapeless"
-        },
        {
            "category": "greate:automatic_brewing"
        },
@ -84,6 +78,12 @@
        {
            "id": "toomanyrecipeviewers:/create/potions"
        },
+        {
+            "id": "toomanyrecipeviewers:/exposure/sequenced_black_and_white_film_developing"
+        },
+        {
+            "id": "toomanyrecipeviewers:/exposure/sequenced_color_film_developing"
+        },
        {
            "id": "/gtceu.+potion_.+/"
        },
--- a/kubejs/assets/forge/models/tag/item/sand.json
+++ b/kubejs/assets/forge/models/tag/item/sand.json
@ -0,0 +1,3 @@
+{
+	"parent": "tfc:item/sand/yellow"
+}
--- a/kubejs/assets/greate/lang/uk_ua.json
+++ b/kubejs/assets/greate/lang/uk_ua.json
@ -32,11 +32,11 @@
  "block.greate.large_andesite_alloy_cogwheel": "Велике базове зубчасте колесо",
  "block.greate.metal_girder_encased_andesite_alloy_shaft": "Базовий вал, обгорнутий металевою балкою",
  "block.greate.powered_andesite_alloy_shaft": "Базовий вал із приводом",
-  "item.greate.rubber_belt_connector": "Гумовий ремінь",
-  "item.greate.silicone_rubber_belt_connector": "Силіконовий гумовий ремінь",
-  "block.greate.polyethylene_belt_titanium": "Ремінь зі стирол-бутадієнової гуми",
-  "block.greate.polyethylene_belt_tungsten_steel": "Ремінь зі стирол-бутадієнової гуми",
-  "item.greate.polyethylene_belt_connector": "Ремінь зі стирол-бутадієнової гуми",
+  "item.greate.andesite_alloy_belt_connector": "Механічний ремінь із дощатим протектором",
+  "item.greate.stone_belt_connector": "Шкіряний механічний ремінь",
+  "item.greate.rubber_belt_connector": "Гумовий механічний ремінь",
+  "item.greate.silicone_rubber_belt_connector": "Механічний ремінь із силіконової гуми",
+  "item.greate.styrene_butadiene_rubber_belt_connector": "Механічний ремінь із стирол-бутадієнової гуми",
  "item.greate.andesite_alloy_vertical_gearbox": "Базовий вертикальний редуктор",
  "greate.recipe.packing": "Зварювання та Пакування",
  "greate.ponder.belt_casing.text_1": "Латунний або металевий кожух можна використовувати для декорування механічних ременів",
--- a/kubejs/assets/gtceu/lang/uk_ua.json
+++ b/kubejs/assets/gtceu/lang/uk_ua.json
@ -14,6 +14,7 @@
  "block.gtceu.ostrum_harvester": "Збирач Острому",
  "block.gtceu.moon_dust_harvester": "Збирач Місячного Пилу",
  "block.tfg.ostrum_linear_accelerator": "Лінійний Прискорювач з Оструму",
+  "block.gtceu.coal_liquefaction_tower": "Вежа зрідження",
  "block.gtceu.ulv_super_tank": "Базовий супер резервувар",
  "block.gtceu.ulv_super_chest": "Базова супер скриня",
  "block.gtceu.ulv_hermetic_casing": "Базова герметична оболонка",
@ -49,10 +50,12 @@
  "gtceu.ostrum_linear_accelerator": "Лінійний Прискорювач з Оструму",
  "gtceu.bioreactor": "Біореактор",
  "gtceu.growth_chamber": "Камера росту",
+  "gtceu.coal_liquefaction_tower": "Вежа зрідження",
+  "gtceu.smr_generator": "Мала модульна турбіна",
  "gtceu.tooltip.machine.moon_dust_harvester_1": "§7Позаземний пилосос§r",
  "gtceu.tooltip.machine.moon_dust_harvester_2": "§7Збирає нескінченну кількість реголітового пилу залежно від біома, в якому він розміщений.§r",
  "gtceu.tooltip.machine.ostrum_harvester_1": "§7Юридично відмінний пряний повзун§r",
-  "gtceu.tooltip.machine.ostrum_harvester_2": "§7Збирає нескінченну кількість острумового пилу, якщо розміщений над родовищем оструму.§r",
+  "gtceu.tooltip.machine.ostrum_harvester_2": "§7Видобуває нескінченний пил оструму, якщо розміщено над родовищем оструму.§r",
  "gtceu.tooltip.machine.ostrum_harvester_3": "§7Потребує бурової рідини для роботи.§r",
  "gtceu.tooltip.machine.ostrum_linear_accelerator_1": "§7Бозон Хіггса не входить у комплект§r",
  "gtceu.tooltip.machine.ostrum_linear_accelerator_2": "§7Розкладає острумовий пил на його компоненти. Потребує різні рідини з лінії поділу.§r",
@ -61,11 +64,11 @@
  "gtceu.tooltip.machine.nuclear_fuel_factory_1": "§7Виробляє додатково пікантні стрижні§r",
  "gtceu.tooltip.machine.nuclear_fuel_factory_2": "§7Переробляє необроблений радіоактивний матеріал у подільне паливо.§r",
  "gtceu.tooltip.machine.steam_bloomery_1": "§7Покращуйте свою домницю силою пари!§r",
-  "gtceu.tooltip.machine.steam_bloomery_2": "§7Переробляє залізовмісний пил або злитки у сирі залізні криці.§r",
-  "gtceu.tooltip.machine.steam_bloomery_3": "§7Використання коксу чи антрациту як палива подвоїть вихід.§r",
+  "gtceu.tooltip.machine.steam_bloomery_2": "§7Переробляє пил або злитки, що містять залізо, у необроблені залізні криці.§r",
+  "gtceu.tooltip.machine.steam_bloomery_3": "§7Використання коксу або антрациту як пального подвоїть продуктивність.§r",
  "gtceu.tooltip.machine.steam_bloomery_4": "§7Може обробляти до 8 рецептів одночасно, що змінює кількість необхідної пари.§r",
-  "gtceu.tooltip.machine.coal_liquefaction_tower_1": "§7Smoothie Maker§r",
-  "gtceu.tooltip.machine.coal_liquefaction_tower_2": "§7Extracts gas and liquids from carbonic solids§r",
+  "gtceu.tooltip.machine.coal_liquefaction_tower_1": "§7Фруктовий міксер§r",
+  "gtceu.tooltip.machine.coal_liquefaction_tower_2": "§7Видобуває гази та рідини з вуглецевих твердих речовин§r",
  "item.gtceu.tiny_wood_dust": "Маленька купа хвойної целюлози",
  "item.gtceu.small_wood_dust": "Мала купа хвойної целюлози",
  "item.gtceu.wood_dust": "Хвойна целюлоза",
@ -129,6 +132,7 @@
  "material.gtceu.ostrum": "Острум",
  "material.tfg.calorite": "Калорит",
  "material.tfg.etrium": "Етріум",
+  "material.gtceu.tarkianite": "Таркіаніт",
  "material.gtceu.aluminium_silicate": "Алюмосилікат",
  "material.gtceu.rocket_alloy_t1": "Алюміносталевий ракетний сплав R-класу",
  "material.gtceu.rocket_alloy_t2": "Ракетний титановий сплав ASM 4914",
@ -187,14 +191,18 @@
  "item.gtceu.tool.tooltip.repair_material": "",
  "gtceu.machine.lp_steam_extractor.tooltip": "§7Не видобуває рідини",
  "gtceu.machine.hp_steam_extractor.tooltip": "§7Не видобуває рідини",
-  "gtceu.jei.bedrock_fluid.moon_helium": "Місячний Гелій",
-  "gtceu.jei.bedrock_fluid.moon_helium_3": "Місячний Гелій-3",
-  "gtceu.jei.bedrock_fluid.moon_argon": "Місячний Аргон",
-  "gtceu.jei.bedrock_fluid.semiheavy_ammoniacal_water": "Марсіанська Напівважка Амоніачна Вода",
-  "gtceu.jei.bedrock_fluid.liquid_carbon_dioxide": "Марсіанський Рідкий Діоксид Карбону",
-  "gtceu.jei.bedrock_fluid.heavy_ammoniacal_water": "Марсіанська важка аміачна вода",
-  "gtceu.jei.bedrock_fluid.liquid_ice": "Марсіанський лід",
+  "gtceu.jei.bedrock_fluid.nether_natural_gas_deposit": "Родовищe природного газу в Безодні",
+  "gtceu.jei.bedrock_fluid.moon_helium": "Місячне родовище гелію",
+  "gtceu.jei.bedrock_fluid.moon_helium_3": "Місячне родовище гелію-3",
+  "gtceu.jei.bedrock_fluid.moon_argon": "Місячне родовище аргону",
+  "gtceu.jei.bedrock_fluid.semiheavy_ammoniacal_water": "Марсіанське родовище напівважкої аміачної води",
+  "gtceu.jei.bedrock_fluid.liquid_carbon_dioxide": "Марсіанське родовище рідкого вуглекислого газу",
+  "gtceu.jei.bedrock_fluid.heavy_ammoniacal_water": "Марсіанське родовище важкої аміачної води",
+  "gtceu.jei.bedrock_fluid.liquid_ice": "Марсіанське родовище льоду",
  "gtceu.recipe.category.ingot_molding": "Формування матеріалів",
+  "block.gtceu.wire_coil.tooltip_pyro": "§8Піролізна піч, вежа зрідження та фабрика ядерного пального:§r",
+  "block.gtceu.wire_coil.tooltip_cracking": "§8Установка крекінгу, місячний та острумний збирачі:§r",
+  "tooltip.moldraw.shift_view": "§7§oУтримуйте (Shift), щоб побачити молекулярну структуру§r",
  "tagprefix.sword_head": "%s Лезо меча",
  "tagprefix.pickaxe_head": "%s Лезо кайла",
  "tagprefix.shovel_head": "%s Лезо лопати",
--- a/kubejs/assets/gtceu/molecules/ruthenium_tetroxide.json
+++ b/kubejs/assets/gtceu/molecules/ruthenium_tetroxide.json
@ -2,7 +2,7 @@
    "contents": [
        {
            "index": 0,
-            "element": "Os",
+            "element": "Ru",
            "x": 0.0,
            "y": 0.0,
            "type": "atom"
--- a/kubejs/assets/minecraft/lang/es_es.json
+++ b/kubejs/assets/minecraft/lang/es_es.json
@ -0,0 +1,103 @@
+{
+  "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.",
+  "block.minecraft.iron_block": "Bloque de hierro fundido",
+  "block.minecraft.stone": "Piedra reconstituida",
+  "block.minecraft.stone_stairs": "Escaleras de piedra reconstituida",
+  "block.minecraft.stone_slab": "Losa de piedra reconstituida",
+  "block.minecraft.cobblestone": "Roca de piedra reconstituida",
+  "block.minecraft.cobblestone_stairs": "Escaleras de roca de piedra reconstituida",
+  "block.minecraft.cobblestone_slab": "Losa de roca de piedra Reconstituida",
+  "block.minecraft.cobblestone_wall": "Muro de roca de piedra Reconstituida",
+  "block.minecraft.mossy_cobblestone": "Roca de piedra Reconstituida Musgosa",
+  "block.minecraft.mossy_cobblestone_stairs": "Escaleras de roca de piedra reconstituida Musgosa",
+  "block.minecraft.mossy_cobblestone_slab": "Losa de roca de piedra reconstituida musgosa",
+  "block.minecraft.mossy_cobblestone_wall": "Muro de roca de piedra reconstituida musgoso",
+  "block.minecraft.smooth_stone": "Piedra reconstituida lisa",
+  "block.minecraft.smooth_stone_slab": "Losa de piedra reconstituida lisa",
+  "block.minecraft.stone_bricks": "Ladrillos de piedra reconstituida",
+  "block.minecraft.stone_bricks_stairs": "Escaleras de ladrillos de piedra reconstituida",
+  "block.minecraft.stone_bricks_slab": "Losa de ladrillos",
+  "block.minecraft.stone_bricks_wall": "Muro de ladrillos de piedra reconstituida",
+  "block.minecraft.cracked_stone_bricks": "Ladrillos de piedra reconstituida agrietados",
+  "block.minecraft.mossy_stone_bricks": "Ladrillos de piedra reconstituida musgosos",
+  "block.minecraft.mossy_stone_bricks_stairs": "Escaleras de ladrillos de piedra reconstituida musgosas",
+  "block.minecraft.mossy_stone_bricks_slab": "Losa de ladrillos de piedra reconstituida musgosa",
+  "block.minecraft.mossy_stone_bricks_wall": "Muro de ladrillos de piedra reconstituida musgosa",
+  "block.minecraft.chiseled_stone_bricks": "Ladrillos de piedra reconstituida cincelados",
+  "block.minecraft.chiseled_deepslate": "Migmatita cincelada",
+  "block.minecraft.cobbled_deepslate": "Roca de migmatita",
+  "block.minecraft.cobbled_deepslate_slab": "Losa de roca de migmatita",
+  "block.minecraft.cobbled_deepslate_stairs": "Escaleras de roca de migmatita",
+  "block.minecraft.cobbled_deepslate_wall": "Muro de roca de migmatita",
+  "block.minecraft.cracked_deepslate_bricks": "Ladrillos de migmatita agrietados",
+  "block.minecraft.cracked_deepslate_tiles": "Baldosas de migmatita agrietadas",
+  "block.minecraft.deepslate": "Migmatita en bruto",
+  "block.minecraft.deepslate_brick_slab": "Losa de ladrillos de migmatita",
+  "block.minecraft.deepslate_brick_stairs": "Escaleras de ladrillos de migmatita",
+  "block.minecraft.deepslate_brick_wall": "Muro de ladrillos de migmatita",
+  "block.minecraft.deepslate_bricks": "Ladrillos de migmatita",
+  "block.minecraft.deepslate_tile_slab": "Losa de baldosas de migmatita",
+  "block.minecraft.deepslate_tile_stairs": "Escaleras de baldosas de migmatita",
+  "block.minecraft.deepslate_tile_wall": "Muro de baldosas de migmatita",
+  "block.minecraft.deepslate_tiles": "Baldosas de migmatita",
+  "block.minecraft.infested_deepslate": "Migmatita infestada",
+  "block.minecraft.polished_deepslate": "Migmatita pulida",
+  "block.minecraft.polished_deepslate_slab": "Losa de migmatita pulida",
+  "block.minecraft.polished_deepslate_stairs": "Escaleras de migmatita pulida",
+  "block.minecraft.polished_deepslate_wall": "Muro de migmatita pulida",
+  "block.minecraft.blackstone": "Piroxenita en bruto",
+  "block.minecraft.blackstone_slab": "Losa de piroxenita",
+  "block.minecraft.blackstone_stairs": "Escaleras de piroxenita",
+  "block.minecraft.blackstone_wall": "Muro de piroxenita",
+  "block.minecraft.chiseled_polished_blackstone": "Piroxenita cincelada",
+  "block.minecraft.cracked_polished_blackstone_bricks": "Ladrillos de piroxenita agrietados",
+  "block.minecraft.gilded_blackstone": "Piroxenita áurea",
+  "block.minecraft.polished_blackstone": "Piroxenita pulida",
+  "block.minecraft.polished_blackstone_brick_slab": "Losa de ladrillos de piroxenita",
+  "block.minecraft.polished_blackstone_brick_stairs": "Escaleras de ladrillos de piroxenita",
+  "block.minecraft.polished_blackstone_brick_wall": "Muro de ladrillos de piroxenita",
+  "block.minecraft.polished_blackstone_bricks": "Ladrillos de piroxenita",
+  "block.minecraft.polished_blackstone_button": "Botón de piroxenita pulida",
+  "block.minecraft.polished_blackstone_pressure_plate": "Placa de presión de piroxenita pulida",
+  "block.minecraft.polished_blackstone_slab": "Losa de piroxenita pulida",
+  "block.minecraft.polished_blackstone_stairs": "Escaleras de piroxenita pulida",
+  "block.minecraft.polished_blackstone_wall": "Muro de piroxenita pulida",
+  "block.minecraft.dripstone_block": "Travertino en bruto",
+  "block.minecraft.nether_bricks": "Ladrillos de queratofiro",
+  "block.minecraft.nether_brick_fence": "Valla de ladrillos de queratofiro",
+  "block.minecraft.nether_brick_slab": "Losa de ladrillos de queratofiro",
+  "block.minecraft.nether_brick_wall": "Muro de ladrillos de queratofiro",
+  "block.minecraft.nether_brick_stairs": "Escaleras de ladrillos de queratofiro",
+  "block.minecraft.cracked_nether_bricks": "Ladrillos de queratofiro agrietados",
+  "block.minecraft.chiseled_nether_bricks": "Ladrillos de queratofiro cincelados",
+  "block.minecraft.magma_block": "Piroxenita de magma",
+  "block.minecraft.twisting_vines": "Tallo de brilloluz",
+  "block.minecraft.pearlescent_froglight": "Brilloluz perlado",
+  "block.minecraft.verdant_froglight": "Brilloluz verdante",
+  "block.minecraft.ochre_froglight": "Brilloluz ocre",
+  "block.minecraft.nether_wart_block": "Bloque de verruga carmesí",
+  "block.minecraft.weeping_vines_plant": "Planta de enredaderas carmesí",
+  "block.minecraft.weeping_vines": "Enredaderas carmesí",
+  "block.minecraft.red_sand": "Arena hematítica",
+  "block.minecraft.red_sandstone": "Arenisca hematítica",
+  "block.minecraft.red_sandstone_stairs": "Escaleras de arenisca hematítica",
+  "block.minecraft.red_sandstone_slab": "Losa de arenisca hematítica",
+  "block.minecraft.red_sandstone_wall": "Muro de arenisca hematítica",
+  "block.minecraft.chiseled_red_sandstone": "Arenisca hematítica cincelada",
+  "block.minecraft.smooth_red_sandstone": "Arenisca hematítica lisa",
+  "block.minecraft.smooth_red_sandstone_stairs": "Escaleras de arenisca hematítica lisa",
+  "block.minecraft.smooth_red_sandstone_slab": "Losa de arenisca hematítica lisa",
+  "block.minecraft.cut_red_sandstone": "Arenisca hematítica cortada",
+  "block.minecraft.cut_red_sandstone_slab": "Losa de arenisca hematítica cortada",
+  "entity.minecraft.furnace_minecart": "Vagoneta con caldera",
+  "item.minecraft.iron_nugget": "Pepita de hierro fundido",
+  "item.minecraft.iron_ingot": "Lingote de hierro fundido",
+  "item.minecraft.iron_block": "Bloque de hierro fundido",
+  "item.minecraft.netherite_leggings": "Grebas de buceo de acero azul",
+  "item.minecraft.netherite_boots": "Botas de buceo de acero azul",
+  "item.minecraft.string": "Hilo de seda",
+  "item.minecraft.glow_ink_sac": "Tinte brillante",
+  "item.minecraft.nether_brick": "Ladrillo de queratofiro",
+  "item.minecraft.furnace_minecart": "Vagoneta con caldera",
+  "material.tfg.dripstone": "Travertino"
+}
--- a/kubejs/assets/minecraft/textures/item/iron_nugget.png
+++ b/kubejs/assets/minecraft/textures/item/iron_nugget.png
--- a/kubejs/assets/species/lang/en_us.json
+++ b/kubejs/assets/species/lang/en_us.json
@ -1,5 +1,21 @@
 {
  "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.",
  "block.species.alphacene_moss_block": "Glacian Cap",
-  "block.species.petrified_egg": "Goober Egg"
+  "block.species.petrified_egg": "Goober Egg",
+  "item.species.wicked_mask": "Disguise Kit",
+  "item.species.wicked_swapper": "Swapper Pearl",
+  "item.species.wicked_treat": "Pet Treat",
+  "subtitles.item.species.wicked_mask.link": "Disguise Kit molds",
+  "subtitles.item.species.wicked_mask.equip": "Disguise Kit sticks",
+  "subtitles.item.species.wicked_swapper.throw": "Swapper Pearl flies",
+  "subtitles.item.species.wicked_swapper.fail": "Swapper Pearl drops",
+  "subtitles.item.species.wicked_swapper.teleport": "Swapper Pearl swaps",
+  "advancements.species.wicked_mask_wither.description": "Disguise yourself as a Wither using a Disguise Kit",
+  "item.species.trooper_spawn_egg": "Sulfie Spawn Egg",
+  "entity.species.trooper": "Sulfie",
+  "subtitles.entity.species.trooper.death": "Sulfie dies",
+  "subtitles.entity.species.trooper.hurt": "Sulfie hurts",
+  "subtitles.entity.species.trooper.step": "Sulfie trots",
+  "subtitles.entity.species.trooper.uproot": "Sulfie uproots",
+  "subtitles.entity.species.trooper.plant": "Sulfie plants"
 }
--- a/kubejs/assets/species/lang/zh_cn.json
+++ b/kubejs/assets/species/lang/zh_cn.json
@ -120,8 +120,7 @@
  "item.species.ancient_pinecone": "远古松果",
  "block.species.trooper": "果立怕",
  "block.species.potted_trooper": "果立怕盆栽",
-  "entity.species.trooper": "果立怕",
-  "item.species.trooper_spawn_egg": "果立怕刷怪蛋",
+  "item.species.trooper_spawn_egg": "硫力怕刷怪蛋",
  "subtitles.entity.species.treeper.death": "树立怕：死亡",
  "subtitles.entity.species.treeper.hurt": "树立怕：受伤",
  "subtitles.entity.species.treeper.idle": "树立怕：低语",
@ -131,11 +130,6 @@
  "subtitles.entity.species.treeper.step": "树立怕：游荡",
  "subtitles.entity.species.treeper.shake_fail": "树立怕：晃动",
  "subtitles.entity.species.treeper.shake_success": "树立怕：掉落树苗",
-  "subtitles.entity.species.trooper.death": "果立怕：死亡",
-  "subtitles.entity.species.trooper.hurt": "果立怕：受伤",
-  "subtitles.entity.species.trooper.step": "果立怕：小步疾跑",
-  "subtitles.entity.species.trooper.uproot": "果立怕：拔根而起",
-  "subtitles.entity.species.trooper.plant": "果立怕：扎根",
  "advancements.species.burn_treeper_into_place.title": "神经损伤",
  "advancements.species.burn_treeper_into_place.description": "灼烧树立怕以防止它移动",
  "advancements.species.tame_trooper.title": "我为树立怕代言",
@ -366,7 +360,6 @@
  "effect.species.combustion.description": "邪火效果。使受影响的实体在死亡时爆炸。爆炸范围和方块破坏强度随等级增加。",
  "effect.species.iron_will": "坚毅",
  "effect.species.iron_will.description": "邪火效果。免疫一切击退。",
-  "item.species.wicked_swapper": "邪火换位币",
  "item.species.wicked_wax": "邪火蜡",
  "item.species.monster_meal": "混沌食品",
  "item.species.monster_meal.desc.effect": "使食用的实体获得一个随机的邪火效果",
@ -377,11 +370,9 @@
  "item.species.wicked_dope": "邪火膏",
  "item.species.wicked_dope.desc.effect": "使所有生效中的效果等级 +1 ",
  "item.species.wicked_dope.no_effects": "你没有任何效果来提升",
-  "item.species.wicked_mask": "邪火面具",
  "item.species.wicked_mask.desc.apply": "伪装成绑定的生物",
  "item.species.wicked_mask.desc.disguise.1": "%1$s + %2$s",
  "item.species.wicked_mask.desc.disguise.2": "选择生物",
-  "item.species.wicked_treat": "邪火点心",
  "item.species.wicked_treat.desc": "只能喂给宠物",
  "item.species.wicked_treat.desc.snatched": "夺躯 II (0:45)",
  "item.species.wicked_treat.desc.iron_will": "坚毅 (0:45)",
@ -395,11 +386,6 @@
  "subtitles.entity.species.wicked.shoot": "邪火法师：发射",
  "subtitles.entity.species.wicked.spot": "邪火法师：跟随生物",
  "subtitles.entity.species.wicked.stop_haunting": "邪火法师：离开附身实体",
-  "subtitles.item.species.wicked_mask.link": "邪火面具：绑定",
-  "subtitles.item.species.wicked_mask.equip": "邪火面具：粘黏声",
-  "subtitles.item.species.wicked_swapper.throw": "邪火换位币：掷空",
-  "subtitles.item.species.wicked_swapper.fail": "邪火换位币：落地",
-  "subtitles.item.species.wicked_swapper.teleport": "邪火换位币：换位",
  "subtitles.item.species.smoke_bomb.charge": "玩家：准备",
  "subtitles.item.species.smoke_bomb.use": "烟雾弹：爆炸",
  "subtitles.item.species.wicked_wax.eat": "进食",
@ -408,7 +394,6 @@
  "subtitles.item.species.wicked_dope.boost": "效果提升",
  "subtitles.item.species.wicked_dope.fail": "提升失败",
  "advancements.species.wicked_mask_wither.title": "我变成了凋零",
-  "advancements.species.wicked_mask_wither.description": "使用邪火面具伪装成凋零",
  "advancements.species.wicked_stop_haunting.title": "超度",
  "advancements.species.wicked_stop_haunting.description": "让一个邪火法师停止附身生物",
  "entity.species.bewereager": "渴血狼人",
@ -513,5 +498,20 @@
  "advancements.species.fall_for_hanger.title": "初坠陷阱",
  "advancements.species.fall_for_hanger.description": "落入悬猎者的陷阱，这波算它们的",
  "advancements.species.fall_for_hanger_twice.title": "梅开二度奖",
-  "advancements.species.fall_for_hanger_twice.description": "再次落入悬猎者的陷阱，不是，你是不是压根没看路啊？"
+  "advancements.species.fall_for_hanger_twice.description": "再次落入悬猎者的陷阱，不是，你是不是压根没看路啊？",
+  "item.species.wicked_mask": "伪装工具包",
+  "item.species.wicked_swapper": "换位珠",
+  "item.species.wicked_treat": "宠物零食",
+  "subtitles.item.species.wicked_mask.link": "伪装工具包：绑定",
+  "subtitles.item.species.wicked_mask.equip": "伪装工具包：粘黏声",
+  "subtitles.item.species.wicked_swapper.throw": "换位珠：掷空",
+  "subtitles.item.species.wicked_swapper.fail": "换位珠：落地",
+  "subtitles.item.species.wicked_swapper.teleport": "换位珠：换位",
+  "advancements.species.wicked_mask_wither.description": "使用伪装工具包伪装成凋零",
+  "entity.species.trooper": "硫力怕",
+  "subtitles.entity.species.trooper.death": "硫力怕：死亡",
+  "subtitles.entity.species.trooper.hurt": "硫力怕：受伤",
+  "subtitles.entity.species.trooper.step": "硫力怕：小步疾跑",
+  "subtitles.entity.species.trooper.uproot": "硫力怕：拔根而起",
+  "subtitles.entity.species.trooper.plant": "硫力怕：扎根"
 }
--- a/kubejs/assets/species/textures/entity/treeper/trooper.png
+++ b/kubejs/assets/species/textures/entity/treeper/trooper.png
--- a/kubejs/assets/species/textures/entity/treeper/trooper_tame.png
+++ b/kubejs/assets/species/textures/entity/treeper/trooper_tame.png
--- a/kubejs/assets/species/textures/item/smoke_bomb.png
+++ b/kubejs/assets/species/textures/item/smoke_bomb.png
--- a/kubejs/assets/species/textures/item/wicked_mask.png
+++ b/kubejs/assets/species/textures/item/wicked_mask.png
--- a/kubejs/assets/species/textures/item/wicked_mask_worn.png
+++ b/kubejs/assets/species/textures/item/wicked_mask_worn.png
--- a/kubejs/assets/species/textures/item/wicked_swapper.png
+++ b/kubejs/assets/species/textures/item/wicked_swapper.png
--- a/kubejs/assets/species/textures/item/wicked_treat.png
+++ b/kubejs/assets/species/textures/item/wicked_treat.png
--- a/kubejs/assets/tacz/lang/uk_ua.json
+++ b/kubejs/assets/tacz/lang/uk_ua.json
@ -6,6 +6,8 @@
  "applied_armorer.attachment.extended_mid_mag_aa_1.name": "Флюіксовий рифлений модуль",
  "applied_armorer.attachment.extended_mid_mag_aa_2.name": "§9Флюіксовий рифлений модуль",
  "applied_armorer.attachment.extended_mid_mag_aa_3.name": "§dФлюіксовий рифлений модуль",
+  "applied_armorer.ammo.cluster_quartz_bullet.name": "§bКластерна кварцова оболонка",
+  "applied_armorer.ammo.etched_quartz_bullet.name": "§bГравійована кварцова куля",
  "applied_armorer.attachment.si_pricision.name": "§aПриціл високої точності",
  "applied_armorer.attachment.si_double_sided_mirror.name": "\"Подвійний дзеркальний\" приціл",
  "applied_armorer.attachment.si_ms_12.name": "§aMS-12 Приціл",
@ -24,9 +26,15 @@
  "create_armorer.attachment.extended_mag_ca_1.name": "Інваровий магазин",
  "create_armorer.attachment.extended_mag_ca_2.name": "Магазин із мідним покриттям",
  "create_armorer.attachment.extended_mag_ca_3.name": "Магазин із латунним покриттям",
-  "create_armorer.ammo.rbapb.name": "Римований патрон із плоским зарядом",
+  "create_armorer.ammo.slap.name": "Куля SLAP",
+  "create_armorer.ammo.rbapb.name": "Куля з фланцем з тупим наконечником",
+  "create_armorer.gun.pistol_auto_stress": "Напівавтоматичний пістолет \"Стрес\"",
  "create_armorer.gun.mg_platemag_flywheel": "\"Маховиковий\" кулемет",
  "create_armorer.gun.rifle_assult_crane": "\"Кранова\" штурмова гвинтівка",
+  "create_armorer.gun.sniper_semi_clockwork": "Гвинтівка \"Клокворк\"",
+  "tacz.ammo.30_06.name": "Куля SLAP 30-06",
+  "tacz.ammo.12g.name": "Патрон 12 калібру",
+  "tacz.gun.m700.name": "Снайперська гвинтівка \"Клатч\"",
  "item.tacz.ammo_box.iron": "Сталевий ящик з набоями",
  "item.tacz.ammo_box.gold": "§9Ящик набоїв з магналію",
  "item.tacz.ammo_box.diamond": "§6Ящик набоїв з дешу"
--- a/kubejs/assets/tfc/lang/uk_ua.json
+++ b/kubejs/assets/tfc/lang/uk_ua.json
@ -11,6 +11,8 @@
  "item.tfc.powder.sulfur": "Сірчаний Порошок",
  "item.tfc.jute_net": "Мішковинна сітка",
  "item.tfc.dirty_jute_net": "Брудна мішковинна сітка",
+  "item.tfc.powder.salt": "Харчова сіль",
+  "item.tfc.blubber": "Тваринний жир",
  "tfc.jei.raw_hide_knapping": "Обробка Сирої Шкіри",
  "metal.tfg.redstone": "Редстоун",
  "metal.tfg.red_alloy": "Червоний сплав",
@ -25,6 +27,7 @@
  "tfc.recipe.barrel.tfg.barrel.gouda_wheel": "Колесо Гауда",
  "tfc.recipe.barrel.tfg.barrel.feta_wheel": "Колесо Фети",
  "tfc.recipe.barrel.tfg.barrel.shosha_wheel": "Колесо Шоша",
+  "tfc.field_guide.book_landing_text": "Вітаю, мандрівнику! Ця книга стане джерелом усього, що тобі потрібно знати, досліджуючи світ TerraFirmaCraft (TFC) у $(bold)TerraFirmaGreg$().$(br)Ця книга доступна будь-коли через іконку праворуч у твоєму інвентарі.$(br)Онлайн-версію цього посібника можна знайти $(bold)$(l:https://terrafirmagreg-team.github.io/Field-Guide-Modern/uk_ua/)тут$().$(br)Натисни на $(italic)Індекс записів$() і почни вводити, щоб $(bold)шукати$().",
  "trim_material.tfc.almandine_tfc": "Альмандин",
  "trim_material.tfc.andradite_tfc": "Андрадіт",
  "trim_material.tfc.blue_topaz_tfc": "Синій Топаз",
@ -42,7 +45,7 @@
  "trim_material.tfc.salt_tfc": "сіль",
  "trim_material.tfc.sapphire_tfc": "Сапфір",
  "trim_material.tfc.sodalite_tfc": "Содаліт",
-  "trim_material.tfc.coke_tfc": "Кокс",
+  "trim_material.tfc.armalcolite_tfc": "Армалколіт",
  "trim_material.tfc.spessartine_tfc": "Спесартин",
  "trim_material.tfc.topaz_tfc": "Топаз",
  "trim_material.tfc.uvarovite_tfc": "Уваровіт",
--- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/earth_ore_index.json
+++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/earth_ore_index.json
@ -19,7 +19,7 @@
    },
    {
      "Type": "patchouli:text",
-      "text": "$(li)Bornite: $(l:tfg_ores/earth_vein_index#deep_sheldonite)53%$(/l), $(l:tfg_ores/earth_vein_index#deep_topaz)15%$(/l)$()$(li)Calcite: $(l:tfg_ores/earth_vein_index#normal_gypsum)30%$(/l), $(l:tfg_ores/earth_vein_index#normal_lapis)15%$(/l)$()$(li)Cassiterite: $(l:tfg_ores/earth_vein_index#surface_cassiterite)60%$(/l), $(l:tfg_ores/earth_vein_index#normal_cassiterite)40%$(/l), $(l:tfg_ores/earth_vein_index#surface_copper)5%$(/l)$()$(li)Cassiterite Sand: $(l:tfg_ores/earth_vein_index#normal_garnet_tin)35%$(/l)$()$(li)Chalcocite: $(l:tfg_ores/earth_vein_index#deep_topaz)25%$(/l)$()$(li)Chalcopyrite: $(l:tfg_ores/earth_vein_index#surface_copper)61%$(/l), $(l:tfg_ores/earth_vein_index#normal_copper)20%$(/l)$()$(li)Chromite: $(l:tfg_ores/earth_vein_index#deep_magnetite)33%$(/l), $(l:tfg_ores/earth_vein_index#normal_magnetite)4%$(/l)$()$(li)Cinnabar: $(l:tfg_ores/earth_vein_index#normal_redstone)20%$(/l)$()$(li)Coal: $(l:tfg_ores/earth_vein_index#normal_coal)100%$(/l), $(l:tfg_ores/earth_vein_index#normal_graphite)30%$(/l)$()$(li)Cobalt: $(l:tfg_ores/earth_vein_index#normal_garnierite)15%$(/l)$()$(li)Cobaltite: $(l:tfg_ores/earth_vein_index#normal_garnierite)20%$(/l)$()$(li)Cooperite: $(l:tfg_ores/earth_vein_index#deep_sheldonite)38%$(/l)$()$(li)Diamond: $(l:tfg_ores/earth_vein_index#normal_graphite)25%$(/l)$()$(li)Diatomite: $(l:tfg_ores/earth_vein_index#normal_saltpeter)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_garnet_tin)15%$(/l)$()",
+      "text": "$(li)Bornite: $(l:tfg_ores/earth_vein_index#deep_sheldonite)53%$(/l), $(l:tfg_ores/earth_vein_index#deep_topaz)15%$(/l)$()$(li)Calcite: $(l:tfg_ores/earth_vein_index#normal_gypsum)30%$(/l), $(l:tfg_ores/earth_vein_index#normal_lapis)15%$(/l)$()$(li)Cassiterite: $(l:tfg_ores/earth_vein_index#surface_cassiterite)55%$(/l), $(l:tfg_ores/earth_vein_index#normal_cassiterite)35%$(/l), $(l:tfg_ores/earth_vein_index#surface_copper)5%$(/l)$()$(li)Cassiterite Sand: $(l:tfg_ores/earth_vein_index#normal_garnet_tin)35%$(/l)$()$(li)Chalcocite: $(l:tfg_ores/earth_vein_index#deep_topaz)25%$(/l)$()$(li)Chalcopyrite: $(l:tfg_ores/earth_vein_index#surface_copper)61%$(/l), $(l:tfg_ores/earth_vein_index#normal_copper)20%$(/l)$()$(li)Chromite: $(l:tfg_ores/earth_vein_index#deep_magnetite)33%$(/l), $(l:tfg_ores/earth_vein_index#normal_magnetite)4%$(/l)$()$(li)Cinnabar: $(l:tfg_ores/earth_vein_index#normal_redstone)20%$(/l)$()$(li)Coal: $(l:tfg_ores/earth_vein_index#normal_coal)100%$(/l), $(l:tfg_ores/earth_vein_index#normal_graphite)30%$(/l)$()$(li)Cobalt: $(l:tfg_ores/earth_vein_index#normal_garnierite)15%$(/l)$()$(li)Cobaltite: $(l:tfg_ores/earth_vein_index#normal_garnierite)20%$(/l)$()$(li)Cooperite: $(l:tfg_ores/earth_vein_index#deep_sheldonite)38%$(/l)$()$(li)Diamond: $(l:tfg_ores/earth_vein_index#normal_graphite)25%$(/l)$()$(li)Diatomite: $(l:tfg_ores/earth_vein_index#normal_saltpeter)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_garnet_tin)15%$(/l)$()",
      "type": "patchouli:text"
    },
    {
@ -39,12 +39,12 @@
    },
    {
      "Type": "patchouli:text",
-      "text": "$(li)Pyrope: $(l:tfg_ores/earth_vein_index#deep_sapphire)27%$(/l)$()$(li)Quartzite: $(l:tfg_ores/earth_vein_index#normal_quartz)43%$(/l)$()$(li)Realgar: $(l:tfg_ores/earth_vein_index#surface_copper)16%$(/l)$()$(li)Red Garnet: $(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)5%$(/l), $(l:tfg_ores/earth_vein_index#deep_garnet_opal)5%$(/l)$()$(li)Redstone: $(l:tfg_ores/earth_vein_index#normal_redstone)45%$(/l)$()$(li)Rock Salt: $(l:tfg_ores/earth_vein_index#normal_salt)40%$(/l), $(l:tfg_ores/earth_vein_index#normal_spodumene)20%$(/l)$()$(li)Ruby: $(l:tfg_ores/earth_vein_index#normal_redstone)35%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)20%$(/l)$()$(li)Salt: $(l:tfg_ores/earth_vein_index#normal_salt)30%$(/l), $(l:tfg_ores/earth_vein_index#normal_spodumene)30%$(/l)$()$(li)Saltpeter: $(l:tfg_ores/earth_vein_index#normal_saltpeter)35%$(/l)$()$(li)Sapphire: $(l:tfg_ores/earth_vein_index#deep_sapphire)16%$(/l), $(l:tfg_ores/earth_vein_index#deep_magnetite)8%$(/l)$()$(li)Scheelite: $(l:tfg_ores/earth_vein_index#deep_scheelite)45%$(/l)$()$(li)Soapstone: $(l:tfg_ores/earth_vein_index#normal_lubricant)30%$(/l)$()$(li)Sodalite: $(l:tfg_ores/earth_vein_index#normal_lapis)25%$(/l)$()$(li)Spessartine: $(l:tfg_ores/earth_vein_index#normal_manganese)25%$(/l)$()",
+      "text": "$(li)Pyrope: $(l:tfg_ores/earth_vein_index#deep_sapphire)27%$(/l)$()$(li)Quartzite: $(l:tfg_ores/earth_vein_index#normal_quartz)43%$(/l)$()$(li)Realgar: $(l:tfg_ores/earth_vein_index#surface_copper)16%$(/l)$()$(li)Red Garnet: $(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)5%$(/l), $(l:tfg_ores/earth_vein_index#deep_garnet_opal)5%$(/l)$()$(li)Redstone: $(l:tfg_ores/earth_vein_index#normal_redstone)45%$(/l)$()$(li)Rock Salt: $(l:tfg_ores/earth_vein_index#normal_salt)40%$(/l), $(l:tfg_ores/earth_vein_index#normal_spodumene)20%$(/l)$()$(li)Ruby: $(l:tfg_ores/earth_vein_index#normal_redstone)35%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)20%$(/l)$()$(li)Salt: $(l:tfg_ores/earth_vein_index#normal_salt)30%$(/l), $(l:tfg_ores/earth_vein_index#normal_spodumene)30%$(/l)$()$(li)Saltpeter: $(l:tfg_ores/earth_vein_index#normal_saltpeter)35%$(/l), $(l:tfg_ores/earth_vein_index#normal_cassiterite)10%$(/l), $(l:tfg_ores/earth_vein_index#surface_cassiterite)10%$(/l)$()$(li)Sapphire: $(l:tfg_ores/earth_vein_index#deep_sapphire)16%$(/l), $(l:tfg_ores/earth_vein_index#deep_magnetite)8%$(/l)$()$(li)Scheelite: $(l:tfg_ores/earth_vein_index#deep_scheelite)45%$(/l)$()$(li)Soapstone: $(l:tfg_ores/earth_vein_index#normal_lubricant)30%$(/l)$()$(li)Sodalite: $(l:tfg_ores/earth_vein_index#normal_lapis)25%$(/l)$()$(li)Spessartine: $(l:tfg_ores/earth_vein_index#normal_manganese)25%$(/l)$()",
      "type": "patchouli:text"
    },
    {
      "Type": "patchouli:text",
-      "text": "$(li)Sphalerite: $(l:tfg_ores/earth_vein_index#normal_sphalerite)40%$(/l), $(l:tfg_ores/earth_vein_index#surface_sphalerite)40%$(/l), $(l:tfg_ores/earth_vein_index#normal_sulfur)15%$(/l)$()$(li)Spodumene: $(l:tfg_ores/earth_vein_index#normal_spodumene)35%$(/l)$()$(li)Stibnite: $(l:tfg_ores/earth_vein_index#normal_tetrahedrite)20%$(/l), $(l:tfg_ores/earth_vein_index#surface_tetrahedrite)20%$(/l)$()$(li)Sulfur: $(l:tfg_ores/earth_vein_index#surface_sphalerite)55%$(/l), $(l:tfg_ores/earth_vein_index#normal_sulfur)50%$(/l), $(l:tfg_ores/earth_vein_index#normal_sphalerite)35%$(/l), $(l:tfg_ores/earth_vein_index#normal_bismuthinite)9%$(/l), $(l:tfg_ores/earth_vein_index#surface_bismuthinite)3%$(/l)$()$(li)Talc: $(l:tfg_ores/earth_vein_index#normal_lubricant)20%$(/l)$()$(li)Tantalite: $(l:tfg_ores/earth_vein_index#normal_manganese)12%$(/l)$()$(li)Tarkianite: $(l:tfg_ores/earth_vein_index#normal_tarkianite)35%$(/l)$()$(li)Tetrahedrite: $(l:tfg_ores/earth_vein_index#surface_tetrahedrite)60%$(/l), $(l:tfg_ores/earth_vein_index#normal_tetrahedrite)50%$(/l)$()$(li)Thorium: $(l:tfg_ores/earth_vein_index#normal_beryllium)15%$(/l)$()$(li)Tin: $(l:tfg_ores/earth_vein_index#normal_cassiterite)60%$(/l), $(l:tfg_ores/earth_vein_index#surface_cassiterite)40%$(/l)$()$(li)Topaz: $(l:tfg_ores/earth_vein_index#deep_topaz)25%$(/l)$()$(li)Tricalcium Phosphate: $(l:tfg_ores/earth_vein_index#normal_apatite)35%$(/l)$()$(li)Trona: $(l:tfg_ores/earth_vein_index#normal_lubricant)10%$(/l), $(l:tfg_ores/earth_vein_index#normal_tarkianite)10%$(/l)$()$(li)Tungstate: $(l:tfg_ores/earth_vein_index#deep_scheelite)35%$(/l)$()",
+      "text": "$(li)Sphalerite: $(l:tfg_ores/earth_vein_index#normal_sphalerite)40%$(/l), $(l:tfg_ores/earth_vein_index#surface_sphalerite)40%$(/l), $(l:tfg_ores/earth_vein_index#normal_sulfur)15%$(/l)$()$(li)Spodumene: $(l:tfg_ores/earth_vein_index#normal_spodumene)35%$(/l)$()$(li)Stibnite: $(l:tfg_ores/earth_vein_index#normal_tetrahedrite)20%$(/l), $(l:tfg_ores/earth_vein_index#surface_tetrahedrite)20%$(/l)$()$(li)Sulfur: $(l:tfg_ores/earth_vein_index#surface_sphalerite)55%$(/l), $(l:tfg_ores/earth_vein_index#normal_sulfur)50%$(/l), $(l:tfg_ores/earth_vein_index#normal_sphalerite)35%$(/l), $(l:tfg_ores/earth_vein_index#normal_bismuthinite)9%$(/l), $(l:tfg_ores/earth_vein_index#surface_bismuthinite)3%$(/l)$()$(li)Talc: $(l:tfg_ores/earth_vein_index#normal_lubricant)20%$(/l)$()$(li)Tantalite: $(l:tfg_ores/earth_vein_index#normal_manganese)12%$(/l)$()$(li)Tarkianite: $(l:tfg_ores/earth_vein_index#normal_tarkianite)35%$(/l)$()$(li)Tetrahedrite: $(l:tfg_ores/earth_vein_index#surface_tetrahedrite)60%$(/l), $(l:tfg_ores/earth_vein_index#normal_tetrahedrite)50%$(/l)$()$(li)Thorium: $(l:tfg_ores/earth_vein_index#normal_beryllium)15%$(/l)$()$(li)Tin: $(l:tfg_ores/earth_vein_index#normal_cassiterite)55%$(/l), $(l:tfg_ores/earth_vein_index#surface_cassiterite)35%$(/l)$()$(li)Topaz: $(l:tfg_ores/earth_vein_index#deep_topaz)25%$(/l)$()$(li)Tricalcium Phosphate: $(l:tfg_ores/earth_vein_index#normal_apatite)35%$(/l)$()$(li)Trona: $(l:tfg_ores/earth_vein_index#normal_lubricant)10%$(/l), $(l:tfg_ores/earth_vein_index#normal_tarkianite)10%$(/l)$()$(li)Tungstate: $(l:tfg_ores/earth_vein_index#deep_scheelite)35%$(/l)$()",
      "type": "patchouli:text"
    },
    {
--- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/earth_vein_index.json
+++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/earth_vein_index.json
@ -563,7 +563,7 @@
        ]
      },
      "enable_visualize": false,
-      "text": "$(thing)Percentage$(): 60%$(br)$(thing)Melts into$(): Tin$(br)$(thing)Formula$(): Sn",
+      "text": "$(thing)Percentage$(): 55%$(br)$(thing)Melts into$(): Tin$(br)$(thing)Formula$(): Sn",
      "type": "patchouli:multiblock"
    },
    {
@ -583,13 +583,28 @@
        ]
      },
      "enable_visualize": false,
-      "text": "$(thing)Percentage$(): 40%$(br)$(thing)Melts into$(): Tin$(br)$(thing)Formula$(): SnO₂",
+      "text": "$(thing)Percentage$(): 35%$(br)$(thing)Melts into$(): Tin$(br)$(thing)Formula$(): SnO₂",
      "type": "patchouli:multiblock"
    },
    {
-      "Type": "patchouli:empty",
-      "draw_filler": true,
-      "type": "patchouli:empty"
+      "Type": "patchouli:multiblock",
+      "name": "Saltpeter",
+      "multiblock": {
+        "mapping": {
+          "0": "#forge:ores/saltpeter"
+        },
+        "pattern": [
+          [
+            "0"
+          ],
+          [
+            " "
+          ]
+        ]
+      },
+      "enable_visualize": false,
+      "text": "$(thing)Percentage$(): 10%$(br)$(thing)Source of$(): Potassium, Nitrogen$(br)$(thing)Formula$(): KNO₃",
+      "type": "patchouli:multiblock"
    },
    {
      "Type": "patchouli:text",
@ -615,7 +630,7 @@
        ]
      },
      "enable_visualize": false,
-      "text": "$(thing)Percentage$(): 60%$(br)$(thing)Melts into$(): Tin$(br)$(thing)Formula$(): SnO₂",
+      "text": "$(thing)Percentage$(): 55%$(br)$(thing)Melts into$(): Tin$(br)$(thing)Formula$(): SnO₂",
      "type": "patchouli:multiblock"
    },
    {
@ -635,13 +650,28 @@
        ]
      },
      "enable_visualize": false,
-      "text": "$(thing)Percentage$(): 40%$(br)$(thing)Melts into$(): Tin$(br)$(thing)Formula$(): Sn",
+      "text": "$(thing)Percentage$(): 35%$(br)$(thing)Melts into$(): Tin$(br)$(thing)Formula$(): Sn",
      "type": "patchouli:multiblock"
    },
    {
-      "Type": "patchouli:empty",
-      "draw_filler": true,
-      "type": "patchouli:empty"
+      "Type": "patchouli:multiblock",
+      "name": "Saltpeter",
+      "multiblock": {
+        "mapping": {
+          "0": "#forge:ores/saltpeter"
+        },
+        "pattern": [
+          [
+            "0"
+          ],
+          [
+            " "
+          ]
+        ]
+      },
+      "enable_visualize": false,
+      "text": "$(thing)Percentage$(): 10%$(br)$(thing)Source of$(): Potassium, Nitrogen$(br)$(thing)Formula$(): KNO₃",
+      "type": "patchouli:multiblock"
    },
    {
      "Type": "patchouli:text",
--- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/nether_ore_index.json
+++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/nether_ore_index.json
@ -19,7 +19,7 @@
    },
    {
      "Type": "patchouli:text",
-      "text": "$(li)Calcite: $(l:tfg_ores/nether_vein_index#nether_gypsum)30%$(/l), $(l:tfg_ores/nether_vein_index#nether_lapis)15%$(/l)$()$(li)Cassiterite: $(l:tfg_ores/nether_vein_index#nether_cassiterite)40%$(/l)$()$(li)Cassiterite Sand: $(l:tfg_ores/nether_vein_index#nether_garnet_tin)35%$(/l)$()$(li)Chalcocite: $(l:tfg_ores/nether_vein_index#nether_topaz)25%$(/l)$()$(li)Chalcopyrite: $(l:tfg_ores/nether_vein_index#nether_copper)20%$(/l)$()$(li)Chromite: $(l:tfg_ores/nether_vein_index#nether_magnetite)10%$(/l)$()$(li)Cinnabar: $(l:tfg_ores/nether_vein_index#nether_redstone)20%$(/l)$()$(li)Coal: $(l:tfg_ores/nether_vein_index#nether_graphite)15%$(/l)$()$(li)Cobalt: $(l:tfg_ores/nether_vein_index#nether_garnierite)14%$(/l)$()$(li)Cobaltite: $(l:tfg_ores/nether_vein_index#nether_garnierite)19%$(/l)$()$(li)Cooperite: $(l:tfg_ores/nether_vein_index#nether_sheldonite)29%$(/l)$()$(li)Diamond: $(l:tfg_ores/nether_vein_index#nether_graphite)40%$(/l)$()$(li)Diatomite: $(l:tfg_ores/nether_vein_index#nether_saltpeter)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_garnet_tin)15%$(/l)$()$(li)Electrotine: $(l:tfg_ores/nether_vein_index#nether_saltpeter)25%$(/l)$()",
+      "text": "$(li)Calcite: $(l:tfg_ores/nether_vein_index#nether_gypsum)30%$(/l), $(l:tfg_ores/nether_vein_index#nether_lapis)15%$(/l)$()$(li)Cassiterite: $(l:tfg_ores/nether_vein_index#nether_cassiterite)36%$(/l)$()$(li)Cassiterite Sand: $(l:tfg_ores/nether_vein_index#nether_garnet_tin)35%$(/l)$()$(li)Chalcocite: $(l:tfg_ores/nether_vein_index#nether_topaz)25%$(/l)$()$(li)Chalcopyrite: $(l:tfg_ores/nether_vein_index#nether_copper)20%$(/l)$()$(li)Chromite: $(l:tfg_ores/nether_vein_index#nether_magnetite)10%$(/l)$()$(li)Cinnabar: $(l:tfg_ores/nether_vein_index#nether_redstone)20%$(/l)$()$(li)Coal: $(l:tfg_ores/nether_vein_index#nether_graphite)15%$(/l)$()$(li)Cobalt: $(l:tfg_ores/nether_vein_index#nether_garnierite)14%$(/l)$()$(li)Cobaltite: $(l:tfg_ores/nether_vein_index#nether_garnierite)19%$(/l)$()$(li)Cooperite: $(l:tfg_ores/nether_vein_index#nether_sheldonite)29%$(/l)$()$(li)Diamond: $(l:tfg_ores/nether_vein_index#nether_graphite)40%$(/l)$()$(li)Diatomite: $(l:tfg_ores/nether_vein_index#nether_saltpeter)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_garnet_tin)15%$(/l)$()$(li)Electrotine: $(l:tfg_ores/nether_vein_index#nether_saltpeter)25%$(/l)$()",
      "type": "patchouli:text"
    },
    {
@ -39,12 +39,12 @@
    },
    {
      "Type": "patchouli:text",
-      "text": "$(li)Quartzite: $(l:tfg_ores/nether_vein_index#nether_quartz)25%$(/l)$()$(li)Red Garnet: $(l:tfg_ores/nether_vein_index#nether_garnet)9%$(/l)$()$(li)Redstone: $(l:tfg_ores/nether_vein_index#nether_redstone)45%$(/l)$()$(li)Rock Salt: $(l:tfg_ores/nether_vein_index#nether_beryllium)18%$(/l)$()$(li)Ruby: $(l:tfg_ores/nether_vein_index#nether_redstone)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)20%$(/l)$()$(li)Saltpeter: $(l:tfg_ores/nether_vein_index#nether_saltpeter)35%$(/l)$()$(li)Sapphire: $(l:tfg_ores/nether_vein_index#nether_sapphire)16%$(/l), $(l:tfg_ores/nether_vein_index#nether_magnetite)10%$(/l)$()$(li)Scheelite: $(l:tfg_ores/nether_vein_index#nether_scheelite)45%$(/l)$()$(li)Soapstone: $(l:tfg_ores/nether_vein_index#nether_lubricant)30%$(/l)$()$(li)Sodalite: $(l:tfg_ores/nether_vein_index#nether_lapis)25%$(/l)$()$(li)Spessartine: $(l:tfg_ores/nether_vein_index#nether_manganese)25%$(/l)$()$(li)Sphalerite: $(l:tfg_ores/nether_vein_index#nether_sphalerite)40%$(/l), $(l:tfg_ores/nether_vein_index#nether_sulfur)15%$(/l)$()$(li)Stibnite: $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)20%$(/l)$()$(li)Sulfur: $(l:tfg_ores/nether_vein_index#nether_sulfur)50%$(/l), $(l:tfg_ores/nether_vein_index#nether_sphalerite)35%$(/l)$()",
+      "text": "$(li)Quartzite: $(l:tfg_ores/nether_vein_index#nether_quartz)25%$(/l)$()$(li)Red Garnet: $(l:tfg_ores/nether_vein_index#nether_garnet)9%$(/l)$()$(li)Redstone: $(l:tfg_ores/nether_vein_index#nether_redstone)45%$(/l)$()$(li)Rock Salt: $(l:tfg_ores/nether_vein_index#nether_beryllium)18%$(/l)$()$(li)Ruby: $(l:tfg_ores/nether_vein_index#nether_redstone)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)20%$(/l)$()$(li)Saltpeter: $(l:tfg_ores/nether_vein_index#nether_saltpeter)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_cassiterite)9%$(/l)$()$(li)Sapphire: $(l:tfg_ores/nether_vein_index#nether_sapphire)16%$(/l), $(l:tfg_ores/nether_vein_index#nether_magnetite)10%$(/l)$()$(li)Scheelite: $(l:tfg_ores/nether_vein_index#nether_scheelite)45%$(/l)$()$(li)Soapstone: $(l:tfg_ores/nether_vein_index#nether_lubricant)30%$(/l)$()$(li)Sodalite: $(l:tfg_ores/nether_vein_index#nether_lapis)25%$(/l)$()$(li)Spessartine: $(l:tfg_ores/nether_vein_index#nether_manganese)25%$(/l)$()$(li)Sphalerite: $(l:tfg_ores/nether_vein_index#nether_sphalerite)40%$(/l), $(l:tfg_ores/nether_vein_index#nether_sulfur)15%$(/l)$()$(li)Stibnite: $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)20%$(/l)$()$(li)Sulfur: $(l:tfg_ores/nether_vein_index#nether_sulfur)50%$(/l), $(l:tfg_ores/nether_vein_index#nether_sphalerite)35%$(/l)$()",
      "type": "patchouli:text"
    },
    {
      "Type": "patchouli:text",
-      "text": "$(li)Sylvite: $(l:tfg_ores/nether_vein_index#nether_sylvite)100%$(/l)$()$(li)Talc: $(l:tfg_ores/nether_vein_index#nether_lubricant)20%$(/l)$()$(li)Tantalite: $(l:tfg_ores/nether_vein_index#nether_manganese)12%$(/l)$()$(li)Tetrahedrite: $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)50%$(/l)$()$(li)Thorium: $(l:tfg_ores/nether_vein_index#nether_beryllium)0%$(/l)$()$(li)Tin: $(l:tfg_ores/nether_vein_index#nether_cassiterite)60%$(/l)$()$(li)Topaz: $(l:tfg_ores/nether_vein_index#nether_topaz)25%$(/l)$()$(li)Tricalcium Phosphate: $(l:tfg_ores/nether_vein_index#nether_apatite)35%$(/l)$()$(li)Trona: $(l:tfg_ores/nether_vein_index#nether_lubricant)10%$(/l)$()$(li)Tungstate: $(l:tfg_ores/nether_vein_index#nether_scheelite)35%$(/l)$()$(li)Uraninite: $(l:tfg_ores/nether_vein_index#nether_pitchblende)25%$(/l)$()$(li)Vanadium Magnetite: $(l:tfg_ores/nether_vein_index#nether_magnetite)30%$(/l)$()$(li)Wulfenite: $(l:tfg_ores/nether_vein_index#nether_molybdenum)42%$(/l), $(l:tfg_ores/nether_vein_index#nether_pitchblende)12%$(/l)$()$(li)Yellow Garnet: $(l:tfg_ores/nether_vein_index#nether_garnet)14%$(/l)$()",
+      "text": "$(li)Sylvite: $(l:tfg_ores/nether_vein_index#nether_sylvite)100%$(/l)$()$(li)Talc: $(l:tfg_ores/nether_vein_index#nether_lubricant)20%$(/l)$()$(li)Tantalite: $(l:tfg_ores/nether_vein_index#nether_manganese)12%$(/l)$()$(li)Tetrahedrite: $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)50%$(/l)$()$(li)Thorium: $(l:tfg_ores/nether_vein_index#nether_beryllium)0%$(/l)$()$(li)Tin: $(l:tfg_ores/nether_vein_index#nether_cassiterite)54%$(/l)$()$(li)Topaz: $(l:tfg_ores/nether_vein_index#nether_topaz)25%$(/l)$()$(li)Tricalcium Phosphate: $(l:tfg_ores/nether_vein_index#nether_apatite)35%$(/l)$()$(li)Trona: $(l:tfg_ores/nether_vein_index#nether_lubricant)10%$(/l)$()$(li)Tungstate: $(l:tfg_ores/nether_vein_index#nether_scheelite)35%$(/l)$()$(li)Uraninite: $(l:tfg_ores/nether_vein_index#nether_pitchblende)25%$(/l)$()$(li)Vanadium Magnetite: $(l:tfg_ores/nether_vein_index#nether_magnetite)30%$(/l)$()$(li)Wulfenite: $(l:tfg_ores/nether_vein_index#nether_molybdenum)42%$(/l), $(l:tfg_ores/nether_vein_index#nether_pitchblende)12%$(/l)$()$(li)Yellow Garnet: $(l:tfg_ores/nether_vein_index#nether_garnet)14%$(/l)$()",
      "type": "patchouli:text"
    },
    {
--- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/nether_vein_index.json
+++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/nether_vein_index.json
@ -396,7 +396,7 @@
        ]
      },
      "enable_visualize": false,
-      "text": "$(thing)Percentage$(): 60%$(br)$(thing)Melts into$(): Tin$(br)$(thing)Formula$(): Sn",
+      "text": "$(thing)Percentage$(): 54%$(br)$(thing)Melts into$(): Tin$(br)$(thing)Formula$(): Sn",
      "type": "patchouli:multiblock"
    },
    {
@ -416,13 +416,28 @@
        ]
      },
      "enable_visualize": false,
-      "text": "$(thing)Percentage$(): 40%$(br)$(thing)Melts into$(): Tin$(br)$(thing)Formula$(): SnO₂",
+      "text": "$(thing)Percentage$(): 36%$(br)$(thing)Melts into$(): Tin$(br)$(thing)Formula$(): SnO₂",
      "type": "patchouli:multiblock"
    },
    {
-      "Type": "patchouli:empty",
-      "draw_filler": true,
-      "type": "patchouli:empty"
+      "Type": "patchouli:multiblock",
+      "name": "Saltpeter",
+      "multiblock": {
+        "mapping": {
+          "0": "#forge:ores/saltpeter"
+        },
+        "pattern": [
+          [
+            "0"
+          ],
+          [
+            " "
+          ]
+        ]
+      },
+      "enable_visualize": false,
+      "text": "$(thing)Percentage$(): 9%$(br)$(thing)Source of$(): Potassium, Nitrogen$(br)$(thing)Formula$(): KNO₃",
+      "type": "patchouli:multiblock"
    },
    {
      "Type": "patchouli:text",
--- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/venus_ore_index.json
+++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/venus_ore_index.json
@ -0,0 +1,22 @@
+{
+  "__credits__": "This page was automatically generated by OresToFieldGuide.",
+  "name": "Venus Ore Index",
+  "icon": "gtceu:sulfur_dust",
+  "category": "tfc:tfg_ores",
+  "read_by_default": true,
+  "secret": false,
+  "pages": [
+    {
+      "Type": "patchouli:text",
+      "text": "This is the $(thing)Ore Index$() for $(thing)Venus$(). All ores are sorted alphabetically and then by richest to poorest vein type. You can click on them to learn more information about each vein.",
+      "title": "Venus Ore Index",
+      "type": "patchouli:text"
+    },
+    {
+      "Type": "patchouli:text",
+      "text": "$(li)Lepidolite: $(l:tfg_ores/venus_vein_index#venus_manual_salt)15%$(/l)$()$(li)Pyrite: $(l:tfg_ores/venus_vein_index#venus_manual_sulfur)35%$(/l)$()$(li)Rock Salt: $(l:tfg_ores/venus_vein_index#venus_manual_salt)20%$(/l)$()$(li)Salt: $(l:tfg_ores/venus_vein_index#venus_manual_salt)50%$(/l)$()$(li)Sphalerite: $(l:tfg_ores/venus_vein_index#venus_manual_sulfur)15%$(/l)$()$(li)Spodumene: $(l:tfg_ores/venus_vein_index#venus_manual_salt)15%$(/l)$()$(li)Sulfur: $(l:tfg_ores/venus_vein_index#venus_manual_sulfur)50%$(/l)$()",
+      "type": "patchouli:text"
+    }
+  ],
+  "sortnum": 8
+}
--- a/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/venus_vein_index.json
+++ b/kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/venus_vein_index.json
@ -0,0 +1,181 @@
+{
+  "__credits__": "This page was automatically generated by OresToFieldGuide.",
+  "name": "Venus Vein Index",
+  "icon": "gtceu:venus_stone_sulfur_ore",
+  "category": "tfc:tfg_ores",
+  "read_by_default": true,
+  "secret": false,
+  "pages": [
+    {
+      "Type": "patchouli:text",
+      "text": "This is the $(thing)Vein Index$() for $(item)Venus$(). Each Vein has details regarding its rarity, density, vein type, height found, sizes, what stones it spawns in, and more.",
+      "title": "Venus Vein Index",
+      "type": "patchouli:text"
+    },
+    {
+      "Type": "patchouli:text",
+      "text": "$(li)$(l:tfg_ores/venus_vein_index#venus_manual_salt)Salts & Spodumene$()$()$(li)$(l:tfg_ores/venus_vein_index#venus_manual_sulfur)Sulfur & Pyrite$()$()",
+      "type": "patchouli:text"
+    },
+    {
+      "Type": "patchouli:text",
+      "text": "$(thing)Rarity$(): 100$(br)$(thing)Density$(): 0.2$(br)$(thing)Type$(): Disc Vein$(br)$(thing)Y$(): 40 — 65$(br)$(thing)Size$(): 20$(br)$(thing)Height$(): 6$(br)$(thing)Indicator Max Depth$(): 30$(br2)$(thing)Stone Types$(): Andesite, Basalt, Dacite, Rhyolite, Trachyte, Travertine$(br2)Only appears in the $(thing)Salt Flats$() biome.",
+      "title": "Salts & Spodumene",
+      "type": "patchouli:text",
+      "anchor": "venus_manual_salt"
+    },
+    {
+      "Type": "patchouli:multiblock",
+      "name": "Salt",
+      "multiblock": {
+        "mapping": {
+          "0": "#forge:ores/salt"
+        },
+        "pattern": [
+          [
+            "0"
+          ],
+          [
+            " "
+          ]
+        ]
+      },
+      "enable_visualize": false,
+      "text": "$(thing)Percentage$(): 50%$(br)$(thing)Source of$(): Sodium, Chlorine$(br)$(thing)Formula$(): NaCl",
+      "type": "patchouli:multiblock"
+    },
+    {
+      "Type": "patchouli:multiblock",
+      "name": "Rock Salt",
+      "multiblock": {
+        "mapping": {
+          "0": "#forge:ores/rock_salt"
+        },
+        "pattern": [
+          [
+            "0"
+          ],
+          [
+            " "
+          ]
+        ]
+      },
+      "enable_visualize": false,
+      "text": "$(thing)Percentage$(): 20%$(br)$(thing)Source of$(): Potassium, Chlorine$(br)$(thing)Formula$(): KCl",
+      "type": "patchouli:multiblock"
+    },
+    {
+      "Type": "patchouli:multiblock",
+      "name": "Lepidolite",
+      "multiblock": {
+        "mapping": {
+          "0": "#forge:ores/lepidolite"
+        },
+        "pattern": [
+          [
+            "0"
+          ],
+          [
+            " "
+          ]
+        ]
+      },
+      "enable_visualize": false,
+      "text": "$(thing)Percentage$(): 15%$(br)$(thing)Source of$(): Potassium, Lithium, Aluminium, Fluorine$(br)$(thing)Formula$(): KLi₃Al₄F₂O₁₀",
+      "type": "patchouli:multiblock"
+    },
+    {
+      "Type": "patchouli:multiblock",
+      "name": "Spodumene",
+      "multiblock": {
+        "mapping": {
+          "0": "#forge:ores/spodumene"
+        },
+        "pattern": [
+          [
+            "0"
+          ],
+          [
+            " "
+          ]
+        ]
+      },
+      "enable_visualize": false,
+      "text": "$(thing)Percentage$(): 15%$(br)$(thing)Source of$(): Lithium, Aluminium$(br)$(thing)Formula$(): LiAlSi₂O₆",
+      "type": "patchouli:multiblock"
+    },
+    {
+      "Type": "patchouli:empty",
+      "draw_filler": true,
+      "type": "patchouli:empty"
+    },
+    {
+      "Type": "patchouli:text",
+      "text": "$(thing)Rarity$(): 100$(br)$(thing)Density$(): 0.2$(br)$(thing)Type$(): Cluster Vein$(br)$(thing)Y$(): 40 — 65$(br)$(thing)Size$(): 15$(br)$(thing)Indicator Max Depth$(): 30$(br2)$(thing)Stone Types$(): Andesite, Basalt, Dacite, Rhyolite, Trachyte, Travertine$(br2)Only appears in the $(thing)Sulfuric Ravines$() biome.",
+      "title": "Sulfur & Pyrite",
+      "type": "patchouli:text",
+      "anchor": "venus_manual_sulfur"
+    },
+    {
+      "Type": "patchouli:multiblock",
+      "name": "Sulfur",
+      "multiblock": {
+        "mapping": {
+          "0": "#forge:ores/sulfur"
+        },
+        "pattern": [
+          [
+            "0"
+          ],
+          [
+            " "
+          ]
+        ]
+      },
+      "enable_visualize": false,
+      "text": "$(thing)Percentage$(): 50%$(br)$(thing)Source of$(): Sulfur$(br)$(thing)Formula$(): S",
+      "type": "patchouli:multiblock"
+    },
+    {
+      "Type": "patchouli:multiblock",
+      "name": "Pyrite",
+      "multiblock": {
+        "mapping": {
+          "0": "#forge:ores/pyrite"
+        },
+        "pattern": [
+          [
+            "0"
+          ],
+          [
+            " "
+          ]
+        ]
+      },
+      "enable_visualize": false,
+      "text": "$(thing)Percentage$(): 35%$(br)$(thing)Melts into$(): Cast Iron$(br)$(thing)Formula$(): FeS₂",
+      "type": "patchouli:multiblock"
+    },
+    {
+      "Type": "patchouli:multiblock",
+      "name": "Sphalerite",
+      "multiblock": {
+        "mapping": {
+          "0": "#forge:ores/sphalerite"
+        },
+        "pattern": [
+          [
+            "0"
+          ],
+          [
+            " "
+          ]
+        ]
+      },
+      "enable_visualize": false,
+      "text": "$(thing)Percentage$(): 15%$(br)$(thing)Melts into$(): Zinc$(br)$(thing)Formula$(): ZnS",
+      "type": "patchouli:multiblock"
+    }
+  ],
+  "sortnum": 9
+}
--- a/kubejs/assets/tfc/patchouli_books/field_guide/fr_fr/entries/tfg_ores/earth_ore_index.json
+++ b/kubejs/assets/tfc/patchouli_books/field_guide/fr_fr/entries/tfg_ores/earth_ore_index.json
@ -19,7 +19,7 @@
    },
    {
      "Type": "patchouli:text",
-      "text": "$(li)Bornite: $(l:tfg_ores/earth_vein_index#deep_sheldonite)53%$(/l), $(l:tfg_ores/earth_vein_index#deep_topaz)15%$(/l)$()$(li)Calcite: $(l:tfg_ores/earth_vein_index#normal_gypsum)30%$(/l), $(l:tfg_ores/earth_vein_index#normal_lapis)15%$(/l)$()$(li)Cassiterite: $(l:tfg_ores/earth_vein_index#surface_cassiterite)60%$(/l), $(l:tfg_ores/earth_vein_index#normal_cassiterite)40%$(/l), $(l:tfg_ores/earth_vein_index#surface_copper)5%$(/l)$()$(li)Cassiterite Sand: $(l:tfg_ores/earth_vein_index#normal_garnet_tin)35%$(/l)$()$(li)Chalcocite: $(l:tfg_ores/earth_vein_index#deep_topaz)25%$(/l)$()$(li)Chalcopyrite: $(l:tfg_ores/earth_vein_index#surface_copper)61%$(/l), $(l:tfg_ores/earth_vein_index#normal_copper)20%$(/l)$()$(li)Chromite: $(l:tfg_ores/earth_vein_index#deep_magnetite)33%$(/l), $(l:tfg_ores/earth_vein_index#normal_magnetite)4%$(/l)$()$(li)Cinnabar: $(l:tfg_ores/earth_vein_index#normal_redstone)20%$(/l)$()$(li)Coal: $(l:tfg_ores/earth_vein_index#normal_coal)100%$(/l), $(l:tfg_ores/earth_vein_index#normal_graphite)30%$(/l)$()$(li)Cobalt: $(l:tfg_ores/earth_vein_index#normal_garnierite)15%$(/l)$()$(li)Cobaltite: $(l:tfg_ores/earth_vein_index#normal_garnierite)20%$(/l)$()$(li)Cooperite: $(l:tfg_ores/earth_vein_index#deep_sheldonite)38%$(/l)$()$(li)Diamond: $(l:tfg_ores/earth_vein_index#normal_graphite)25%$(/l)$()$(li)Diatomite: $(l:tfg_ores/earth_vein_index#normal_saltpeter)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_garnet_tin)15%$(/l)$()",
+      "text": "$(li)Bornite: $(l:tfg_ores/earth_vein_index#deep_sheldonite)53%$(/l), $(l:tfg_ores/earth_vein_index#deep_topaz)15%$(/l)$()$(li)Calcite: $(l:tfg_ores/earth_vein_index#normal_gypsum)30%$(/l), $(l:tfg_ores/earth_vein_index#normal_lapis)15%$(/l)$()$(li)Cassiterite: $(l:tfg_ores/earth_vein_index#surface_cassiterite)55%$(/l), $(l:tfg_ores/earth_vein_index#normal_cassiterite)35%$(/l), $(l:tfg_ores/earth_vein_index#surface_copper)5%$(/l)$()$(li)Cassiterite Sand: $(l:tfg_ores/earth_vein_index#normal_garnet_tin)35%$(/l)$()$(li)Chalcocite: $(l:tfg_ores/earth_vein_index#deep_topaz)25%$(/l)$()$(li)Chalcopyrite: $(l:tfg_ores/earth_vein_index#surface_copper)61%$(/l), $(l:tfg_ores/earth_vein_index#normal_copper)20%$(/l)$()$(li)Chromite: $(l:tfg_ores/earth_vein_index#deep_magnetite)33%$(/l), $(l:tfg_ores/earth_vein_index#normal_magnetite)4%$(/l)$()$(li)Cinnabar: $(l:tfg_ores/earth_vein_index#normal_redstone)20%$(/l)$()$(li)Coal: $(l:tfg_ores/earth_vein_index#normal_coal)100%$(/l), $(l:tfg_ores/earth_vein_index#normal_graphite)30%$(/l)$()$(li)Cobalt: $(l:tfg_ores/earth_vein_index#normal_garnierite)15%$(/l)$()$(li)Cobaltite: $(l:tfg_ores/earth_vein_index#normal_garnierite)20%$(/l)$()$(li)Cooperite: $(l:tfg_ores/earth_vein_index#deep_sheldonite)38%$(/l)$()$(li)Diamond: $(l:tfg_ores/earth_vein_index#normal_graphite)25%$(/l)$()$(li)Diatomite: $(l:tfg_ores/earth_vein_index#normal_saltpeter)25%$(/l), $(l:tfg_ores/earth_vein_index#normal_garnet_tin)15%$(/l)$()",
      "type": "patchouli:text"
    },
    {
@ -39,12 +39,12 @@
    },
    {
      "Type": "patchouli:text",
-      "text": "$(li)Pyrope: $(l:tfg_ores/earth_vein_index#deep_sapphire)27%$(/l)$()$(li)Quartzite: $(l:tfg_ores/earth_vein_index#normal_quartz)43%$(/l)$()$(li)Realgar: $(l:tfg_ores/earth_vein_index#surface_copper)16%$(/l)$()$(li)Red Garnet: $(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)5%$(/l), $(l:tfg_ores/earth_vein_index#deep_garnet_opal)5%$(/l)$()$(li)Redstone: $(l:tfg_ores/earth_vein_index#normal_redstone)45%$(/l)$()$(li)Rock Salt: $(l:tfg_ores/earth_vein_index#normal_salt)40%$(/l), $(l:tfg_ores/earth_vein_index#normal_spodumene)20%$(/l)$()$(li)Ruby: $(l:tfg_ores/earth_vein_index#normal_redstone)35%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)20%$(/l)$()$(li)Salt: $(l:tfg_ores/earth_vein_index#normal_salt)30%$(/l), $(l:tfg_ores/earth_vein_index#normal_spodumene)30%$(/l)$()$(li)Saltpeter: $(l:tfg_ores/earth_vein_index#normal_saltpeter)35%$(/l)$()$(li)Sapphire: $(l:tfg_ores/earth_vein_index#deep_sapphire)16%$(/l), $(l:tfg_ores/earth_vein_index#deep_magnetite)8%$(/l)$()$(li)Scheelite: $(l:tfg_ores/earth_vein_index#deep_scheelite)45%$(/l)$()$(li)Soapstone: $(l:tfg_ores/earth_vein_index#normal_lubricant)30%$(/l)$()$(li)Sodalite: $(l:tfg_ores/earth_vein_index#normal_lapis)25%$(/l)$()$(li)Spessartine: $(l:tfg_ores/earth_vein_index#normal_manganese)25%$(/l)$()",
+      "text": "$(li)Pyrope: $(l:tfg_ores/earth_vein_index#deep_sapphire)27%$(/l)$()$(li)Quartzite: $(l:tfg_ores/earth_vein_index#normal_quartz)43%$(/l)$()$(li)Realgar: $(l:tfg_ores/earth_vein_index#surface_copper)16%$(/l)$()$(li)Red Garnet: $(l:tfg_ores/earth_vein_index#deep_garnet_amethyst)5%$(/l), $(l:tfg_ores/earth_vein_index#deep_garnet_opal)5%$(/l)$()$(li)Redstone: $(l:tfg_ores/earth_vein_index#normal_redstone)45%$(/l)$()$(li)Rock Salt: $(l:tfg_ores/earth_vein_index#normal_salt)40%$(/l), $(l:tfg_ores/earth_vein_index#normal_spodumene)20%$(/l)$()$(li)Ruby: $(l:tfg_ores/earth_vein_index#normal_redstone)35%$(/l), $(l:tfg_ores/earth_vein_index#deep_hematite)20%$(/l)$()$(li)Salt: $(l:tfg_ores/earth_vein_index#normal_salt)30%$(/l), $(l:tfg_ores/earth_vein_index#normal_spodumene)30%$(/l)$()$(li)Saltpeter: $(l:tfg_ores/earth_vein_index#normal_saltpeter)35%$(/l), $(l:tfg_ores/earth_vein_index#normal_cassiterite)10%$(/l), $(l:tfg_ores/earth_vein_index#surface_cassiterite)10%$(/l)$()$(li)Sapphire: $(l:tfg_ores/earth_vein_index#deep_sapphire)16%$(/l), $(l:tfg_ores/earth_vein_index#deep_magnetite)8%$(/l)$()$(li)Scheelite: $(l:tfg_ores/earth_vein_index#deep_scheelite)45%$(/l)$()$(li)Soapstone: $(l:tfg_ores/earth_vein_index#normal_lubricant)30%$(/l)$()$(li)Sodalite: $(l:tfg_ores/earth_vein_index#normal_lapis)25%$(/l)$()$(li)Spessartine: $(l:tfg_ores/earth_vein_index#normal_manganese)25%$(/l)$()",
      "type": "patchouli:text"
    },
    {
      "Type": "patchouli:text",
-      "text": "$(li)Sphalerite: $(l:tfg_ores/earth_vein_index#normal_sphalerite)40%$(/l), $(l:tfg_ores/earth_vein_index#surface_sphalerite)40%$(/l), $(l:tfg_ores/earth_vein_index#normal_sulfur)15%$(/l)$()$(li)Spodumene: $(l:tfg_ores/earth_vein_index#normal_spodumene)35%$(/l)$()$(li)Stibnite: $(l:tfg_ores/earth_vein_index#normal_tetrahedrite)20%$(/l), $(l:tfg_ores/earth_vein_index#surface_tetrahedrite)20%$(/l)$()$(li)Sulfur: $(l:tfg_ores/earth_vein_index#surface_sphalerite)55%$(/l), $(l:tfg_ores/earth_vein_index#normal_sulfur)50%$(/l), $(l:tfg_ores/earth_vein_index#normal_sphalerite)35%$(/l), $(l:tfg_ores/earth_vein_index#normal_bismuthinite)9%$(/l), $(l:tfg_ores/earth_vein_index#surface_bismuthinite)3%$(/l)$()$(li)Talc: $(l:tfg_ores/earth_vein_index#normal_lubricant)20%$(/l)$()$(li)Tantalite: $(l:tfg_ores/earth_vein_index#normal_manganese)12%$(/l)$()$(li)Tarkianite: $(l:tfg_ores/earth_vein_index#normal_tarkianite)35%$(/l)$()$(li)Tetrahedrite: $(l:tfg_ores/earth_vein_index#surface_tetrahedrite)60%$(/l), $(l:tfg_ores/earth_vein_index#normal_tetrahedrite)50%$(/l)$()$(li)Thorium: $(l:tfg_ores/earth_vein_index#normal_beryllium)15%$(/l)$()$(li)Tin: $(l:tfg_ores/earth_vein_index#normal_cassiterite)60%$(/l), $(l:tfg_ores/earth_vein_index#surface_cassiterite)40%$(/l)$()$(li)Topaz: $(l:tfg_ores/earth_vein_index#deep_topaz)25%$(/l)$()$(li)Tricalcium Phosphate: $(l:tfg_ores/earth_vein_index#normal_apatite)35%$(/l)$()$(li)Trona: $(l:tfg_ores/earth_vein_index#normal_lubricant)10%$(/l), $(l:tfg_ores/earth_vein_index#normal_tarkianite)10%$(/l)$()$(li)Tungstate: $(l:tfg_ores/earth_vein_index#deep_scheelite)35%$(/l)$()",
+      "text": "$(li)Sphalerite: $(l:tfg_ores/earth_vein_index#normal_sphalerite)40%$(/l), $(l:tfg_ores/earth_vein_index#surface_sphalerite)40%$(/l), $(l:tfg_ores/earth_vein_index#normal_sulfur)15%$(/l)$()$(li)Spodumene: $(l:tfg_ores/earth_vein_index#normal_spodumene)35%$(/l)$()$(li)Stibnite: $(l:tfg_ores/earth_vein_index#normal_tetrahedrite)20%$(/l), $(l:tfg_ores/earth_vein_index#surface_tetrahedrite)20%$(/l)$()$(li)Sulfur: $(l:tfg_ores/earth_vein_index#surface_sphalerite)55%$(/l), $(l:tfg_ores/earth_vein_index#normal_sulfur)50%$(/l), $(l:tfg_ores/earth_vein_index#normal_sphalerite)35%$(/l), $(l:tfg_ores/earth_vein_index#normal_bismuthinite)9%$(/l), $(l:tfg_ores/earth_vein_index#surface_bismuthinite)3%$(/l)$()$(li)Talc: $(l:tfg_ores/earth_vein_index#normal_lubricant)20%$(/l)$()$(li)Tantalite: $(l:tfg_ores/earth_vein_index#normal_manganese)12%$(/l)$()$(li)Tarkianite: $(l:tfg_ores/earth_vein_index#normal_tarkianite)35%$(/l)$()$(li)Tetrahedrite: $(l:tfg_ores/earth_vein_index#surface_tetrahedrite)60%$(/l), $(l:tfg_ores/earth_vein_index#normal_tetrahedrite)50%$(/l)$()$(li)Thorium: $(l:tfg_ores/earth_vein_index#normal_beryllium)15%$(/l)$()$(li)Tin: $(l:tfg_ores/earth_vein_index#normal_cassiterite)55%$(/l), $(l:tfg_ores/earth_vein_index#surface_cassiterite)35%$(/l)$()$(li)Topaz: $(l:tfg_ores/earth_vein_index#deep_topaz)25%$(/l)$()$(li)Tricalcium Phosphate: $(l:tfg_ores/earth_vein_index#normal_apatite)35%$(/l)$()$(li)Trona: $(l:tfg_ores/earth_vein_index#normal_lubricant)10%$(/l), $(l:tfg_ores/earth_vein_index#normal_tarkianite)10%$(/l)$()$(li)Tungstate: $(l:tfg_ores/earth_vein_index#deep_scheelite)35%$(/l)$()",
      "type": "patchouli:text"
    },
    {
--- a/kubejs/assets/tfc/patchouli_books/field_guide/fr_fr/entries/tfg_ores/earth_vein_index.json
+++ b/kubejs/assets/tfc/patchouli_books/field_guide/fr_fr/entries/tfg_ores/earth_vein_index.json
@ -563,7 +563,7 @@
        ]
      },
      "enable_visualize": false,
-      "text": "$(thing)Percentage$(): 60%$(br)$(thing)Melts into$(): Tin$(br)$(thing)Formula$(): Sn",
+      "text": "$(thing)Percentage$(): 55%$(br)$(thing)Melts into$(): Tin$(br)$(thing)Formula$(): Sn",
      "type": "patchouli:multiblock"
    },
    {
@ -583,13 +583,28 @@
        ]
      },
      "enable_visualize": false,
-      "text": "$(thing)Percentage$(): 40%$(br)$(thing)Melts into$(): Tin$(br)$(thing)Formula$(): SnO₂",
+      "text": "$(thing)Percentage$(): 35%$(br)$(thing)Melts into$(): Tin$(br)$(thing)Formula$(): SnO₂",
      "type": "patchouli:multiblock"
    },
    {
-      "Type": "patchouli:empty",
-      "draw_filler": true,
-      "type": "patchouli:empty"
+      "Type": "patchouli:multiblock",
+      "name": "Saltpeter",
+      "multiblock": {
+        "mapping": {
+          "0": "#forge:ores/saltpeter"
+        },
+        "pattern": [
+          [
+            "0"
+          ],
+          [
+            " "
+          ]
+        ]
+      },
+      "enable_visualize": false,
+      "text": "$(thing)Percentage$(): 10%$(br)$(thing)Source of$(): Potassium, Nitrogen$(br)$(thing)Formula$(): KNO₃",
+      "type": "patchouli:multiblock"
    },
    {
      "Type": "patchouli:text",
@ -615,7 +630,7 @@
        ]
      },
      "enable_visualize": false,
-      "text": "$(thing)Percentage$(): 60%$(br)$(thing)Melts into$(): Tin$(br)$(thing)Formula$(): SnO₂",
+      "text": "$(thing)Percentage$(): 55%$(br)$(thing)Melts into$(): Tin$(br)$(thing)Formula$(): SnO₂",
      "type": "patchouli:multiblock"
    },
    {
@ -635,13 +650,28 @@
        ]
      },
      "enable_visualize": false,
-      "text": "$(thing)Percentage$(): 40%$(br)$(thing)Melts into$(): Tin$(br)$(thing)Formula$(): Sn",
+      "text": "$(thing)Percentage$(): 35%$(br)$(thing)Melts into$(): Tin$(br)$(thing)Formula$(): Sn",
      "type": "patchouli:multiblock"
    },
    {
-      "Type": "patchouli:empty",
-      "draw_filler": true,
-      "type": "patchouli:empty"
+      "Type": "patchouli:multiblock",
+      "name": "Saltpeter",
+      "multiblock": {
+        "mapping": {
+          "0": "#forge:ores/saltpeter"
+        },
+        "pattern": [
+          [
+            "0"
+          ],
+          [
+            " "
+          ]
+        ]
+      },
+      "enable_visualize": false,
+      "text": "$(thing)Percentage$(): 10%$(br)$(thing)Source of$(): Potassium, Nitrogen$(br)$(thing)Formula$(): KNO₃",
+      "type": "patchouli:multiblock"
    },
    {
      "Type": "patchouli:text",
--- a/kubejs/assets/tfc/patchouli_books/field_guide/fr_fr/entries/tfg_ores/nether_ore_index.json
+++ b/kubejs/assets/tfc/patchouli_books/field_guide/fr_fr/entries/tfg_ores/nether_ore_index.json
@ -19,7 +19,7 @@
    },
    {
      "Type": "patchouli:text",
-      "text": "$(li)Calcite: $(l:tfg_ores/nether_vein_index#nether_gypsum)30%$(/l), $(l:tfg_ores/nether_vein_index#nether_lapis)15%$(/l)$()$(li)Cassiterite: $(l:tfg_ores/nether_vein_index#nether_cassiterite)40%$(/l)$()$(li)Cassiterite Sand: $(l:tfg_ores/nether_vein_index#nether_garnet_tin)35%$(/l)$()$(li)Chalcocite: $(l:tfg_ores/nether_vein_index#nether_topaz)25%$(/l)$()$(li)Chalcopyrite: $(l:tfg_ores/nether_vein_index#nether_copper)20%$(/l)$()$(li)Chromite: $(l:tfg_ores/nether_vein_index#nether_magnetite)10%$(/l)$()$(li)Cinnabar: $(l:tfg_ores/nether_vein_index#nether_redstone)20%$(/l)$()$(li)Coal: $(l:tfg_ores/nether_vein_index#nether_graphite)15%$(/l)$()$(li)Cobalt: $(l:tfg_ores/nether_vein_index#nether_garnierite)14%$(/l)$()$(li)Cobaltite: $(l:tfg_ores/nether_vein_index#nether_garnierite)19%$(/l)$()$(li)Cooperite: $(l:tfg_ores/nether_vein_index#nether_sheldonite)29%$(/l)$()$(li)Diamond: $(l:tfg_ores/nether_vein_index#nether_graphite)40%$(/l)$()$(li)Diatomite: $(l:tfg_ores/nether_vein_index#nether_saltpeter)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_garnet_tin)15%$(/l)$()$(li)Electrotine: $(l:tfg_ores/nether_vein_index#nether_saltpeter)25%$(/l)$()",
+      "text": "$(li)Calcite: $(l:tfg_ores/nether_vein_index#nether_gypsum)30%$(/l), $(l:tfg_ores/nether_vein_index#nether_lapis)15%$(/l)$()$(li)Cassiterite: $(l:tfg_ores/nether_vein_index#nether_cassiterite)36%$(/l)$()$(li)Cassiterite Sand: $(l:tfg_ores/nether_vein_index#nether_garnet_tin)35%$(/l)$()$(li)Chalcocite: $(l:tfg_ores/nether_vein_index#nether_topaz)25%$(/l)$()$(li)Chalcopyrite: $(l:tfg_ores/nether_vein_index#nether_copper)20%$(/l)$()$(li)Chromite: $(l:tfg_ores/nether_vein_index#nether_magnetite)10%$(/l)$()$(li)Cinnabar: $(l:tfg_ores/nether_vein_index#nether_redstone)20%$(/l)$()$(li)Coal: $(l:tfg_ores/nether_vein_index#nether_graphite)15%$(/l)$()$(li)Cobalt: $(l:tfg_ores/nether_vein_index#nether_garnierite)14%$(/l)$()$(li)Cobaltite: $(l:tfg_ores/nether_vein_index#nether_garnierite)19%$(/l)$()$(li)Cooperite: $(l:tfg_ores/nether_vein_index#nether_sheldonite)29%$(/l)$()$(li)Diamond: $(l:tfg_ores/nether_vein_index#nether_graphite)40%$(/l)$()$(li)Diatomite: $(l:tfg_ores/nether_vein_index#nether_saltpeter)25%$(/l), $(l:tfg_ores/nether_vein_index#nether_garnet_tin)15%$(/l)$()$(li)Electrotine: $(l:tfg_ores/nether_vein_index#nether_saltpeter)25%$(/l)$()",
      "type": "patchouli:text"
    },
    {
@ -39,12 +39,12 @@
    },
    {
      "Type": "patchouli:text",
-      "text": "$(li)Quartzite: $(l:tfg_ores/nether_vein_index#nether_quartz)25%$(/l)$()$(li)Red Garnet: $(l:tfg_ores/nether_vein_index#nether_garnet)9%$(/l)$()$(li)Redstone: $(l:tfg_ores/nether_vein_index#nether_redstone)45%$(/l)$()$(li)Rock Salt: $(l:tfg_ores/nether_vein_index#nether_beryllium)18%$(/l)$()$(li)Ruby: $(l:tfg_ores/nether_vein_index#nether_redstone)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)20%$(/l)$()$(li)Saltpeter: $(l:tfg_ores/nether_vein_index#nether_saltpeter)35%$(/l)$()$(li)Sapphire: $(l:tfg_ores/nether_vein_index#nether_sapphire)16%$(/l), $(l:tfg_ores/nether_vein_index#nether_magnetite)10%$(/l)$()$(li)Scheelite: $(l:tfg_ores/nether_vein_index#nether_scheelite)45%$(/l)$()$(li)Soapstone: $(l:tfg_ores/nether_vein_index#nether_lubricant)30%$(/l)$()$(li)Sodalite: $(l:tfg_ores/nether_vein_index#nether_lapis)25%$(/l)$()$(li)Spessartine: $(l:tfg_ores/nether_vein_index#nether_manganese)25%$(/l)$()$(li)Sphalerite: $(l:tfg_ores/nether_vein_index#nether_sphalerite)40%$(/l), $(l:tfg_ores/nether_vein_index#nether_sulfur)15%$(/l)$()$(li)Stibnite: $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)20%$(/l)$()$(li)Sulfur: $(l:tfg_ores/nether_vein_index#nether_sulfur)50%$(/l), $(l:tfg_ores/nether_vein_index#nether_sphalerite)35%$(/l)$()",
+      "text": "$(li)Quartzite: $(l:tfg_ores/nether_vein_index#nether_quartz)25%$(/l)$()$(li)Red Garnet: $(l:tfg_ores/nether_vein_index#nether_garnet)9%$(/l)$()$(li)Redstone: $(l:tfg_ores/nether_vein_index#nether_redstone)45%$(/l)$()$(li)Rock Salt: $(l:tfg_ores/nether_vein_index#nether_beryllium)18%$(/l)$()$(li)Ruby: $(l:tfg_ores/nether_vein_index#nether_redstone)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_hematite)20%$(/l)$()$(li)Saltpeter: $(l:tfg_ores/nether_vein_index#nether_saltpeter)35%$(/l), $(l:tfg_ores/nether_vein_index#nether_cassiterite)9%$(/l)$()$(li)Sapphire: $(l:tfg_ores/nether_vein_index#nether_sapphire)16%$(/l), $(l:tfg_ores/nether_vein_index#nether_magnetite)10%$(/l)$()$(li)Scheelite: $(l:tfg_ores/nether_vein_index#nether_scheelite)45%$(/l)$()$(li)Soapstone: $(l:tfg_ores/nether_vein_index#nether_lubricant)30%$(/l)$()$(li)Sodalite: $(l:tfg_ores/nether_vein_index#nether_lapis)25%$(/l)$()$(li)Spessartine: $(l:tfg_ores/nether_vein_index#nether_manganese)25%$(/l)$()$(li)Sphalerite: $(l:tfg_ores/nether_vein_index#nether_sphalerite)40%$(/l), $(l:tfg_ores/nether_vein_index#nether_sulfur)15%$(/l)$()$(li)Stibnite: $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)20%$(/l)$()$(li)Sulfur: $(l:tfg_ores/nether_vein_index#nether_sulfur)50%$(/l), $(l:tfg_ores/nether_vein_index#nether_sphalerite)35%$(/l)$()",
      "type": "patchouli:text"
    },
    {
      "Type": "patchouli:text",
-      "text": "$(li)Sylvite: $(l:tfg_ores/nether_vein_index#nether_sylvite)100%$(/l)$()$(li)Talc: $(l:tfg_ores/nether_vein_index#nether_lubricant)20%$(/l)$()$(li)Tantalite: $(l:tfg_ores/nether_vein_index#nether_manganese)12%$(/l)$()$(li)Tetrahedrite: $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)50%$(/l)$()$(li)Thorium: $(l:tfg_ores/nether_vein_index#nether_beryllium)0%$(/l)$()$(li)Tin: $(l:tfg_ores/nether_vein_index#nether_cassiterite)60%$(/l)$()$(li)Topaz: $(l:tfg_ores/nether_vein_index#nether_topaz)25%$(/l)$()$(li)Tricalcium Phosphate: $(l:tfg_ores/nether_vein_index#nether_apatite)35%$(/l)$()$(li)Trona: $(l:tfg_ores/nether_vein_index#nether_lubricant)10%$(/l)$()$(li)Tungstate: $(l:tfg_ores/nether_vein_index#nether_scheelite)35%$(/l)$()$(li)Uraninite: $(l:tfg_ores/nether_vein_index#nether_pitchblende)25%$(/l)$()$(li)Vanadium Magnetite: $(l:tfg_ores/nether_vein_index#nether_magnetite)30%$(/l)$()$(li)Wulfenite: $(l:tfg_ores/nether_vein_index#nether_molybdenum)42%$(/l), $(l:tfg_ores/nether_vein_index#nether_pitchblende)12%$(/l)$()$(li)Yellow Garnet: $(l:tfg_ores/nether_vein_index#nether_garnet)14%$(/l)$()",
+      "text": "$(li)Sylvite: $(l:tfg_ores/nether_vein_index#nether_sylvite)100%$(/l)$()$(li)Talc: $(l:tfg_ores/nether_vein_index#nether_lubricant)20%$(/l)$()$(li)Tantalite: $(l:tfg_ores/nether_vein_index#nether_manganese)12%$(/l)$()$(li)Tetrahedrite: $(l:tfg_ores/nether_vein_index#nether_tetrahedrite)50%$(/l)$()$(li)Thorium: $(l:tfg_ores/nether_vein_index#nether_beryllium)0%$(/l)$()$(li)Tin: $(l:tfg_ores/nether_vein_index#nether_cassiterite)54%$(/l)$()$(li)Topaz: $(l:tfg_ores/nether_vein_index#nether_topaz)25%$(/l)$()$(li)Tricalcium Phosphate: $(l:tfg_ores/nether_vein_index#nether_apatite)35%$(/l)$()$(li)Trona: $(l:tfg_ores/nether_vein_index#nether_lubricant)10%$(/l)$()$(li)Tungstate: $(l:tfg_ores/nether_vein_index#nether_scheelite)35%$(/l)$()$(li)Uraninite: $(l:tfg_ores/nether_vein_index#nether_pitchblende)25%$(/l)$()$(li)Vanadium Magnetite: $(l:tfg_ores/nether_vein_index#nether_magnetite)30%$(/l)$()$(li)Wulfenite: $(l:tfg_ores/nether_vein_index#nether_molybdenum)42%$(/l), $(l:tfg_ores/nether_vein_index#nether_pitchblende)12%$(/l)$()$(li)Yellow Garnet: $(l:tfg_ores/nether_vein_index#nether_garnet)14%$(/l)$()",
      "type": "patchouli:text"
    },
    {
--- a/kubejs/assets/tfc/patchouli_books/field_guide/fr_fr/entries/tfg_ores/nether_vein_index.json
+++ b/kubejs/assets/tfc/patchouli_books/field_guide/fr_fr/entries/tfg_ores/nether_vein_index.json
@ -396,7 +396,7 @@
        ]
      },
      "enable_visualize": false,
-      "text": "$(thing)Percentage$(): 60%$(br)$(thing)Melts into$(): Tin$(br)$(thing)Formula$(): Sn",
+      "text": "$(thing)Percentage$(): 54%$(br)$(thing)Melts into$(): Tin$(br)$(thing)Formula$(): Sn",
      "type": "patchouli:multiblock"
    },
    {
@ -416,13 +416,28 @@
        ]
      },
      "enable_visualize": false,
-      "text": "$(thing)Percentage$(): 40%$(br)$(thing)Melts into$(): Tin$(br)$(thing)Formula$(): SnO₂",
+      "text": "$(thing)Percentage$(): 36%$(br)$(thing)Melts into$(): Tin$(br)$(thing)Formula$(): SnO₂",
      "type": "patchouli:multiblock"
    },
    {
-      "Type": "patchouli:empty",
-      "draw_filler": true,
-      "type": "patchouli:empty"
+      "Type": "patchouli:multiblock",
+      "name": "Saltpeter",
+      "multiblock": {
+        "mapping": {
+          "0": "#forge:ores/saltpeter"
+        },
+        "pattern": [
+          [
+            "0"
+          ],
+          [
+            " "
+          ]
+        ]
+      },
+      "enable_visualize": false,
+      "text": "$(thing)Percentage$(): 9%$(br)$(thing)Source of$(): Potassium, Nitrogen$(br)$(thing)Formula$(): KNO₃",
+      "type": "patchouli:multiblock"
    },
    {
      "Type": "patchouli:text",
--- a/kubejs/assets/tfc/patchouli_books/field_guide/fr_fr/entries/tfg_ores/venus_ore_index.json
+++ b/kubejs/assets/tfc/patchouli_books/field_guide/fr_fr/entries/tfg_ores/venus_ore_index.json
@ -0,0 +1,22 @@
+{
+  "__credits__": "This page was automatically generated by OresToFieldGuide.",
+  "name": "Venus Ore Index",
+  "icon": "gtceu:sulfur_dust",
+  "category": "tfc:tfg_ores",
+  "read_by_default": true,
+  "secret": false,
+  "pages": [
+    {
+      "Type": "patchouli:text",
+      "text": "This is the $(thing)Ore Index$() for $(thing)Venus$(). All ores are sorted alphabetically and then by richest to poorest vein type. You can click on them to learn more information about each vein.",
+      "title": "Venus Ore Index",
+      "type": "patchouli:text"
+    },
+    {
+      "Type": "patchouli:text",
+      "text": "$(li)Lepidolite: $(l:tfg_ores/venus_vein_index#venus_manual_salt)15%$(/l)$()$(li)Pyrite: $(l:tfg_ores/venus_vein_index#venus_manual_sulfur)35%$(/l)$()$(li)Rock Salt: $(l:tfg_ores/venus_vein_index#venus_manual_salt)20%$(/l)$()$(li)Salt: $(l:tfg_ores/venus_vein_index#venus_manual_salt)50%$(/l)$()$(li)Sphalerite: $(l:tfg_ores/venus_vein_index#venus_manual_sulfur)15%$(/l)$()$(li)Spodumene: $(l:tfg_ores/venus_vein_index#venus_manual_salt)15%$(/l)$()$(li)Sulfur: $(l:tfg_ores/venus_vein_index#venus_manual_sulfur)50%$(/l)$()",
+      "type": "patchouli:text"
+    }
+  ],
+  "sortnum": 8
+}
--- a/Show more
+++ b/Show more