merged from upstream

.github/ISSUE_TEMPLATE/BUG_REPORT.yml

@@ -1,5 +1,5 @@
 name: "[🐛]: Bug report"
-description: "Report a bug where something is not working as expected, which does not crash the game."
+description: "Report a bug where something is not working as expected, but does not crash the game."
 title: "[🐛]: "
 labels: [ "Status: Backlog" ]
 projects: ["TerraFirmaGreg-Team/10"]
@@ -10,28 +10,65 @@ body:
     id: exists
     attributes:
       label: "Was this bug reported before?"
-      description: "Please search open/closed issues before submitting, as the issue may have already been reported/addressed."
+      description: "Please search OPEN/CLOSED issues before submitting, as the issue may have already been reported/addressed."
       options:
         - label: "No, it was not."
           required: true
 
+  - type: dropdown
+    id: launcher
+    validations:
+      required: true
+    attributes:
+      label: "Are you using Prism or Curseforge?"
+      description: "Prism and Curseforge are the only supported launchers for TFG. Some others may not work. TLAUNCHER DOES NOT WORK."
+      options:
+        - "Yes, I am using Prism or Curseforge."
+        - "No, I am not using Prism or Curseforge."
+
+  - type: checkboxes
+    id: redownload
+    attributes:
+      label: "Have you tried redownloading the pack?"
+      description: "For issues that you are experiencing singularly, redownloading the pack may fix the issue."
+      options:
+        - label: "Not Applicable / Yes, I have tried downloading a new instance."
+          required: true
+
+  - type: input
+    id: os
+    validations:
+      required: true
+    attributes:
+      label: Computer OS
+      description: Write which OS your PC is running on.
+      placeholder: "Example: Windows 11"
+
   - type: input
     id: version
     validations:
       required: true
     attributes:
-      label: "Version modpack used"
+      label: Modpack Version Used
-      description: "Write which version of the modpack you are using."
+      description: Write which version of the modpack you are using.
       placeholder: "Example: 0.1.1"
 
-  - type: input
+  - type: dropdown
     id: environment
     validations:
       required: true
     attributes:
-      label: Environment
+      label: Minecraft Environment
-      description: "How you were playing on the world. Typical answers include: Singleplayer, Open to LAN, Forge Server, Sponge Server, or Mohist Server."
+      options:
-      placeholder: "Example: Singleplayer"
+        - "Singleplayer"
+        - "LAN"
+        - "Forge Server"
+        - "Sponge Server"
+        - "Magma Server"
+        - "Mohist Server"
+        - "E4MC"
+        - "Essential"
+        - "Other"
 
   - type: dropdown
     id: world

.github/ISSUE_TEMPLATE/CRASH_REPORT.yml

@@ -9,29 +9,74 @@ body:
   - type: checkboxes
     id: exists
     attributes:
-      label: "Was this crash report before?"
+      label: "Was this crash reported before?"
-      description: "Please search open/closed issues before submitting, as the issue may have already been reported/addressed."
+      description: "Please search OPEN/CLOSED issues before submitting, as the issue may have already been reported/addressed."
       options:
         - label: "No, it was not."
           required: true
 
+  - type: dropdown
+    id: launcher
+    validations:
+      required: true
+    attributes:
+      label: "Are you using Prism or Curseforge?"
+      description: "Prism and Curseforge are the only supported launchers for TFG. Some others may not work. TLAUNCHER DOES NOT WORK."
+      options:
+        - "Yes, I am using Prism or Curseforge."
+        - "No, I am not using Prism or Curseforge."
+
+  - type: checkboxes
+    id: dependencies
+    attributes:
+      label: "Did you install required dependencies?"
+      description: "If you are using Prism or Modrinth you will be instructed to install required mods. Do so."
+      options:
+        - label: "Not Applicable / Yes, I have all required dependencies installed."
+          required: true
+
+  - type: checkboxes
+    id: redownload
+    attributes:
+      label: "Have you tried redownloading the pack?"
+      description: "For issues that you are experiencing singularly, redownloading the pack may fix the issue."
+      options:
+        - label: "Not Applicable / Yes, I have tried downloading a new instance."
+          required: true
+
+  - type: input
+    id: os
+    validations:
+      required: true
+    attributes:
+      label: Computer OS
+      description: Write which OS your PC is running on.
+      placeholder: "Example: Windows 10"
+
   - type: input
     id: version
     validations:
       required: true
     attributes:
-      label: Version modpack used
+      label: Modpack Version Used
       description: Write which version of the modpack you are using.
       placeholder: "Example: 0.1.1"
 
-  - type: input
+  - type: dropdown
     id: environment
     validations:
       required: true
     attributes:
-      label: Environment
+      label: Minecraft Environment
-      description: "How you were playing on the world. Typical answers include: Singleplayer, Open to LAN, Forge Server, Sponge Server, or Mohist Server."
+      options:
-      placeholder: "Example: Singleplayer"
+        - "Singleplayer"
+        - "LAN"
+        - "Forge Server"
+        - "Sponge Server"
+        - "Mohist Server"
+        - "E4MC"
+        - "Essential"
+        - "Other"
 
   - type: dropdown
     id: crash

.github/ISSUE_TEMPLATE/ENHANCEMENT.yml

@@ -1,6 +1,6 @@
-name: "[🪡]: Enhancement"
+name: "[💎]: Enhancement"
-description: "Provide supporting details for a feature in development"
+description: "Provide details for a gameplay enhancement or improvement."
-title: "[🪡]: "
+title: "[💎]: "
 labels: [ "Status: Backlog" ]
 projects: ["TerraFirmaGreg-Team/10"]
 type: "Enhancement"
@@ -9,8 +9,8 @@ body:
   - type: checkboxes
     id: exists
     attributes:
-      label: "Was this enhancement asked before?"
+      label: "Was this enhancement suggested before?"
-      description: "Please search open/closed issues before submitting, as the issue may have already been reported/addressed."
+      description: "Please search OPEN/CLOSED issues before submitting, as the enhancement may have already been reported/addressed."
       options:
         - label: "No, it was not."
           required: true
@@ -20,8 +20,8 @@ body:
     validations:
       required: true
     attributes:
-      label: What would you like to be added?
+      label: What would you like to be added/ changed?
-      description: Feature requests are unlikely to make progress as issues.
+      description: Enhancement requests should focus on gameplay improvements or additions that can be achieved without completely new features. Ex. Rebalancing the energy cost of a recipe.
 
   - type: textarea
     id: rationale
@@ -32,4 +32,4 @@ body:
 
   - type: markdown
     attributes:
-      value: "Thanks for taking the time to fill out this request enhancement."
+      value: "Thanks for taking the time to fill out this enhancement request."

.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml

@@ -1,6 +1,6 @@
-name: "[🪶]: Feature request"
+name: "[💡]: Feature request"
-description: "Request a new feature or a change to an existing one."
+description: "Request a new feature or a new mod."
-title: "[🪶]: "
+title: "[💡]: "
 labels: [ "Status: Backlog" ]
 projects: ["TerraFirmaGreg-Team/10"]
 type: "Feature"
@@ -10,46 +10,44 @@ body:
     id: exists
     attributes:
       label: "Was this feature suggested before?"
-      description: "Please search open/closed issues before submitting, as the issue may have already been reported/addressed."
+      description: "Please search OPEN/CLOSED issues before submitting, as the feature may have already been reported/addressed."
       options:
         - label: "No, it was not."
           required: true
 
-  - type: input
+  - type: checkboxes
-    id: version
+    id: blacklist
+    attributes:
+      label: "A list of popular features/mods the team has already considered and will not implement."
+      description: |
+        ### Mod Requests:
+        - Other large tech mods (Immersive Engineering, Mekanism, etc.) will not be added to the pack due to overlap with Gregtech.
+        - Magic mods (Thaumcraft, Botania, etc.) will not be added to the pack as we wish to be grounded in plausibility.
+        - Create: the factory must grow. And other large Create mods. They do not work with Greate and we do not wish to focus on Create too much.
+        - Create Clockworks & Valkyrian Skies. Both cool mods, but impossible to balance in TFG.
+        - Stargate. Overdone in GT packs. We will work on something unique as an endgame goal.
+        
+        ### Feature Requests:
+        - Dyson Spheres. Boring and overdone.
+        - More GT Voltage Tiers. We would prefer to have larger more rounded tiers than many small ones.
+      options:
+        - label: "I understand :("
+          required: true
+
+  - type: textarea
+    id: feature
     validations:
       required: true
     attributes:
-      label: "Version modpack used"
+      label: What would you like to be added?
-      description: Write which version of the modpack you are using.
+      description: Feature requests should focus on new gameplay experiences or QoL additions.
-      placeholder: "Example: 0.1.1"
 
   - type: textarea
-    id: problem
+    id: rationale
-    validations:
-      required: false
-    attributes:
-      label: "Related problem"
-      description: If the feature you wish to change is related to a problem, please desscribe it. Leave this field blank if it is not related to a problem.
-      placeholder: "Example: I'm always frustrated when..."
-
-  - type: textarea
-    id: solution
     validations:
       required: true
     attributes:
-      label: "Your solution"
+      label: Why is this needed?
-      description: Describe the solution you would like to have happen.
-      placeholder: "Example: If I could..."
-
-  - type: textarea
-    id: additional-info
-    validations:
-      required: false
-    attributes:
-      label: "Additional information"
-      description: Any additional information you wish to provide. Please add anything which did not fit into the other sections here.
-      placeholder: "Example: This is likely achieveable by doing X because..."
 
   - type: markdown
     attributes:

.github/ISSUE_TEMPLATE/QUESTION.yml

@@ -9,7 +9,7 @@ body:
     id: exists
     attributes:
       label: "Was this question asked before?"
-      description: "Please search open/closed issues before submitting, as the issue may have already been reported/addressed."
+      description: "Please search OPEN/CLOSED issues before submitting, as the issue may have already been reported/addressed."
       options:
         - label: "No, it was not."
           required: true
@@ -17,9 +17,13 @@ body:
   - type: markdown
     attributes:
       value: |
-        If you are in need of quick response, Discord may be a better place. You can find a link to join in our README.md for this project.
+        If you are in need of a quick response, [Discord](https://discord.gg/AEaCzCTUwQ) may be a better place.
         
-        If you are looking for a game wiki, we are currently developing it, however most information is available in-game info through tooltips, JEI/HEI and quest. You can also ask any question on Discord, and someone will most likely have a response.
+        Most information is available in-game through Tooltips, EMI, Field Guide, or Quests.
+        An online version of the [Field Guide](https://terrafirmagreg-team.github.io/Field-Guide-Modern/en_us/) is also available.
+        
+        For installing a development environment, please refer to the [Contributing Guide](https://github.com/TerraFirmaGreg-Team/Modpack-Modern/blob/dev/.github/CONTRIBUTING.md)
+        For information about translating please read our [Localization Guide](https://github.com/TerraFirmaGreg-Team/Modpack-Modern/blob/dev/kubejs/README_IF_TRANSLATING.md)
 
   - type: textarea
     id: question

.github/ISSUE_TEMPLATE/config.yml

@@ -7,3 +7,7 @@ contact_links:
   - name: TerraFirmaGreg CurseForge
     url: https://www.curseforge.com/minecraft/modpacks/terrafirmagreg-modern
     about: Download page.
+
+  - name: TerraFirmaGreg YouTube
+    url: https://www.youtube.com/@TFG-modern
+    about: YouTube channel.

.github/SECURITY.md

@@ -1,42 +0,0 @@
-# Security Policy
-
-## Scope
-
-Keeping users safe and secure is a top priority for us.We welcome the contribution of external security researchers.
-
-If you believe you’ve found a security or vulnerability issue in the repo we encourage you to notify us.
-
-There are no hard and fast rules to determine if a bug is worth reporting as a security issue or a “regular” issue.
-When in doubt, please do send us a report.
-
-## How to submit a report
-
-Security issues can be reported by sending an [email to us][contact].
-
-The team will acknowledge your email within 48 hours. You will receive a more detailed response within 96 hours.
-
-We will create a maintainer security advisory on GitHub to discuss internally, and when needed, invite you to the
-advisory.
-
-## Purpose
-
-- Make a good faith effort to avoid privacy violations, destruction of data, and interruption or degradation of our
-  services
-- Only interact with accounts you own or with explicit permission of the account holder. If you do encounter Personally
-  Identifiable Information (PII) contact us immediately,
-  do not proceed with access, and immediately purge any local information
-- Provide us with a reasonable amount of time to resolve vulnerabilities prior to any disclosure to the public or a
-  third-party
-- We will consider activities conducted consistent with this policy to constitute “authorized” conduct and will not
-  pursue civil action or initiate a complaint to law enforcement.
-  We will help to the extent we can if legal action is initiated by a third party against you
-
-Please submit a report to us before engaging in conduct that may be inconsistent with or unaddressed by this policy.
-
-## Preferences
-
-- Please provide detailed reports with reproducible steps and a clearly defined impact
-- Submit one vulnerability per report
-- Social engineering (such as phishing, vishing, smishing) is prohibited
-
-[contact]: mailto:admin@terrafirmagreg.su

.github/workflows/build.yml

@@ -34,7 +34,7 @@ jobs:
     
     steps:
       - name: 📦 Checkout
-        uses: actions/checkout@v6.0.1
+        uses: actions/checkout@v6.0.2
         with:
           fetch-depth: 0
         
@@ -229,7 +229,7 @@ jobs:
     steps:
 
       - name: Checkout
-        uses: actions/checkout@v6.0.1
+        uses: actions/checkout@v6.0.2
         with:
           fetch-depth: 0
 
@@ -313,7 +313,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v6.0.1
+        uses: actions/checkout@v6.0.2
 
       - name: 🔄 Replace strings
         shell: bash
@@ -327,24 +327,27 @@ jobs:
 
 
           sed -i -e "s/DEV/${VERSION}/g" pakku.json
-          sed -i -e "s/DEV/${VERSION}/g" .github/docker/docker-compose.yml
           sed -i -e "s/DEV/${VERSION}/g" config/mod-director/modpack.json
           sed -i -e "s/DEV/${VERSION}/g" config/fancymenu/customization/gui_main_menu.txt
           sed -i -e "s/DEV/${VERSION}/g" .pakku/multimc-overrides/instance.cfg
           sed -i -e "s/DEV/${VERSION}/g" .pakku/server-overrides/server.properties
+          sed -i -e "s/DEV/${VERSION}/g" .pakku/docker-overrides/docker-compose.yml
 
           
           sed -i -e "s/LOADER_VERSION/${LOADER_VERSION}/g" .pakku/multimc-overrides/mmc-pack.json
           sed -i -e "s/LOADER_VERSION/${LOADER_VERSION}/g" .pakku/server-overrides/forge-auto-install.txt
+          sed -i -e "s/LOADER_VERSION/${LOADER_VERSION}/g" .pakku/docker-overrides/docker-compose.yml
 
           sed -i -e "s/LOADER_TYPE/${LOADER_TYPE}/g" .pakku/multimc-overrides/mmc-pack.json
           sed -i -e "s/LOADER_TYPE/${LOADER_TYPE}/g" .pakku/server-overrides/forge-auto-install.txt
+          sed -i -e "s/LOADER_TYPE/${LOADER_TYPE}/g" .pakku/docker-overrides/docker-compose.yml
 
           sed -i -e "s/MINECRAFT_VERSION/${MINECRAFT_VERSION}/g" .pakku/multimc-overrides/mmc-pack.json
           sed -i -e "s/MINECRAFT_VERSION/${MINECRAFT_VERSION}/g" .pakku/server-overrides/forge-auto-install.txt
+          sed -i -e "s/MINECRAFT_VERSION/${MINECRAFT_VERSION}/g" .pakku/docker-overrides/docker-compose.yml
 
       - name: 📝 Cache Pakku
-        uses: actions/cache@v5.0.1
+        uses: actions/cache@v5.0.3
         id: cache
         with:
           path: build/.cache
@@ -457,7 +460,7 @@ jobs:
 
     steps:
       - name: 📦 Checkout
-        uses: actions/checkout@v6.0.1
+        uses: actions/checkout@v6.0.2
 
       - name: 📦 Download artifact
         uses: actions/download-artifact@v7.0.0

.gitignore

@@ -16,6 +16,7 @@ package-lock.json
 node_modules/
 Modpack-Modern.sln
 Modpack-Modern.esproj
+crowdin.yml
 
 # Pakku
 build/

.pakku/docker-overrides/docker-compose.yml

@@ -12,8 +12,9 @@ services:
       GUI: "false"
       MEMORY: 8G
 
-      TYPE: CUSTOM
+      TYPE: LOADER_TYPE
-      CUSTOM_SERVER: ./minecraft_server.jar
+      VERSION: MINECRAFT_VERSION
+      FORGE_VERSION: LOADER_VERSION
       SKIP_GENERIC_PACK_UPDATE_CHECK: "true"
       OVERRIDE_SERVER_PROPERTIES: "false"
 

.pakku/server-overrides/README.md

@@ -21,3 +21,8 @@ The config files shipped with the server pack should be a good starting point fo
  
 * defaultconfigs/ftbranks/ranks.snbt
    * Depending on how powerful of a server you're using, you may want to change the amount of force-loaded chunks each player is allowed to have. Note that players on the same team will combine their total allowance, so small numbers can encourage team play.
+ 
+* config/ftbbackups2.json
+   * Backup frequency is set with cron time info.
+   * By default for servers this is every morning at 10:15AM: `"backup_cron": "0 15 10 * * ? *"`
+   * If you want it hourly like singleplayer worlds, use `"backup_cron": "0 0 0/1 1/1 * ? *"`

.pakku/server-overrides/defaultconfigs/ftbranks/ranks.snbt

@@ -1,14 +1,14 @@
 {
-	member: {
+	novice: {
-		name: "Player"
+		name: "Novice"
-		power: 1
+		power: 0
 		condition: "always_active"
-		ftbranks.name_format: "&a{name}"
+		ftbranks.name_format: "&7{name}"
-		ftbchunks.max_claimed: 50
+		ftbchunks.max_claimed: 10
-		ftbchunks.max_force_loaded: 6
+		ftbchunks.max_force_loaded: 0
 		ftbchunks.chunk_load_offline: false
-        
+
-       	command.enderchest: false
+		command.enderchest: false
         command.ldlib: false
         command.compass_server: false
         command.chunky: false
@@ -41,6 +41,21 @@
 		command.tpx: false
         
 		command.trashcan: true
+	}
+
+	member: {
+		name: "Player"
+		power: 1
+		condition: {
+			type: "playtime"
+			time: 5
+			time_unit: "days"
+		}
+		ftbranks.name_format: "&a{name}"
+		ftbchunks.max_claimed: 50
+		ftbchunks.max_force_loaded: 6
+		ftbchunks.chunk_load_offline: false
+        
 
 	}
 	vip: {
@@ -57,6 +72,15 @@
 		ftbranks.name_format: "&b{name}"
 		ftbchunks.max_claimed: 200
 		ftbchunks.max_force_loaded: 8
+
+		command.ftbchunks.admin.bypass_protection: true
+		command.ban: true
+		command.ban-ip: true
+		command.pardon: true
+		command.pardon-ip: true
+		command.kick: true
+		command.clear: true
+		command.invsee: true
 	}
 	admin: {
 		name: "Admin"

.pakku/server-overrides/defaultconfigs/tfc-server.toml

@@ -167,7 +167,7 @@ familiarityDecayLimit = 0.3
 		#
 		# Tank capacity of a crucible (in mB).
 		#Range: 0 ~ 2147483645
-		crucibleCapacity = 4032
+		crucibleCapacity = 4608
 		#
 		# A modifier for how fast fluid containers empty into crucibles. Containers will empty 1 mB every (this) number of ticks.
 		#Range: > 1

CHANGELOG.md

@@ -5,6 +5,336 @@
 ### Bug fixes
 ### Translation updates
 
+## [0.11.22] - 16-02-2026
+### Changes
+- GregTech updated to 7.5.2, see [its changelog](https://github.com/GregTechCEu/GregTech-Modern/releases/tag/v7.5.0-1.20.1) for more details
+- Blaze burners no longer work outside of Earth @Mqrius @thederpysockdude123
+- High Tier saws can Silk Harvest Ice (#3019) @Nebby1999
+- Colored small vessels now have new textures backported from 1.21 TFC
+- The alloy smelter kaolin clay to powder recipe now uses a mold instead of a circuit (since steam machines don't have circuits) @Pyritie
+- Added more of Create's decorative stone blocks to the Domum whitelist
+- Drinkable alcohols can now be drank even when your hydration is full @Ujhik
+- The Strength effect is now exclusive to wines, but all wines also now have an additional effect! @Pyritie
+- Made deployers cheaper @Pyritie
+### Bug fixes
+- Fixed the blur effect after being downed not going away
+- Fixed arrow duplication (#2089) @Ujhik
+- Fixed the blaze burner liquid fuel list not properly working on servers @Mqrius
+- Fixed dimension indicator icons duplicating when increasing the energy tier display @BlueBoat29
+- Fixed the face mask new curio slot not actually preventing hazards @Bumperdo09
+- Fixed mars crop seeds not going in the seed pouch (#3058) @Pyritie
+- Fixed not being able to make aluminium double plates with LV machines (#3030) @Pyritie
+- Fixed not being able to recycle unfired firmalife oven parts @Pyritie
+- Fixed not being able to fire scraping knife molds (#3038) @Pyritie
+- Fixed some tree types not contributing to ambient bird noises @Pyritie
+- Fixed startup issues when the system language is set to Turkish @Pyritie
+- Fixed a bunch of quests @Pyritie @Eilandor
+### Translation updates
+- Russian @Nixieeunrare
+- German @Enderderschander
+- Ukranian @MetEnBouldry
+- Chinese (simplified) @jmecn
+
+## [0.11.21] - 09-02-2026
+### Breaking changes
+If you missed it, [0.11.19](https://github.com/TerraFirmaGreg-Team/Modpack-Modern/releases/tag/0.11.19) and [0.11.20](https://github.com/TerraFirmaGreg-Team/Modpack-Modern/releases/tag/0.11.20) were Alpha versions with many important breaking changes. Be sure to read their changelogs as well!
+- And because we didn't make it a big enough deal yet, **the railgun now works on servers**!
+- Greate Encased Fans now work differently. Water (or distilled water) needs to be pumped into the encased fan itself, instead of having a source block in front. Items also must be on a Depot or Belt in order to be washed, instead of the floor. Processing time decreases with fan RPM. Regular water produces fewer byproducts than distilled water.
+- Some recipe changes to AE2 mainly to ExtandedAE to avoid conflicts, check your patterns
+### Changes
+- Large Solar Array MK2 is now craftable after reaching Mars rather than at the end of the Fission Line
+- Added artisan table recipes for all pipe mold sizes (#2983) @Redeix
+- You can now pick up foxes @Pyritie
+- Added glass batch to glass vial extruder recipe (#2999) @Inceitious
+- Added a new Face curios slot for Create's Goggles and the Face Mask (#2992) @Bumperdo09
+- Added more recycling recipes for wood related items (#2986) @Redeix
+- Added soybean + sea water to soy mixture recipe (#2984) @Redeix
+- Added optional [Chimes](https://www.curseforge.com/minecraft/mc-mods/chimes) compat. (#2973) @TreyR9
+- Added optional [Create: Sound of Steam](https://www.curseforge.com/minecraft/mc-mods/create-sound-of-steam) compat (#2324) @samtsa
+- Added Universal Bags of Composts (#3016) @Nebby1999
+### Bug fixes
+- Fixed the T1 empty fuel rod being uncraftable (#3008) @TomPlop
+- Fixed fission fuel rods looking for the wrong items to recycle @TomPlop
+- Added a missing recipe for the Heat Input Hatch that was making progressing on the Fission line after Uranium impossible @TomPlop
+- Added a missing recipe for the Titanium Exhaust Vent that was making building the Cooling Tower impossible @TomPlop
+- Fixed incorrect mechanical mixer recipes for weak and regular colored steel dust (#2977) @Pyritie
+- Fixed cobble breaking into two cobble blocks (#2980) @Pyritie
+- Fixed a recycling dupe with maintenance hatches (#3003) @Pyritie
+- Fixed warped and crimson lamella giving the wrong saplings (#2990) @Pyritie
+- Fixed recipe conflict with soybeans (#2988) @Pyritie
+- Fixed TFC pure fertilisers to GT fertiliser recipe amounts being reversed (#2985) @Coox1e
+- Fixed pandas not dropping meat @Pyritie
+- Fixed plutonium ores existing @Pyritie
+- Fixed names of non-TFC materials in ingot piles @Ujhik
+- Fixed cricket sounds on mars @Pyritie
+- Added recipe for wooden bracket (#3007) @Pyritie
+### Translation updates
+- Ukranian @MetEnBouldry
+- German @Enderderschander
+- Russian @Nixieeunrare + @Petr211071
+- Chinese (simplified) @jmecn
+- Spanish @NikoNeko17
+
+## [0.11.20] - 04-02-2026
+### Changes
+- Added EV laser hatches! @TomPlop
+- Removed the logs to wood dust quern recipes as originally intended @Pyritie
+- Added a sealed barrel recipe to convert clay dust into clay balls (#2943) @OLOXpl
+- Added more fluid hatches to the Heat Exchanger to handle the increased flowrate (#2971) @TomPlop
+### Bug fixes
+- Fixed all the missing crafting table saw recipes (#2967) @Pyritie
+- Fixed not being able to send crafting requests to your AE2 network with the interdimensional wireless card @Mqrius
+- Fixed the hydroponics facility, pisciculture fishery, and growth chamber's missing overclocks @TomPlop
+- Fixed matches, matchboxes, and lighters so they actually work with TFC things now (#1486) @Pyritie
+### Translation updates
+- Spanish @NikoNeko17
+
+## [0.11.19] - 03-02-2026
+### Breaking changes
+- The chemical reactor recipe for making Kaolinite Powder now uses circuit 3 @Pyritie
+- The two chemical reactor recipes for Tetramethoxysilane now have circuits (1 and 2) (#2898) @Pyritie
+- Toluene + Benzene = Biphenyl + Methane now uses circuit 1 (#2928) @Pyritie
+- TFC Gurman changed its name and recipe IDs to TFC Gourmet. There will be conversion items, but not fluids, so drink all your lemonade and kvass before updating.
+- The BTX line has been modified, with the Cracker now outputting the used Catalyser instead of the LCR
+#### Energy Update
+- Cetane Boosted Diesel's duration is buffed by 30%
+- Diesel's duration is nerfed by 25%, but can now be crafted at ULV
+- Added distillation recipe to get fuel from oil with the Vacuum Chamber
+- Light Fuel isn't a fuel anymore (make Diesel with it!)
+- High Octane Gasoline now requires an IV Energy Hatch
+- Add Small Fission Reactor, Small Turbine Generator, and the Cooling Tower. You can now make power from Fission on Earth!
+- BTX has been buffed by 10%, and also produces 12.5% more with each craft!
+#### ULV changes
+- The vacuum chamber requires a blue steel spring now, so the colored steel anvil can't be skipped
+- The steel mechanical mixer can now only make weak red/blue steel dust, not regular (it can still make black steel dust though). The LV mixer can make normal red/blue steel dust
+- Changed ULV hulls to needing lead plates instead of wood plates
+- Adjusted a few other machine recipes slightly
+- Deserts now contain oil spouts for heavy, raw, light, and normal oils
+- Oilsands veins are now smaller across most of the world, except the huge ones have been moved to the desert
+- Unhid and added a recipe for the kinetic bridge (#2881) @Pyritie
+- High speed on a Belt Grinder now only requires 64 RPM instead of 128 RPM
+- Added steam alloy smelter glass batch recipes (#2853) @Pyritie
+#### LV changes
+- Completely rearranged the quest chapter! Now it should be much less intimidating for new players
+- Added Bakelite, a new early plastic used for Phenolic Boards and MV machine hulls (instead of wrought iron plates)
+- Removed the other fiberboard that was previously used for phenolic boards
+- Added some recipes to get Phenol and Methane in LV
+- Added new ceramics required to craft Cupronickel Coils, made out of your recycled TFC blast furnace, Magnesia, and some resin
+- Cupronickel coils now also need blue steel foil instead of bronze
+- Polyethylene now requires an MV chemical reactor
+- Added the Artisan Table to "knap" circuit boards and GT extruder and casting molds, replacing their crafting table recipes. @BlueBoat29 @Redeix
+#### EV changes
+- Added Radon to EV Superconductor so they are gated behind the Uranium Reactor
+- Active Energy Transformer and Normal Laser Pipe are moved to EV behind the Uranium Reactor
+- Change to Refrigerant Pellet, you now need the TerraFirmaGuard PA6 to run your first Plutonium Rods
+- Added the Heat Battery - a new multiblock that stores heat from your fission coolant
+- Rework of the Ostrum Linear Accelerator - it can now be expanded in height, requires heat from a Heat Battery to run and used for many new resources
+- Every Fission Reactor recipe now outputs a depleted rod that you have to process to get the product from fission
+- The depleted rod now has an average heat depending on the temperature of the fission reactor while it was in it. Every time the reactor goes on cooldown, it adds 10,000 heat to your rod
+- RTM Coils were modified to require resources from Mars (from the martian trees) and Rockwool, but now you don't need them as early in EV
+- Blocks (such as sand piles) in the Nuclear Turbine's chimney or turbine area will now just stop it from working instead of unforming the multiblock
+#### IV changes
+- Multi-Layer Insulated Shielding is now required for HSS-G coils.
+#### Electric Greenhouse changes
+- You can now use glass casings and trapdoors for the EGH floor. @Redeix
+- Aquaponic multiblocks now only need half an amp to run. (#2950) @Redeix
+- Base recipe duration has been reduced to 600/450/300 seconds. (#2950) @Redeix
+- More circuit options for recipes that priorities seeds/saplings and recipes that prioritize leaves have been added. (#2950) @Redeix
+- More plants have been added for production. @Redeix & @thederpysockdude123
+- The EGH and the Pisciculture recipes now require 50% less energy
+#### Other major changes
+- The railgun should actually work on servers now! (#2820, #2702, #2030, #2031, #2057, #2010) @gustovafing, @asere
+- Added two-person rockets! @BlueBoat29
+- Added new advanced GTCEu Terminals @TomPlop
+- Added much more music to the different dimensions @Pyritie
+### Changes
+- Vanadium magnetite is now usable as an iron ore for TFC purposes (#2834) @Pyritie
+- Paracetamol now cures a small amount of the Radioactive condition, and RadAway now cures everything completely @Pyritie
+- Glow ink now just requires a fluid solidifier and a ball mold, instead of whatever it was doing before @Pyritie
+- TFC "pure" fertilisers are now all craftable and provide 100 fertiliser instead of 15 (#2884) @Coox1e
+- Added shapeless recipes to convert any old stone dusts into their new equivalents (#2900) @Pyritie
+- Added recipe to convert sedimentary carbonate stone dust into flux (#2862) @Pyritie
+- Fixed the crucible capacity config on servers (#2899) @Pyritie
+- Some volcanoes should now have much bigger amounts of lava underneath them, for more lava needs, but also infinite obsidian via the rock breaker has been removed. (Use a fluid solidifier instead) @Pyritie
+- Added manual/automated sanding recipes for making smooth stone (#2876) @Pyritie
+- Added deployer recipes for all the in-world block modification recipes (#2876) @Pyritie
+- Added recipe to convert kaolin clay blocks back into kaolin clay (#2904) @Pyritie
+- Axolotls now have genders @Pyritie
+- Piglins can now spawn with crossbows @Pyritie
+- Piglin brutes now always spawn with full armor and harder-hitting weapons @Pyritie
+- Added quartzite as a mars stone type @Pyritie
+- Added assembler recipe for framed cubes (#2889) @Coox1e
+- Added a furnace recipe for dead grass to thatch (#2935) @Coox1e
+- Added support for Bluemap (#2922) @trisjob
+- Added mixer and barrel recipes for dye fluids (#2925, #2938) @OLOXpl
+- Added recipes to convert leaves into leaf piles. (#2950) @Redeix
+- Added a recipe to convert fruit leaf blocks into firmalife fruit leaf items. (#2950) @Redeix
+- Added a recipe to turn leaf blocks into hedges. (#2950) @Redeix
+- Added recipes to make krummholz. (#2950) @Redeix
+- Added config file for Via Romana support. (#2950) @Redeix
+- Backpack void upgrades are now cheaper @Pyritie
+- All tools should now have TFC damage types (#2868) @Pyritie
+- TFC magma blocks, lightblooms, and bulbkins now correctly have emissive textures @Pyritie
+- Quivers can now also go in the belt curios slot (#2927) @Pyritie
+- Various quest fixes and improvements @ashleney @Tinchik @TomPlop @Pyritie
+### Bug fixes
+- Fixed being able to right-click crops with a scythe to harvest them (#1724) @Ujhik
+- Fixed large miners not outputting crushed ore when mining Migmatite @Pyritie
+- Fixed red granite ores never dropping poor or rich raw ores @Pyritie
+- Fixed rosin leaves and saplings having tags the wrong way around (#2840) @TanJeeSchuan
+- Fixed missing borax to flux recipe @Pyritie
+- Fixed lavaproof blue steel boots not having armor resistances (#2872) @Paradalope
+- Fixed the dye colors used to make Create Deco's bricks (#2859) @silllil
+- Fixed the Electric Greenhouse outputting way less Chorus Fruit than before @Pyritie
+- Fixed the hot ingot icons for Ostrum and Vanadium ingots looking inconsistent with the regular ingots (#2875) @RubenVerg
+- Fixed pyrogallol and black and white film developer requiring too high of a heat on the pot recipe (#2909) @Pyritie
+- Fixed not being able to fire scraping blade clay mold (#2905) @Pyritie
+- Fixed stair and slab versions of road blocks not having speed bonuses (#2912) @Pyritie
+- Fixed RNR roofs not having mineable tags, and blocked the stair/slab frame from Additional Placements (#2870) @Pyritie
+- Fixed piglin brutes not dropping meat or bones @Pyritie
+- Fixed not being able to put rings, wrench tips, screwdriver tips, buzzsaw blades, or wire cutter tips in a crucible (#2913) @Pyritie
+- Fixed a concrete dupe (#2948) and some other stone-related recycling recipes @Pyritie
+- Fixed the rendering of adjacent large martian nests @Mqrius
+- Fixed the interdimensional wireless card so it should actually work again (the crafting requests aren't fixed yet though) @Mqrius
+- Fixed the position of the dimension indicator on recipes that are valid on multiple dimensions @BlueBoat29
+- Fixed rockets breaking when you were carrying something @BlueBoat29
+- Fixed a rare crash with beneath to overworld teleporting @Lolens
+- Added Sacks 'n' Such's containers to the Toolbelt blacklist, preventing a dupe (#2926) @Pyritie
+- Fixed a dupe with steam miner and steam rock crusher recycling @Pyritie
+### Translation updates
+- Chinese (simplified) @jmecn
+- Russian @Petr211071 + @Nixieeunrare
+- Spanish @NikoNeko17
+
+## [0.11.18] - 23-01-2026
+### Important notes
+If you missed it, 0.11.17 was a Beta version with other important breaking changes. Be sure to [read it](https://github.com/TerraFirmaGreg-Team/Modpack-Modern/releases/tag/0.11.17) as well!
+- OC has been fixed on the Pisciculture Fishery and Hydroponics Facility. You will have to break and replace the machine for the fix to take effect.
+- The Saltpeter chemical reactor recipe is now on circuit 2, to avoid a conflict with Nitrous Oxide (#2826) @Pyritie
+### Breaking changes we forgot to write last time
+- Water wheels now *require* flowing water to work correctly. So you can't just put them in a lake, but you can make little flows off the side of it or use aqueducts and those should work. Other than that, they should have their same stress numbers as before.
+#### Stone dusts and other rock-related changes
+- Individual stone dusts for each rock type have been removed, instead being replaced with more general dusts based on rock composition. The centrifuging recipes have also been removed, though we plan on using these for something else later.
+- Marble/chalk dust has been replaced with Carbonate Sedimentary dust in concrete-related recipes
+- The Moon Sand in the Regolith Vapor recipe has been replaced with Asurine Dust (renewable via Rock Breaker)
+- The Mars rock dusts in the Hexafluorosilic Acid recipe has been replaced with Ochrum Dust (renewable via Rock Breaker)
+- Other recipe and tag unifications for consistency, like all cobbles should landslide, all slabs should be craftable the same way, etc
+### Changes
+- Fixed balancing issues with the Aquaponics Loop. @Redeix
+- Mars log electric greenhouse recipes now output the same amount of logs as earth log recipes @Pyritie
+- Geodes (in newly generated chunks) are now completely solid so they won't cause cave-ins any more @Pyritie
+- Recolored the different oils so you can actually tell them apart visually @Pyritie
+- The food meter's saturation level is now indicated by a gold outline instead of a red one, so it's less difficult to see (#2812) @TreyR9
+- Changed some of the colors of Greate things to make the different tiers more visually distinct @Pyritie
+- Buffed ore washing and ore maceration recipes so at least they aren't so awful compared to Greate's methods @Pyritie
+- Added TFG's crops to the field guide's Wild Crops entry @Petr211071
+- You can now drink concrete @Pyritie
+### Bug fixes
+- Fixed a config bug causing waves to deposit shells etc with 100% chance. @Mqrius
+- Fixed a bug preventing the Pisciculture Fishery and Hydroponics Facility from overclocking. @Redeix
+- Fixed not being able to make glass tubes out of glass dust (#2795) @thederpysockdude123
+- Fixed roads losing their movement speed bonus (#2790) @Pyritie
+- Fixed water wheels misbehaving again (#2791) @Pyritie
+- Fixed not being able to cast steel or higher tier materials into ceramic molds (#2789, #2794) @Pyritie
+- Fixed the Ad Astra airlock not counting as a cleanroom door (#2808) @thederpysockdude123
+- Removed some leftover rock dust centrifuge recipes (#2804) @thederpysockdude123
+- Fixed some mars plants self-destructing @Pyritie
+- Fixed mossy cobblestone not collapsing @Pyritie
+- Fixed welding not preserving forging bonuses (#2827) @Pyritie
+### Translation updates
+- Spanish @NikoNeko17
+- Russian @Petr211071
+- Chinese (simplified) @jmecn
+- Japanese @sakura-gondra
+
+## [0.11.17] - 20-01-2026
+### Important note
+- Due to a config file error, the automatic hourly backup has not been running since 0.11.15. So before you update make sure to make a copy of your world in case anything goes wrong! This is generally good advice but extra important right now.
+### Breaking changes
+- The steam thermal centrifuge now requires a maintenance hatch. It also now requires 480mB steam per tick instead of 64mb, equivalent to how much 8 LV thermal centrifuges would use. It also also now only takes 20 seconds instead of 30. It also also also now actually outputs byproducts like it was supposed to. @Pyritie
+- Single block steam generators are now more expensive to craft, so there isn't such a huge gap between steam, gas, and combustion generators. @TomPlop
+- A lot of backend code has been cleaned up and refactored, so there may be duplicate, missing, or incorrect recipes. If you find any, please report them in [our github](https://github.com/TerraFirmaGreg-Team/Modpack-Modern/issues)! @Pyritie
+### Electric Greenhouse
+- The Electric Greenhouse multiblock has completely changed. It's significantly shorter and slightly narrower too. You can still grow the same things in it, but it no longer has Perfect Overclocking. Instead, it's stronger in LV but starts getting weaker in HV+. @Redeix
+- There's a new IV variant (Hydroponics Facility) which supports parallel hatches and can do any recipe on any planet. @Redeix
+- Added a new Pisciculture Fishery to mid HV which, when properly looped, will improve the Electric Greenhouse further than just fertiliser. It also breeds fish! @Redeix
+- Removed the single-block fishing machines
+### Performance improvements
+- Fixed the huge amount of lag from looking at lots of interconnected trees @Mqrius
+- Fixed tree chopping also stripping nearby trees of all their leaves (note that this will only also apply to earth trees and newly generated Mars trees, old Mars trees will have the old behaviour) @Mqrius
+- Fixed tree chopping not working on trees that had no leaves @Mqrius
+- Fixed tree chopping working on player-placed logs (yes, this means you can't place logs to chop down many trees at once any more) @Mqrius
+- Fixed a huge amount of lag from TFC Ambiental checking for nearby hot/cold sources @Mqrius
+- Improved food stacking performance @Mqrius
+### Changes
+- Added tree index field guide entries for Earth and Mars (#2638) @Jeuvke
+- Added drinkable effects field guide entry (#2676) @FlightingFalcon
+- Ice slush is now drinkable, for a cooling effect (#2708) @Inceitious
+- You can now use coal as bloomery fuel! Both the vanilla item as well as any of the raw coals (#2731) @Pyritie
+- The crucible now holds 4608mB (32 ingots) instead of 4032mB (28 ingots) (#2634) @Pyritie
+- Large gears can now be crafted in an anvil/mechanical press @Pyritie
+- Added recipe to make tubes from volcanic glass batches (#2667) @Redeix
+- Added cast iron to the rod, gear, and nugget molds (#2677) @Mqrius
+- Added vinegar as an option for curdled milk in a gregtech mixer (#2675) @JeanRdSz
+- Fallen leaves, leaf blocks, bio chaff, and plant balls now all count as compost greens (#2653) @Inceitious
+- Added more pie charts to various ores and composite materials (#2640) @BlueBoat29
+- Unified crafting recipes for all the different metal bars (#2641)
+- Changed to a new UI mod that improves performance, let us know if it causes issues! (#2620) @trisjob
+- Cut and paste and Copy and paste building gadgets have been moved from IV to EV (#2660) @thederpysockdude123
+- The sandworm no longer spawns in the Superflat preset that's a big vanilla desert biome
+- You can now also use mars water in gregtech and create boilers @Pyritie
+- Changed the texture of out-of-season blood lilies so they're findable year-round @Pyritie
+- Added alloy smelter recipes for jar lids (#2705) @thederpysockdude123
+- Reduced the amount of ambient awoos at night, and crickets/cicadas now require grass plants instead of grass blocks. Rivers now have a louder water sound and lakes have a quieter one. (#2680) @Pyritie
+- You can now use any wrench to remove the extruder molds from the curving press instead of just the create wrench @Pyritie
+- Added wrapped locometal to gregtech facade blocks (#2726) @Pyritie
+- Peat can now be turned into creosote @Pyritie
+- Coke oven bricks now require mortar to craft @Pyritie
+- Glowstone can now be quickly broken with a pickaxe/mining hammer @Pyritie
+- Added some more knapping recipes for chalk items, improved the durability of others (#2753) @Pyritie
+- Red elk now drop bladders rarely, and have increased meat drops when killed with a butchery knife (#2778) @Pyritie
+- Vanilla ferns and large ferns now break into straw with a knife, so Beneath start is a bit less painful early on @Pyritie
+- Added shapeless pressure plate to button recipes (#2740) @Pyritie
+- Added some Beneath plants to the `#tfg:rubber_plants` tag (#2759) @Pyritie
+- Cleaned up hanging sign recipes so they don't spam as much (#2733, #2771) @Inceitious
+- Added recipes to change AE2 glass cables into covered/smart cables, and changed some recipes to require smart cables instead (#2756) @awfulworldkid
+- Crop, tree tap, and beehive tooltips, and the climate tab, now show the accurate current temperature when in an oxygenated area @Mqrius
+- Anthracite can now be used as boiler fuel with the same duration as Coke @Pyritie
+- Added more grain options for soup (#2785) @Pyritie
+- Added a mechanical mixer recipe for crafting sticky resin (#2693) @JeanRdSz
+- Framed blocks that have been made "glowing" by right-clicking them with glowstone dust, now only emit a little bit of light @Pyritie
+### Bug fixes
+- Fixed not being able to craft Paracetamol or Rad-Away @Pyritie
+- Fixed the missing dried fruit to yeast starter recipe (#2673) @Mqrius
+- Fixed crash when disassembling a train with computercraft @Mqrius
+- Water wheels now spin the correct direction in rivers (#2450) @zehmaria
+- Water wheels now also work with flowing water from aqueducts, instead of requiring an adjacent source block @zehmaria
+- Added locometal to the domum ornamentum whitelist (#2651) @thederpysockdude123
+- Fixed the new venus bugs spawning on earth @Pyritie
+- Fixed some inconsistent recipes with coal in coke ovens, and removed a duplicate recipe (#2688) @jurjen909
+- Fixed the rendering of two-block tall crops in the electric greenhouse @Pyritie
+- Fixed dry ice dropping nothing when broken (#2687) @Pyritie
+- Fixed the TFC blast furnace on mars but for real this time @Pyritie
+- Fixed bismuth bronze and black bronze extractor recipes being tiered at MV (#2684) @Inceitious
+- Fixed fridge tooltip power usage (#2689) @Karo4a
+- Fixed invar crucible alloying using the wrong amounts of iron and nickel @Pyritie
+- Fixed inconsistent saturation values from cooked long pig filet (#2714) @Pyritie
+- Fixed soaked paper in a helve hammer having a blow count of less than 1 for some anvils (#2655) @Pyritie
+- Fixed casting of rods and gears for various metals @Pyritie
+- Fixed a dupe with scraping knives (#2716) @Inceitious
+- Fixed a rendering issue with the lunchboxes when held @Thomasx0
+- Fixed the lunchbox eating particles so now they look like the food being eaten @Thomasx0
+- Fixed the cooling lunchbox not stacking empty cells correctly (#2475) @Thomasx0
+- Fixed the lunchboxes not removing the "cooling" trait when items were removed with the number keys @Thomasx0
+- Digger helmet crafting now correctly consumes the cloth hat (#2770) @Inceitious
+- Fixed an exploit with the schematicannon @Mqrius
+- Fixed backup frequency config @Mqrius
+### Translation updates
+- Chinese (simplified) @jmecn
+- Russian @Petr211071 + @Nixieeunrare + @Maxiffon
+- Japanese @sakura-gondra
+- Ukranian @MetEnBouldry
+
 ## [0.11.16] - 05-01-2026
 ### Changes
 - Added new steam multiblocks for the alloy smelter, compressor, forge hammer, and thermal centrifuge @Pyritie

config/InventoryHUD/curios.json

@@ -13,6 +13,13 @@
         "halign": "LEFT",
         "valign": "BOTTOM"
     },
+    "face": {
+        "x": 2,
+        "y": 134,
+        "enabled": true,
+        "halign": "LEFT",
+        "valign": "BOTTOM"
+    },
     "hands": {
         "x": 2,
         "y": 44,

config/ModernUI/bootstrap.properties

@@ -0,0 +1,3 @@
+#Modern UI bootstrap file
+#Fri Dec 19 22:14:20 EST 2025
+modernui_mc_disableSmoothScrolling=true

config/ModernUI/client.toml

@@ -0,0 +1,188 @@
+
+#Screen Config
+[screen]
+	#The duration of GUI background color and blur radius animation in milliseconds. (0 = OFF)
+	#Range: 0 ~ 800
+	animationDuration = 200
+	#The GUI background color in #RRGGBB or #AARRGGBB format. Default value: #99000000
+	#Can be one to four values representing top left, top right, bottom right and bottom left color.
+	#Multiple values produce a gradient effect, whereas one value produce a solid color.
+	#When values is less than 4, the rest of the corner color will be replaced by the last value.
+	backgroundColor = ["#99000000"]
+	#Add Gaussian blur effect to GUI background when opened.
+	#Disable this if you run into a problem or are on low-end PCs
+	blurEffect = true
+	#This option means that blur effect only applies to GUI screens with a background.
+	#Similar to Minecraft 1.20.6. Enable this for better optimization & compatibility.
+	blurWithBackground = true
+	#The kernel radius for gaussian convolution blur effect, 0 = disable.
+	#samples per pixel = ((radius * 2) + 1) * 2, sigma = radius / 2.
+	#Range: 0 ~ 18
+	blurRadius = 7
+	#A list of GUI screen superclasses that won't activate blur effect when opened.
+	blurBlacklist = ["net.minecraft.client.gui.screens.ChatScreen"]
+	#(Beta) Pause the game when inventory (also includes creative mode) opened.
+	inventoryPause = false
+	#Framerate limit on window inactive (out of focus or minimized), 0 = no change.
+	#Range: 0 ~ 255
+	framerateInactive = 10
+	#Framerate limit on window minimized, 0 = same as framerate inactive.
+	#This value will be no greater than framerate inactive.
+	#Range: 0 ~ 255
+	framerateMinimized = 0
+	#Master volume multiplier on window inactive (out of focus or minimized), 1 = no change.
+	#Range: 0.0 ~ 1.0
+	masterVolumeInactive = 0.5
+	#Master volume multiplier on window minimized, 1 = same as master volume inactive.
+	#This value will be no greater than master volume inactive.
+	#Range: 0.0 ~ 1.0
+	masterVolumeMinimized = 0.25
+
+#Tooltip Config
+[tooltip]
+	#Whether to enable Modern UI enhanced tooltip, or back to vanilla default.
+	enable = true
+	#Whether to use rounded tooltip shapes, or to use vanilla style.
+	roundedShape = false
+	#True to center the tooltip title if rendering an item's tooltip.
+	#Following lines are not affected by this option.
+	centerTitle = true
+	#True to add a title break below the tooltip title line.
+	#TitleBreak and CenterTitle will work/appear at the same time.
+	titleBreak = true
+	#True to exactly position tooltip to pixel grid, smoother movement.
+	exactPositioning = true
+	#The tooltip background color in #RRGGBB or #AARRGGBB format. Default: #E6000000
+	#Can be one to four values representing top left, top right, bottom right and bottom left color.
+	#Multiple values produce a gradient effect, whereas one value produces a solid color.
+	#If less than 4 are provided, repeat the last value.
+	colorFill = ["#E6000000"]
+	#The tooltip border color in #RRGGBB or #AARRGGBB format. Default: #F0AADCF0, #F0DAD0F4, #F0FFC3F7 and #F0DAD0F4
+	#Can be one to four values representing top left, top right, bottom right and bottom left color.
+	#Multiple values produce a gradient effect, whereas one value produces a solid color.
+	#If less than 4 are provided, repeat the last value.
+	colorStroke = ["#FFC2D0D6", "#FFE7DAE5", "#FFCCDAC8", "#FFC8B9AC"]
+	#The cycle time of tooltip border color in milliseconds. (0 = OFF)
+	#Range: 0 ~ 5000
+	borderCycleTime = 1000
+	#The width of tooltip border, if rounded, in GUI Scale Independent Pixels.
+	#Range: 0.5 ~ 2.5
+	borderWidth = 1.3333333333333333
+	#The corner radius of tooltip border, if rounded, in GUI Scale Independent Pixels.
+	#Range: 0.0 ~ 8.0
+	cornerRadius = 4.0
+	#The shadow radius of tooltip, if rounded, in GUI Scale Independent Pixels.
+	#No impact on performance.
+	#Range: 0.0 ~ 32.0
+	shadowRadius = 10.0
+	#The shadow opacity of tooltip, if rounded. No impact on performance.
+	#Range: 0.0 ~ 1.0
+	shadowOpacity = 0.25
+	#When true, tooltip border colors adapt to item's name and rarity.
+	adaptiveColors = true
+	#Amount to scroll the tooltip in response to a arrow key pressed event.
+	#Range: 0 ~ 320
+	arrowScrollFactor = 60
+
+#General Config
+[general]
+	#Play a sound effect when the game is loaded.
+	ding = true
+	#Specify a sound event to custom the ding sound effect.
+	#The default is "minecraft:entity.experience_orb.pickup"
+	dingSound = ""
+	#Specify a volume multiplier to the ding sound effect.
+	#Range: 0.0 ~ 10.0
+	dingVolume = 0.25
+	#Press 'C' key (by default) to zoom 4x, the same as OptiFine's.
+	#This is auto disabled when OptiFine is installed.
+	zoom = false
+	#Control the window mode, normal mode does nothing.
+	#Allowed Values: NORMAL, FULLSCREEN, FULLSCREEN_BORDERLESS, MAXIMIZED, MAXIMIZED_BORDERLESS, WINDOWED, WINDOWED_BORDERLESS
+	windowMode = "NORMAL"
+	#Whether to replace vanilla GUI scale button to slider with tips.
+	useNewGuiScale = true
+	#Remove telemetry event of client behaviors.
+	removeTelemetry = false
+	#Allow Slack or Discord shortcodes to replace Unicode Emoji Sequences in chat.
+	emojiShortcodes = true
+
+#View Config
+[view]
+	#Force layout direction to RTL, otherwise, the current Locale setting.
+	forceRtl = false
+	#The global font scale used with sp units.
+	#Range: 0.5 ~ 2.0
+	fontScale = 1.1
+	#Default scrollbar size in dips.
+	#Range: 0 ~ 1024
+	scrollbarSize = 4
+	#Distance a touch can wander before we think the user is scrolling in dips.
+	#Range: 0 ~ 1024
+	touchSlop = 4
+	#Distance a hover can wander while it is still considered "stationary" in dips.
+	#Range: 0 ~ 1024
+	hoverSlop = 4
+	#Minimum size of the touch target for a scrollbar in dips.
+	#Range: 0 ~ 1024
+	minScrollbarTouchTarget = 16
+	#Minimum velocity to initiate a fling in dips per second.
+	#Range: 0 ~ 32767
+	minimumFlingVelocity = 50
+	#Maximum velocity to initiate a fling in dips per second.
+	#Range: 0 ~ 32767
+	maximumFlingVelocity = 8000
+	#The coefficient of friction applied to flings/scrolls.
+	#Range: 0.001 ~ 7.389
+	scrollFriction = 0.014999999664723873
+	#Max distance in dips to overscroll for edge effects.
+	#Range: 0 ~ 1024
+	overscrollDistance = 0
+	#Max distance in dips to overfling for edge effects.
+	#Range: 0 ~ 1024
+	overflingDistance = 12
+	#Amount to scroll in response to a vertical scroll event, in dips per axis value.
+	#Range: 0.0 ~ 1024.0
+	verticalScrollFactor = 64.0
+	#Amount to scroll in response to a horizontal scroll event, in dips per axis value.
+	#Range: 0.0 ~ 1024.0
+	horizontalScrollFactor = 64.0
+	#The duration in milliseconds before a hover event causes a tooltip to be shown.
+	#Range: 0 ~ 1200
+	hoverTooltipShowTimeout = 500
+	#The duration in milliseconds before mouse inactivity causes a tooltip to be hidden.
+	#Range: 3000 ~ 120000
+	hoverTooltipHideTimeout = 30000
+
+#Font Config
+[font]
+	#The first font family to use. See fallbackFontFamilyList
+	firstFontFamily = ".\\config\\ModernUI\\unifont-17.0.03.otf"
+	#A set of fallback font families to determine the typeface to use.
+	#The order is first > fallbacks. TrueType & OpenType are supported.
+	#Each element can be one of the following two cases:
+	#1) Name of registered font family, for instance: Segoe UI
+	#2) Path of font files on your PC, for instance: /usr/shared/fonts/x.otf
+	#Registered font families include:
+	#1) OS builtin fonts.
+	#2) Font files in fontRegistrationList.
+	#3) Font files in '/resourcepacks' directory.
+	#4) Font files under 'modernui:font' in resource packs.
+	#Note that for TTC/OTC font, you should register it and select one of font families.
+	#Otherwise, only the first font family from the TrueType/OpenType Collection will be used.
+	#This is only read once when the game is loaded, you can reload via in-game GUI.
+	fallbackFontFamilyList = ["Source Han Sans CN Medium", "Noto Sans", "Segoe UI Variable", "Segoe UI", "San Francisco", "Open Sans", "SimHei", "STHeiti", "Segoe UI Symbol", "mui-i18n-compat"]
+	#A set of additional font files (or directories) to register.
+	#For TrueType/OpenType Collections, all contained font families will be registered.
+	#Registered fonts can be referenced in Modern UI and Minecraft (Modern Text Engine).
+	#For example, "E:/Fonts" means all font files in that directory will be registered.
+	#System requires random access to these files, you should not remove them while running.
+	#This is only read once when the game is loaded, i.e. registration.
+	fontRegistrationList = []
+	#Whether to use Google Noto Color Emoji, otherwise grayscale emoji (faster).
+	#See Unicode 15.0 specification for details on how this affects text layout.
+	useColorEmoji = true
+	#When enabled, text layout uses fractional metrics with no font hinting and applies sub-pixel positioning.
+	#When disabled, text layout uses integer metrics with full font hinting.
+	linearMetrics = true
+

config/ModernUI/text.toml

@@ -0,0 +1,102 @@
+
+#Text Engine Config
+[text]
+	#Allow text renderer to drop shadow, setting to false can improve performance.
+	allowShadow = true
+	#Fix resolution level at 2. When the GUI scale increases, the resolution level remains.
+	#Then GUI scale should be even numbers (2, 4, 6...), based on Minecraft GUI system.
+	#If your fonts are not bitmap fonts, then you should keep this setting false.
+	fixedResolution = false
+	#Control base font size, in GUI scaled pixels. The default and vanilla value is 8.
+	#For bitmap fonts, 8 represents a glyph size of 8x or 16x if fixed resolution.
+	#This option only applies to TrueType fonts.
+	#Range: 6.5 ~ 9.5
+	baseFontSize = 7.4
+	#Control vertical baseline for vanilla text layout, in GUI scaled pixels.
+	#The vanilla default value is 7.
+	#Range: 4.0 ~ 10.0
+	baselineShift = 7.0
+	#Control the text shadow offset for vanilla text rendering, in GUI scaled pixels.
+	#Range: 0.20000000298023224 ~ 2.0
+	shadowOffset = 0.5
+	#Control the text outline offset for vanilla text rendering, in GUI scaled pixels.
+	#Range: 0.20000000298023224 ~ 2.0
+	outlineOffset = 0.5
+	#Control the horizontal offset for bitmap fonts, in GUI scaled pixels.
+	#Range: 0.0 ~ 1.0
+	bitmapOffset = 0.5
+	#Set the recycle time of layout cache in seconds, using least recently used algorithm.
+	#Range: 2 ~ 15
+	cacheLifespan = 6
+	#The bidirectional text heuristic algorithm. The default is FirstStrong (Locale).
+	#This will affect which BiDi algorithm to use during text layout.
+	#Allowed Values: FIRST_STRONG, ANY_RTL, LTR, RTL, LOCALE, FIRST_STRONG_LTR, FIRST_STRONG_RTL
+	textDirection = "FIRST_STRONG"
+	#Whether to use Modern UI text rendering pipeline in 3D world.
+	#Disabling this means that SDF text and rendering optimization are no longer effective.
+	#But text rendering can be compatible with OptiFine Shaders and Iris Shaders.
+	#This does not affect text rendering in GUI.
+	#This option only applies to TrueType fonts.
+	useTextShadersInWorld = true
+	#For "minecraft:default" font, should we keep some glyph providers of them?
+	#Ignore All: Only use Modern UI typeface list.
+	#Keep ASCII: Include minecraft:font/ascii.png, minecraft:font/accented.png, minecraft:font/nonlatin_european.png
+	#Keep Other: Include providers other than ASCII and Unicode font.
+	#Keep All: Include all except Unicode font.
+	#Only Include: Only include providers that specified by defaultFontRuleSet.
+	#Only Exclude: Only exclude providers that specified by defaultFontRuleSet.
+	#Allowed Values: IGNORE_ALL, KEEP_ASCII, KEEP_OTHER, KEEP_ALL, ONLY_INCLUDE, ONLY_EXCLUDE
+	defaultFontBehavior = "KEEP_ALL"
+	#Used when defaultFontBehavior is either ONLY_INCLUDE or ONLY_EXCLUDE.
+	#This specifies a set of regular expressions to match the glyph provider name.
+	#For bitmap providers, this is the texture path without 'textures/'.
+	#For TTF providers, this is the TTF file path without 'font/'.
+	#For space providers, this is "font_name / minecraft:space",
+	#where font_name is font definition path without 'font/'.
+	defaultFontRuleSet = ["^minecraft:font\\/(nonlatin_european|accented|ascii|element_ideographs|cjk_punctuations|ellipsis|2em_dash)\\.png$", "^minecraft:include\\/space \\/ minecraft:space$", "^minecraft:font\\/(mcsans|emoji)_05_00\\d.png$", "minecraft:uniform"]
+	#Whether to use text component object as hash key to lookup in layout cache.
+	#If you find that Modern UI text rendering is not compatible with some mods,
+	#you can disable this option for compatibility, but this will decrease performance a bit.
+	#Modern UI will use another cache strategy if this is disabled.
+	useComponentCache = true
+	#Allow text layout to be computed from background threads (not cached).
+	#Otherwise, block the current thread and wait for main thread.
+	allowAsyncLayout = true
+	#See CSS line-break property, https://developer.mozilla.org/en-US/docs/Web/CSS/line-break
+	#Allowed Values: AUTO, LOOSE, NORMAL, STRICT
+	lineBreakStyle = "AUTO"
+	#Allowed Values: AUTO, PHRASE
+	lineBreakWordStyle = "AUTO"
+	#When enabled, Modern UI will compute texel density in device-space to determine whether to use SDF text or bilinear sampling.
+	#This feature requires GLSL 400 or has no effect.
+	#This generally decreases performance but provides better rendering quality.
+	#This option only applies to TrueType fonts. May not be compatible with OptiFine.
+	smartSDFShaders = true
+	#When rendering in 2D, this option allows Modern UI to exactly compute font size in device-space from the current coordinate transform matrix.
+	#This provides perfect text rendering for scaling-down texts in vanilla, but may increase GPU memory usage.
+	#When disabled, Modern UI will use SDF text rendering if appropriate.
+	#This option only applies to TrueType fonts.
+	computeDeviceFontSize = true
+	#When enabled, Modern UI will use SDF text rendering if appropriate.
+	#Otherwise, it uses nearest-neighbor or bilinear sampling based on texel density.
+	#This option only applies to TrueType fonts.
+	allowSDFTextIn2D = true
+	#When enabled, the outline of the experience level text will be tweaked.
+	tweakExperienceText = true
+	#Control the anti-aliasing of raw glyph rasterization.
+	antiAliasing = false
+	#When enabled, text layout uses fractional metrics with no font hinting.
+	#When disabled, text layout uses integer metrics with full font hinting.
+	#Disable if on low-res monitor; enable for linear text.
+	linearMetrics = false
+	#Control the minimum pixel density for SDF text and text in 3D world rendering.
+	#This value will be no less than current GUI scale.
+	#Recommend setting a higher value on high-res monitor and powerful PC hardware.
+	#Range: 4 ~ 10
+	minPixelDensityForSDF = 10
+	#Enable linear sampling for A8 font atlases with mipmaps, mag filter will be always
+	#NEAREST. We prefer computeDeviceFontSize and allowSDFTextIn2D, then setting this to
+	#false can improve performance. If either of the above two is false or Shaders are active,
+	#then setting this to true can improve readability.
+	linearSamplingA8Atlas = false
+

config/additionalplacements-startup.toml

@@ -14,13 +14,13 @@
 			[startup.types.additionalplacements.slab]
 				#Blocklist for controlling which blocks (that are valid for this type) will generate variants of this type
 				#See https://github.com/FirEmerald/AdditionalPlacements/wiki/Blocklist-Format for blocklist format
-				enabled = ["+*"]
+				enabled = ["+*", "-rnr:roof_frame_slab"]
 
 			#Stairs
 			[startup.types.additionalplacements.stairs]
 				#Blocklist for controlling which blocks (that are valid for this type) will generate variants of this type
 				#See https://github.com/FirEmerald/AdditionalPlacements/wiki/Blocklist-Format for blocklist format
-				enabled = ["+*"]
+				enabled = ["+*", "-rnr:roof_frame_stairs"]
 				#Blocklist to control which blocks will allow for vertical stair connections.
 				#Keep in mind vertical is RELATIVE to the placement of the stair - "vertical" for a vertically placed stair will be one of the two horizontal directions.
 				#See https://github.com/FirEmerald/AdditionalPlacements/wiki/Blocklist-Format for blocklist format

config/blockrunner.json

@@ -1,11 +1,26 @@
 {
-  "schema_version": "2",
+	"schema_version": "2",
-  "minecraft:dirt_path": 1.35,
+	"#tfc:paths": 1,
-  "#blockrunner:slow_blocks": 0.65,
+	"rnr:hoggin": 1.1,
-  "#blockrunner:very_slow_blocks": 0.45,
+	"rnr:hoggin_slab": 1.1,
-  "#blockrunner:quick_blocks": 1.35,
+	"rnr:hoggin_stairs": 1.1,
-  "#blockrunner:very_quick_blocks": 1.55,
+	"#rnr:gravel_road_blocks": 1.1,
-  "#blockrunner:slightly_slow_blocks": 0.85,
+	"#rnr:gravel_road_stairs": 1.1,
-  "#blockrunner:slightly_quick_blocks": 1.15,
+	"#rnr:gravel_road_slabs": 1.1,
-  "#minecraft:stone_bricks": 1.15
+	"#rnr:overheight_gravel_blocks": 1.1,
+	"#rnr:macadam_road_blocks": 1.2,
+	"#rnr:macadam_road_stairs": 1.2,
+	"#rnr:macadam_road_slabs": 1.2,
+	"#rnr:sett_road_blocks": 1.2,
+	"#rnr:sett_road_stairs": 1.2,
+	"#rnr:sett_road_slabs": 1.2,
+	"#rnr:flagstones_blocks": 1.2,
+	"#rnr:flagstones_stairs": 1.2,
+	"#rnr:flagstones_slabs": 1.2,
+	"#rnr:cobbled_road_blocks": 1.2,
+	"#rnr:cobbled_road_stairs": 1.2,
+	"#rnr:cobbled_road_slabs": 1.2,
+	"#rnr:functional_concrete_roads": 1.3,
+	"#rnr:functional_concrete_road_stairs": 1.3,
+	"#rnr:functional_concrete_road_slabs": 1.3
 }

config/bluemap/packs/TFG_fix/assets/afc/blockColors.json

@@ -0,0 +1,95 @@
+{
+//AFC leaves
+  "afc:wood/leaves/boabab": "@foliage",
+  "afc:wood/leaves/eucalyptus": "@foliage",
+  "afc:wood/leaves/mahogany": "@foliage",
+  "afc:wood/leaves/hevea": "@foliage",
+  "afc:wood/leaves/tualang": "@foliage",
+  "afc:wood/leaves/teak": "@foliage",
+  "afc:wood/leaves/cypress": "@foliage",
+  "afc:wood/leaves/fig": "@foliage",
+  "afc:wood/leaves/ironwood": "@foliage",
+  "afc:wood/leaves/ipe": "@foliage",
+  "afc:wood/leaves/gum_arabic": "@foliage",
+  "afc:wood/leaves/acacia_koa": "@foliage",
+  "afc:wood/leaves/poplar": "@foliage",
+  "afc:wood/leaves/mpingo_blackwood": "@foliage",
+  "afc:wood/leaves/mountain_fir": "@foliage",
+  "afc:wood/leaves/balsam_fir": "@foliage",
+  "afc:wood/leaves/scrub_hickory": "@foliage",
+  "afc:wood/leaves/red_silk_cotton": "@foliage",
+  "afc:wood/leaves/bigleaf_maple": "@foliage",
+  "afc:wood/leaves/weeping_maple": "@foliage",
+  "afc:wood/leaves/black_oak": "@foliage",
+  "afc:wood/leaves/live_oak": "@foliage",
+  "afc:wood/leaves/jaggery_palm": "@foliage",
+  "afc:wood/leaves/stone_pine": "@foliage",
+  "afc:wood/leaves/red_pine": "@foliage",
+  "afc:wood/leaves/tamarack": "@foliage",
+  "afc:wood/leaves/giant_rosewood": "@foliage",
+  "afc:wood/leaves/coast_redwood": "@foliage",
+  "afc:wood/leaves/coast_spruce": "@foliage",
+  "afc:wood/leaves/sitka_spruce": "@foliage",
+  "afc:wood/leaves/black_spruce": "@foliage",
+  "afc:wood/leaves/atlas_cedar": "@foliage",
+  "afc:wood/leaves/weeping_willow": "@foliage",
+  "afc:wood/leaves/rainbow_eucalyptus": "@foliage",
+  "afc:wood/leaves/mountain_ash": "@foliage",
+  "afc:wood/leaves/rubber_fig": "@foliage",
+  "afc:wood/leaves/redcedar": "@foliage",
+  "afc:wood/leaves/weeping_cypress": "@foliage",
+  "afc:wood/leaves/bald_cypress": "@foliage",
+  "afc:wood/leaves/sapele_mahogany": "@foliage",
+  "afc:wood/leaves/small_leaf_mahogany": "@foliage",
+  "afc:wood/leaves/iroko_teak": "@foliage",
+  "afc:wood/leaves/flame_of_the_forest": "@foliage",
+  "afc:wood/leaves/lebombo_ironwood": "@foliage",
+  "afc:wood/leaves/horsetail_ironwood": "@foliage",
+
+//AFC fallen_leaves
+  "afc:wood/fallen_leaves/boabab": "@foliage",
+  "afc:wood/fallen_leaves/eucalyptus": "@foliage",
+  "afc:wood/fallen_leaves/mahogany": "@foliage",
+  "afc:wood/fallen_leaves/hevea": "@foliage",
+  "afc:wood/fallen_leaves/tualang": "@foliage",
+  "afc:wood/fallen_leaves/teak": "@foliage",
+  "afc:wood/fallen_leaves/cypress": "@foliage",
+  "afc:wood/fallen_leaves/fig": "@foliage",
+  "afc:wood/fallen_leaves/ironwood": "@foliage",
+  "afc:wood/fallen_leaves/ipe": "@foliage",
+  "afc:wood/fallen_leaves/gum_arabic": "@foliage",
+  "afc:wood/fallen_leaves/acacia_koa": "@foliage",
+  "afc:wood/fallen_leaves/poplar": "@foliage",
+  "afc:wood/fallen_leaves/mpingo_blackwood": "@foliage",
+  "afc:wood/fallen_leaves/mountain_fir": "@foliage",
+  "afc:wood/fallen_leaves/balsam_fir": "@foliage",
+  "afc:wood/fallen_leaves/scrub_hickory": "@foliage",
+  "afc:wood/fallen_leaves/red_silk_cotton": "@foliage",
+  "afc:wood/fallen_leaves/bigleaf_maple": "@foliage",
+  "afc:wood/fallen_leaves/weeping_maple": "@foliage",
+  "afc:wood/fallen_leaves/black_oak": "@foliage",
+  "afc:wood/fallen_leaves/live_oak": "@foliage",
+  "afc:wood/fallen_leaves/jaggery_palm": "@foliage",
+  "afc:wood/fallen_leaves/stone_pine": "@foliage",
+  "afc:wood/fallen_leaves/red_pine": "@foliage",
+  "afc:wood/fallen_leaves/tamarack": "@foliage",
+  "afc:wood/fallen_leaves/giant_rosewood": "@foliage",
+  "afc:wood/fallen_leaves/coast_redwood": "@foliage",
+  "afc:wood/fallen_leaves/coast_spruce": "@foliage",
+  "afc:wood/fallen_leaves/sitka_spruce": "@foliage",
+  "afc:wood/fallen_leaves/black_spruce": "@foliage",
+  "afc:wood/fallen_leaves/atlas_cedar": "@foliage",
+  "afc:wood/fallen_leaves/weeping_willow": "@foliage",
+  "afc:wood/fallen_leaves/rainbow_eucalyptus": "@foliage",
+  "afc:wood/fallen_leaves/mountain_ash": "@foliage",
+  "afc:wood/fallen_leaves/rubber_fig": "@foliage",
+  "afc:wood/fallen_leaves/redcedar": "@foliage",
+  "afc:wood/fallen_leaves/weeping_cypress": "@foliage",
+  "afc:wood/fallen_leaves/bald_cypress": "@foliage",
+  "afc:wood/fallen_leaves/sapele_mahogany": "@foliage",
+  "afc:wood/fallen_leaves/small_leaf_mahogany": "@foliage",
+  "afc:wood/fallen_leaves/iroko_teak": "@foliage",
+  "afc:wood/fallen_leaves/flame_of_the_forest": "@foliage",
+  "afc:wood/fallen_leaves/lebombo_ironwood": "@foliage",
+  "afc:wood/fallen_leaves/horsetail_ironwood": "@foliage",
+}

config/bluemap/packs/TFG_fix/assets/tfc/blockColors.json

@@ -0,0 +1,245 @@
+{
+//TFC plants
+  "tfc:peat_grass": "@grass",
+  "tfc:kaolin_clay_grass": "@grass",
+  "tfc:grass/silt": "@grass",
+  "tfc:clay_grass/silt": "@grass",
+  "tfc:grass/loam": "@grass",
+  "tfc:clay_grass/loam": "@grass",
+  "tfc:grass/sandy": "@grass",
+  "tfc:clay_grass/sandy": "@grass",
+  "tfc:grass/silty_loam": "@grass",
+  "tfc:clay_grass/silty_loam": "@grass",
+  "tfc:grass/sandy_loam": "@grass",
+  "tfc:clay_grass/sandy_loam": "@grass",
+  "tfc:plant/sagebrush": "@foliage",
+  "tfc:plant/cordgrass": "@foliage",
+  "tfc:plant/guzmania": "@foliage",
+  "tfc:plant/pine_krummholz": "@foliage",
+  "tfc:plant/king_fern": "@foliage",
+  "tfc:plant/perovskia": "@foliage",
+  "tfc:plant/gooseberry_bush": "@foliage",
+  "tfc:plant/saguaro_fruit": "@foliage",
+  "tfc:plant/olive_growing_branch": "@foliage",
+  "tfc:plant/manatee_grass": "@foliage",
+  "tfc:plant/spanish_moss": "@foliage",
+  "tfc:plant/hanging_vines_plant": "@foliage",
+  "tfc:plant/philodendron": "@foliage",
+  "tfc:plant/maiden_pink": "@foliage",
+  "tfc:plant/switchgrass": "@foliage",
+  "tfc:plant/red_apple_branch": "@foliage",
+  "tfc:plant/lily_of_the_valley": "@foliage",
+  "tfc:plant/licorice_fern": "@foliage",
+  "tfc:plant/cloudberry_bush": "@foliage",
+  "tfc:plant/ivy": "@foliage",
+  "tfc:plant/peach_branch": "@foliage",
+  "tfc:plant/plum_leaves": "@foliage",
+  "tfc:plant/cattail": "@foliage",
+  "tfc:plant/butterfly_milkweed": "@foliage",
+  "tfc:plant/saguaro": "@foliage",
+  "tfc:plant/laminaria": "@foliage",
+  "tfc:plant/poppy": "@foliage",
+  "tfc:plant/snapdragon_yellow": "@foliage",
+  "tfc:plant/plum_sapling": "@foliage",
+  "tfc:plant/olive_sapling": "@foliage",
+  "tfc:plant/tulip_pink": "@foliage",
+  "tfc:plant/dead_bush": "@foliage",
+  "tfc:plant/peach_leaves": "@foliage",
+  "tfc:plant/canna": "@foliage",
+  "tfc:plant/green_apple_sapling": "@foliage",
+  "tfc:plant/orange_sapling": "@foliage",
+  "tfc:plant/strawberry_bush": "@foliage",
+  "tfc:plant/raddia_grass": "@foliage",
+  "tfc:plant/bromegrass": "@foliage",
+  "tfc:plant/kangaroo_paw": "@foliage",
+  "tfc:plant/green_apple_growing_branch": "@foliage",
+  "tfc:plant/gutweed": "@foliage",
+  "tfc:plant/phragmite": "@foliage",
+  "tfc:plant/tulip_red": "@foliage",
+  "tfc:plant/banana_sapling": "@foliage",
+  "tfc:plant/sword_fern": "@foliage",
+  "tfc:plant/lemon_growing_branch": "@foliage",
+  "tfc:plant/elderberry_bush_cane": "@foliage",
+  "tfc:plant/red_apple_growing_branch": "@foliage",
+  "tfc:plant/anthurium": "@foliage",
+  "tfc:plant/goldenrod": "@foliage",
+  "tfc:plant/peach_growing_branch": "@foliage",
+  "tfc:plant/elderberry_bush": "@foliage",
+  "tfc:plant/duckweed": "@foliage",
+  "tfc:plant/cranberry_bush": "@foliage",
+  "tfc:plant/field_horsetail": "@foliage",
+  "tfc:plant/olive_branch": "@foliage",
+  "tfc:plant/giant_kelp_plant": "@foliage",
+  "tfc:plant/blood_lily": "@foliage",
+  "tfc:plant/raspberry_bush": "@foliage",
+  "tfc:plant/leafy_kelp_plant": "@foliage",
+  "tfc:plant/orange_branch": "@foliage",
+  "tfc:plant/allium": "@foliage",
+  "tfc:plant/lotus": "@foliage",
+  "tfc:plant/strelitzia": "@foliage",
+  "tfc:plant/peach_sapling": "@foliage",
+  "tfc:plant/red_algae": "@foliage",
+  "tfc:plant/dead_berry_bush": "@foliage",
+  "tfc:plant/bur_reed": "@foliage",
+  "tfc:plant/cherry_growing_branch": "@foliage",
+  "tfc:plant/pulsatilla": "@foliage",
+  "tfc:plant/orange_leaves": "@foliage",
+  "tfc:plant/sea_palm": "@foliage",
+  "tfc:plant/silver_spurflower": "@foliage",
+  "tfc:plant/coontail": "@foliage",
+  "tfc:plant/sapphire_tower": "@foliage",
+  "tfc:plant/scutch_grass": "@foliage",
+  "tfc:plant/sago": "@foliage",
+  "tfc:plant/winged_kelp_plant": "@foliage",
+  "tfc:plant/aspen_krummholz": "@foliage",
+  "tfc:plant/raspberry_bush_cane": "@foliage",
+  "tfc:plant/timothy_grass": "@foliage",
+  "tfc:plant/cobblestone_lichen": "@foliage",
+  "tfc:plant/snapdragon_pink": "@foliage",
+  "tfc:plant/red_apple_leaves": "@foliage",
+  "tfc:plant/winged_kelp": "@foliage",
+  "tfc:plant/saguaro_plant": "@foliage",
+  "tfc:plant/sargassum": "@foliage",
+  "tfc:plant/artists_conk": "@foliage",
+  "tfc:plant/black_orchid": "@foliage",
+  "tfc:plant/dry_phragmite_plant": "@foliage",
+  "tfc:plant/tree_fern_plant": "@foliage",
+  "tfc:plant/oxeye_daisy": "@foliage",
+  "tfc:plant/vriesea": "@foliage",
+  "tfc:plant/toquilla_palm": "@foliage",
+  "tfc:plant/badderlocks": "@foliage",
+  "tfc:plant/grape_hyacinth": "@foliage",
+  "tfc:plant/red_sealing_wax_palm": "@foliage",
+  "tfc:plant/lemon_sapling": "@foliage",
+  "tfc:plant/spanish_moss_plant": "@foliage",
+  "tfc:plant/blueberry_bush_cane": "@foliage",
+  "tfc:plant/bluegrass": "@foliage",
+  "tfc:plant/spruce_krummholz": "@foliage",
+  "tfc:plant/heliconia": "@foliage",
+  "tfc:plant/water_taro": "@foliage",
+  "tfc:plant/green_apple_branch": "@foliage",
+  "tfc:plant/dry_phragmite": "@foliage",
+  "tfc:plant/barrel_cactus": "@foliage",
+  "tfc:plant/rose": "@foliage",
+  "tfc:plant/houstonia": "@foliage",
+  "tfc:plant/labrador_tea": "@foliage",
+  "tfc:plant/nasturtium": "@foliage",
+  "tfc:plant/leafy_kelp": "@foliage",
+  "tfc:plant/moss": "@foliage",
+  "tfc:plant/yucca": "@foliage",
+  "tfc:plant/lemon_leaves": "@foliage",
+  "tfc:plant/snowberry_bush": "@foliage",
+  "tfc:plant/orchard_grass": "@foliage",
+  "tfc:plant/morning_glory": "@foliage",
+  "tfc:plant/hanging_vines": "@foliage",
+  "tfc:plant/water_lily": "@foliage",
+  "tfc:plant/blueberry_bush": "@foliage",
+  "tfc:plant/blue_orchid": "@foliage",
+  "tfc:plant/banana_plant": "@foliage",
+  "tfc:plant/blackberry_bush_cane": "@foliage",
+  "tfc:plant/reindeer_lichen": "@foliage",
+  "tfc:plant/athyrium_fern": "@foliage",
+  "tfc:plant/trillium": "@foliage",
+  "tfc:plant/white_cedar_krummholz": "@foliage",
+  "tfc:plant/turtle_grass": "@foliage",
+  "tfc:plant/arrowhead": "@foliage",
+  "tfc:plant/blackberry_bush": "@foliage",
+  "tfc:plant/tall_fescue_grass": "@foliage",
+  "tfc:plant/blue_ginger": "@foliage",
+  "tfc:plant/arundo": "@foliage",
+  "tfc:plant/sacred_datura": "@foliage",
+  "tfc:plant/tree_fern": "@foliage",
+  "tfc:plant/heather": "@foliage",
+  "tfc:plant/foxglove": "@foliage",
+  "tfc:plant/liana": "@foliage",
+  "tfc:plant/douglas_fir_krummholz": "@foliage",
+  "tfc:plant/lemon_branch": "@foliage",
+  "tfc:plant/giant_kelp_flower": "@foliage",
+  "tfc:plant/meads_milkweed": "@foliage",
+  "tfc:plant/tulip_orange": "@foliage",
+  "tfc:plant/arundo_plant": "@foliage",
+  "tfc:plant/olive_leaves": "@foliage",
+  "tfc:plant/pistia": "@foliage",
+  "tfc:plant/snapdragon_red": "@foliage",
+  "tfc:plant/water_canna": "@foliage",
+  "tfc:plant/ryegrass": "@foliage",
+  "tfc:plant/fountain_grass": "@foliage",
+  "tfc:plant/bunchberry_bush": "@foliage",
+  "tfc:plant/lady_fern": "@foliage",
+  "tfc:plant/dandelion": "@foliage",
+  "tfc:plant/tulip_white": "@foliage",
+  "tfc:plant/cherry_leaves": "@foliage",
+  "tfc:plant/cherry_sapling": "@foliage",
+  "tfc:plant/orange_growing_branch": "@foliage",
+  "tfc:plant/dead_banana_plant": "@foliage",
+  "tfc:plant/star_grass": "@foliage",
+  "tfc:plant/desert_flame": "@foliage",
+  "tfc:plant/eel_grass": "@foliage",
+  "tfc:plant/wintergreen_berry_bush": "@foliage",
+  "tfc:plant/beachgrass": "@foliage",
+  "tfc:plant/milfoil": "@foliage",
+  "tfc:plant/pickerelweed": "@foliage",
+  "tfc:plant/primrose": "@foliage",
+  "tfc:plant/sea_lavender": "@foliage",
+  "tfc:plant/marigold": "@foliage",
+  "tfc:plant/tropical_milkweed": "@foliage",
+  "tfc:plant/pampas_grass": "@foliage",
+  "tfc:plant/ostrich_fern": "@foliage",
+  "tfc:plant/green_algae": "@foliage",
+  "tfc:plant/liana_plant": "@foliage",
+  "tfc:plant/hibiscus": "@foliage",
+  "tfc:plant/green_apple_leaves": "@foliage",
+  "tfc:plant/jungle_vines": "@foliage",
+  "tfc:plant/dead_cane": "@foliage",
+  "tfc:plant/red_apple_sapling": "@foliage",
+  "tfc:plant/calendula": "@foliage",
+  "tfc:plant/plum_growing_branch": "@foliage",
+  "tfc:plant/snapdragon_white": "@foliage",
+  "tfc:plant/cherry_branch": "@foliage",
+  "tfc:plant/plum_branch": "@foliage",
+  "tfc:plant/lilac": "@foliage",
+
+//TFC leaves
+  "tfc:wood/leaves/willow": "@foliage",
+  "tfc:wood/leaves/acacia": "@foliage",
+  "tfc:wood/leaves/maple": "@foliage",
+  "tfc:wood/leaves/douglas_fir": "@foliage",
+  "tfc:wood/leaves/chestnut": "@foliage",
+  "tfc:wood/leaves/kapok": "@foliage",
+  "tfc:wood/leaves/blackwood": "@foliage",
+  "tfc:wood/leaves/oak": "@foliage",
+  "tfc:wood/leaves/sequoia": "@foliage",
+  "tfc:wood/leaves/mangrove": "@foliage",
+  "tfc:wood/leaves/white_cedar": "@foliage",
+  "tfc:wood/leaves/ash": "@foliage",
+  "tfc:wood/leaves/hickory": "@foliage",
+  "tfc:wood/leaves/birch": "@foliage",
+  "tfc:wood/leaves/rosewood": "@foliage",
+  "tfc:wood/leaves/spruce": "@foliage",
+  "tfc:wood/leaves/palm": "@foliage",
+  "tfc:wood/leaves/aspen": "@foliage",
+  "tfc:wood/leaves/pine": "@foliage",
+  "tfc:wood/leaves/sycamore": "@foliage",
+
+//TFC fallen leaves
+  "tfc:wood/fallen_leaves/willow": "@foliage",
+  "tfc:wood/fallen_leaves/acacia": "@foliage",
+  "tfc:wood/fallen_leaves/maple": "@foliage",
+  "tfc:wood/fallen_leaves/douglas_fir": "@foliage",
+  "tfc:wood/fallen_leaves/chestnut": "@foliage",
+  "tfc:wood/fallen_leaves/kapok": "@foliage",
+  "tfc:wood/fallen_leaves/blackwood": "@foliage",
+  "tfc:wood/fallen_leaves/oak": "@foliage",
+  "tfc:wood/fallen_leaves/sequoia": "@foliage",
+  "tfc:wood/fallen_leaves/mangrove": "@foliage",
+  "tfc:wood/fallen_leaves/white_cedar": "@foliage",
+  "tfc:wood/fallen_leaves/ash": "@foliage",
+  "tfc:wood/fallen_leaves/hickory": "@foliage",
+  "tfc:wood/fallen_leaves/birch": "@foliage",
+  "tfc:wood/fallen_leaves/rosewood": "@foliage",
+  "tfc:wood/fallen_leaves/spruce": "@foliage",
+  "tfc:wood/fallen_leaves/palm": "@foliage",
+  "tfc:wood/fallen_leaves/aspen": "@foliage",
+  "tfc:wood/fallen_leaves/pine": "@foliage",
+  "tfc:wood/fallen_leaves/sycamore": "@foliage"
+}

config/bluemap/packs/TFG_fix/assets/tfc/models/block/fluid/river_water.json

@@ -0,0 +1 @@
+{}

config/bluemap/packs/TFG_fix/assets/tfc/models/block/fluid/salt_water.json

@@ -0,0 +1 @@
+{}

config/bluemap/packs/TFG_fix/assets/tfc/models/block/fluid/spring_water.json

@@ -0,0 +1 @@
+{}

config/bluemap/packs/TFG_fix/pack.mcmeta

@@ -0,0 +1,6 @@
+{
+    "pack": {
+        "pack_format": 8,
+        "description": "TFC Water and Grass Fix for BlueMap by dhs92 + AFC tree and leaves fix by WoopSmile"
+    }
+}

config/carryon-common.toml

@@ -57,7 +57,7 @@
 [whitelist]
 	#Whitelist. Read about the format here: https://github.com/Tschipp/CarryOn/wiki/Black---and-Whitelist-Config
 	#Entities that CAN be picked up (useWhitelistEntities must be true)
-	allowedEntities = ["minecraft:axolotl", "tfc:turkey", "tfc:isopod", "tfc:lobster", "tfc:frog", "tfc:penguin", "tfc:turtle", "tfc:horseshoe_crab", "tfc:crayfish", "tfc:grouse", "tfc:pheasant", "tfc:peafowl", "tfc:rat", "tfc:chicken", "tfc:duck", "tfc:quail", "tfc:rabbit", "tfc:sheep", "tfc:wolf", "tfc:dog", "tfc:pig", "tfc:goat", "tfc:alpaca", "tfg:wraptor", "tfg:surfer", "tfg:moon_rabbit", "species:limpet", "species:birt", "species:stackatick", "species:springling", "tfg:glacian_ram", "wan_ancient_beasts:crusher", "wan_ancient_beasts:glider", "wan_ancient_beasts:soarer", "wan_ancient_beasts:surfer", "primitive_creatures:viloger_10"]
+	allowedEntities = ["minecraft:axolotl", "tfc:turkey", "tfc:isopod", "tfc:lobster", "tfc:frog", "tfc:penguin", "tfc:turtle", "tfc:horseshoe_crab", "tfc:crayfish", "tfc:grouse", "tfc:pheasant", "tfc:peafowl", "tfc:rat", "tfc:chicken", "tfc:duck", "tfc:quail", "tfc:rabbit", "tfc:sheep", "tfc:wolf", "tfc:dog", "tfc:pig", "tfc:goat", "tfc:alpaca", "tfc:fox", "tfc:boar", "tfg:wraptor", "tfg:surfer", "tfg:moon_rabbit", "species:limpet", "species:birt", "species:stackatick", "species:springling", "tfg:glacian_ram", "wan_ancient_beasts:crusher", "wan_ancient_beasts:glider", "wan_ancient_beasts:soarer", "wan_ancient_beasts:surfer", "wan_ancient_beasts:snatcher", "primitive_creatures:viloger_10"]
 	#Blocks that CAN be picked up (useWhitelistBlocks must be true)
 	allowedBlocks = ["framedblocks:framed_chest", "tfc:wood/chest/*", "tfc:wood/trapped_chest/*", "afc:wood/chest/*", "afc:wood/trapped_chest/*", "#forge:chests/wooden"]
 	#Entities that CAN have other entities stacked on top of them (useWhitelistStacking must be true)

config/crash_assistant/modlist.json

@@ -123,19 +123,19 @@
     "curseForgeHash": 409215932,
     "modrinthHash": "f0b711df59cd589b088e536ca4134c5e6e73fd58"
   },
-  "AmbientSounds_FORGE_v6.3.1_mc1.20.1.jar": {
+  "AmbientSounds_FORGE_v6.3.4_mc1.20.1.jar": {
-    "jarName": "AmbientSounds_FORGE_v6.3.1_mc1.20.1.jar",
+    "jarName": "AmbientSounds_FORGE_v6.3.4_mc1.20.1.jar",
     "modId": "ambientsounds",
-    "version": "6.3.1",
+    "version": "6.3.4",
-    "curseForgeHash": 1168047345,
+    "curseForgeHash": 2803957593,
-    "modrinthHash": "b6c676fbe4e586de6c266190943c069a0a49104d"
+    "modrinthHash": "e84e7053c4c3a73c7f608c9da516bb5d393aab60"
   },
-  "applied_ammo_box-1.0.0.jar": {
+  "applied_ammo_box-1.0.2.jar": {
-    "jarName": "applied_ammo_box-1.0.0.jar",
+    "jarName": "applied_ammo_box-1.0.2.jar",
     "modId": "applied_ammo_box",
-    "version": "1.0.0",
+    "version": "1.0.2",
-    "curseForgeHash": 719209453,
+    "curseForgeHash": 2900950740,
-    "modrinthHash": "3fc67723dc70b544b57ab0d0a34e2be991d285f9"
+    "modrinthHash": "ab97dbd5bef9a488be8dea88672028963d3c0104"
   },
   "architectury-9.2.14-forge.jar": {
     "jarName": "architectury-9.2.14-forge.jar",
@@ -144,6 +144,13 @@
     "curseForgeHash": 98480002,
     "modrinthHash": "a52918a500ff421180a1cbd1a0cabee712134ec4"
   },
+  "arthropocolypse-1.0.6.jar": {
+    "jarName": "arthropocolypse-1.0.6.jar",
+    "modId": "arthropocolypse",
+    "version": "1.0.6",
+    "curseForgeHash": 2478485800,
+    "modrinthHash": "c43b2c1e8a9fa11d139a202e37054a01db8fd677"
+  },
   "astikorcarts-1.20.1-1.1.8.jar": {
     "jarName": "astikorcarts-1.20.1-1.1.8.jar",
     "modId": "astikorcarts",
@@ -158,19 +165,19 @@
     "curseForgeHash": 381211649,
     "modrinthHash": "6eb69343eb21d38f95d1b1d00e6bc777bdb336fa"
   },
-  "baguettelib-1.20.1-Forge-1.1.5.jar": {
+  "baguettelib-1.20.1-Forge-1.1.6.jar": {
-    "jarName": "baguettelib-1.20.1-Forge-1.1.5.jar",
+    "jarName": "baguettelib-1.20.1-Forge-1.1.6.jar",
     "modId": "baguettelib",
-    "version": "1.1.5",
+    "version": "1.1.6",
-    "curseForgeHash": 734602455,
+    "curseForgeHash": 2947245849,
-    "modrinthHash": "7aaab6216e7fc72e1606b1e35f1f56a18f01153f"
+    "modrinthHash": "8d3c9551bbed4c2f2e8cb2b9a10d31bad4edb52d"
   },
-  "balm-forge-1.20.1-7.3.37-all.jar": {
+  "balm-forge-1.20.1-7.3.38-all.jar": {
-    "jarName": "balm-forge-1.20.1-7.3.37-all.jar",
+    "jarName": "balm-forge-1.20.1-7.3.38-all.jar",
     "modId": "balm",
-    "version": "7.3.37",
+    "version": "7.3.38",
-    "curseForgeHash": 3384992026,
+    "curseForgeHash": 29168845,
-    "modrinthHash": "bb7af11fd4bc2e76fce98f90c752279ae381b934"
+    "modrinthHash": "c689f4cbe1a5250177aced15b66ca251d9476d35"
   },
   "barrels_2012-2.1.jar": {
     "jarName": "barrels_2012-2.1.jar",
@@ -207,13 +214,6 @@
     "curseForgeHash": 1808343910,
     "modrinthHash": "71fc6fe4b99dc495528edbb0be12b126eab64b6f"
   },
-  "blur-forge-3.1.1.jar": {
-    "jarName": "blur-forge-3.1.1.jar",
-    "modId": "blur",
-    "version": "3.1.1",
-    "curseForgeHash": 1712179068,
-    "modrinthHash": "562f34155f3849463449aeb1ab54cc7064e4bc86"
-  },
   "Bookshelf-Forge-1.20.1-20.2.13.jar": {
     "jarName": "Bookshelf-Forge-1.20.1-20.2.13.jar",
     "modId": "bookshelf",
@@ -263,12 +263,12 @@
     "curseForgeHash": 2339474770,
     "modrinthHash": "42f34947910ca428497fac0bf2566a45959a51a5"
   },
-  "chat_heads-0.14.2-forge-1.20.jar": {
+  "chat_heads-0.15.0-forge-1.20.jar": {
-    "jarName": "chat_heads-0.14.2-forge-1.20.jar",
+    "jarName": "chat_heads-0.15.0-forge-1.20.jar",
     "modId": "chat_heads",
-    "version": "0.14.2",
+    "version": "0.15.0",
-    "curseForgeHash": 1586719138,
+    "curseForgeHash": 562582520,
-    "modrinthHash": "0410ab9636c69324e3671012af64c7743f6d6079"
+    "modrinthHash": "52a21207af65259adfa840e26042c28058f6513f"
   },
   "cherishedworlds-forge-6.1.7+1.20.1.jar": {
     "jarName": "cherishedworlds-forge-6.1.7+1.20.1.jar",
@@ -305,12 +305,12 @@
     "curseForgeHash": 635589968,
     "modrinthHash": "c65d07748acc57ceb45d53b3964368b84f34d54f"
   },
-  "colorwheel-forge-1.1.2+mc1.20.1.jar": {
+  "colorwheel-forge-1.2.1+mc1.20.1.jar": {
-    "jarName": "colorwheel-forge-1.1.2+mc1.20.1.jar",
+    "jarName": "colorwheel-forge-1.2.1+mc1.20.1.jar",
     "modId": "colorwheel",
-    "version": "1.1.2+mc1.20.1",
+    "version": "1.2.1+mc1.20.1",
-    "curseForgeHash": 4284935425,
+    "curseForgeHash": 4138397164,
-    "modrinthHash": "08089e16b24756e0ef1e50967dcf2286b20f5923"
+    "modrinthHash": "791578afecd261f0d03669db993b35d14badc1a9"
   },
   "colorwheel_patcher-forge-1.0.4+mc1.20.1.jar": {
     "jarName": "colorwheel_patcher-forge-1.0.4+mc1.20.1.jar",
@@ -361,12 +361,12 @@
     "curseForgeHash": 3614955629,
     "modrinthHash": "afd9fa3fe95e8c086e8d439df403ed1e5ea5cbea"
   },
-  "craftingtweaks-forge-1.20.1-18.2.6.jar": {
+  "craftingtweaks-forge-1.20.1-18.2.8.jar": {
-    "jarName": "craftingtweaks-forge-1.20.1-18.2.6.jar",
+    "jarName": "craftingtweaks-forge-1.20.1-18.2.8.jar",
     "modId": "craftingtweaks",
-    "version": "18.2.6",
+    "version": "18.2.8",
-    "curseForgeHash": 791328458,
+    "curseForgeHash": 1007694343,
-    "modrinthHash": "f2091c7b171f1104bb22434d5b4a01ad678cdaf9"
+    "modrinthHash": "1c93d31216aa53e53e97f4e24adb899673accb52"
   },
   "CraftPresence-2.7.0+1.20.1-forge.jar": {
     "jarName": "CraftPresence-2.7.0+1.20.1-forge.jar",
@@ -396,12 +396,12 @@
     "curseForgeHash": 2156032012,
     "modrinthHash": "b13d912b9247a38d66d11598c121442585a1c1e9"
   },
-  "create_connected-1.1.10-mc1.20.1-all.jar": {
+  "create_connected-1.1.13-mc1.20.1-all.jar": {
-    "jarName": "create_connected-1.1.10-mc1.20.1-all.jar",
+    "jarName": "create_connected-1.1.13-mc1.20.1-all.jar",
     "modId": "create_connected",
-    "version": "1.1.10-mc1.20.1",
+    "version": "1.1.13-mc1.20.1",
-    "curseForgeHash": 198954090,
+    "curseForgeHash": 3555789816,
-    "modrinthHash": "eea1d04aee638689a99acf66457327b13a4b3f96"
+    "modrinthHash": "0e1ffa4e6d3f7b379c7d30e8e59d424fd527acb4"
   },
   "create_factory_logistics-1.20.1-1.4.7.jar": {
     "jarName": "create_factory_logistics-1.20.1-1.4.7.jar",
@@ -410,12 +410,12 @@
     "curseForgeHash": 561746208,
     "modrinthHash": "bf67707d1645197f27cd9a4abea13159fa0fef1e"
   },
-  "create_hypertube-0.3.0-FORGE.jar": {
+  "create_hypertube-0.4.0-FORGE.jar": {
-    "jarName": "create_hypertube-0.3.0-FORGE.jar",
+    "jarName": "create_hypertube-0.4.0-FORGE.jar",
     "modId": "create_hypertube",
-    "version": "0.3.0",
+    "version": "0.4.0",
-    "curseForgeHash": 302353697,
+    "curseForgeHash": 694433954,
-    "modrinthHash": "476ae93802024b766badb15e538e0cf65a2e3fbd"
+    "modrinthHash": "49712554e365e4412fa6362f0394e919fe7eb261"
   },
   "createaddition-1.20.1-1.3.3.jar": {
     "jarName": "createaddition-1.20.1-1.3.3.jar",
@@ -445,12 +445,12 @@
     "curseForgeHash": 1069225375,
     "modrinthHash": "d216cf52735f8e4d3594943139599f6b0b20b8cf"
   },
-  "createpickywheels-forge-1.20.1-6.0.6-2.jar": {
+  "createpickywheels-forge-1.20.1-6.0.8-4.jar": {
-    "jarName": "createpickywheels-forge-1.20.1-6.0.6-2.jar",
+    "jarName": "createpickywheels-forge-1.20.1-6.0.8-4.jar",
     "modId": "createpickywheels",
-    "version": "1.20.1-6.0.6-2",
+    "version": "1.20.1-6.0.8-4",
-    "curseForgeHash": 2218118416,
+    "curseForgeHash": 3915242941,
-    "modrinthHash": "698050b3f98b8fd9390b810741cf0eb08fee25ed"
+    "modrinthHash": "338704cdf6623ad96983e72e81e8a9d97e8b28d8"
   },
   "CreativeCore_FORGE_v2.12.32_mc1.20.1.jar": {
     "jarName": "CreativeCore_FORGE_v2.12.32_mc1.20.1.jar",
@@ -508,12 +508,12 @@
     "curseForgeHash": 4053708632,
     "modrinthHash": "08b58bfbdf20660bdc5a0c4a0b088f7d89f40a38"
   },
-  "domum_ornamentum-1.20.1-1.0.292-snapshot-universal.jar": {
+  "domum_ornamentum-1.20.1-1.0.296-universal.jar": {
-    "jarName": "domum_ornamentum-1.20.1-1.0.292-snapshot-universal.jar",
+    "jarName": "domum_ornamentum-1.20.1-1.0.296-universal.jar",
     "modId": "domum_ornamentum",
-    "version": "1.20.1-1.0.292-snapshot",
+    "version": "1.20.1-1.0.296",
-    "curseForgeHash": 2581620858,
+    "curseForgeHash": 12848397,
-    "modrinthHash": "1b3b96dda8dd4541afba652c7a975ba439fc1026"
+    "modrinthHash": "f0052adb170e5f73f0f5b625c411bc5b99183c00"
   },
   "drippyloadingscreen_forge_3.1.0_MC_1.20.1.jar": {
     "jarName": "drippyloadingscreen_forge_3.1.0_MC_1.20.1.jar",
@@ -571,33 +571,33 @@
     "curseForgeHash": 1564210994,
     "modrinthHash": "4f440ac41309993a46e0ffcb2dd6106d7b92b3e2"
   },
-  "everycomp-1.20-2.9.13-forge.jar": {
+  "everycomp-1.20-2.9.17-forge.jar": {
-    "jarName": "everycomp-1.20-2.9.13-forge.jar",
+    "jarName": "everycomp-1.20-2.9.17-forge.jar",
     "modId": "everycomp",
-    "version": "1.20-2.9.13",
+    "version": "1.20-2.9.17",
-    "curseForgeHash": 473863607,
+    "curseForgeHash": 90477853,
-    "modrinthHash": "2c78942c7396b1fab9e53e4ee8172f7ce0ba4482"
+    "modrinthHash": "f916b0f9871722d56adea057111b70e4c0529866"
   },
-  "exposure-1.20.1-1.7.16-forge.jar": {
+  "exposure-forge-1.20.1-1.9.13.jar": {
-    "jarName": "exposure-1.20.1-1.7.16-forge.jar",
+    "jarName": "exposure-forge-1.20.1-1.9.13.jar",
     "modId": "exposure",
-    "version": "1.7.16",
+    "version": "1.9.13",
-    "curseForgeHash": 652681066,
+    "curseForgeHash": 2516577834,
-    "modrinthHash": "b1ec92eeafdc97e88e0baacd5d89f4c1f89a4bbc"
+    "modrinthHash": "2c1b71dffa45e8ef2008a4341a00fae55c331c20"
   },
-  "ExtendedAE-1.20-1.4.9-forge.jar": {
+  "ExtendedAE-1.20-1.4.11-forge.jar": {
-    "jarName": "ExtendedAE-1.20-1.4.9-forge.jar",
+    "jarName": "ExtendedAE-1.20-1.4.11-forge.jar",
     "modId": "expatternprovider",
-    "version": "1.20-1.4.9-forge",
+    "version": "1.20-1.4.11-forge",
-    "curseForgeHash": 2620237685,
+    "curseForgeHash": 4165358956,
-    "modrinthHash": "55a8c773659036176142242ded460a4b88ee6fb0"
+    "modrinthHash": "d37b8af49def8516123e0b03206a2a23ae0fdb0e"
   },
-  "ExtremeSoundMuffler-3.49.2-forge-1.20.1.jar": {
+  "ExtremeSoundMuffler-3.51-forge-1.20.1.jar": {
-    "jarName": "ExtremeSoundMuffler-3.49.2-forge-1.20.1.jar",
+    "jarName": "ExtremeSoundMuffler-3.51-forge-1.20.1.jar",
     "modId": "extremesoundmuffler",
-    "version": "3.48",
+    "version": "3.51",
-    "curseForgeHash": 382750826,
+    "curseForgeHash": 2384074866,
-    "modrinthHash": "3b73ae534ff7e4f9c65e78c1f868655a23ab90c7"
+    "modrinthHash": "025499c74e1e9305fa931b44c3832f43b1925ec7"
   },
   "fallingtrees-forge-0.12.7-1.20.jar": {
     "jarName": "fallingtrees-forge-0.12.7-1.20.jar",
@@ -620,12 +620,12 @@
     "curseForgeHash": 3575355395,
     "modrinthHash": "ceeeae222c51ae100e5126c4a5a7a05f4f3f4712"
   },
-  "FastSuite-1.20.1-5.1.0.jar": {
+  "FastSuite-1.20.1-5.1.2.jar": {
-    "jarName": "FastSuite-1.20.1-5.1.0.jar",
+    "jarName": "FastSuite-1.20.1-5.1.2.jar",
     "modId": "fastsuite",
-    "version": "5.1.0",
+    "version": "5.1.2",
-    "curseForgeHash": 2667792324,
+    "curseForgeHash": 2881858684,
-    "modrinthHash": "3a759dce0ddc91e299027faa800c0ee40ab90de8"
+    "modrinthHash": "32ea4495b0e646f8f060e4e97d17044dd9fdefbd"
   },
   "FastWorkbench-1.20.1-8.0.4.jar": {
     "jarName": "FastWorkbench-1.20.1-8.0.4.jar",
@@ -725,12 +725,12 @@
     "curseForgeHash": 1064675696,
     "modrinthHash": "1ef101b4c5991cc239d9b56a95500e3b404228f7"
   },
-  "ftb-teams-forge-2001.3.1.jar": {
+  "ftb-teams-forge-2001.3.2.jar": {
-    "jarName": "ftb-teams-forge-2001.3.1.jar",
+    "jarName": "ftb-teams-forge-2001.3.2.jar",
     "modId": "ftbteams",
-    "version": "2001.3.1",
+    "version": "2001.3.2",
-    "curseForgeHash": 1240744296,
+    "curseForgeHash": 816412664,
-    "modrinthHash": "c2af94e0b86631cb75daa8de2377ff72527651ca"
+    "modrinthHash": "c49023f5d471aa1ba7fc624d2565fe9e82b7117e"
   },
   "ftb-xmod-compat-forge-2.1.3.jar": {
     "jarName": "ftb-xmod-compat-forge-2.1.3.jar",
@@ -760,19 +760,19 @@
     "curseForgeHash": 3895274001,
     "modrinthHash": "6f1e3a25c4a0258c2592fefb837f95a24eb3bfa0"
   },
-  "fzzy_config-0.7.4+1.20.1+forge.jar": {
+  "fzzy_config-0.7.6+1.20.1+forge.jar": {
-    "jarName": "fzzy_config-0.7.4+1.20.1+forge.jar",
+    "jarName": "fzzy_config-0.7.6+1.20.1+forge.jar",
     "modId": "fzzy_config",
-    "version": "0.7.4+1.20.1+forge",
+    "version": "0.7.6+1.20.1+forge",
-    "curseForgeHash": 4069840182,
+    "curseForgeHash": 3620637257,
-    "modrinthHash": "b0213984f7591c3d1ec4ab5eebd87c605728d451"
+    "modrinthHash": "2e9ca1c5f028c251e1bc18b9ebaa06d401c8e624"
   },
-  "geckolib-forge-1.20.1-4.8.2.jar": {
+  "geckolib-forge-1.20.1-4.8.3.jar": {
-    "jarName": "geckolib-forge-1.20.1-4.8.2.jar",
+    "jarName": "geckolib-forge-1.20.1-4.8.3.jar",
     "modId": "geckolib",
-    "version": "4.8.2",
+    "version": "4.8.3",
-    "curseForgeHash": 1555934041,
+    "curseForgeHash": 4092514766,
-    "modrinthHash": "395a9f21a36dc8466d67c2af67a904e7013460d1"
+    "modrinthHash": "5428765c6c2e2135da6ee01f2f0478fa0db6aee7"
   },
   "Glodium-1.20-1.5-forge.jar": {
     "jarName": "Glodium-1.20-1.5-forge.jar",
@@ -795,26 +795,33 @@
     "curseForgeHash": 3324262533,
     "modrinthHash": "aa53625ab5e145c6aa196645335b062b37ae82da"
   },
-  "greate-0.0.60.jar": {
+  "greate-0.0.66.jar": {
-    "jarName": "greate-0.0.60.jar",
+    "jarName": "greate-0.0.66.jar",
     "modId": "greate",
-    "version": "0.0.60",
+    "version": "0.0.66",
-    "curseForgeHash": 1014860832,
+    "curseForgeHash": 1988745374,
-    "modrinthHash": "3fc325df338f275847344f553ad81c3e9be0bc80"
+    "modrinthHash": "34cc291020c237e39e0f04939cc78ccf2a9ab862"
   },
-  "gtceu-1.20.1-7.4.0.jar": {
+  "gtceu-1.20.1-7.4.1.jar": {
-    "jarName": "gtceu-1.20.1-7.4.0.jar",
+    "jarName": "gtceu-1.20.1-7.4.1.jar",
     "modId": "gtceu",
-    "version": "7.4.0",
+    "version": "7.4.1",
-    "curseForgeHash": 3505279105,
+    "curseForgeHash": 2174922911,
-    "modrinthHash": "19c638cb4913b0581da1e518771f41965f96932f"
+    "modrinthHash": "50ae5df1cc5213aa429a976b6393e0bd4e22238e"
   },
-  "gtmoldraw-2.0.3.jar": {
+  "gtceuterminal-2.4.6.jar": {
-    "jarName": "gtmoldraw-2.0.3.jar",
+    "jarName": "gtceuterminal-2.4.6.jar",
+    "modId": "gtceuterminal",
+    "version": "2.4.6",
+    "curseForgeHash": 3171573363,
+    "modrinthHash": "b7284297c33359569cff22208e938012c26a06ec"
+  },
+  "gtmoldraw-3.0.1.jar": {
+    "jarName": "gtmoldraw-3.0.1.jar",
     "modId": "moldraw",
-    "version": "2.0.3",
+    "version": "3.0.1",
-    "curseForgeHash": 432163685,
+    "curseForgeHash": 3258582267,
-    "modrinthHash": "24e461ca4eac2877458e125dc4c9eb678ad3c270"
+    "modrinthHash": "caaf28b88afe1b01ec4180a4458c2795184255bc"
   },
   "guideme-20.1.14.jar": {
     "jarName": "guideme-20.1.14.jar",
@@ -844,12 +851,12 @@
     "curseForgeHash": 726705548,
     "modrinthHash": "bc2d8febd3ddb7f5a0da5c840544ad49eb6e8625"
   },
-  "ImmediatelyFast-Forge-1.5.3+1.20.4.jar": {
+  "ImmediatelyFast-Forge-1.5.4+1.20.4.jar": {
-    "jarName": "ImmediatelyFast-Forge-1.5.3+1.20.4.jar",
+    "jarName": "ImmediatelyFast-Forge-1.5.4+1.20.4.jar",
     "modId": "immediatelyfast",
-    "version": "1.5.3+1.20.4",
+    "version": "1.5.4+1.20.4",
-    "curseForgeHash": 2056126318,
+    "curseForgeHash": 4234781540,
-    "modrinthHash": "d4695d013e9da7089e2906db3f56bc5398e478e2"
+    "modrinthHash": "e2e60485a0c3efa72f1948c952b095150e3ba4fc"
   },
   "immersive_aircraft-1.4.0+1.20.1-forge.jar": {
     "jarName": "immersive_aircraft-1.4.0+1.20.1-forge.jar",
@@ -912,12 +919,12 @@
     "curseForgeHash": 2392977662,
     "modrinthHash": "962fdb760409d6d71cbf079235f1ca94e3863a22"
   },
-  "KryptonReforged-0.2.3.jar": {
+  "Krypton FNP-forge-1.20.1-0.2.28.2-1.20.1.jar": {
-    "jarName": "KryptonReforged-0.2.3.jar",
+    "jarName": "Krypton FNP-forge-1.20.1-0.2.28.2-1.20.1.jar",
-    "modId": "krypton",
+    "modId": "krypton_fnp",
-    "version": "0.2.3",
+    "version": "0.2.28.2-1.20.1",
-    "curseForgeHash": 2538339304,
+    "curseForgeHash": 326889372,
-    "modrinthHash": "92690482dad46a8c9cf28e4b6b26e49f4dc67095"
+    "modrinthHash": "84f719905f9c01943b7e67ba61b0624ae6b073a3"
   },
   "kubejs-create-forge-2001.3.0-build.8.jar": {
     "jarName": "kubejs-create-forge-2001.3.0-build.8.jar",
@@ -968,12 +975,12 @@
     "curseForgeHash": 2035895651,
     "modrinthHash": "e6346060ae70cbf103b231d8a1536bcd044c84a8"
   },
-  "lootjs-forge-1.20.1-2.13.0.jar": {
+  "lootjs-forge-1.20.1-2.13.1.jar": {
-    "jarName": "lootjs-forge-1.20.1-2.13.0.jar",
+    "jarName": "lootjs-forge-1.20.1-2.13.1.jar",
     "modId": "lootjs",
-    "version": "1.20.1-2.13.0",
+    "version": "1.20.1-2.13.1",
-    "curseForgeHash": 4083554858,
+    "curseForgeHash": 1389353380,
-    "modrinthHash": "fdf90acf177c19bcbfaa08527f6568bd3e6e622e"
+    "modrinthHash": "804deb0bd34d69cad873170642b9d7e47fa0d6ad"
   },
   "lootr-forge-1.20-0.7.35.94.jar": {
     "jarName": "lootr-forge-1.20-0.7.35.94.jar",
@@ -1024,19 +1031,19 @@
     "curseForgeHash": 544928077,
     "modrinthHash": "24e6611df470afd957eafd16c43890b7214e3da9"
   },
-  "modernfix-forge-5.25.2+mc1.20.1.jar": {
+  "modernfix-forge-5.26.2+mc1.20.1.jar": {
-    "jarName": "modernfix-forge-5.25.2+mc1.20.1.jar",
+    "jarName": "modernfix-forge-5.26.2+mc1.20.1.jar",
     "modId": "modernfix",
-    "version": "5.25.2+mc1.20.1",
+    "version": "5.26.2+mc1.20.1",
-    "curseForgeHash": 3074548209,
+    "curseForgeHash": 2785638273,
-    "modrinthHash": "4069534174e618393f0c14d9dc61ac27a04bb992"
+    "modrinthHash": "0adfc122e9f632d8847688c4c3ed20a1af182afa"
   },
-  "moonlight-1.20-2.16.19-forge.jar": {
+  "moonlight-1.20-2.16.27-forge.jar": {
-    "jarName": "moonlight-1.20-2.16.19-forge.jar",
+    "jarName": "moonlight-1.20-2.16.27-forge.jar",
     "modId": "moonlight",
-    "version": "1.20-2.16.19",
+    "version": "1.20-2.16.27",
-    "curseForgeHash": 2861614006,
+    "curseForgeHash": 827170608,
-    "modrinthHash": "de55e348bdf3a3ac7520fde157654d615967f9b1"
+    "modrinthHash": "0a1b384ec20d63e94c56123b53e264dc2afe5b17"
   },
   "morered-1.20.1-4.0.0.4.jar": {
     "jarName": "morered-1.20.1-4.0.0.4.jar",
@@ -1087,12 +1094,12 @@
     "curseForgeHash": 1367373369,
     "modrinthHash": "c0806369f4257149664904db44efc60bd1785c17"
   },
-  "notenoughanimations-forge-1.11.1-mc1.20.1.jar": {
+  "notenoughanimations-forge-1.11.2-mc1.20.1.jar": {
-    "jarName": "notenoughanimations-forge-1.11.1-mc1.20.1.jar",
+    "jarName": "notenoughanimations-forge-1.11.2-mc1.20.1.jar",
     "modId": "notenoughanimations",
-    "version": "1.11.1",
+    "version": "1.11.2",
-    "curseForgeHash": 1394524316,
+    "curseForgeHash": 978006094,
-    "modrinthHash": "9aa8917d7c0a5311dc495da3c720434de49e0e24"
+    "modrinthHash": "fe7898d27c15b76552a69b972abec0728be9ea8a"
   },
   "OctoLib-FORGE-0.5.0.1+1.20.1.jar": {
     "jarName": "OctoLib-FORGE-0.5.0.1+1.20.1.jar",
@@ -1122,12 +1129,12 @@
     "curseForgeHash": 3233971835,
     "modrinthHash": "cc0332d3bbf7824b673abc59e231f1f5aafc6420"
   },
-  "particle_core-0.2.6+1.20.1+forge.jar": {
+  "particle_core-0.3.3+1.20.1+forge.jar": {
-    "jarName": "particle_core-0.2.6+1.20.1+forge.jar",
+    "jarName": "particle_core-0.3.3+1.20.1+forge.jar",
     "modId": "particle_core",
-    "version": "0.2.6+1.20.1+forge",
+    "version": "0.3.3+1.20.1+forge",
-    "curseForgeHash": 4189650687,
+    "curseForgeHash": 1956610132,
-    "modrinthHash": "91f302ab9b85016aeb3a9a0e85b80650a1d2e984"
+    "modrinthHash": "1da5744853d17979033d5ee3cd4251b8340ea7be"
   },
   "particular-1.20.1-Forge-1.2.7.jar": {
     "jarName": "particular-1.20.1-Forge-1.2.7.jar",
@@ -1157,6 +1164,13 @@
     "curseForgeHash": 3174429337,
     "modrinthHash": "e85f53de2e582a79ce25ff1df1e7b5b5fc08440f"
   },
+  "playerrevive_compat-1.0.2-12c699b.jar": {
+    "jarName": "playerrevive_compat-1.0.2-12c699b.jar",
+    "modId": "playerrevive_compat",
+    "version": "1.0.2",
+    "curseForgeHash": 2120677158,
+    "modrinthHash": "a0f05d85155560b743d6ffab61741e3da3803611"
+  },
   "PlayerRevive_FORGE_v2.0.31_mc1.20.1.jar": {
     "jarName": "PlayerRevive_FORGE_v2.0.31_mc1.20.1.jar",
     "modId": "playerrevive",
@@ -1199,6 +1213,13 @@
     "curseForgeHash": 1441086174,
     "modrinthHash": "f5f5f792473bb7b85ec221f75c5afb3740afb13a"
   },
+  "Reblured-1.20.1-1.3.0.jar": {
+    "jarName": "Reblured-1.20.1-1.3.0.jar",
+    "modId": "reblured",
+    "version": "1.20.1-1.3.0",
+    "curseForgeHash": 1448441159,
+    "modrinthHash": "9acd6f7702418fc77280bcc3c82b8589032d9f34"
+  },
   "resourcefulconfig-forge-1.20.1-2.1.3.jar": {
     "jarName": "resourcefulconfig-forge-1.20.1-2.1.3.jar",
     "modId": "resourcefulconfig",
@@ -1255,12 +1276,12 @@
     "curseForgeHash": 3171281796,
     "modrinthHash": "ed5a23ec30c90fd06b3f1d8140614028e1fafaee"
   },
-  "ShoulderSurfing-Forge-1.20.1-4.18.1.jar": {
+  "ShoulderSurfing-Forge-1.20.1-4.18.2.jar": {
-    "jarName": "ShoulderSurfing-Forge-1.20.1-4.18.1.jar",
+    "jarName": "ShoulderSurfing-Forge-1.20.1-4.18.2.jar",
     "modId": "shouldersurfing",
-    "version": "1.20.1-4.18.1",
+    "version": "1.20.1-4.18.2",
-    "curseForgeHash": 1413955737,
+    "curseForgeHash": 197734397,
-    "modrinthHash": "77b9cd4384a622f709ae69decb3ad4e6e44afe38"
+    "modrinthHash": "2385592f8a4101edd6627ce2a75811368e5d6abd"
   },
   "showcaseitem-1.20.1-1.2.jar": {
     "jarName": "showcaseitem-1.20.1-1.2.jar",
@@ -1311,19 +1332,19 @@
     "curseForgeHash": 2197810606,
     "modrinthHash": "7529fbf938787ed13a251cbf40936f8c29ec4b6c"
   },
-  "sophisticatedbackpacks-1.20.1-3.24.12.1411.jar": {
+  "sophisticatedbackpacks-1.20.1-3.24.21.1515.jar": {
-    "jarName": "sophisticatedbackpacks-1.20.1-3.24.12.1411.jar",
+    "jarName": "sophisticatedbackpacks-1.20.1-3.24.21.1515.jar",
     "modId": "sophisticatedbackpacks",
-    "version": "3.24.12.1411",
+    "version": "3.24.21.1515",
-    "curseForgeHash": 2442024860,
+    "curseForgeHash": 2050984609,
-    "modrinthHash": "c6624f4719cfa8c15ef87860570a2748afd715da"
+    "modrinthHash": "d3977c8262cf2eff9eed7852e3b3a73f7bcdbe9a"
   },
-  "sophisticatedcore-1.20.1-1.2.107.1240.jar": {
+  "sophisticatedcore-1.20.1-1.3.2.1468.jar": {
-    "jarName": "sophisticatedcore-1.20.1-1.2.107.1240.jar",
+    "jarName": "sophisticatedcore-1.20.1-1.3.2.1468.jar",
     "modId": "sophisticatedcore",
-    "version": "1.2.107.1240",
+    "version": "1.3.2.1468",
-    "curseForgeHash": 3130924746,
+    "curseForgeHash": 2053827009,
-    "modrinthHash": "a0a8e69b482e18bc82404c57f868db06d827ffca"
+    "modrinthHash": "da6fed216fee206c71e8b517197347868774e478"
   },
   "SoulBinding1.20.1(Forge)vs1.0.2.jar": {
     "jarName": "SoulBinding1.20.1(Forge)vs1.0.2.jar",
@@ -1346,12 +1367,12 @@
     "curseForgeHash": 4174736090,
     "modrinthHash": "b4d924f4faf6eb201db04205b61fa1524a8b0178"
   },
-  "Steam_Rails-1.6.14-beta+forge-mc1.20.1.jar": {
+  "Steam_Rails-1.6.15-beta+forge-mc1.20.1.jar": {
-    "jarName": "Steam_Rails-1.6.14-beta+forge-mc1.20.1.jar",
+    "jarName": "Steam_Rails-1.6.15-beta+forge-mc1.20.1.jar",
     "modId": "railways",
-    "version": "1.6.14-beta+forge-mc1.20.1",
+    "version": "1.6.15-beta+forge-mc1.20.1",
-    "curseForgeHash": 2914385349,
+    "curseForgeHash": 1571373559,
-    "modrinthHash": "90ea1d917bc20a5e4cc50abaa512d2084149dc64"
+    "modrinthHash": "924c3efb2187138b85a0d5285dbb65b371c4f7e9"
   },
   "supermartijn642configlib-1.1.8-forge-mc1.20.jar": {
     "jarName": "supermartijn642configlib-1.1.8-forge-mc1.20.jar",
@@ -1360,26 +1381,19 @@
     "curseForgeHash": 3016368264,
     "modrinthHash": "f80f9eed728966adcfbcc848633e789645057281"
   },
-  "supermartijn642corelib-1.1.18-forge-mc1.20.1.jar": {
+  "tacz-1.20.1-1.1.7-hotfix.jar": {
-    "jarName": "supermartijn642corelib-1.1.18-forge-mc1.20.1.jar",
+    "jarName": "tacz-1.20.1-1.1.7-hotfix.jar",
-    "modId": "supermartijn642corelib",
-    "version": "1.1.18",
-    "curseForgeHash": 4078642907,
-    "modrinthHash": "d37e1148b512c67cee704635b4f07d1f9ea8c31c"
-  },
-  "tacz-1.20.1-1.1.7-release.jar": {
-    "jarName": "tacz-1.20.1-1.1.7-release.jar",
     "modId": "tacz",
-    "version": "1.1.7",
+    "version": "1.1.7-hotfix",
-    "curseForgeHash": 1186606411,
+    "curseForgeHash": 218830698,
-    "modrinthHash": "869decffc818e6ccd7d6d0d734aecfaa265e908b"
+    "modrinthHash": "7d4f578a42c9b880744ea6058a495847aac9e4c3"
   },
-  "tacz-tweaks-2.11.2-all.jar": {
+  "tacz-tweaks-2.13.0-all.jar": {
-    "jarName": "tacz-tweaks-2.11.2-all.jar",
+    "jarName": "tacz-tweaks-2.13.0-all.jar",
     "modId": "tacztweaks",
-    "version": "2.11.2",
+    "version": "2.13.0",
-    "curseForgeHash": 2376197194,
+    "curseForgeHash": 3917857281,
-    "modrinthHash": "889c0885b6388fc7966b956a5df4efbb1c758965"
+    "modrinthHash": "1b2d7873fd3e2150f339d0d36e588196a50061d1"
   },
   "taczammoquery-1.20.1-1.0.0.jar": {
     "jarName": "taczammoquery-1.20.1-1.0.0.jar",
@@ -1388,33 +1402,33 @@
     "curseForgeHash": 1292892332,
     "modrinthHash": "e3d20ecf37d57b2ce0541cd0b082355853566296"
   },
-  "taczjs-forge-1.3.7-mc1.20.1.jar": {
+  "taczjs-forge-1.4.0+mc1.20.1.jar": {
-    "jarName": "taczjs-forge-1.3.7-mc1.20.1.jar",
+    "jarName": "taczjs-forge-1.4.0+mc1.20.1.jar",
     "modId": "taczjs",
-    "version": "1.3.7-mc1.20.1",
+    "version": "1.4.0+mc1.20.1",
-    "curseForgeHash": 1742901301,
+    "curseForgeHash": 189217583,
-    "modrinthHash": "8a97de20e31f7e863a968f82fd90e196f4b3a3b3"
+    "modrinthHash": "b44f0a0352d1e2eaa523744be6bc0742274dcc1a"
   },
-  "TerraFirmaCraft-Forge-1.20.1-3.2.19.jar": {
+  "TerraFirmaCraft-Forge-1.20.1-3.2.20.jar": {
-    "jarName": "TerraFirmaCraft-Forge-1.20.1-3.2.19.jar",
+    "jarName": "TerraFirmaCraft-Forge-1.20.1-3.2.20.jar",
     "modId": "tfc",
-    "version": "3.2.19",
+    "version": "3.2.20",
-    "curseForgeHash": 837967200,
+    "curseForgeHash": 2679626739,
-    "modrinthHash": "107d4aec4694c509ea7ea8f3963478ae8002f46e"
+    "modrinthHash": "ea725f5bed9662aa22d4ec089a009bd52fb82275"
   },
-  "TerraFirmaGreg-Core-Modern-0.8.13.jar": {
+  "TerraFirmaGreg-Core-Modern-0.8.21.jar": {
-    "jarName": "TerraFirmaGreg-Core-Modern-0.8.13.jar",
+    "jarName": "TerraFirmaGreg-Core-Modern-0.8.21.jar",
     "modId": "tfg",
-    "version": "0.8.13",
+    "version": "0.8.21",
-    "curseForgeHash": 1252674808,
+    "curseForgeHash": 3989792002,
-    "modrinthHash": "557984bbe48f571e60426b370d6fa52baa4a1cef"
+    "modrinthHash": "aa5ce192eee7a877264b036c5ffd2da71bce2807"
   },
-  "tfc_gurman-1.2.0.jar": {
+  "tfc_gourmet-1.4.3.jar": {
-    "jarName": "tfc_gurman-1.2.0.jar",
+    "jarName": "tfc_gourmet-1.4.3.jar",
-    "modId": "tfc_gurman",
+    "modId": "tfc_gourmet",
-    "version": "1.1.0",
+    "version": "1.4.3",
-    "curseForgeHash": 3362991748,
+    "curseForgeHash": 415442845,
-    "modrinthHash": "4e219504c5ca011c2ea7036d6002d30ce14085c0"
+    "modrinthHash": "103326499c4a574c87474a5af52f97d7a730071f"
   },
   "TFC_punishment_for_death-1.20.1-1.0.0.15.jar": {
     "jarName": "TFC_punishment_for_death-1.20.1-1.0.0.15.jar",
@@ -1430,12 +1444,12 @@
     "curseForgeHash": 301500460,
     "modrinthHash": "a3759bcb6545195e680121c145608eeefc70a18a"
   },
-  "tfc_support_indicator-1.0.3+mc1.20.1.jar": {
+  "tfc_support_indicator-1.0.6+mc1.20.1.jar": {
-    "jarName": "tfc_support_indicator-1.0.3+mc1.20.1.jar",
+    "jarName": "tfc_support_indicator-1.0.6+mc1.20.1.jar",
     "modId": "tfc_support_indicator",
-    "version": "1.0.3+mc1.20.1",
+    "version": "1.0.6+mc1.20.1",
-    "curseForgeHash": 852302900,
+    "curseForgeHash": 3676229392,
-    "modrinthHash": "2cc053dc89943471f171d3473af9a0ee50c7a16b"
+    "modrinthHash": "b1b4be876060fec0660842abe99279d0c93d5ebc"
   },
   "tfc_textile-1.0.5.jar": {
     "jarName": "tfc_textile-1.0.5.jar",
@@ -1514,12 +1528,12 @@
     "curseForgeHash": 2411075624,
     "modrinthHash": "021052fcfdd3b51ec5c0b3e46974ecdfd641a0c8"
   },
-  "tfclunchbox-1.20.1-1.0.0.26.jar": {
+  "tfclunchbox-1.20.1-1.0.0.28.jar": {
-    "jarName": "tfclunchbox-1.20.1-1.0.0.26.jar",
+    "jarName": "tfclunchbox-1.20.1-1.0.0.28.jar",
     "modId": "tfclunchbox",
-    "version": "1.0.0.26",
+    "version": "1.0.0.28",
-    "curseForgeHash": 3150756370,
+    "curseForgeHash": 350342431,
-    "modrinthHash": "e9ddf2c2ea8a3458c06ef31712543d201a1cb499"
+    "modrinthHash": "7894fbb87bc561b7c186ec9f3997118b953659d0"
   },
   "tfcscraping-1.0.2.jar": {
     "jarName": "tfcscraping-1.0.2.jar",
@@ -1577,12 +1591,12 @@
     "curseForgeHash": 3460520715,
     "modrinthHash": "3e4e2d2e3ee9486de4c6b64bcf8f25d87d55fc92"
   },
-  "toomanyrecipeviewers-0.7.0+mc.20.1.jar": {
+  "toomanyrecipeviewers-0.7.1+mc.20.1.jar": {
-    "jarName": "toomanyrecipeviewers-0.7.0+mc.20.1.jar",
+    "jarName": "toomanyrecipeviewers-0.7.1+mc.20.1.jar",
     "modId": "toomanyrecipeviewers",
-    "version": "0.7.0+mc.20.1",
+    "version": "0.7.1+mc.20.1",
-    "curseForgeHash": 831210803,
+    "curseForgeHash": 3793441057,
-    "modrinthHash": "24973cc8530188fef712d34767a27d2f001c50e6"
+    "modrinthHash": "29bec57f882d3a4bab4a2dc4c46e19cadcd32c67"
   },
   "tp_shooting-1.20.1-5.1.1+tacz1.1.6-all.jar": {
     "jarName": "tp_shooting-1.20.1-5.1.1+tacz1.1.6-all.jar",
@@ -1619,19 +1633,26 @@
     "curseForgeHash": 2388627373,
     "modrinthHash": "ca49a4163794cc0f94a31a17f6956be11979db53"
   },
-  "vintageimprovements-1.20.1-0.3.6.0.jar": {
+  "vintageimprovements-1.20.1-0.3.7.0.jar": {
-    "jarName": "vintageimprovements-1.20.1-0.3.6.0.jar",
+    "jarName": "vintageimprovements-1.20.1-0.3.7.0.jar",
     "modId": "vintageimprovements",
-    "version": "1.20.1-0.3.6.0",
+    "version": "1.20.1-0.3.7.0",
-    "curseForgeHash": 1485580658,
+    "curseForgeHash": 1687292018,
-    "modrinthHash": "a893480c03a2803b130f79b2124d27345779f531"
+    "modrinthHash": "d1416bd683464538a7615d1649eecc7027b227e2"
   },
-  "wab-1.20.1-1.3.2.jar": {
+  "wab-1.20.1-1.4.1.jar": {
-    "jarName": "wab-1.20.1-1.3.2.jar",
+    "jarName": "wab-1.20.1-1.4.1.jar",
     "modId": "wan_ancient_beasts",
-    "version": "1.3.2",
+    "version": "1.4.1",
-    "curseForgeHash": 2333549546,
+    "curseForgeHash": 194648790,
-    "modrinthHash": "7298a59e383d2327e2acc49d8f1b132cedb8860b"
+    "modrinthHash": "6a9465b15671d7f1ea2f7b3ed44c881065b945f6"
+  },
+  "wakes-1.20.1-Forge-1.0.9.jar": {
+    "jarName": "wakes-1.20.1-Forge-1.0.9.jar",
+    "modId": "wakes",
+    "version": "1.0.9",
+    "curseForgeHash": 650217522,
+    "modrinthHash": "4e2f19e3c2d36968630f66b370ad0ab984aa5b25"
   },
   "waterflasks-3.0.10.jar": {
     "jarName": "waterflasks-3.0.10.jar",

config/createpickywheels-common.toml

@@ -1,22 +1,50 @@
 
-##Waterwheel requirements
+#Waterwheel requirements
 [waterwheels]
 	#Enable waterwheels modifications?
 	waterwheelsEnabled = true
 	#Only enable pickyness onPlacement, if the water wheel was instead generated during worldgen, it works as default.
 	waterwheelsPickyOnPlacement = true
-	#Boost for Waterwheels placed on boosted biomes.
+
-	#Range: 0.0 ~ 1.7976931348623157E308
+	#Biome impact on waterwheel
-	waterwheelBaseBoost = 1.0
+	[waterwheels."biome efficiency"]
-	#Penalty for Waterwheels placed on whitelisted but not on preferential biomes [waterwheel_boosted biome tag].
+		#RPM Boost for Waterwheels placed on boosted biomes tag.
-	#Range: 0.0 ~ 1.7976931348623157E308
+		#Range: 0.0 ~ 1.7976931348623157E308
-	waterwheelPenalty = 0.25
+		waterwheelBiomeRPMBoost = 1.0
-	#The minimum amount of fluid blocks the waterwheel needs to find before rotation begins.
+		#RPM Penalty for Waterwheels placed on whitelisted but not on preferential biomes [waterwheel_boosted biome tag].
-	#Range: > 1
+		#Range: 0.0 ~ 1.7976931348623157E308
-	waterwheelThreshold = 1
+		waterwheelBiomeRPMPenalty = 0.25
-	#The maximum distance a waterwheel can consider fluid blocks from.
+		#STRESS Boost for Waterwheels placed on boosted Biomes.
-	#Range: > 1
+		#Range: 0.0 ~ 1.7976931348623157E308
-	waterwheelRange = 2
+		waterwheelBiomeSTRESSBoost = 1.0
+		#STRESS Penalty for Waterwheels placed on whitelisted but not on preferential biomes [waterwheel_boosted biome tag].
+		#Range: 0.0 ~ 1.7976931348623157E308
+		waterwheelBiomeSTRESSPenalty = 1.0
+
+	#Body of water requirement impact (similar to infinite fluid extraction from pulley)
+	[waterwheels."power source condition"]
+		#When enabled waterwheels also work when under create's default conditions but at a penalty
+		waterwheelsPorqueNoLosDos = true
+		#Boost for Waterwheels placed on optimal conditions.
+		#Range: 0.0 ~ 1.7976931348623157E308
+		waterwheelSourceRPMBoost = 1.0
+		#Penalty for Waterwheels placed under create's default conditions.
+		#Range: 0.0 ~ 1.7976931348623157E308
+		waterwheelSourceRPMPenalty = 1.0
+		#Boost for Waterwheels placed on optimal conditions.
+		#Range: 0.0 ~ 1.7976931348623157E308
+		waterwheelSourceSTRESSBoost = 1.0
+		#Penalty for Waterwheels placed under create's default conditions.
+		#Range: 0.0 ~ 1.7976931348623157E308
+		waterwheelSourceSTRESSPenalty = 1.0
+		#The minimum amount of fluid blocks the waterwheel needs to find before rotation begins.
+		#Range: > 1
+		waterwheelSourceThreshold = 1
+		#The maximum distance a waterwheel can consider fluid blocks from.
+		#Range: > 1
+		waterwheelSourceRange = 3
+		#When enabled boosted waterwheels require correct flow (like in TerraFirmaCraft's water river)
+		waterwheelsSourceRequiresFlow = true
 
 ##Windmill requirements
 [windmills]
@@ -37,7 +65,7 @@
 	#The minimum amount of points that must hit windmillRequiredRange.
 	#Range: > 1
 	windmillRequiredRangePoints = 1
-	#The maximum distance a waterwheel can consider air blocks from.
+	#The maximum distance a windmill can consider air blocks from.
 	#Range: > 1
 	windmillMaxRange = 32
 	#The percentage of Generated Speed only given if windmills are raised enough.

config/defaultoptions/keybindings.txt

@@ -78,7 +78,7 @@ key_key.astikorcarts.desc:key.keyboard.r:NONE
 key_key.curios.open.desc:key.keyboard.unknown:NONE
 key_create.keyinfo.toolmenu:key.keyboard.left.alt:NONE
 key_create.keyinfo.toolbelt:key.keyboard.left.alt:NONE
-key_key.toolbelt.open:key.keyboard.unknown:NONE
+key_key.toolbelt.open:key.keyboard.x:NONE
 key_key.toolbelt.slot:key.keyboard.unknown:NONE
 key_gui.xaero_switch_waypoint_set:key.keyboard.unknown:NONE
 key_gui.xaero_instant_waypoint:key.keyboard.unknown:NONE
@@ -120,4 +120,9 @@ key_gtceu.key.armor_mode_switch:key.keyboard.o
 key_key.ftbchunks.map:key.keyboard.unknown:NONE
 key_key.ftbchunks.claim_manager:key.keyboard.unknown:NONE
 key_key.ad_astra.toggle_suit_flight:key.keyboard.h:NONE
-key_key.ad_astra.open_radio:key.keyboard.r:NONE
+key_key.ad_astra.open_radio:key.keyboard.r:NONE
+key_key.wan_ancient_beasts.special_ability:key.keyboard.c:NONE
+key_key.saveToolbarActivator:key.keyboard.unknown:NONE
+key_key.loadToolbarActivator:key.keyboard.unknown:NONE
+key_key.tacz.crawl.desc:key.keyboard.c:NONE
+key_key.prone:key.keyboard.c:NONE

config/defaultoptions/options.txt

@@ -3,7 +3,7 @@ resourcePacks:["vanilla","mod_resources","gtceu:dynamic_assets","Moonlight Mods
 incompatibleResourcePacks:["firmalife_data","file/Perfected Anvil Helper.zip"]
 narrator:0
 soundCategory_master:1.0
-soundCategory_music:0.3
+soundCategory_music:0.4
 soundCategory_record:1.0
 soundCategory_weather:1.0
 soundCategory_block:1.0

config/fallingtrees_common.json

@@ -50,7 +50,11 @@
           "beneath:wood/leaves/crimson",
           "beneath:wood/leaves/warped",
           "ad_astra:aeronos_cap",
-          "ad_astra:strophar_cap"
+          "ad_astra:strophar_cap",
+          "tfg:crimson_wart_block",
+          "tfg:warped_wart_block",
+          "tfg:aeronos_cap",
+          "tfg:strophar_cap"
         ],
         "blacklist": []
       },

config/fancymenu/customization/gui_main_menu.txt

@@ -286,7 +286,7 @@ element {
 
 element {
   button_element_executable_block_identifier = dbfd850d-f49c-44f9-975c-52b0b07335f1-1710837053353
-  [executable_action_instance:dc0290c6-6dcd-41ab-b222-a76c27eaec6e-1710837053356][action_type:joinserver] = modern.terrafirmagreg.su
+  [executable_action_instance:dc0290c6-6dcd-41ab-b222-a76c27eaec6e-1710837053356][action_type:joinserver] = modern.terrafirmagreg.team
   [executable_block:dbfd850d-f49c-44f9-975c-52b0b07335f1-1710837053353][type:generic] = [executables:dc0290c6-6dcd-41ab-b222-a76c27eaec6e-1710837053356;]
   backgroundnormal = [source:local]kubejs/assets/tfg/textures/gui/button_98x20.png
   backgroundhovered = [source:location]tfg:textures/gui/button_hover_98x20.gif

config/ftbbackups2.json

@@ -27,13 +27,15 @@
 	   More info here
 	   (http://www.cronmaker.com)
 	*/
-	"backup_cron": "0 15 10 * * ? *",
+	"backup_cron": "0 0 0/1 1/1 * ? *",
 	// Time between manual backups using the command
 	"manual_backups_time": 0,
 	// Only run a backup if a player has been online since the last backup
 	"only_if_players_been_online": true,
 	// Additional directories to include in backup
-	"additional_directories": [],
+	"additional_directories": [
+		"xaero/minimap/"
+	],
 	/* Additional files and directories to include in backup.
 	   Can specify a file name, path relative to server directory or wildcard file path
 	   Examples:                       (All file paths are relative to server root)
@@ -44,7 +46,11 @@
 	   *path/ends/with.txt             Any files who's path ends with
 	   *path/contains*                 Any files who's path contains
 	*/
-	"additional_files": [],
+	"additional_files": [
+		"/cherishedworlds-favorites.dat",
+		"/emi.json",
+		"/options.txt"
+	],
 	// Display file size in backup message
 	"display_file_size": false,
 	// backup location
@@ -52,9 +58,9 @@
 	// Specify the backup format. Valid options are ZIP and DIRECTORY
 	"backup_format": "ZIP",
 	// Minimum free disk space in MB. If a backup's creation would leave less than this amount of disk space remaining, the backup will be aborted.
-	"minimum_free_space": 51200,
+	"minimum_free_space": 0,
 	// If the previous backup failed due to lack of space, the oldest backup will be deleted to free space.
-	"free_space_if_needed": true,
+	"free_space_if_needed": false,
 	/* Specify files or folders to be excluded.
 	   Can specify a file name, path relative to server directory or wildcard file path
 	   Examples:                       (All file paths are relative to server root)

config/ftbquests/quests/chapters/applied_energistics_2.snbt

@@ -72,8 +72,8 @@
 	quest_links: [{
 		id: "6845144F7EA1081D"
 		linked_quest: "24158DEE63DAEB41"
-		x: 5.0d
+		x: 6.0d
-		y: -4.5d
+		y: -3.5d
 	}]
 	quests: [
 		{
@@ -141,15 +141,22 @@
 					type: "item"
 				}
 				{
-					id: "31CD18493D0D65BC"
+					id: "52F9B7116D01F7F8"
-					item: "gtceu:hv_sifter"
+					item: "gtceu:hv_autoclave"
 					optional_task: true
 					type: "item"
 				}
 				{
-					id: "52F9B7116D01F7F8"
+					id: "394F7CEA050D785B"
-					item: "gtceu:hv_autoclave"
+					item: {
+						Count: 1
+						id: "ftbfiltersystem:smart_filter"
+						tag: {
+							"ftbfiltersystem:filter": "or(item(vintageimprovements:vibrating_table)item(gtceu:lv_sifter)item(gtceu:mv_sifter)item(gtceu:hv_sifter)item(gtceu:ev_sifter)item(gtceu:iv_sifter)item(gtceu:luv_sifter)item(gtceu:zpm_sifter)item(gtceu:uv_sifter))"
+						}
+					}
 					optional_task: true
+					title: "{quests.ore_proc.sifter.task}"
 					type: "item"
 				}
 			]
@@ -224,10 +231,9 @@
 			y: -0.5d
 		}
 		{
-			can_repeat: true
 			dependencies: ["0C0B09D66D0CFFBA"]
 			description: ["{quests.ae2.ae_guide.desc}"]
-			icon: "ae2:guide"
+			icon: "ae2:singularity"
 			id: "6CF08AFB924905F0"
 			rewards: [{
 				id: "34825A998EA88DB4"
@@ -362,6 +368,7 @@
 					type: "item"
 				}
 			]
+			title: "{quests.ae2.cables.title}"
 			x: 0.5d
 			y: -6.0d
 		}
@@ -400,7 +407,7 @@
 				item: "ae2:crafting_unit"
 				type: "item"
 			}]
-			x: -1.0d
+			x: -2.0d
 			y: -6.0d
 		}
 		{
@@ -412,7 +419,7 @@
 				item: "ae2:crafting_accelerator"
 				type: "item"
 			}]
-			x: -2.5d
+			x: -3.5d
 			y: -6.5d
 		}
 		{
@@ -431,7 +438,8 @@
 				title: "{quests.ae2.crafting_storage.task}"
 				type: "item"
 			}]
-			x: -2.5d
+			title: "{quests.ae2.crafting_storage.title}"
+			x: -3.5d
 			y: -5.5d
 		}
 		{
@@ -452,6 +460,7 @@
 				title: "{quests.ae2.pattern_provider.task}"
 				type: "item"
 			}]
+			title: "{quests.ae2.pattern_provider.title}"
 			x: 0.5d
 			y: -9.0d
 		}
@@ -507,7 +516,7 @@
 				item: "ae2:interface"
 				type: "item"
 			}]
-			x: 2.0d
+			x: 3.0d
 			y: -6.0d
 		}
 		{
@@ -526,7 +535,8 @@
 				title: "{quests.ae2.export_bus.task}"
 				type: "item"
 			}]
-			x: 3.5d
+			title: "{quests.ae2.export_bus.title}"
+			x: 5.0d
 			y: -7.0d
 		}
 		{
@@ -537,8 +547,16 @@
 			id: "0F1104DEEB22EF86"
 			size: 1.0d
 			tasks: [{
-				id: "6D9B9EAFE680B768"
+				id: "6CBA077E634222BC"
-				type: "checkmark"
+				item: {
+					Count: 1
+					id: "ftbfiltersystem:smart_filter"
+					tag: {
+						"ftbfiltersystem:filter": "ftbfiltersystem:item_tag(gtceu:circuits/iv)"
+					}
+				}
+				title: "Any #gtceu:circuits/iv"
+				type: "item"
 			}]
 			title: "{quests.ae2.iv.title}"
 			x: 3.0d
@@ -637,8 +655,16 @@
 			id: "1F3621FABA32DC6B"
 			size: 1.0d
 			tasks: [{
-				id: "4CE3EF0D1FAC1B6C"
+				id: "7D229D57EB72CF9E"
-				type: "checkmark"
+				item: {
+					Count: 1
+					id: "ftbfiltersystem:smart_filter"
+					tag: {
+						"ftbfiltersystem:filter": "ftbfiltersystem:item_tag(gtceu:circuits/luv)"
+					}
+				}
+				title: "Any #gtceu:circuits/luv"
+				type: "item"
 			}]
 			title: "{quests.ae2.luv.title}"
 			x: 0.5d
@@ -653,7 +679,7 @@
 				item: "ae2:import_bus"
 				type: "item"
 			}]
-			x: 3.5d
+			x: 5.0d
 			y: -5.0d
 		}
 		{
@@ -680,7 +706,7 @@
 					type: "item"
 				}
 			]
-			x: 3.5d
+			x: 5.0d
 			y: -6.0d
 		}
 		{
@@ -693,20 +719,17 @@
 				type: "checkmark"
 			}]
 			title: "{quests.ae2.interface_automation.title}"
-			x: 5.0d
+			x: 6.5d
 			y: -6.0d
 		}
 		{
 			dependencies: ["6CF08AFB924905F0"]
 			description: ["{quests.ae2.hv.desc}"]
+			disable_toast: true
 			icon: "tfg:hv_universal_circuit"
 			icon_scale: 2.0d
 			id: "3C3C21482E31267B"
 			size: 1.0d
-			tasks: [{
-				id: "1D4A01B75676146B"
-				type: "checkmark"
-			}]
 			title: "{quests.ae2.hv.title}"
 			x: 0.5d
 			y: -2.5d
@@ -1094,6 +1117,7 @@
 				{
 					id: "270F842BF5012A13"
 					item: "ae2:io_port"
+					optional_task: true
 					type: "item"
 				}
 				{
@@ -1283,6 +1307,27 @@
 			x: -2.0d
 			y: -9.0d
 		}
+		{
+			can_repeat: true
+			dependencies: ["6CF08AFB924905F0"]
+			description: ["{quests.ae2.books_again.desc}"]
+			icon: "ae2:guide"
+			id: "21ED71AAA4EE4890"
+			optional: true
+			rewards: [{
+				id: "0507786BBEF1A6C9"
+				item: "ae2:guide"
+				type: "item"
+			}]
+			shape: "none"
+			tasks: [{
+				id: "26C00F0A52235B5D"
+				type: "checkmark"
+			}]
+			title: "{quests.ae2.books_again.title}"
+			x: -0.5d
+			y: -1.0d
+		}
 	]
 	subtitle: ["{quests.ae2.subtitle}"]
 	title: "{quests.ae2}"

config/ftbquests/quests/chapters/create_logistics.snbt

@@ -131,6 +131,8 @@
 			dependencies: [
 				"572A8983FA12152A"
 				"3AF956758FA289A8"
+				"07E7678095258EDB"
+				"383A14A5C65B3ADF"
 			]
 			dependency_requirement: "one_completed"
 			description: ["{quests.create_logistics.rose_quartz_lens.desc}"]
@@ -209,8 +211,9 @@
 		{
 			dependencies: [
 				"7C4807A247AF36A1"
-				"648BCF486E16CCB2"
+				"713C8D6A20BF3A0E"
 			]
+			dependency_requirement: "one_completed"
 			description: ["{quests.create_logistics.stock_link.desc}"]
 			id: "76490E046A44BCC3"
 			size: 2.0d
@@ -225,7 +228,11 @@
 			y: -1.0d
 		}
 		{
-			dependencies: ["76490E046A44BCC3"]
+			dependencies: [
+				"76490E046A44BCC3"
+				"50FE830DA6F403B2"
+			]
+			dependency_requirement: "one_completed"
 			description: [
 				"{quests.create_logistics.stock_ticker.desc.1}"
 				"{@pagebreak}"
@@ -245,7 +252,11 @@
 			y: -2.5d
 		}
 		{
-			dependencies: ["76490E046A44BCC3"]
+			dependencies: [
+				"76490E046A44BCC3"
+				"50FE830DA6F403B2"
+			]
+			dependency_requirement: "one_completed"
 			description: ["{quests.create_logistics.redstone_requester.desc}"]
 			id: "3F44CFF8A6018F3E"
 			subtitle: "{quests.create_logistics.redstone_requester.subtitle}"

config/ftbquests/quests/chapters/gregtech_energy.snbt

@@ -118,10 +118,7 @@
 			y: -7.0d
 		}
 		{
-			dependencies: [
+			dependencies: ["06B2E38F7DCF2678"]
-				"06B2E38F7DCF2678"
-				"22510C5F2386B453"
-			]
 			dependency_requirement: "one_completed"
 			description: ["{quests.gregtech_energy.produce_energy.desc}"]
 			icon: "gtceu:lv_field_generator"
@@ -235,7 +232,7 @@
 			dependencies: [
 				"60FF9249376DF9BD"
 				"05E2F203DA46A5E8"
-				"3EC8D58DB73CEFE5"
+				"2BE373381980C85F"
 			]
 			dependency_requirement: "one_completed"
 			description: ["{quests.gregtech_energy.transformer.desc}"]
@@ -801,7 +798,7 @@
 			y: -5.0d
 		}
 		{
-			dependencies: ["4D0ADC66D2CF09B1"]
+			dependencies: ["0AF286AA540A82E6"]
 			description: ["{quests.gregtech_energy.solar_panel.desc}"]
 			id: "109C57B63EE95E35"
 			subtitle: "{quests.gregtech_energy.solar_panel.subtitle}"
@@ -812,12 +809,14 @@
 				type: "item"
 			}]
 			x: -6.0d
-			y: -3.0d
+			y: -5.0d
 		}
 		{
 			dependencies: [
 				"109C57B63EE95E35"
 				"5826EC76931359B8"
+				"00A2566109144D7F"
+				"4D0ADC66D2CF09B1"
 			]
 			dependency_requirement: "one_completed"
 			description: [
@@ -835,7 +834,7 @@
 				type: "item"
 			}]
 			x: -6.0d
-			y: -2.0d
+			y: -3.0d
 		}
 		{
 			dependencies: ["4D0ADC66D2CF09B1"]
@@ -1019,8 +1018,8 @@
 		}
 		{
 			dependencies: [
-				"0AF286AA540A82E6"
 				"0C718329245D9619"
+				"4C620105AAC49381"
 			]
 			description: [
 				"{quests.medium_voltage.mv_diesel.desc.1}"
@@ -1037,8 +1036,8 @@
 				type: "item"
 			}]
 			title: "{quests.medium_voltage.mv_diesel.title}"
-			x: -9.0d
+			x: -8.5d
-			y: -5.0d
+			y: -7.0d
 		}
 		{
 			dependencies: ["7AF726555D721DFC"]
@@ -1083,13 +1082,16 @@
 				"4C620105AAC49381"
 				"0C718329245D9619"
 			]
+			description: ["{quests.low_voltage.lv_biodiesel.desc}"]
 			id: "139C7DF629329753"
+			subtitle: "{quests.low_voltage.lv_biodiesel.subtitle}"
 			tasks: [{
 				id: "7BA9FDD1F45B53F6"
 				item: "gtceu:bio_diesel_bucket"
 				type: "item"
 			}]
-			x: -9.0d
+			title: "{quests.low_voltage.lv_biodiesel.title}"
+			x: -9.5d
 			y: -7.0d
 		}
 		{
@@ -1147,14 +1149,17 @@
 		{
 			dependencies: [
 				"0585527D1854628B"
-				"05E2F203DA46A5E8"
+				"7AF726555D721DFC"
+				"5FA09DA68D309548"
 			]
+			dependency_requirement: "one_completed"
 			description: [
 				"{quests.gregtech_energy.large_solar_t2.desc.1}"
 				"{@pagebreak}"
 				"{quests.gregtech_energy.large_solar_t2.desc.2}"
 			]
 			id: "3AEAB1930F4CC034"
+			optional: true
 			subtitle: "{quests.gregtech_energy.large_solar_t2.subtitle}"
 			tasks: [{
 				id: "149BF93064D121D3"
@@ -1162,15 +1167,16 @@
 				type: "item"
 			}]
 			x: -6.0d
-			y: 1.0d
+			y: -1.0d
 		}
 		{
 			dependencies: [
 				"3AEAB1930F4CC034"
-				"1DB543EFEEB67238"
+				"05E2F203DA46A5E8"
 			]
 			description: ["{quests.gregtech_energy.large_solar_t3.desc}"]
 			id: "7CA3A5EFE3D5B688"
+			optional: true
 			subtitle: "{quests.gregtech_energy.large_solar_t3.subtitle}"
 			tasks: [{
 				id: "612817A7FA759E03"
@@ -1178,7 +1184,7 @@
 				type: "item"
 			}]
 			x: -6.0d
-			y: 3.0d
+			y: 1.0d
 		}
 		{
 			dependencies: [
@@ -1236,16 +1242,65 @@
 				"05E2F203DA46A5E8"
 				"0ABD326DC2551CBD"
 			]
-			description: ["{quests.gregtech_energy.smr.desc.1}"]
+			description: [
+				"{quests.gregtech_energy.smr.desc.1}"
+				"{@pagebreak}"
+				"{quests.gregtech_energy.smr.desc.2}"
+				"{@pagebreak}"
+				"{quests.gregtech_energy.smr.desc.3}"
+			]
+			icon: "tfg:smr_generator"
 			id: "4659447C85CDC058"
 			subtitle: "{quests.gregtech_energy.smr.subtitle}"
-			tasks: [{
+			tasks: [
-				id: "1D02468DD9869C72"
+				{
-				item: "deafission:fission_reactor_smr1"
+					id: "1D02468DD9869C72"
-				type: "item"
+					item: "deafission:fission_reactor_smr1"
-			}]
+					type: "item"
+				}
+				{
+					id: "4DA2451D673DABE3"
+					item: "tfg:smr_generator"
+					type: "item"
+				}
+				{
+					id: "7647ABCBC805E3B3"
+					item: "tfg:uv_smr_fluid_import_hatch"
+					type: "item"
+				}
+				{
+					id: "4BDA2F8B0D5B310D"
+					item: "gtceu:lubricant_bucket"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "5C5003050BCE8601"
+					item: "tfg:polyalkylene_lubricant_bucket"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "79126D47F1236F45"
+					item: "tfg:ozone_bucket"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "5075B6C62A7AB675"
+					item: "tfg:cyclohex_diperoxide_bucket"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "28AAB372882C8996"
+					item: "tfg:ticl4_doped_supercritical_co2_bucket"
+					optional_task: true
+					type: "item"
+				}
+			]
 			title: "{quests.gregtech_energy.smr.title}"
-			x: -7.5d
+			x: -7.0d
 			y: 1.0d
 		}
 		{
@@ -1266,21 +1321,65 @@
 			y: -7.0d
 		}
 		{
-			dependencies: ["4512E5DE7A84F809"]
+			dependencies: [
-			description: ["{quests.gregtech_energy.fission_rod.desc.1}"]
+				"4512E5DE7A84F809"
+				"4C29DDE89AE8D6EE"
+				"3E0ABDFCC0FC6928"
+			]
+			dependency_requirement: "one_completed"
+			description: [
+				"{quests.gregtech_energy.fission_rod.desc.1}"
+				"{@pagebreak}"
+				"{quests.gregtech_energy.fission_rod.desc.2}"
+				"{@pagebreak}"
+				"{quests.gregtech_energy.fission_rod.desc.3}"
+			]
+			icon: {
+				Count: 1
+				id: "tfg:tbu_232_rod"
+				tag: {
+					Damage: 0
+				}
+			}
 			id: "0ABD326DC2551CBD"
 			subtitle: "{quests.gregtech_energy.fission_rod.subtitle}"
-			tasks: [{
+			tasks: [
-				id: "68E3EE04F4931EFE"
+				{
-				item: {
+					id: "68E3EE04F4931EFE"
-					Count: 1
+					item: {
-					id: "tfg:tbu_232_rod"
+						Count: 1
-					tag: {
+						id: "tfg:tbu_232_rod"
-						Damage: 0
+						tag: {
+							Damage: 0
+						}
 					}
+					type: "item"
 				}
-				type: "item"
+				{
-			}]
+					id: "21383A5C0CF976DD"
+					item: {
+						Count: 1
+						id: "tfg:americium_241_rod"
+						tag: {
+							Damage: 0
+						}
+					}
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "5B22DEC6694CDCCB"
+					item: {
+						Count: 1
+						id: "tfg:neptunium_237_rod"
+						tag: {
+							Damage: 0
+						}
+					}
+					optional_task: true
+					type: "item"
+				}
+			]
 			title: "{quests.gregtech_energy.fission_rod.title}"
 			x: -7.5d
 			y: 0.0d
@@ -1320,6 +1419,41 @@
 			x: -9.0d
 			y: -1.0d
 		}
+		{
+			dependencies: [
+				"05E2F203DA46A5E8"
+				"0ABD326DC2551CBD"
+			]
+			description: [
+				"{quests.gregtech_energy.cooling_tower.desc.1}"
+				"{@pagebreak}"
+				"{quests.gregtech_energy.cooling_tower.desc.2}"
+			]
+			icon: "tfg:cooling_tower"
+			id: "7F2F435C727C7AB3"
+			subtitle: "{quests.gregtech_energy.cooling_tower.subtitle}"
+			tasks: [
+				{
+					id: "0347D107FEC9761B"
+					item: "tfg:cooling_tower"
+					type: "item"
+				}
+				{
+					id: "7CD0D40C08CC42D2"
+					item: "tfg:boron_enriched_coolant_bucket"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "23C1F8FEFBD23A5C"
+					item: "tfg:warm_water_bucket"
+					optional_task: true
+					type: "item"
+				}
+			]
+			x: -8.0d
+			y: 1.0d
+		}
 	]
 	subtitle: ["{quests.gregtech_energy.subtitle}"]
 	title: "{quests.gregtech_energy}"

config/ftbquests/quests/chapters/hv__high_voltage.snbt

@@ -11,13 +11,13 @@
 			id: "2583D0B64E51FAC8"
 			linked_quest: "5063FDFFBE3E4855"
 			x: 2.5d
-			y: -7.5d
+			y: -8.5d
 		}
 		{
 			id: "308E11BE764398A1"
 			linked_quest: "7C1FD81C5DCFB74E"
 			x: -8.0d
-			y: -7.5d
+			y: -8.5d
 		}
 		{
 			id: "33D3C2A9337335D2"
@@ -42,14 +42,22 @@
 		{
 			id: "513464FBE4A87CB7"
 			linked_quest: "3A2E442E4D84C891"
-			x: 2.5d
+			shape: "octagon"
-			y: -10.0d
+			size: 2.0d
+			x: 0.0d
+			y: -11.0d
 		}
 		{
 			id: "1B29194F9C306CFE"
 			linked_quest: "36B9B5024356C53C"
-			x: 3.5d
+			x: 0.0d
-			y: -10.0d
+			y: -13.0d
+		}
+		{
+			id: "3274381865E7D011"
+			linked_quest: "0585527D1854628B"
+			x: 14.0d
+			y: 1.5d
 		}
 	]
 	quests: [
@@ -353,7 +361,7 @@
 			}]
 			title: "{quests.high_voltage.superconductors.title}"
 			x: -8.0d
-			y: -10.0d
+			y: -11.0d
 		}
 		{
 			dependencies: ["7E755297E9685374"]
@@ -374,7 +382,7 @@
 			}]
 			title: "{quests.high_voltage.nichrome_coils.title}"
 			x: -6.5d
-			y: -10.0d
+			y: -11.0d
 		}
 		{
 			dependencies: [
@@ -410,7 +418,7 @@
 			}]
 			title: "{quests.high_voltage.vacuum_freezer.title}"
 			x: -5.0d
-			y: -7.5d
+			y: -8.5d
 		}
 		{
 			dependencies: ["124B32A0583A636A"]
@@ -475,7 +483,7 @@
 			icon: "gtceu:cleanroom"
 			id: "3568BC9742092FC5"
 			shape: "octagon"
-			size: 2.0d
+			size: 1.5d
 			subtitle: "{quests.high_voltage.cleanroom.subtitle}"
 			tasks: [
 				{
@@ -559,7 +567,7 @@
 			]
 			title: "{quests.high_voltage.fluorine.title}"
 			x: 1.5d
-			y: 4.5d
+			y: 4.0d
 		}
 		{
 			dependencies: [
@@ -592,7 +600,7 @@
 			]
 			title: "{quests.high_voltage.ptfe.title}"
 			x: 0.0d
-			y: 4.5d
+			y: 5.0d
 		}
 		{
 			dependencies: ["5BACED5AE350EAB1"]
@@ -617,8 +625,8 @@
 				}
 			]
 			title: "{quests.high_voltage.nitrobenzene.title}"
-			x: -3.0d
+			x: -3.5d
-			y: 5.0d
+			y: 6.0d
 		}
 		{
 			dependencies: ["7CC79617A4965F25"]
@@ -653,7 +661,7 @@
 			]
 			title: "{quests.high_voltage.lcr.title}"
 			x: 0.0d
-			y: 6.0d
+			y: 7.0d
 		}
 		{
 			description: [
@@ -777,8 +785,8 @@
 				}
 			]
 			title: "{quests.high_voltage.nitric_acid.title}"
-			x: -1.5d
+			x: -2.0d
-			y: 6.0d
+			y: 7.0d
 		}
 		{
 			dependencies: ["5BACED5AE350EAB1"]
@@ -803,8 +811,8 @@
 				}
 			]
 			title: "{quests.high_voltage.cetane_diesel.title}"
-			x: -3.0d
+			x: -3.5d
-			y: 7.0d
+			y: 8.0d
 		}
 		{
 			dependencies: ["16B735F9C391D260"]
@@ -902,14 +910,13 @@
 				}
 			]
 			title: "{quests.high_voltage.ammonia.title}"
-			x: -1.5d
+			x: -2.0d
 			y: 4.5d
 		}
 		{
 			dependencies: ["52AD30F04DD5A812"]
 			dependency_requirement: "all_started"
 			description: ["{quests.high_voltage.hv_mixer.desc}"]
-			icon: "gtceu:hv_mixer"
 			id: "05ABC370D7153350"
 			subtitle: "{quests.high_voltage.hv_mixer.subtitle}"
 			tasks: [{
@@ -921,6 +928,7 @@
 						"ftbfiltersystem:filter": "or(item(gtceu:hv_mixer)item(greate:stainless_steel_mechanical_mixer))"
 					}
 				}
+				title: "{quests.tasktype.item.any}"
 				type: "item"
 			}]
 			title: "{quests.high_voltage.hv_mixer.title}"
@@ -940,8 +948,8 @@
 				type: "item"
 			}]
 			title: "{quests.high_voltage.blue_alloy.title}"
-			x: 0.0d
+			x: 1.0d
-			y: -9.0d
+			y: -7.5d
 		}
 		{
 			dependencies: [
@@ -952,8 +960,8 @@
 			description: ["{quests.high_voltage.ev_circuits.desc}"]
 			icon: "gtceu:micro_processor_computer"
 			id: "6A451F43F3D7A671"
-			shape: "square"
+			shape: "octagon"
-			size: 1.0d
+			size: 1.5d
 			subtitle: "{quests.high_voltage.ev_circuits.subtitle}"
 			tasks: [{
 				id: "01FE6BC2780D623B"
@@ -962,7 +970,7 @@
 			}]
 			title: "{quests.high_voltage.ev_circuits.title}"
 			x: 0.0d
-			y: -7.5d
+			y: -8.5d
 		}
 		{
 			description: [
@@ -997,7 +1005,7 @@
 			}]
 			title: "{quests.high_voltage.nichrome.title}"
 			x: -5.0d
-			y: -10.0d
+			y: -11.0d
 		}
 		{
 			dependencies: [
@@ -1006,19 +1014,28 @@
 				"4AD686D18247315E"
 				"72BD27FEEB34C7B0"
 			]
+			dependency_requirement: "one_completed"
 			description: ["{quests.high_voltage.rocket_t1.desc}"]
+			icon: {
+				Count: 1
+				id: "ad_astra:tier_1_rocket"
+				tag: { }
+			}
 			icon_scale: 2.0d
 			id: "3FBDC8552F7D8008"
 			shape: "none"
 			size: 2.0d
 			subtitle: "{quests.high_voltage.rocket_t1.subtitle}"
 			tasks: [{
-				id: "76D1CE96C52F9963"
+				id: "6F40128FAA409B16"
 				item: {
 					Count: 1
-					id: "ad_astra:tier_1_rocket"
+					id: "ftbfiltersystem:smart_filter"
-					tag: { }
+					tag: {
+						"ftbfiltersystem:filter": "or(item(ad_astra:tier_1_rocket)item(tfg:tier_1_double_rocket))"
+					}
 				}
+				title: "{quests.high_voltage.rocket_t1.task}"
 				type: "item"
 			}]
 			title: "{quests.high_voltage.rocket_t1.title}"
@@ -1265,8 +1282,8 @@
 				type: "checkmark"
 			}]
 			title: "{quests.high_voltage.linked_quest_energy.title}"
-			x: -4.5d
+			x: -5.0d
-			y: 6.0d
+			y: 7.0d
 		}
 		{
 			description: ["{quests.high_voltage.kaolinite_powder.desc}"]
@@ -1373,7 +1390,7 @@
 				type: "checkmark"
 			}]
 			title: "{quests.high_voltage.space_survival.title}"
-			x: 13.0d
+			x: 12.0d
 			y: 1.5d
 		}
 		{
@@ -1668,8 +1685,47 @@
 				type: "item"
 			}]
 			title: "{quests.gregtech_energy.reformate_gas.title}"
+			x: -1.5d
+			y: -13.0d
+		}
+		{
+			dependencies: ["6A451F43F3D7A671"]
+			description: [
+				"{quests.high_voltage.pisciculture.desc.1}"
+				""
+				"{image:tfg:textures/quests/pisciculture_fishery.png width:100 height:100 align:center}"
+				"{@pagebreak}"
+				"{quests.high_voltage.pisciculture.desc.2}"
+			]
+			icon: "tfc:bucket/tropical_fish"
+			id: "04ADA3B900F182A0"
+			optional: true
+			shape: "heart"
+			size: 1.5d
+			subtitle: "{quests.high_voltage.pisciculture.subtitle}"
+			tasks: [{
+				id: "63DC421339C9BB42"
+				item: "tfg:pisciculture_fishery"
+				type: "item"
+			}]
+			title: "{quests.high_voltage.pisciculture.title}"
+			x: -2.25d
+			y: -11.0d
+		}
+		{
+			dependencies: ["41D32C5178760F47"]
+			description: ["{quests.high_voltage.multi_structure_terminal.desc}"]
+			id: "3FC6D346B3EE4A92"
+			optional: true
+			shape: "heart"
+			subtitle: "{quests.high_voltage.multi_structure_terminal.subtitle}"
+			tasks: [{
+				id: "32C53F040A2F0AD8"
+				item: "gtceuterminal:multi_structure_manager"
+				type: "item"
+			}]
 			x: 5.0d
-			y: -10.0d
+			y: 1.0d
 		}
 	]
 	subtitle: ["{quests.high_voltage.subtitle}"]

config/ftbquests/quests/chapters/mars.snbt

@@ -153,7 +153,7 @@
 				type: "item"
 			}]
 			title: "{quests.space_survival.heavy_ammoniacal_water.title}"
-			x: 15.0d
+			x: 15.5d
 			y: -4.0d
 		}
 		{
@@ -174,7 +174,7 @@
 		{
 			dependencies: ["5AC5AAB9B3758E30"]
 			description: ["{quests.space_survival.soarer.desc}"]
-			guide_page: "tfc:field_guide tfc:tfg_tips/space_fauna 20"
+			guide_page: "tfc:field_guide tfc:tfg_tips/space_fauna 21"
 			icon: "wan_ancient_beasts:soarer_egg"
 			id: "2F711C064635EF2D"
 			optional: true
@@ -289,7 +289,7 @@
 			}]
 			title: "{quests.space_survival.mars_crops.title}"
 			x: 13.5d
-			y: -1.5d
+			y: -2.0d
 		}
 		{
 			dependencies: ["0967CE7F5DFF5CF6"]
@@ -460,7 +460,7 @@
 			]
 			title: "{quests.space_survival.bulbkin_pie.title}"
 			x: 13.5d
-			y: 0.0d
+			y: -0.5d
 		}
 		{
 			dependencies: ["155F421FC2F39C3C"]
@@ -479,7 +479,7 @@
 		{
 			dependencies: ["5AC5AAB9B3758E30"]
 			description: ["{quests.space_survival.surfer.desc}"]
-			guide_page: "tfc:field_guide tfc:tfg_tips/space_fauna 17"
+			guide_page: "tfc:field_guide tfc:tfg_tips/space_fauna 20"
 			id: "43EBECA48E341C47"
 			optional: true
 			shape: "heart"
@@ -578,6 +578,65 @@
 			x: 12.0d
 			y: -6.5d
 		}
+		{
+			dependencies: ["5AC5AAB9B3758E30"]
+			description: ["{quests.space_survival.charger.desc}"]
+			guide_page: "tfc:field_guide tfc:tfg_tips/space_fauna 19"
+			icon: "wan_ancient_beasts:charger_egg"
+			id: "148C2DA8FB1D6DB1"
+			optional: true
+			shape: "heart"
+			subtitle: "{quests.space_survival.charger.subtitle}"
+			tasks: [
+				{
+					icon: "wan_ancient_beasts:charger_egg"
+					id: "78EBECCA1C40A3BD"
+					observe_type: 5
+					timer: 0L
+					title: "{quests.space_survival.charger.task}"
+					to_observe: "wan_ancient_beasts:charger"
+					type: "observation"
+				}
+				{
+					id: "33ADD26F6AA89CA7"
+					item: {
+						Count: 1
+						id: "ftbfiltersystem:smart_filter"
+						tag: {
+							"ftbfiltersystem:filter": "ftbfiltersystem:item_tag(wan_ancient_beasts:charger_armors)"
+						}
+					}
+					optional_task: true
+					title: "Any #wan_ancient_beasts:charger_armors"
+					type: "item"
+				}
+			]
+			title: "{quests.space_survival.charger.title}"
+			x: 9.0d
+			y: -4.0d
+		}
+		{
+			dependencies: ["5AC5AAB9B3758E30"]
+			description: ["{quests.space_survival.snatcher.desc}"]
+			guide_page: "tfc:field_guide tfc:tfg_tips/space_fauna 17"
+			icon: "wan_ancient_beasts:snatcher_egg"
+			id: "02A7FD58F462320F"
+			optional: true
+			shape: "heart"
+			subtitle: "{quests.space_survival.snatcher.subtitle}"
+			tasks: [{
+				icon: "wan_ancient_beasts:snatcher_egg"
+				id: "4AC531B94CBA93CE"
+				observe_type: 5
+				timer: 0L
+				title: "{quests.space_survival.snatchertask}"
+				to_observe: "wan_ancient_beasts:snatcher"
+				type: "observation"
+			}]
+			title: "{quests.space_survival.snatcher.title}"
+			x: 9.0d
+			y: -3.0d
+		}
 	]
 	subtitle: ["{quests.mars.subtitle}"]
 	title: "{quests.mars}"

config/ftbquests/quests/chapters/moon.snbt

@@ -326,29 +326,14 @@
 			subtitle: "{quests.space_survival.stone_dust_centrifuging.subtitle}"
 			tasks: [
 				{
-					id: "72B3F8FE3EA395BE"
+					id: "63474F1F74F04C68"
-					item: {
+					item: "gtceu:helium_3_bucket"
-						Count: 1
+					optional_task: true
-						id: "ftbfiltersystem:smart_filter"
-						tag: {
-							"ftbfiltersystem:filter": "or(item(tfg:moon_stone_dust)item(tfg:glacio_stone_dust)item(tfg:moon_deepslate_dust))"
-						}
-					}
-					title: "{quests.space_survival.stone_dust_centrifuging.task}"
 					type: "item"
 				}
 				{
-					disable_toast: true
+					id: "4905C812B8FB0185"
-					id: "3B3532D745548B3D"
+					type: "checkmark"
-					item: {
-						Count: 1
-						id: "ftbfiltersystem:smart_filter"
-						tag: {
-							"ftbfiltersystem:filter": "or(item(gtceu:lv_centrifuge)item(gtceu:mv_centrifuge)item(gtceu:hv_centrifuge)item(gtceu:ev_centrifuge)item(gtceu:iv_centrifuge)item(gtceu:luv_centrifuge)item(gtceu:zpm_centrifuge)item(gtceu:uv_centrifuge))"
-						}
-					}
-					title: "{quests.ore_proc.centrifuge_sifter.task}"
-					type: "item"
 				}
 			]
 			title: "{quests.space_survival.stone_dust_centrifuging.title}"
@@ -377,6 +362,8 @@
 			dependencies: ["493D733A5438DD7E"]
 			description: ["{quests.space_survival.zip_gun.desc}"]
 			id: "3F68A259FA38D342"
+			optional: true
+			shape: "heart"
 			subtitle: "{quests.space_survival.zip_gun.subtitle}"
 			tasks: [{
 				id: "56DD17ED9D60A1BD"
@@ -493,14 +480,15 @@
 				"33374462FF07BC75"
 			]
 			dependency_requirement: "one_completed"
-			description: ["&6For each travel you will need Rocket Fuel&r, it seems complicated and it is quite a long process but you can make Rocket Fuel from &bChlorine&r, &bMethane&r, &bNitrogen&r, &bOxygen&r and &bWater&r. Nothing too bad, also if you already have your &5Large Chemical Reactor&r you could unlock some bypass.\\n\\n&7We advise you to use EMI Recipe Tree to have an easier time understanding each step. Simply click on the small icon with 4 squares on the right of the crafting recipe.&r"]
+			description: ["{quests.high_voltage.rocket_fuel.desc}"]
 			id: "0B80972F50E08B8D"
-			subtitle: "Easier than you think"
+			subtitle: "{quests.high_voltage.rocket_fuel.subtitle}"
 			tasks: [{
 				id: "5FBF567FFC837BFA"
 				item: "gtceu:rocket_fuel_bucket"
 				type: "item"
 			}]
+			title: "{quests.high_voltage.rocket_fuel.title}"
 			x: -7.0d
 			y: -5.5d
 		}
@@ -617,6 +605,7 @@
 			description: ["{quests.space_survival.redstone_railgun.desc}"]
 			icon: "minecraft:redstone_torch"
 			id: "0538DCD4D4811574"
+			shape: "circle"
 			subtitle: "{quests.space_survival.redstone_railgun.subtitle}"
 			tasks: [{
 				id: "63FFA0CBDDD635B9"
@@ -632,6 +621,7 @@
 			description: ["{quests.space_survival.robot_arm_railgun.desc}"]
 			icon: "gtceu:hv_robot_arm"
 			id: "7118634C06AE1141"
+			shape: "circle"
 			subtitle: "{quests.space_survival.robot_arm_railgun.subtitle}"
 			tasks: [{
 				id: "6C995E2B46963E1E"
@@ -677,6 +667,7 @@
 			description: ["{quests.space_survival.delay_railgun.desc}"]
 			icon: "create:cuckoo_clock"
 			id: "183AC1085D558086"
+			shape: "circle"
 			subtitle: "{quests.space_survival.delay_railgun.subtitle}"
 			tasks: [{
 				id: "119FD14202435E03"

config/ftbquests/quests/chapters/mv__medium_voltage.snbt

@@ -1283,28 +1283,6 @@
 			x: 6.0d
 			y: 8.0d
 		}
-		{
-			dependencies: ["45769156F4253C86"]
-			dependency_requirement: "one_completed"
-			description: ["{quests.medium_voltage.mv_jetpack.desc}"]
-			id: "6FA956DAA72D6139"
-			optional: true
-			shape: "heart"
-			size: 1.0d
-			subtitle: "{quests.medium_voltage.mv_jetpack.subtitle}"
-			tasks: [{
-				id: "022324F9630960C6"
-				item: {
-					Count: 1
-					id: "gtceu:liquid_fuel_jetpack"
-					tag: { }
-				}
-				type: "item"
-			}]
-			title: "{quests.medium_voltage.mv_jetpack.title}"
-			x: -5.0d
-			y: 5.0d
-		}
 		{
 			dependencies: ["75F38905DEA60F15"]
 			dependency_requirement: "one_completed"
@@ -1325,7 +1303,7 @@
 			}]
 			title: "{quests.medium_voltage.mv_jetpack_2.title}"
 			x: 1.5d
-			y: 5.0d
+			y: 4.5d
 		}
 		{
 			dependencies: [
@@ -1700,6 +1678,21 @@
 			x: -5.0d
 			y: 4.0d
 		}
+		{
+			dependencies: ["75F38905DEA60F15"]
+			description: ["{quests.medium_voltage.terminal_dismantler.desc}"]
+			id: "0053E98892F910BF"
+			shape: "heart"
+			subtitle: "{quests.medium_voltage.terminal_dismantler.subtitle}"
+			tasks: [{
+				id: "6AE4D07F675A23D0"
+				item: "gtceuterminal:dismantler"
+				type: "item"
+			}]
+			title: "{quests.medium_voltage.terminal_dismantler.title}"
+			x: 1.5d
+			y: 5.5d
+		}
 	]
 	subtitle: ["{quests.medium_voltage.subtitle}"]
 	title: "{quests.medium_voltage}"

config/ftbquests/quests/chapters/ore_processing.snbt

@@ -175,12 +175,6 @@
 			x: -5.5d
 			y: -13.0d
 		}
-		{
-			id: "138C7D4A61E2A77D"
-			linked_quest: "6B10099F3F0931B9"
-			x: 9.0d
-			y: -15.0d
-		}
 		{
 			id: "21670DA706D747EC"
 			linked_quest: "378F0AFCF95354B2"
@@ -1336,12 +1330,12 @@
 			id: "12C0BC3514FCEF96"
 			subtitle: "{quests.ore_proc.gem_slurry.subtitle}"
 			tasks: [{
-				id: "57587D74BD9DA754"
+				id: "730EA57B64DE54C0"
 				item: {
 					Count: 1
 					id: "ftbfiltersystem:smart_filter"
 					tag: {
-						"ftbfiltersystem:filter": "or(item(gtceu:crushed_ruby_ore)item(gtceu:crushed_sapphire_ore)item(gtceu:crushed_green_sapphire_ore))"
+						"ftbfiltersystem:filter": "or(item(gtceu:crushed_ruby_ore)item(gtceu:crushed_sapphire_ore)item(gtceu:crushed_green_sapphire_ore)item(gtceu:purified_ruby_ore)item(gtceu:purified_sapphire_ore)item(gtceu:purified_green_sapphire_ore))"
 					}
 				}
 				title: "{quests.ore_proc.gem_slurry.task}"

config/ftbquests/quests/chapters/questsmetallurgy.snbt

@@ -51,7 +51,7 @@
 			id: "19CF6D922179DFF9"
 			linked_quest: "11C45DBB20ED7647"
 			shape: "heart"
-			x: 9.0d
+			x: 8.5d
 			y: -34.0d
 		}
 		{
@@ -60,6 +60,12 @@
 			x: 18.5d
 			y: -28.0d
 		}
+		{
+			id: "5B4E347985A66970"
+			linked_quest: "21C58B2541BFA2EE"
+			x: -1.5d
+			y: -32.0d
+		}
 	]
 	quests: [
 		{
@@ -415,6 +421,7 @@
 			description: ["{quests.metal_age.anvil_recycling.desc}"]
 			icon: "tfc:firepit"
 			id: "3B2550394C94CEC9"
+			shape: "circle"
 			size: 1.0d
 			subtitle: "{quests.metal_age.anvil_recycling.subtitle}"
 			tasks: [{
@@ -646,6 +653,7 @@
 				}
 			}
 			id: "5792DDAA82895E67"
+			shape: "circle"
 			subtitle: "{quests.metal_age.red_blu.subtitle}"
 			tasks: [{
 				id: "63890641DCD6659F"
@@ -719,6 +727,7 @@
 			description: ["{quests.metal_age.wrought_iron_goodies.desc}"]
 			icon: "create:chute"
 			id: "20C2CE92459BE14A"
+			shape: "circle"
 			subtitle: "{quests.metal_age.wrought_iron_goodies.subtitle}"
 			tasks: [{
 				id: "60605AA92B6947D8"
@@ -734,6 +743,7 @@
 			description: ["{quests.metal_age.fire_clay_ingredients.desc}"]
 			icon: "minecraft:cartography_table"
 			id: "5A936E9BCF30AA3D"
+			shape: "circle"
 			subtitle: "{quests.metal_age.fire_clay_ingredients.subtitle}"
 			tasks: [{
 				id: "39CA01175999A291"
@@ -816,6 +826,7 @@
 			description: ["{quests.metal_age.steel_goodies.desc}"]
 			icon: "greate:steel_mechanical_pump"
 			id: "0C9B7745D812555A"
+			shape: "circle"
 			subtitle: "{quests.metal_age.steel_goodies.subtitle}"
 			tasks: [{
 				id: "3EB7C3AE88950E4B"
@@ -1297,6 +1308,31 @@
 			x: 18.5d
 			y: -24.0d
 		}
+		{
+			dependencies: ["174DA15847665CF8"]
+			description: ["{quests.metal_age.toolbelt.desc}"]
+			icon: "toolbelt:belt"
+			id: "1DEC710C3570D5D0"
+			optional: true
+			shape: "heart"
+			subtitle: "{quests.metal_age.toolbelt.subtitle}"
+			tasks: [
+				{
+					id: "0233F2A323C9FF6F"
+					item: "toolbelt:belt"
+					type: "item"
+				}
+				{
+					id: "09A674FE4BA67280"
+					item: "toolbelt:pouch"
+					optional_task: true
+					type: "item"
+				}
+			]
+			title: "{quests.metal_age.toolbelt.title}"
+			x: 9.5d
+			y: -34.0d
+		}
 	]
 	subtitle: ["{quests.metal_age.subtitle}"]
 	title: "{quests.metal_age}"

config/ftbquests/quests/chapters/questssteam_age.snbt

@@ -19,20 +19,22 @@
 		{
 			id: "39027CF4DC307D33"
 			linked_quest: "5E186CD5E83BFDF0"
-			x: -28.5d
+			x: -27.0d
 			y: 2.0d
 		}
 		{
 			id: "0CE64B9914191C56"
 			linked_quest: "6FFD4990FF07078A"
 			shape: "diamond"
-			x: -9.5d
+			x: -9.0d
 			y: 11.5d
 		}
 		{
 			id: "23A27702FF816291"
 			linked_quest: "6903C72A254A7B08"
-			x: -12.5d
+			shape: "octagon"
+			size: 2.0d
+			x: -11.5d
 			y: 8.0d
 		}
 		{
@@ -40,27 +42,27 @@
 			linked_quest: "48A8E3210B2BAE1C"
 			shape: "octagon"
 			size: 2.0d
-			x: -28.5d
+			x: -27.0d
 			y: 0.0d
 		}
 		{
 			id: "7C03FE015586C652"
 			linked_quest: "55213ACBF5F5D398"
 			shape: "heart"
-			x: -12.0d
+			x: -10.5d
 			y: 16.0d
 		}
 		{
 			id: "65E0B13E245D2E5F"
 			linked_quest: "379F434116632A89"
-			x: -26.0d
+			x: -24.5d
 			y: 1.0d
 		}
 		{
 			id: "68F5E521F2DB0A86"
 			linked_quest: "0404FBCC34011053"
 			shape: "heart"
-			x: -13.0d
+			x: -11.5d
 			y: 16.0d
 		}
 		{
@@ -77,6 +79,14 @@
 			x: -22.5d
 			y: 4.0d
 		}
+		{
+			id: "6C8C3BBD2BA9853B"
+			linked_quest: "56CA2EB7812529C5"
+			shape: "gear"
+			size: 1.5d
+			x: -13.0d
+			y: 13.5d
+		}
 	]
 	quests: [
 		{
@@ -84,7 +94,11 @@
 				"7B045998769930F0"
 				"55FDF06AC0C01D0B"
 			]
-			description: ["{quests.steam_age.basic_millstone.desc}"]
+			description: [
+				"{quests.steam_age.basic_millstone.desc.1}"
+				"{@pagebreak}"
+				"{quests.steam_age.basic_millstone.desc.2}"
+			]
 			id: "48C1E980F7D64317"
 			size: 1.0d
 			subtitle: "{quests.steam_age.basic_millstone.subtitle}"
@@ -94,7 +108,7 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.basic_millstone.title}"
-			x: -20.5d
+			x: -19.0d
 			y: 0.0d
 		}
 		{
@@ -112,7 +126,7 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.horse_crank.title}"
-			x: -24.5d
+			x: -23.0d
 			y: -2.0d
 		}
 		{
@@ -131,7 +145,7 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.helve_hammer.title}"
-			x: -20.5d
+			x: -19.0d
 			y: -4.0d
 		}
 		{
@@ -159,7 +173,7 @@
 				}
 			]
 			title: "{quests.steam_age.basic_greate.title}"
-			x: -20.5d
+			x: -19.0d
 			y: -2.0d
 		}
 		{
@@ -173,7 +187,7 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.water_wheel.title}"
-			x: -14.5d
+			x: -13.0d
 			y: 0.0d
 		}
 		{
@@ -195,7 +209,7 @@
 				}
 			]
 			title: "{quests.steam_age.windmill.title}"
-			x: -14.5d
+			x: -13.0d
 			y: -4.0d
 		}
 		{
@@ -210,7 +224,7 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.metal_casing.title}"
-			x: -9.5d
+			x: -8.0d
 			y: -2.0d
 		}
 		{
@@ -227,7 +241,7 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.steel_encased_fan.title}"
-			x: -5.5d
+			x: -4.0d
 			y: 4.0d
 		}
 		{
@@ -247,7 +261,7 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.steel_pump.title}"
-			x: -3.5d
+			x: -2.0d
 			y: 2.0d
 		}
 		{
@@ -297,7 +311,7 @@
 				}
 			]
 			title: "{quests.steam_age.steam_engine.title}"
-			x: -5.5d
+			x: -4.0d
 			y: -2.0d
 		}
 		{
@@ -316,7 +330,7 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.mechanical_saw.title}"
-			x: -9.5d
+			x: -8.0d
 			y: 0.0d
 		}
 		{
@@ -330,7 +344,7 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.mechanical_harvester.title}"
-			x: -9.5d
+			x: -8.0d
 			y: -4.0d
 		}
 		{
@@ -358,7 +372,7 @@
 				}
 			]
 			title: "{quests.steam_age.chute.title}"
-			x: -12.0d
+			x: -10.5d
 			y: 0.0d
 		}
 		{
@@ -376,7 +390,7 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.mold_table.title}"
-			x: -3.5d
+			x: -2.0d
 			y: 4.0d
 		}
 		{
@@ -406,7 +420,7 @@
 				}
 			]
 			title: "{quests.steam_age.steel_greate.title}"
-			x: -5.5d
+			x: -4.0d
 			y: 2.0d
 		}
 		{
@@ -424,7 +438,7 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.steel_millstone.title}"
-			x: -7.5d
+			x: -6.0d
 			y: 2.0d
 		}
 		{
@@ -461,11 +475,13 @@
 				{
 					id: "72112F5EC062766C"
 					item: "gtceu:treated_wood_dust"
+					optional_task: true
 					type: "item"
 				}
 				{
 					id: "0D95727196D033B5"
 					item: "gtceu:treated_wood_plate"
+					optional_task: true
 					type: "item"
 				}
 				{
@@ -523,8 +539,8 @@
 				}
 			]
 			title: "{quests.steam_age.miner.title}"
-			x: -10.0d
+			x: -9.0d
-			y: 17.0d
+			y: 18.0d
 		}
 		{
 			dependencies: [
@@ -622,21 +638,25 @@
 				}
 				{
 					count: 3L
+					disable_toast: true
 					id: "019C4D427A06DF0E"
-					item: { Count: 3, id: "gtceu:bronze_firebox_casing" }
+					item: "gtceu:bronze_firebox_casing"
 					type: "item"
 				}
 				{
+					disable_toast: true
 					id: "402700D6CCD2BEF1"
 					item: "gtceu:steam_input_hatch"
 					type: "item"
 				}
 				{
+					disable_toast: true
 					id: "7B99996072C53AD9"
 					item: "gtceu:steam_input_bus"
 					type: "item"
 				}
 				{
+					disable_toast: true
 					id: "6E4B41FDD286E184"
 					item: "gtceu:steam_output_bus"
 					type: "item"
@@ -677,7 +697,7 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.item_pipes.title}"
-			x: -12.0d
+			x: -10.5d
 			y: 2.0d
 		}
 		{
@@ -691,14 +711,21 @@
 			shape: "square"
 			size: 1.0d
 			subtitle: "{quests.steam_age.circuit_boards.subtitle}"
-			tasks: [{
+			tasks: [
-				id: "2B8B038789480789"
+				{
-				item: "gtceu:resin_printed_circuit_board"
+					id: "2B8B038789480789"
-				type: "item"
+					item: "gtceu:resin_printed_circuit_board"
-			}]
+					type: "item"
+				}
+				{
+					id: "171A20DD9F208437"
+					item: "tfg:artisan_table"
+					type: "item"
+				}
+			]
 			title: "{quests.steam_age.circuit_boards.title}"
-			x: -9.5d
+			x: -9.0d
-			y: 10.5d
+			y: 10.0d
 		}
 		{
 			dependencies: ["46FA9DD4755A5548"]
@@ -766,8 +793,8 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.vacuum_tubes.title}"
-			x: -8.0d
+			x: -7.0d
-			y: 14.0d
+			y: 15.0d
 		}
 		{
 			dependencies: ["7DB7AB5349218605"]
@@ -817,7 +844,7 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.resistors.title}"
-			x: -5.0d
+			x: -4.0d
 			y: 11.5d
 		}
 		{
@@ -833,8 +860,8 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.coiling_machine.title}"
-			x: -5.0d
+			x: -4.0d
-			y: 16.0d
+			y: 17.0d
 		}
 		{
 			dependencies: ["2C35D4E01AEC02AA"]
@@ -849,8 +876,8 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.steel_mixer.title}"
-			x: -5.0d
+			x: -4.0d
-			y: 14.5d
+			y: 15.5d
 		}
 		{
 			dependencies: ["2C35D4E01AEC02AA"]
@@ -864,8 +891,8 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.lathe.title}"
-			x: -6.0d
+			x: -5.0d
-			y: 17.0d
+			y: 18.0d
 		}
 		{
 			dependencies: [
@@ -902,8 +929,8 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.vibrating_table.title}"
-			x: -8.0d
+			x: -7.0d
-			y: 17.0d
+			y: 18.0d
 		}
 		{
 			dependencies: ["2C35D4E01AEC02AA"]
@@ -922,8 +949,8 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.rolling_mill.title}"
-			x: -5.0d
+			x: -4.0d
-			y: 13.0d
+			y: 14.0d
 		}
 		{
 			dependencies: ["2C35D4E01AEC02AA"]
@@ -937,8 +964,8 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.steel_saw.title}"
-			x: -7.0d
+			x: -6.0d
-			y: 17.0d
+			y: 18.0d
 		}
 		{
 			dependencies: ["2C35D4E01AEC02AA"]
@@ -952,8 +979,8 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.curving_press.title}"
-			x: -9.0d
+			x: -8.0d
-			y: 17.0d
+			y: 18.0d
 		}
 		{
 			dependencies: [
@@ -992,28 +1019,33 @@
 					type: "item"
 				}
 				{
+					disable_toast: true
 					id: "4EE63FDD07EC0467"
 					item: "gtceu:steam_input_hatch"
 					type: "item"
 				}
 				{
+					disable_toast: true
 					id: "0C9D5C87DEC212D2"
 					item: "gtceu:steam_input_bus"
 					type: "item"
 				}
 				{
+					disable_toast: true
 					id: "60828361A38F4E1E"
 					item: "gtceu:steam_output_bus"
 					type: "item"
 				}
 				{
 					count: 8L
+					disable_toast: true
 					id: "10EC49FF899232F6"
 					item: "gtceu:steam_machine_casing"
 					type: "item"
 				}
 				{
 					count: 8L
+					disable_toast: true
 					id: "27DDD13BE482E8A3"
 					item: "gtceu:bronze_firebox_casing"
 					type: "item"
@@ -1108,7 +1140,7 @@
 				}
 			]
 			title: "{quests.steam_age.fluid_pipes.title}"
-			x: -3.5d
+			x: -2.0d
 			y: 0.0d
 		}
 		{
@@ -1134,7 +1166,7 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.fluid_drums.title}"
-			x: -1.5d
+			x: 0.0d
 			y: 2.0d
 		}
 		{
@@ -1163,8 +1195,8 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.potin.title}"
-			x: -3.5d
+			x: -2.5d
-			y: 14.5d
+			y: 15.5d
 		}
 		{
 			dependencies: ["6F1BC99BE641B671"]
@@ -1191,7 +1223,7 @@
 				}
 			]
 			title: "{quests.steam_age.create_tools.title}"
-			x: -22.5d
+			x: -21.0d
 			y: -4.0d
 		}
 		{
@@ -1224,7 +1256,10 @@
 			y: 16.0d
 		}
 		{
-			dependencies: ["6AA07588374B59AB"]
+			dependencies: [
+				"6AA07588374B59AB"
+				"56CA2EB7812529C5"
+			]
 			description: ["{quests.steam_age.vacuum_chamber.desc}"]
 			id: "5F3063C539C9CBBF"
 			subtitle: "{quests.steam_age.vacuum_chamber.subtitle}"
@@ -1234,7 +1269,7 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.vacuum_chamber.title}"
-			x: -12.5d
+			x: -11.5d
 			y: 15.0d
 		}
 		{
@@ -1305,7 +1340,7 @@
 				}
 			]
 			title: "{quests.steam_age.poor_paths.title}"
-			x: -26.0d
+			x: -24.5d
 			y: -3.5d
 		}
 		{
@@ -1357,7 +1392,7 @@
 				}
 			]
 			title: "{quests.steam_age.normal_paths.title}"
-			x: -26.5d
+			x: -25.0d
 			y: -2.0d
 		}
 		{
@@ -1415,7 +1450,7 @@
 				}
 			]
 			title: "{quests.steam_age.good_paths.title}"
-			x: -26.0d
+			x: -24.5d
 			y: -0.5d
 		}
 		{
@@ -1437,7 +1472,7 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.lv_circuit.title}"
-			x: -8.0d
+			x: -7.0d
 			y: 8.0d
 		}
 		{
@@ -1452,7 +1487,7 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.paper.title}"
-			x: -3.5d
+			x: -2.5d
 			y: 11.5d
 		}
 		{
@@ -1475,7 +1510,7 @@
 				type: "item"
 			}]
 			title: "{quests.metal_age.bronze_goodies.title}"
-			x: -22.5d
+			x: -21.0d
 			y: -2.0d
 		}
 		{
@@ -1499,7 +1534,7 @@
 				type: "item"
 			}]
 			title: "{quests.metal_age.wrought_iron_goodies.title}"
-			x: -12.0d
+			x: -10.5d
 			y: -2.0d
 		}
 		{
@@ -1523,7 +1558,7 @@
 				type: "item"
 			}]
 			title: "{quests.metal_age.steel_goodies.title}"
-			x: -5.5d
+			x: -4.0d
 			y: 0.0d
 		}
 		{
@@ -1565,21 +1600,25 @@
 				}
 				{
 					count: 22L
+					disable_toast: true
 					id: "71D6716A2B985592"
-					item: { Count: 22, id: "gtceu:steam_machine_casing" }
+					item: "gtceu:steam_machine_casing"
 					type: "item"
 				}
 				{
+					disable_toast: true
 					id: "26D9013B4161E463"
 					item: "gtceu:steam_input_hatch"
 					type: "item"
 				}
 				{
+					disable_toast: true
 					id: "7D354B529103D126"
 					item: "gtceu:steam_input_bus"
 					type: "item"
 				}
 				{
+					disable_toast: true
 					id: "63B935735E346133"
 					item: "gtceu:steam_output_bus"
 					type: "item"
@@ -1601,7 +1640,7 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.rotation_speed_controller.title}"
-			x: -7.5d
+			x: -6.0d
 			y: 0.0d
 		}
 		{
@@ -1618,7 +1657,7 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.resin_boards.title}"
-			x: -11.5d
+			x: -10.5d
 			y: 11.5d
 		}
 		{
@@ -1652,7 +1691,7 @@
 				}
 			]
 			title: "{quests.metal_age.coke_oven.title}"
-			x: -14.5d
+			x: -13.0d
 			y: -2.0d
 		}
 		{
@@ -1687,7 +1726,7 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.basic_mech_press.title}"
-			x: -18.5d
+			x: -17.0d
 			y: -2.0d
 		}
 		{
@@ -1710,7 +1749,7 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.steel_mech_press.title}"
-			x: -7.5d
+			x: -6.0d
 			y: 4.0d
 		}
 		{
@@ -1725,7 +1764,7 @@
 				type: "checkmark"
 			}]
 			title: "{quests.steam_age.fuel_sources.title}"
-			x: -7.5d
+			x: -6.0d
 			y: -2.0d
 		}
 		{
@@ -1739,7 +1778,7 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.large_water_wheel.title}"
-			x: -3.5d
+			x: -2.0d
 			y: -2.0d
 		}
 		{
@@ -1761,8 +1800,8 @@
 				type: "item"
 			}]
 			title: "{quests.steam_age.supers.title}"
-			x: -10.5d
+			x: -6.0d
-			y: 13.5d
+			y: 13.0d
 		}
 		{
 			dependencies: ["0D0D461AE3A3F7BF"]
@@ -1791,7 +1830,7 @@
 				}
 			]
 			title: "{quests.steam_age.multiblock_tank.title}"
-			x: -16.5d
+			x: -15.0d
 			y: -2.0d
 		}
 		{
@@ -1809,36 +1848,42 @@
 					type: "item"
 				}
 				{
+					disable_toast: true
 					id: "5CC7BDBF599B405A"
 					item: "gtceu:steam_input_hatch"
 					type: "item"
 				}
 				{
+					disable_toast: true
 					id: "4998CA4B8DDF6E02"
 					item: "gtceu:steam_input_bus"
 					type: "item"
 				}
 				{
+					disable_toast: true
 					id: "31A69C679FC6F99A"
 					item: "gtceu:steam_output_bus"
 					type: "item"
 				}
 				{
 					count: 12L
+					disable_toast: true
 					id: "709D4C32D2F43ABD"
 					item: "gtceu:steam_machine_casing"
 					type: "item"
 				}
 				{
 					count: 4L
+					disable_toast: true
 					id: "559F1DA9AF2EC5C3"
-					item: { Count: 4, id: "gtceu:steel_machine_casing" }
+					item: "gtceu:steel_machine_casing"
 					type: "item"
 				}
 				{
 					count: 8L
+					disable_toast: true
 					id: "769C82179FD4F75B"
-					item: { Count: 8, id: "create:metal_girder" }
+					item: "create:metal_girder"
 					type: "item"
 				}
 			]
@@ -1861,30 +1906,35 @@
 					type: "item"
 				}
 				{
+					disable_toast: true
 					id: "5496E814C911D5C1"
 					item: "gtceu:steam_input_hatch"
 					type: "item"
 				}
 				{
+					disable_toast: true
 					id: "40181C28B6560C94"
 					item: "gtceu:steam_output_bus"
 					type: "item"
 				}
 				{
+					disable_toast: true
 					id: "249376D261C69933"
 					item: "gtceu:steam_input_bus"
 					type: "item"
 				}
 				{
 					count: 8L
+					disable_toast: true
 					id: "790DDB716EAE9769"
-					item: { Count: 8, id: "gtceu:steam_machine_casing" }
+					item: "gtceu:steam_machine_casing"
 					type: "item"
 				}
 				{
 					count: 8L
+					disable_toast: true
 					id: "266BA05C0A212C6C"
-					item: { Count: 8, id: "gtceu:bronze_firebox_casing" }
+					item: "gtceu:bronze_firebox_casing"
 					type: "item"
 				}
 			]
@@ -1907,36 +1957,42 @@
 					type: "item"
 				}
 				{
+					disable_toast: true
 					id: "3BBEAD3334C1E3D0"
 					item: "gtceu:steam_input_hatch"
 					type: "item"
 				}
 				{
+					disable_toast: true
 					id: "6D8C5AA895D6DC15"
 					item: "gtceu:steam_output_bus"
 					type: "item"
 				}
 				{
+					disable_toast: true
 					id: "0D2DC79ED3C74B1F"
 					item: "gtceu:steam_input_bus"
 					type: "item"
 				}
 				{
 					count: 7L
+					disable_toast: true
 					id: "4BDAA78AC3C92713"
 					item: "gtceu:steam_machine_casing"
 					type: "item"
 				}
 				{
 					count: 3L
+					disable_toast: true
 					id: "4DFE7CD587BFFAB9"
-					item: { Count: 3, id: "gtceu:bronze_machine_casing" }
+					item: "gtceu:bronze_machine_casing"
 					type: "item"
 				}
 				{
 					count: 6L
+					disable_toast: true
 					id: "7C5983298F614109"
-					item: { Count: 6, id: "gtceu:steel_frame" }
+					item: "gtceu:steel_frame"
 					type: "item"
 				}
 			]

config/ftbquests/quests/chapters/questsstoneage.snbt

@@ -32,14 +32,36 @@
 		}
 	]
 	order_index: 0
-	quest_links: [{
+	quest_links: [
-		id: "409385C6F6640BEA"
+		{
-		linked_quest: "427814F6E9386772"
+			id: "409385C6F6640BEA"
-		shape: "gear"
+			linked_quest: "427814F6E9386772"
-		size: 4.0d
+			shape: "gear"
-		x: 4.0d
+			size: 4.0d
-		y: 0.0d
+			x: 4.0d
-	}]
+			y: 0.0d
+		}
+		{
+			id: "66FB69B8381F5A01"
+			linked_quest: "67F40A90844EC0FC"
+			x: 8.0d
+			y: 2.0d
+		}
+		{
+			id: "78C8274E7CA78B12"
+			linked_quest: "509C064AA92FD78F"
+			shape: "heart"
+			x: 1.0d
+			y: 16.0d
+		}
+		{
+			id: "5E38676D9AD5336C"
+			linked_quest: "21C58B2541BFA2EE"
+			shape: "heart"
+			x: -1.5d
+			y: 16.0d
+		}
+	]
 	quests: [
 		{
 			dependencies: ["427814F6E9386772"]
@@ -1507,32 +1529,6 @@
 			shape: "heart"
 			subtitle: "{quests.stone_age.meals.subtitle}"
 			tasks: [
-				{
-					id: "7D77C6BFE159FDC9"
-					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: "firmalife:food/cooked_pizza"
-					}
-					type: "item"
-				}
 				{
 					id: "597808680916715E"
 					item: {
@@ -1674,6 +1670,7 @@
 				}
 			}
 			id: "1562419608EB333D"
+			shape: "circle"
 			size: 1.5d
 			subtitle: "{quests.stone_age.hydration.subtitle}"
 			tasks: [{
@@ -1847,6 +1844,7 @@
 			description: ["{quests.stone_age.water_bucket.desc}"]
 			icon: "minecraft:water_bucket"
 			id: "1F9321F1743A0B79"
+			shape: "circle"
 			subtitle: "{quests.stone_age.water_bucket.subtitle}"
 			tasks: [{
 				id: "64BE95016DF461FD"
@@ -2295,6 +2293,8 @@
 				"{quests.stone_age.medical_conditions.desc.1}"
 				"{@pagebreak}"
 				"{quests.stone_age.medical_conditions.desc.2}"
+				"{@pagebreak}"
+				"{quests.stone_age.medical_conditions.desc.3}"
 			]
 			icon: "createdeco:decal_skull"
 			id: "00117AD40FACB89D"

config/ftbquests/quests/chapters/queststfc_tips.snbt

@@ -262,6 +262,7 @@
 			guide_page: "tfc:field_guide tfc:firmalife/beekeeping"
 			icon: "firmalife:beeswax"
 			id: "1071B804483BB882"
+			shape: "circle"
 			subtitle: "{quests.tfg_tips.beekeeping.subtitle}"
 			tasks: [{
 				id: "07A6195AEE51DAB7"
@@ -627,6 +628,7 @@
 			guide_page: "tfc:field_guide tfc:mechanics/decay"
 			icon: "minecraft:clock"
 			id: "4047EE998BC4CD03"
+			shape: "circle"
 			subtitle: "{quests.tfg_tips.preservation.subtitle}"
 			tasks: [{
 				id: "29CDDE027CC8B84A"
@@ -675,6 +677,7 @@
 		{
 			dependencies: ["4047EE998BC4CD03"]
 			description: ["{quests.tfg_tips.get_milk.desc}"]
+			icon: "minecraft:milk_bucket"
 			id: "3C7F170E065B60E1"
 			subtitle: "{quests.tfg_tips.get_milk.subtitle}"
 			tasks: [
@@ -684,7 +687,7 @@
 						Count: 1
 						id: "ftbfiltersystem:smart_filter"
 						tag: {
-							"ftbfiltersystem:filter": "or(only_one(nbt(fuzzy:{fluid:{Amount:1000,FluidName:\"minecraft:milk\"}})item(minecraft:milk_bucket))only_one(nbt(fuzzy:{fluid:{Amount:1000,FluidName:\"firmalife:yak_milk\"}})item(firmalife:bucket/yak_milk))only_one(nbt(fuzzy:{fluid:{Amount:1000,FluidName:\"firmalife:goat_milk\"}})item(firmalife:bucket/goat_milk)))"
+							"ftbfiltersystem:filter": "or(item(minecraft:milk_bucket)item(firmalife:bucket/yak_milk)item(firmalife:bucket/goat_milk)item(tfc_gourmet:ox_milk_bucket)item(tfc_gourmet:sheep_milk_bucket)item(tfc_gourmet:alpaca_milk_bucket))"
 						}
 					}
 					optional_task: true
@@ -827,6 +830,7 @@
 			]
 			dependency_requirement: "one_completed"
 			description: ["{quests.tfg_tips.brine_something.desc}"]
+			icon: "tfc:bucket/brine"
 			id: "71393B553550EA42"
 			subtitle: "{quests.tfg_tips.brine_something.subtitle}"
 			tasks: [
@@ -890,6 +894,7 @@
 			]
 			dependency_requirement: "one_completed"
 			description: ["{quests.tfg_tips.pickle_something.desc}"]
+			icon: "tfc:bucket/vinegar"
 			id: "060C84862C9BB9CE"
 			subtitle: "{quests.tfg_tips.pickle_something.subtitle}"
 			tasks: [
@@ -950,6 +955,7 @@
 			dependencies: ["52D944ADA884EFEF"]
 			description: ["{quests.tfg_tips.dry_fruit.desc}"]
 			guide_page: "tfc:field_guide tfc:firmalife/drying"
+			icon: "firmalife:drying_mat"
 			id: "4417A395801DC4E5"
 			subtitle: "{quests.tfg_tips.dry_fruit.subtitle}"
 			tasks: [
@@ -995,6 +1001,7 @@
 		{
 			dependencies: ["52290DFBF39F0D07"]
 			description: ["{quests.tfg_tips.salt_meat.desc}"]
+			icon: "tfc:powder/salt"
 			id: "01CB939598271EC4"
 			subtitle: "{quests.tfg_tips.salt_meat.subtitle}"
 			tasks: [
@@ -1042,6 +1049,7 @@
 			dependency_requirement: "one_completed"
 			description: ["{quests.tfg_tips.smoke_meat.desc}"]
 			guide_page: "tfc:field_guide tfc:firmalife/smoking"
+			icon: "tfc:wool_yarn"
 			id: "1FC019B45383695E"
 			subtitle: "{quests.tfg_tips.smoke_meat.subtitle}"
 			tasks: [
@@ -1091,6 +1099,7 @@
 			]
 			dependency_requirement: "one_completed"
 			description: ["{quests.tfg_tips.cook_meat.desc}"]
+			icon: "firmalife:cured_oven_top"
 			id: "5335969963D0A6CC"
 			subtitle: "{quests.tfg_tips.cook_meat.subtitle}"
 			tasks: [
@@ -1174,6 +1183,16 @@
 		{
 			dependencies: ["0FCB88A64D3FBF0F"]
 			description: ["{quests.tfg_tips.smoke_cheese.desc}"]
+			icon: {
+				Count: 1
+				ForgeCaps: {
+					"tfc:food": {
+						creationDate: -9223372036854775808L
+						traits: [ ]
+					}
+				}
+				id: "ad_astra:cheese"
+			}
 			id: "6FF80B0E333D2F14"
 			subtitle: "{quests.tfg_tips.smoke_cheese.subtitle}"
 			tasks: [
@@ -1214,10 +1233,15 @@
 		}
 		{
 			dependencies: ["2EFB241490502DB3"]
-			description: ["{quests.tfg_tips.greenhouse.desc}"]
+			description: [
+				"{quests.tfg_tips.greenhouse.desc}"
+				"\\n"
+				"{image:tfg:textures/quests/firmalife_greenhouse.png width:250 height:150 align:center}"
+			]
 			guide_page: "tfc:field_guide tfc:firmalife/greenhouse"
 			icon: "firmalife:large_planter"
 			id: "07FBA022050DA24A"
+			shape: "circle"
 			subtitle: "{quests.tfg_tips.greenhouse.subtitle}"
 			tasks: [{
 				id: "63D7E5FDBE2B66D5"
@@ -1567,6 +1591,7 @@
 				}
 			}
 			id: "28333A7852497C4D"
+			shape: "circle"
 			subtitle: "{quests.tfg_tips.status_effects.subtitle}"
 			tasks: [{
 				id: "1F96808948B568A2"
@@ -1736,7 +1761,9 @@
 		{
 			dependencies: ["4AA0EBFBA5D8788C"]
 			description: ["{quests.tfg_tips.beneath_prep.desc}"]
+			icon: "create:clipboard"
 			id: "4A8910950F638BB5"
+			shape: "circle"
 			subtitle: "{quests.tfg_tips.beneath_prep.subtitle}"
 			tasks: [{
 				id: "2E029DE0398319F2"
@@ -1838,6 +1865,7 @@
 				}
 			}
 			id: "098739E441CF565D"
+			shape: "circle"
 			subtitle: "{quests.tfg_tips.beneath_clothes.subtitle}"
 			tasks: [{
 				id: "70EF47E8FD504806"
@@ -1851,7 +1879,7 @@
 		{
 			dependencies: ["4A8910950F638BB5"]
 			description: ["{quests.tfg_tips.juicer.desc}"]
-			guide_page: "tfc:field_guide tfc:beneath:water"
+			guide_page: "tfc:field_guide tfc:beneath/water"
 			id: "3D845616A2F7083F"
 			subtitle: "{quests.tfg_tips.juicer.subtitle}"
 			tasks: [{
@@ -1866,7 +1894,9 @@
 		{
 			dependencies: ["70DA01DFDAE54224"]
 			description: ["{quests.tfg_tips.fuck_go_back.desc}"]
+			icon: "minecraft:ladder"
 			id: "4FD6D93811DADCE4"
+			shape: "circle"
 			subtitle: "{quests.tfg_tips.fuck_go_back.subtitle}"
 			tasks: [{
 				id: "6D482B9189A97E0F"
@@ -2137,6 +2167,96 @@
 			x: 0.0d
 			y: -10.5d
 		}
+		{
+			dependencies: [
+				"30DD0DDF86C96926"
+				"1F41C35890E2C44F"
+			]
+			dependency_requirement: "one_completed"
+			description: ["{quests.tfg_tips.food_automation.desc}"]
+			icon: "tfg:lv_food_oven"
+			id: "46111F4D970EE3C5"
+			optional: true
+			subtitle: "{quests.tfg_tips.food_automation.subtitle}"
+			tasks: [
+				{
+					id: "770BC20A8062A6BD"
+					item: "tfg:lv_food_processor"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "3EB084CA435F8C19"
+					item: "tfg:lv_food_oven"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "150B81D83DFFB9A1"
+					item: "gtceu:lv_robot_arm"
+					optional_task: true
+					type: "item"
+				}
+				{
+					id: "2332EB45D64DB9FB"
+					type: "checkmark"
+				}
+			]
+			title: "{quests.tfg_tips.food_automation.title}"
+			x: 0.0d
+			y: -12.0d
+		}
+		{
+			dependencies: ["2EFB241490502DB3"]
+			description: ["{quests.tfg_tips.composter.desc}"]
+			guide_page: "tfc:field_guide tfc:mechanics/composter"
+			id: "264D138DFFE13BD0"
+			subtitle: "{quests.tfg_tips.composter.subtitle}"
+			tasks: [{
+				id: "2EE61FD71FE330D3"
+				item: "tfc:composter"
+				type: "item"
+			}]
+			title: "{quests.tfg_tips.composter.title}"
+			x: 2.0d
+			y: -4.0d
+		}
+		{
+			dependencies: ["264D138DFFE13BD0"]
+			description: ["{quests.tfg_tips.universal_compost.desc}"]
+			id: "13E4AE4F46A1A1A0"
+			subtitle: "{quests.tfg_tips.universal_compost.subtitle}"
+			tasks: [
+				{
+					id: "6F3BD81EAD7CC109"
+					item: {
+						Count: 1
+						id: "ftbfiltersystem:smart_filter"
+						tag: {
+							"ftbfiltersystem:filter": "or(item(tfg:universal_compost_browns)item(tfg:universal_compost_greens))"
+						}
+					}
+					title: "{quests.tfg_tips.universal_compost.task.1}"
+					type: "item"
+				}
+				{
+					id: "787E7A402B3162B5"
+					item: {
+						Count: 1
+						id: "ftbfiltersystem:smart_filter"
+						tag: {
+							"ftbfiltersystem:filter": "or(item(tfg:universal_compost_browns_bag)item(tfg:universal_compost_greens_bag))"
+						}
+					}
+					optional_task: true
+					title: "{quests.tfg_tips.universal_compost.task.2}"
+					type: "item"
+				}
+			]
+			title: "{quests.tfg_tips.universal_compost.title}"
+			x: 4.0d
+			y: -4.0d
+		}
 	]
 	subtitle: ["{quests.tfg_tips.subtitle}"]
 	title: "{quests.tfg_tips}"

config/ftbquests/quests/chapters/tips__tools.snbt

@@ -790,7 +790,10 @@
 			y: 15.0d
 		}
 		{
-			dependencies: ["02FDECC931B5E8EF"]
+			dependencies: [
+				"02FDECC931B5E8EF"
+				"3E6DC423FE4A99F7"
+			]
 			description: [
 				"{quests.tfg_tips.gt_power_tools.desc.1}"
 				"{@pagebreak}"
@@ -823,20 +826,13 @@
 				}
 			}
 			id: "2D2CB8104E40E808"
+			optional: true
 			subtitle: "{quests.tfg_tips.gt_power_tools.subtitle}"
-			tasks: [
+			tasks: [{
-				{
+				id: "5DA224C235E227E3"
-					id: "5DA224C235E227E3"
+				title: "GT Tool"
-					title: "GT Tool"
+				type: "checkmark"
-					type: "checkmark"
+			}]
-				}
-				{
-					id: "5B0BF3A94CA0D8A9"
-					item: "gtceu:lv_charger_4x"
-					optional_task: true
-					type: "item"
-				}
-			]
 			title: "{quests.tfg_tips.gt_power_tools.title}"
 			x: 10.5d
 			y: 11.5d
@@ -2506,10 +2502,14 @@
 			y: 1.0d
 		}
 		{
-			dependencies: ["7FA5B6354A49C396"]
+			dependencies: [
+				"7FA5B6354A49C396"
+				"560B17BFBE8D477D"
+			]
 			description: ["{quests.tfg_tips.first_sacks.desc}"]
 			guide_page: "tfc:field_guide tfc:sns/leather_sack"
 			id: "509C064AA92FD78F"
+			optional: true
 			subtitle: "{quests.tfg_tips.first_sacks.subtitle}"
 			tasks: [
 				{
@@ -2577,10 +2577,15 @@
 			y: -0.5d
 		}
 		{
-			dependencies: ["509C064AA92FD78F"]
+			dependencies: [
+				"509C064AA92FD78F"
+				"234B68E86F72C29E"
+			]
+			dependency_requirement: "one_completed"
 			description: ["{quests.tfg_tips.special_sacks.desc}"]
 			guide_page: "tfc:field_guide tfc:sns/ore_sack"
 			id: "21C58B2541BFA2EE"
+			optional: true
 			shape: "heart"
 			subtitle: "{quests.tfg_tips.special_sacks.subtitle}"
 			tasks: [
@@ -2613,7 +2618,6 @@
 						}
 						id: "sns:ore_sack"
 					}
-					optional_task: true
 					type: "item"
 				}
 			]
@@ -2644,10 +2648,14 @@
 			y: 5.0d
 		}
 		{
-			dependencies: ["7FA5B6354A49C396"]
+			dependencies: [
+				"7FA5B6354A49C396"
+				"015E7A116CCD3191"
+			]
 			description: ["{quests.tfg_tips.straw_basket.desc}"]
 			guide_page: "tfc:field_guide tfc:sns/straw_basket"
 			id: "67F40A90844EC0FC"
+			optional: true
 			subtitle: "{quests.tfg_tips.straw_basket.subtitle}"
 			tasks: [{
 				id: "542549225517097C"

config/greate-recipes.yaml

@@ -9,6 +9,19 @@ enableHardCreateRecipes: false
 # If false, GTCEu items will be used instead.
 useCreateItemsInRecipes: false
 
+# Should recipes from create that conflict with GTCEu recipes be enabled?
+# [WARNING]: This will not cover every single recipe conflict, only common conflicts (like components (plates/sheets)), or ore processing conflicts.
+disableConflictingRecipes: true
+
+# Should tiered encased fans process item entities?
+processItemEntitiesWithFan: false
+
+# Should recipes that cannot be removed be logged?
+logUnremovableRecipes: true
+
+# "Multiplier used for calculating how many ticks should initially be removed in fan processing recipes, based on how fast the fan is spinning."
+fanSpeedMultiplier: 0.5
+
 # Recipe types that should not be copied to Greate machines. Ex. 'gtceu:macerator' for macerator recipes
 ignoredRecipeTypes:
   - gtceu:ore_washer

config/immediatelyfast.json

@@ -1,9 +1,9 @@
 {
   "REGULAR_INFO": "----- Regular config values below -----",
-  "font_atlas_resizing": true,
+  "font_atlas_resizing": false,
   "map_atlas_generation": true,
   "hud_batching": false,
-  "fast_text_lookup": true,
+  "fast_text_lookup": false,
   "fast_buffer_upload": true,
   "COSMETIC_INFO": "----- Cosmetic only config values below (Does not optimize anything) -----",
   "dont_add_info_into_debug_hud": false,
@@ -18,4 +18,4 @@
   "debug_only_and_not_recommended_disable_hardware_conflict_handling": false,
   "debug_only_print_additional_error_information": false,
   "debug_only_use_last_usage_for_batch_ordering": false
-}
+}

config/sound_physics_remastered/occlusion.properties

@@ -216,4 +216,4 @@ minecraft\:jukebox=0.0
 # Lava (Block)
 minecraft\:lava=0.75
 # Water (Block)
-minecraft\:water=0.25
+\#minecraft\:water=0.25

config/via_romana.json

@@ -0,0 +1,62 @@
+{
+  "infrastructure_check_radius": 1,
+  "path_quality_threshold": 0.6,
+  "node_distance_minimum": 10,
+  "node_distance_maximum": 20,
+  "path_block_ids": [
+  ],
+  "path_block_tags": [
+    "tfc:paths",
+    "forge:gravel",
+    "rnr:gravel_road_blocks",
+    "rnr:gravel_road_slabs",
+    "rnr:gravel_road_stairs",
+    "forge:cobblestone",
+    "minecraft:stairs",
+    "minecraft:slabs",
+    "rnr:cobbled_road_blocks",
+    "rnr:cobbled_road_stairs",
+    "rnr:cobbled_road_slabs",
+    "minecraft:mineable/pickaxe",
+    "minecraft:mineable/axe"
+  ],
+  "path_block_strings": [
+  ],
+  "block_string_blacklist": [
+  ],
+  "invalid_dimensions": [],
+  "no_gui_charting": false,
+  "invalid_entities": [],
+  "warp_block_ids": [
+    "via_romana:warp_block"
+  ],
+  "warp_block_tags": [
+    "minecraft:all_signs"
+  ],
+  "travel_fatigue_cooldown": 6,
+  "fast_movement_speed": 0.0,
+  "direct_warp": false,
+  "fog_of_war_distance": 10,
+  "spline_animation_time": 2.0,
+  "maximum_map_dimension": 512,
+  "map_refresh_interval": 10,
+  "map_refresh_threshold": 10,
+  "map_save_interval": 5,
+  "biome_color_pairs": [],
+  "use_biome_fallback_for_lowres": false,
+  "enable_remote_map_access": true,
+  "enable_surveyor_landmark": false,
+  "enable_surveyor_landmark_coloring": false,
+  "invalid_block_overlay_opacity": 0.4,
+  "biome_map_opacity": 0.3,
+  "node_vignette_opacity": 1.0,
+  "line_colors": [
+    "#ffffff",
+    "#cccccc"
+  ],
+  "line_opacity": 1.0,
+  "enable_teleport_particles": true,
+  "enable_sign_particles": true,
+  "enable_custom_cursor": true,
+  "logging_enum": "NONE"
+}

config/waves-common.toml

@@ -10,10 +10,10 @@ waveSearchDistance = 14
 waveSpawnDistance = 0.0
 #Additional amount of waves to spawn.
 #Range: 0.0 ~ 1.7976931348623157E308
-waveSpawnAmount = 0.8
+waveSpawnAmount = 0.5
 #Time in ticks between each spawn sequence of waves. Set to 0 to disable waves.
 #Range: > 0
-waveSpawnFrequency = 30
+waveSpawnFrequency = 40
 #Maximum spawn distance from shore.
 #Range: 0.0 ~ 1.7976931348623157E308
 waveSpawnDistanceFromShoreMax = 48.0
@@ -25,10 +25,10 @@ waveSpawnDistanceFromShoreMin = 4.0
 waveSpriteCount = 5
 #How great should the chance for waves to deposit blocks be? Lower value = higher chance.
 #Range: > 1
-waveBlockDepositChance = 100
+waveBlockDepositChance = 1000
 #How often the waves should make a sound. Higher value = rarer.
 #Range: > 0
-waveBreakingSoundChance = 40
+waveBreakingSoundChance = 50
 #How fast the bioluminescence should change (octaves).
 #Range: > 1
 waveBioluminescenceChange = 16
@@ -43,10 +43,10 @@ waveSpawningFOVLimit = 140.0
 waveFindNearestShoreIterations = 3
 #Volume modifier for the waves. 1.0 = 100% volume.
 #Range: 0.0 ~ 10.0
-waveVolume = 1.0
+waveVolume = 0.8
 #The multiplier value for how strong the interaction force of the waves are. Higher value = stronger force.
 #Range: -1.7976931348623157E308 ~ 1.7976931348623157E308
-waveInteractionForceFactor = 1.0
+waveInteractionForceFactor = 2.0
 #How often the wave interaction should refresh/update. Higher values can yield better TPS at the cost of decreased interaction precision. Higher value => longer intervals between updates.
 #Range: > 1
 waveInteractionUpdateFrequency = 4

defaultconfigs/createhorsepower-server.toml

@@ -3,13 +3,13 @@
 creatureRPMRange = 16
 #How much stress small creatures can produce for the horse crank.
 #Range: > 1
-smallCreatureStressRange = 8
+smallCreatureStressRange = 16
 #How much stress medium creatures can produce for the horse crank.
 #Range: > 1
-mediumCreatureStressRange = 12
+mediumCreatureStressRange = 24
 #How much stress large creatures can produce for the horse crank.
 #Range: > 1
-largeCreatureStressRange = 16
+largeCreatureStressRange = 32
 #The multiplier for "Poor" paths
 #Range: 0.0 ~ 1.7976931348623157E308
 poorMultiplier = 0.5
@@ -30,5 +30,5 @@ smallCreatures = ["tfc:wolf", "tfc:dog", "tfc:pig", "tfc:sheep", "tfc:goat", "tf
 #Valid "Medium" creatures
 mediumCreatures = ["tfc:cow", "tfc:donkey", "tfc:dolphin", "wan_ancient_beasts:glider", "wan_ancient_beasts:soarer"]
 #Valid "Large" creatures
-largeCreatures = ["tfc:horse", "tfc:mule", "tfc:musk_ox", "tfc:yak", "tfg:sniffer", "wan_ancient_beasts:walker", "species:cruncher"]
+largeCreatures = ["tfc:horse", "tfc:mule", "tfc:musk_ox", "tfc:yak", "tfg:sniffer", "wan_ancient_beasts:walker", "species:cruncher", "wan_ancient_beasts:charger"]
 

defaultconfigs/framedblocks-server.toml

@@ -12,5 +12,5 @@
 	consumeCamoItem = true
 	#The light level to emit when glowstone dust is applied to a framed block
 	#Range: 0 ~ 15
-	glowstoneLightLevel = 15
+	glowstoneLightLevel = 3
 

defaultconfigs/tfc-server.toml

@@ -167,7 +167,7 @@ familiarityDecayLimit = 0.3
 		#
 		# Tank capacity of a crucible (in mB).
 		#Range: 0 ~ 2147483645
-		crucibleCapacity = 4032
+		crucibleCapacity = 4608
 		#
 		# A modifier for how fast fluid containers empty into crucibles. Containers will empty 1 mB every (this) number of ticks.
 		#Range: > 1
@@ -514,7 +514,7 @@ familiarityDecayLimit = 0.3
 	[blocks.mud]
 		#
 		# If TFC dirt blocks are able to be created into mud blocks using a water-filled fluid container.
-		enableDirtToMudCreation = true
+		enableDirtToMudCreation = false
 
 	[blocks.quern]
 		#

defaultconfigs/tfg-server.toml

@@ -26,7 +26,7 @@
 	can_glide_on_mars = false
 	#
 	#If true, gliders will function in the Ad Astra dimension Venus
-	can_glide_on_venus = false
+	can_glide_on_venus = true
 	#
 	#If true, gliders will function in the Ad Astra dimension Mercury
 	can_glide_on_mercury = false

defaultconfigs/toolbelt-server.toml

@@ -3,7 +3,7 @@
 	#List of items to force-allow placing in the belt. Takes precedence over blacklist.
 	whitelist = ["measurements:tape_measure"]
 	#List of items to disallow from placing in the belt. (whitelist takes precedence)
-	blacklist = ["tfclunchbox:lunchbox", "tfclunchbox:cooling_lunchbox", "tfclunchbox:electric_lunchbox", "sophisticatedbackpacks:backpack", "sophisticatedbackpacks:iron_backpack", "sophisticatedbackpacks:gold_backpack", "sophisticatedbackpacks:diamond_backpack", "sophisticatedbackpacks:netherite_backpack", "tfc:ceramic/cyan_glazed_vessel", "tfc:ceramic/purple_glazed_vessel", "tfc:ceramic/blue_glazed_vessel", "tfc:ceramic/brown_glazed_vessel", "tfc:ceramic/green_glazed_vessel", "tfc:ceramic/red_glazed_vessel", "tfc:ceramic/black_glazed_vessel", "tfc:ceramic/large_vessel/gray", "tfc:ceramic/large_vessel/pink", "tfc:ceramic/large_vessel/lime", "tfc:ceramic/large_vessel/yellow", "tfc:ceramic/large_vessel/light_blue", "tfc:ceramic/large_vessel/magenta", "tfc:ceramic/large_vessel/orange", "tfc:ceramic/large_vessel/white", "tfc:ceramic/large_vessel", "tfc:ceramic/large_vessel/light_gray", "tfc:ceramic/large_vessel/cyan", "tfc:ceramic/large_vessel/purple", "tfc:ceramic/large_vessel/blue", "tfc:ceramic/large_vessel/brown", "tfc:ceramic/large_vessel/green", "tfc:ceramic/large_vessel/red", "tfc:ceramic/large_vessel/black", "tfc:ceramic/vessel", "tfc:ceramic/light_gray_glazed_vessel", "tfc:ceramic/gray_glazed_vessel", "tfc:ceramic/pink_glazed_vessel", "tfc:ceramic/lime_glazed_vessel", "tfc:ceramic/yellow_glazed_vessel", "tfc:ceramic/light_blue_glazed_vessel", "tfc:ceramic/magenta_glazed_vessel", "tfc:ceramic/orange_glazed_vessel", "tfc:ceramic/white_glazed_vessel"]
+	blacklist = ["tfclunchbox:lunchbox", "tfclunchbox:cooling_lunchbox", "tfclunchbox:electric_lunchbox", "sophisticatedbackpacks:backpack", "sophisticatedbackpacks:iron_backpack", "sophisticatedbackpacks:gold_backpack", "sophisticatedbackpacks:diamond_backpack", "sophisticatedbackpacks:netherite_backpack", "tfc:ceramic/cyan_glazed_vessel", "tfc:ceramic/purple_glazed_vessel", "tfc:ceramic/blue_glazed_vessel", "tfc:ceramic/brown_glazed_vessel", "tfc:ceramic/green_glazed_vessel", "tfc:ceramic/red_glazed_vessel", "tfc:ceramic/black_glazed_vessel", "tfc:ceramic/large_vessel/gray", "tfc:ceramic/large_vessel/pink", "tfc:ceramic/large_vessel/lime", "tfc:ceramic/large_vessel/yellow", "tfc:ceramic/large_vessel/light_blue", "tfc:ceramic/large_vessel/magenta", "tfc:ceramic/large_vessel/orange", "tfc:ceramic/large_vessel/white", "tfc:ceramic/large_vessel", "tfc:ceramic/large_vessel/light_gray", "tfc:ceramic/large_vessel/cyan", "tfc:ceramic/large_vessel/purple", "tfc:ceramic/large_vessel/blue", "tfc:ceramic/large_vessel/brown", "tfc:ceramic/large_vessel/green", "tfc:ceramic/large_vessel/red", "tfc:ceramic/large_vessel/black", "tfc:ceramic/vessel", "tfc:ceramic/light_gray_glazed_vessel", "tfc:ceramic/gray_glazed_vessel", "tfc:ceramic/pink_glazed_vessel", "tfc:ceramic/lime_glazed_vessel", "tfc:ceramic/yellow_glazed_vessel", "tfc:ceramic/light_blue_glazed_vessel", "tfc:ceramic/magenta_glazed_vessel", "tfc:ceramic/orange_glazed_vessel", "tfc:ceramic/white_glazed_vessel", "sns:burlap_sack", "sns:frame_pack", "sns:leather_sack", "sns:ore_sack", "sns:quiver", "sns:seed_pouch", "sns:straw_basket"]
 	#When set to false, stackable items will no longer be allowed by default.
 	allowAllNonStackableItems = true
 

defaultconfigs/vintageimprovements-server.toml

@@ -21,7 +21,7 @@
 			#.
 			#Medium speed value for grinder crafts, speedLimits = 2.
 			#Range: 1 ~ 256
-			mediumSpeedValue = 128
+			mediumSpeedValue = 64
 			#.
 			#Allows sandpaper crafts on belt grinder, when recipes collides belt grinder recipe have priority.
 			allowSandpaperPolishingOnGrinder = true

defaultconfigs/wan_ancient_beasts-server.toml

@@ -74,3 +74,30 @@
 	#Range: 1.0 ~ 1024.0
 	health = 80.0
 
+#Raider Attributes
+[charger]
+	#Raider health [default: 60]
+	#Range: 1.0 ~ 1024.0
+	health = 200.0
+	#Raider armor [default: 4]
+	#Range: 0.0 ~ 30.0
+	armor = 6.0
+	#Raider attack damage [default: 15]
+	#Range: 0.0 ~ 1024.0
+	armorToughness = 4.0
+
+[raider]
+	#Raider health [default: 60]
+	#Range: 1.0 ~ 1024.0
+	health = 200.0
+	#Raider armor [default: 4]
+	#Range: 0.0 ~ 30.0
+	armor = 6.0
+	#Raider attack damage [default: 15]
+	#Range: 0.0 ~ 1024.0
+	armorToughness = 4.0
+
+[snatcher]
+	#Raider health [default: 60]
+	#Range: 1.0 ~ 1024.0
+	health = 50.0

kubejs/assets/ad_astra/lang/de_de.json

@@ -0,0 +1,169 @@
+{
+  "__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": "Sauerstoffverteiler",
+  "block.ad_astra.infernal_spire_block": "Höllische Spitze",
+  "block.ad_astra.moon_sand": "Grauer Sand",
+  "block.ad_astra.moon_stone": "Rauer Anorthosit",
+  "block.ad_astra.moon_cobblestone": "Anorthositschotter",
+  "block.ad_astra.moon_cobblestone_slab": "Anorthositschotterstufe",
+  "block.ad_astra.moon_cobblestone_stairs": "Anorthositschottertreppe",
+  "block.ad_astra.moon_pillar": "Anorthositsäule",
+  "block.ad_astra.moon_stone_brick_slab": "Anorthositziegelstufe",
+  "block.ad_astra.moon_stone_brick_stairs": "Anorthositziegeltreppe",
+  "block.ad_astra.moon_stone_brick_wall": "Anorthositziegelwand",
+  "block.ad_astra.moon_stone_bricks": "Anorthositziegel",
+  "block.ad_astra.moon_stone_slab": "Raue Anorthositstufe",
+  "block.ad_astra.moon_stone_stairs": "Raue Anorthosittreppe",
+  "block.ad_astra.chiseled_moon_stone_bricks": "Gemeißelte Anorthositziegel",
+  "block.ad_astra.chiseled_moon_stone_slab": "Gemeißelte Anorthositstufe",
+  "block.ad_astra.chiseled_moon_stone_stairs": "Gemeißelte Anorthosittreppe",
+  "block.ad_astra.cracked_moon_stone_bricks": "Rissige Anorthositziegel",
+  "block.ad_astra.polished_moon_stone": "Polierter Anorthosit",
+  "block.ad_astra.polished_moon_stone_slab": "Polierte Anorthositstufe",
+  "block.ad_astra.polished_moon_stone_stairs": "Polierte Anorthosittreppe",
+  "block.ad_astra.sky_stone": "Meteorit",
+  "block.ad_astra.moon_deepslate": "Rauer Norit",
+  "block.ad_astra.cheese_block": "Mondkäseblock",
+  "block.ad_astra.moon_cheese_ore": "Anorthosit Käseerz",
+  "block.ad_astra.glacian_log": "Gletscherstamm",
+  "block.ad_astra.stripped_glacian_log": "Entrindeter Gletscherstamm",
+  "block.ad_astra.glacian_leaves": "Gletscherlamellen",
+  "block.ad_astra.mars_sand": "Argillit Sand",
+  "block.ad_astra.mars_stone": "Rauer Argillit",
+  "block.ad_astra.mars_cobblestone": "Argillitschotter",
+  "block.ad_astra.mars_cobblestone_slab": "Argillitschotterstufe",
+  "block.ad_astra.mars_cobblestone_stairs": "Argillitschotterstufe",
+  "block.ad_astra.mars_pillar": "Argillitsäule",
+  "block.ad_astra.mars_stone_brick_slab": "Argillitziegelstufe",
+  "block.ad_astra.mars_stone_brick_stairs": "Argillitziegeltreppe",
+  "block.ad_astra.mars_stone_brick_wall": "Argillitziegelwand",
+  "block.ad_astra.mars_stone_bricks": "Argillitziegel",
+  "block.ad_astra.mars_stone_slab": "Raue Argillitstufe",
+  "block.ad_astra.mars_stone_stairs": "Raue Argillittreppe",
+  "block.ad_astra.chiseled_mars_stone_bricks": "Gemeißelte Argillitziegel",
+  "block.ad_astra.chiseled_mars_stone_slab": "Gemeißelte Argillitstufe",
+  "block.ad_astra.chiseled_mars_stone_stairs": "Gemeißelte Argillittreppe",
+  "block.ad_astra.cracked_mars_stone_bricks": "Rissige Argillitziegel",
+  "block.ad_astra.polished_mars_stone": "Polierter Argillit",
+  "block.ad_astra.polished_mars_stone_slab": "Polierte Argillitstufe",
+  "block.ad_astra.polished_mars_stone_stairs": "Polierte Argillittreppe",
+  "block.ad_astra.conglomerate": "Mesa Deckgestein",
+  "block.ad_astra.polished_conglomerate": "Poliertes Mesa Deckgestein",
+  "block.ad_astra.venus_sand": "Trachyt Sand",
+  "block.ad_astra.venus_stone": "Rauer Trachyt",
+  "block.ad_astra.venus_cobblestone": "Trachytschotter",
+  "block.ad_astra.venus_cobblestone_slab": "Trachytschotterstufe",
+  "block.ad_astra.venus_cobblestone_stairs": "Trachytschottertreppe",
+  "block.ad_astra.venus_pillar": "Trachytsäule",
+  "block.ad_astra.venus_stone_brick_slab": "Trachytziegelstufe",
+  "block.ad_astra.venus_stone_brick_stairs": "Trachytziegeltreppe",
+  "block.ad_astra.venus_stone_brick_wall": "Trachytziegelwand",
+  "block.ad_astra.venus_stone_bricks": "Trachytziegel",
+  "block.ad_astra.venus_stone_slab": "Raue Trachytstufe",
+  "block.ad_astra.venus_stone_stairs": "Raue Trachyttreppe",
+  "block.ad_astra.chiseled_venus_stone_bricks": "Gemeißelte Trachytziegel",
+  "block.ad_astra.chiseled_venus_stone_slab": "Gemeißelte Trachytstufe",
+  "block.ad_astra.chiseled_venus_stone_stairs": "Gemeißelte Trachyttreppe",
+  "block.ad_astra.cracked_venus_stone_bricks": "Rissige Trachytziegel",
+  "block.ad_astra.polished_venus_stone": "Polierter Trachyt",
+  "block.ad_astra.polished_venus_stone_slab": "Polierte Trachytstufe",
+  "block.ad_astra.polished_venus_stone_stairs": "Polierte Trachyttreppe",
+  "block.ad_astra.venus_sandstone": "Trachyt Sandstein",
+  "block.ad_astra.venus_sandstone_bricks": "Trachyt Sandsteinziegel",
+  "block.ad_astra.venus_sandstone_brick_slab": "Trachyt Sandsteinziegelstufe",
+  "block.ad_astra.venus_sandstone_brick_stairs": "Trachyt Sandsteinziegeltreppe",
+  "block.ad_astra.cracked_venus_sandstone_bricks": "Rissige Trachyt Sandsteinziegel",
+  "block.ad_astra.mercury_stone": "Rauer Komatiit",
+  "block.ad_astra.mercury_cobblestone": "Komatiitschotter",
+  "block.ad_astra.mercury_cobblestone_slab": "Komatiitschotterstufe",
+  "block.ad_astra.mercury_cobblestone_stairs": "Komatiitschottertreppe",
+  "block.ad_astra.mercury_pillar": "Komatiitsäule",
+  "block.ad_astra.mercury_stone_brick_slab": "Komatiitziegelstufe",
+  "block.ad_astra.mercury_stone_brick_stairs": "Komatiitziegeltreppe",
+  "block.ad_astra.mercury_stone_brick_wall": "Komatiitziegelwand",
+  "block.ad_astra.mercury_stone_bricks": "Komatiitziegel",
+  "block.ad_astra.mercury_stone_slab": "Raue Komatiitstufe",
+  "block.ad_astra.mercury_stone_stairs": "Raue Komatiittreppe",
+  "block.ad_astra.chiseled_mercury_stone_bricks": "Gemeißelte Komatiitziegel",
+  "block.ad_astra.chiseled_mercury_stone_slab": "Gemeißelte Komatiitstufe",
+  "block.ad_astra.chiseled_mercury_stone_stairs": "Gemeißelte Komatiittreppe",
+  "block.ad_astra.cracked_mercury_stone_bricks": "Rissige Komatiitziegel",
+  "block.ad_astra.polished_mercury_stone": "Polierter Komatiit",
+  "block.ad_astra.polished_mercury_stone_slab": "Polierte Komatiitstufe",
+  "block.ad_astra.polished_mercury_stone_stairs": "Polierte Komatiittreppe",
+  "block.ad_astra.glacio_stone": "Rauer Phonolith",
+  "block.ad_astra.glacio_cobblestone": "Phonolithschotter",
+  "block.ad_astra.glacio_cobblestone_slab": "Phonolithschotterstufe",
+  "block.ad_astra.glacio_cobblestone_stairs": "Phonolithschottertreppe",
+  "block.ad_astra.glacio_pillar": "Phonolithsäule",
+  "block.ad_astra.glacio_stone_brick_slab": "Phonolithziegelstufe",
+  "block.ad_astra.glacio_stone_brick_stairs": "Phonolithziegeltreppe",
+  "block.ad_astra.glacio_stone_brick_wall": "Phonolithziegelwand",
+  "block.ad_astra.glacio_stone_bricks": "Phonolithziegel",
+  "block.ad_astra.glacio_stone_slab": "Raue Phonolithstufe",
+  "block.ad_astra.glacio_stone_stairs": "Raue Phonolithtreppe",
+  "block.ad_astra.chiseled_glacio_stone_bricks": "Gemeißelte Phonolithziegel",
+  "block.ad_astra.chiseled_glacio_stone_slab": "Gemeißelte Phonolithstufe",
+  "block.ad_astra.chiseled_glacio_stone_stairs": "Gemeißelte Phonolithtreppe",
+  "block.ad_astra.cracked_glacio_stone_bricks": "Rissige Phonolithziegel",
+  "block.ad_astra.polished_glacio_stone": "Polierter Phonolith",
+  "block.ad_astra.polished_glacio_stone_slab": "Polierte Phonolithstufe",
+  "block.ad_astra.polished_glacio_stone_stairs": "Polierte Phonolithtreppe",
+  "block.ad_astra.glacio_globe": "Europa Globus",
+  "entity.ad_astra.corrupted_lunarian": "Mondzombie",
+  "entity.ad_astra.martian_raptor": "Skelettraptor",
+  "entity.ad_astra.tier_1_rocket": "R-Aluminostahlrakete",
+  "entity.ad_astra.tier_2_rocket": "ASM 4914 Titanrakete",
+  "entity.ad_astra.tier_3_rocket": "45-Ti Wolframstahlrakete",
+  "entity.ad_astra.tier_1_rover": "Rover",
+  "fluid_type.ad_astra.oxygen": "Sauerstoff",
+  "item.ad_astra.steel_cable": "Einfaches RF Kabel",
+  "item.ad_astra.desh_cable": "Fortgeschrittenes RF Kabel",
+  "item.ad_astra.tier_1_rocket": "R-Aluminostahlrakete",
+  "item.ad_astra.tier_2_rocket": "ASM 4914 Titanrakete",
+  "item.ad_astra.tier_3_rocket": "45-Ti Wolframstahlrakete",
+  "item.ad_astra.oxygen_bucket": "Sauerstoffeimer",
+  "item.ad_astra.tier_1_rover": "Rover",
+  "item.ad_astra.photovoltaic_etrium_cell": "Fortgeschrittene Photovoltaikzelle",
+  "item.ad_astra.photovoltaic_vesnium_cell": "Energium Photovoltaikzelle",
+  "item.ad_astra.ostrum_tank": "Ostrum Feststoffrakete",
+  "item.ad_astra.steel_engine": "Stahl Raketentriebwerk",
+  "item.ad_astra.desh_engine": "Desh Raketentriebwerk",
+  "item.ad_astra.ostrum_engine": "Ostrum Raketentriebwerk",
+  "item.ad_astra.netherite_space_helmet": "§bWolframstahl Weltraumhelm",
+  "item.ad_astra.netherite_space_suit": "§bWolframstahl Weltraumanzug",
+  "item.ad_astra.netherite_space_pants": "§bWolframstahl Weltraumbeinschutz",
+  "item.ad_astra.netherite_space_boots": "§bWolframstahl Weltraumstiefel",
+  "item.ad_astra.cheese": "Mondkäse",
+  "dimension.ad_astra.glacio": "Europa",
+  "dimension.ad_astra.glacio_orbit": "Europa Umlaufbahn",
+  "painting.ad_astra.glacio.title": "Europa",
+  "planet.ad_astra.glacio": "Europa",
+  "planet.ad_astra.glacio_orbit": "Europa Umlaufbahn",
+  "tagprefix.moon_stone": "Anorthosit %s Erz",
+  "tagprefix.moon_deepslate": "Norit %s Erz",
+  "tagprefix.mars_stone": "Argillit %s Erz",
+  "tagprefix.venus_stone": "Trachyt %s Erz",
+  "tagprefix.mercury_stone": "Komatiit %s Erz",
+  "tagprefix.glacio_stone": "Phonolith %s Erz",
+  "info.ad_astra.solar_panel": "Generiert Energie von der Sonne. Die generierte Energie ist abhängig vom Planeten.",
+  "tooltip.ad_astra.energy": "%s FE / %s FE",
+  "tooltip.ad_astra.energy_generation_per_tick": "Generiert %s FE pro Tick",
+  "tooltip.ad_astra.energy_in": "Zufuhr: %s FE/t",
+  "tooltip.ad_astra.energy_out": "Ausgabe: %s FE/t",
+  "tooltip.ad_astra.energy_per_tick": "%s FE/t",
+  "tooltip.ad_astra.energy_transfer_tick": "Transfer: %s FE/t",
+  "tooltip.ad_astra.energy_use_per_tick": "Verwendet %s FE pro Tick",
+  "tooltip.ad_astra.max_energy_in": "Max. Zufuhr: %s FE/t",
+  "tooltip.ad_astra.max_energy_out": "Max. Ausgabe: %s FE/t",
+  "tooltip.ad_astra.max_generation": "Max.: %s FE/t",
+  "tooltip.ad_astra.max_fluid_in": "Max. Zufuhr: %s mB/t",
+  "tooltip.ad_astra.max_fluid_out": "Max. Ausgabe: %s mB/t",
+  "tooltip.ad_astra.fluid": "%s mB / %s mB %s",
+  "tooltip.ad_astra.fluid_generation_per_iteration": "Generiert %s mB pro Iteration",
+  "tooltip.ad_astra.fluid_in": "Zufuhr: %s mB/t",
+  "tooltip.ad_astra.fluid_out": "Ausgabe: %s mB/t",
+  "tooltip.ad_astra.fluid_per_tick": "%s mB/t",
+  "tooltip.ad_astra.fluid_transfer_tick": "Transfer: %s mB/t",
+  "tooltip.ad_astra.fluid_use_per_iteration": "Verwendet %s mB pro Iteration"
+}

kubejs/assets/ad_astra/lang/en_us.json

@@ -2,7 +2,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": "Breathable Air Distributor",
   "block.ad_astra.infernal_spire_block": "Infernal Spire",
-  "block.ad_astra.moon_sand": "Lunar Sand",
+  "block.ad_astra.moon_sand": "Gray Sand",
   "block.ad_astra.moon_stone": "Raw Anorthosite",
   "block.ad_astra.moon_cobblestone": "Anorthosite Cobble",
   "block.ad_astra.moon_cobblestone_slab": "Anorthosite Cobble Slab",

kubejs/assets/ad_astra/lang/es_es.json

@@ -0,0 +1,169 @@
+{
+  "__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": "Distribuidor de aire respirable",
+  "block.ad_astra.infernal_spire_block": "Chapitel infernal",
+  "block.ad_astra.moon_sand": "Arena Lunar",
+  "block.ad_astra.moon_stone": "Anortosita en bruto",
+  "block.ad_astra.moon_cobblestone": "Roca de anortosita",
+  "block.ad_astra.moon_cobblestone_slab": "Losa de roca de anortosita",
+  "block.ad_astra.moon_cobblestone_stairs": "Escaleras de roca de anortosita",
+  "block.ad_astra.moon_pillar": "Pilar de anortosita",
+  "block.ad_astra.moon_stone_brick_slab": "Losa de ladrillos de anortosita",
+  "block.ad_astra.moon_stone_brick_stairs": "Escaleras de ladrillos de anortosita",
+  "block.ad_astra.moon_stone_brick_wall": "Muro de ladrillos de anortosita",
+  "block.ad_astra.moon_stone_bricks": "Ladrillos de anortosita",
+  "block.ad_astra.moon_stone_slab": "Losa de anortosita en bruto",
+  "block.ad_astra.moon_stone_stairs": "Escaleras de anortosita en bruto",
+  "block.ad_astra.chiseled_moon_stone_bricks": "Ladrillos de anortosita cincelados",
+  "block.ad_astra.chiseled_moon_stone_slab": "Losa de ladrillos de anortosita cincelados",
+  "block.ad_astra.chiseled_moon_stone_stairs": "Escaleras de ladrillos de anortosita cincelados",
+  "block.ad_astra.cracked_moon_stone_bricks": "Ladrillos de anortosita agrietados",
+  "block.ad_astra.polished_moon_stone": "Anortosita pulida",
+  "block.ad_astra.polished_moon_stone_slab": "Losa de anortosita pulida",
+  "block.ad_astra.polished_moon_stone_stairs": "Escaleras de anortosita pulida",
+  "block.ad_astra.sky_stone": "Meteorito",
+  "block.ad_astra.moon_deepslate": "Norita en bruto",
+  "block.ad_astra.cheese_block": "Bloque de queso lunar",
+  "block.ad_astra.moon_cheese_ore": "Mena de queso de anortosita",
+  "block.ad_astra.glacian_log": "Tallo glacial",
+  "block.ad_astra.stripped_glacian_log": "Tallo glacial sin corteza",
+  "block.ad_astra.glacian_leaves": "Lamella glacial",
+  "block.ad_astra.mars_sand": "Arena de argilita",
+  "block.ad_astra.mars_stone": "Argilita en bruto",
+  "block.ad_astra.mars_cobblestone": "Roca de argilita",
+  "block.ad_astra.mars_cobblestone_slab": "Losa de roca de argilita",
+  "block.ad_astra.mars_cobblestone_stairs": "Escaleras de roca de argilita",
+  "block.ad_astra.mars_pillar": "Pilar de argilita",
+  "block.ad_astra.mars_stone_brick_slab": "Losa de ladrillos de argilita",
+  "block.ad_astra.mars_stone_brick_stairs": "Escaleras de ladrillos de argilita",
+  "block.ad_astra.mars_stone_brick_wall": "Muro de ladrillos de argilita",
+  "block.ad_astra.mars_stone_bricks": "Ladrillos de argilita",
+  "block.ad_astra.mars_stone_slab": "Losa de argilita en bruto",
+  "block.ad_astra.mars_stone_stairs": "Escaleras de argilita en bruto",
+  "block.ad_astra.chiseled_mars_stone_bricks": "Ladrillos de argilita cincelados",
+  "block.ad_astra.chiseled_mars_stone_slab": "Losa de argilita cincelada",
+  "block.ad_astra.chiseled_mars_stone_stairs": "Escaleras de argilita cincelada",
+  "block.ad_astra.cracked_mars_stone_bricks": "Ladrillos de argilita agrietados",
+  "block.ad_astra.polished_mars_stone": "Argilita pulida",
+  "block.ad_astra.polished_mars_stone_slab": "Losa de argilita pulida",
+  "block.ad_astra.polished_mars_stone_stairs": "Escaleras de argilita pulida",
+  "block.ad_astra.conglomerate": "Roca de cubierta de meseta",
+  "block.ad_astra.polished_conglomerate": "Roca de cubierta de meseta pulida",
+  "block.ad_astra.venus_sand": "Arena de traquita",
+  "block.ad_astra.venus_stone": "Traquita en bruto",
+  "block.ad_astra.venus_cobblestone": "Roca de traquita",
+  "block.ad_astra.venus_cobblestone_slab": "Losa de roca de traquita",
+  "block.ad_astra.venus_cobblestone_stairs": "Escaleras de roca de traquita",
+  "block.ad_astra.venus_pillar": "Pilar de traquita",
+  "block.ad_astra.venus_stone_brick_slab": "Losa de ladrillos de traquita",
+  "block.ad_astra.venus_stone_brick_stairs": "Escaleras de ladrillos de traquita",
+  "block.ad_astra.venus_stone_brick_wall": "Muro de ladrillos de traquita",
+  "block.ad_astra.venus_stone_bricks": "Ladrillos de traquita",
+  "block.ad_astra.venus_stone_slab": "Losa de traquita en bruto",
+  "block.ad_astra.venus_stone_stairs": "Escaleras de traquita en bruto",
+  "block.ad_astra.chiseled_venus_stone_bricks": "Ladrillos de traquita cincelados",
+  "block.ad_astra.chiseled_venus_stone_slab": "Losa de traquita cincelada",
+  "block.ad_astra.chiseled_venus_stone_stairs": "Escaleras de traquita cinceladas",
+  "block.ad_astra.cracked_venus_stone_bricks": "Ladrillos de traquita agrietados",
+  "block.ad_astra.polished_venus_stone": "Traquita pulida",
+  "block.ad_astra.polished_venus_stone_slab": "Losa de traquita pulida",
+  "block.ad_astra.polished_venus_stone_stairs": "Escaleras de traquita pulidas",
+  "block.ad_astra.venus_sandstone": "Arenisca de traquita",
+  "block.ad_astra.venus_sandstone_bricks": "Ladrillos de arenisca de traquita",
+  "block.ad_astra.venus_sandstone_brick_slab": "Losa de ladrillos de arenisca de traquita",
+  "block.ad_astra.venus_sandstone_brick_stairs": "Escaleras de ladrillos de arenisca de traquita",
+  "block.ad_astra.cracked_venus_sandstone_bricks": "Ladrillos de arenisca de traquita agrietados",
+  "block.ad_astra.mercury_stone": "Komatita en bruto",
+  "block.ad_astra.mercury_cobblestone": "Roca de komatita",
+  "block.ad_astra.mercury_cobblestone_slab": "Losa de roca de komatita",
+  "block.ad_astra.mercury_cobblestone_stairs": "Escaleras de roca de komatita",
+  "block.ad_astra.mercury_pillar": "Pilar de komatita",
+  "block.ad_astra.mercury_stone_brick_slab": "Losa de ladrillos de komatita",
+  "block.ad_astra.mercury_stone_brick_stairs": "Escaleras de ladrillos de komatita",
+  "block.ad_astra.mercury_stone_brick_wall": "Muro de ladrillos de komatita",
+  "block.ad_astra.mercury_stone_bricks": "Ladrillos de komatita",
+  "block.ad_astra.mercury_stone_slab": "Losa de komatita en bruto",
+  "block.ad_astra.mercury_stone_stairs": "Escaleras de komatita en bruto",
+  "block.ad_astra.chiseled_mercury_stone_bricks": "Ladrillos de komatita cincelados",
+  "block.ad_astra.chiseled_mercury_stone_slab": "Losa de komatita cincelados",
+  "block.ad_astra.chiseled_mercury_stone_stairs": "Escaleras de komatita cinceladas",
+  "block.ad_astra.cracked_mercury_stone_bricks": "Ladrillos de komatita agrietados",
+  "block.ad_astra.polished_mercury_stone": "Komatita pulida",
+  "block.ad_astra.polished_mercury_stone_slab": "Losa de komatita pulida",
+  "block.ad_astra.polished_mercury_stone_stairs": "Escaleras de komatita pulidas",
+  "block.ad_astra.glacio_stone": "Fonolita en bruto",
+  "block.ad_astra.glacio_cobblestone": "Roca de fonolita",
+  "block.ad_astra.glacio_cobblestone_slab": "Losa de roca de fonolita",
+  "block.ad_astra.glacio_cobblestone_stairs": "Escaleras de roca de fonolita",
+  "block.ad_astra.glacio_pillar": "Pilar de fonolita",
+  "block.ad_astra.glacio_stone_brick_slab": "Losa de ladrillos de fonolita",
+  "block.ad_astra.glacio_stone_brick_stairs": "Escaleras de ladrillos de fonolita",
+  "block.ad_astra.glacio_stone_brick_wall": "Muro de ladrillos de fonolita",
+  "block.ad_astra.glacio_stone_bricks": "Ladrillos de fonolita",
+  "block.ad_astra.glacio_stone_slab": "Losa de fonolita en bruto",
+  "block.ad_astra.glacio_stone_stairs": "Escaleras de fonolita en bruto",
+  "block.ad_astra.chiseled_glacio_stone_bricks": "Ladrillos de fonolita cincelados",
+  "block.ad_astra.chiseled_glacio_stone_slab": "Losa de fonolita cincelada",
+  "block.ad_astra.chiseled_glacio_stone_stairs": "Escaleras de fonolita cinceladas",
+  "block.ad_astra.cracked_glacio_stone_bricks": "Ladrillos de fonolita agrietados",
+  "block.ad_astra.polished_glacio_stone": "Fonolita pulida",
+  "block.ad_astra.polished_glacio_stone_slab": "Losa de fonolita pulida",
+  "block.ad_astra.polished_glacio_stone_stairs": "Escaleras de fonolita pulida",
+  "block.ad_astra.glacio_globe": "Globo de Europa",
+  "entity.ad_astra.corrupted_lunarian": "Zombi lunar",
+  "entity.ad_astra.martian_raptor": "Ave de presa esquelética",
+  "entity.ad_astra.tier_1_rocket": "Cohete de R-Aluminacero",
+  "entity.ad_astra.tier_2_rocket": "Cohete de titanio ASM 4914",
+  "entity.ad_astra.tier_3_rocket": "Cohete de acero de tungsteno 45-Ti",
+  "entity.ad_astra.tier_1_rover": "Astromóvil",
+  "fluid_type.ad_astra.oxygen": "Aire respirable",
+  "item.ad_astra.steel_cable": "Cable RF básico",
+  "item.ad_astra.desh_cable": "Cable RF avanzado",
+  "item.ad_astra.tier_1_rocket": "Cohete de R-Aluminacero",
+  "item.ad_astra.tier_2_rocket": "Cohete de titanio ASM 4914",
+  "item.ad_astra.tier_3_rocket": "Cohete de acero de tungsteno 45-Ti",
+  "item.ad_astra.oxygen_bucket": "Cubo con aire respirable",
+  "item.ad_astra.tier_1_rover": "Astromóvil",
+  "item.ad_astra.photovoltaic_etrium_cell": "Celda fotovoltáica avanzada",
+  "item.ad_astra.photovoltaic_vesnium_cell": "Celda fotovoltáica de energium",
+  "item.ad_astra.ostrum_tank": "Ostrum Booster Tank",
+  "item.ad_astra.steel_engine": "Motor de cohete de acero",
+  "item.ad_astra.desh_engine": "Motor de cohete de desh",
+  "item.ad_astra.ostrum_engine": "Motor de cohete de ostrum",
+  "item.ad_astra.netherite_space_helmet": "§bCasco espacial de acero de tungsteno",
+  "item.ad_astra.netherite_space_suit": "§bTraje espacial de acero de tungsteno",
+  "item.ad_astra.netherite_space_pants": "§bPantalones espaciales de acero de tungsteno",
+  "item.ad_astra.netherite_space_boots": "§bBotas espaciales de acero de tungsteno",
+  "item.ad_astra.cheese": "Queso lunar",
+  "dimension.ad_astra.glacio": "Europa",
+  "dimension.ad_astra.glacio_orbit": "Órbita de Europa",
+  "painting.ad_astra.glacio.title": "Europa",
+  "planet.ad_astra.glacio": "Europa",
+  "planet.ad_astra.glacio_orbit": "Órbita de Europa",
+  "tagprefix.moon_stone": "Mena de %s de anortosita",
+  "tagprefix.moon_deepslate": "Mena de %s de norita",
+  "tagprefix.mars_stone": "Mena de %s de argilita",
+  "tagprefix.venus_stone": "Mena de %s de traquita",
+  "tagprefix.mercury_stone": "Mena de %s de komatita",
+  "tagprefix.glacio_stone": "Mena de %s de fonolita",
+  "info.ad_astra.solar_panel": "Genera energía solar durante el día. La energía generada es dependiente del planeta.",
+  "tooltip.ad_astra.energy": "%s FE / %s FE",
+  "tooltip.ad_astra.energy_generation_per_tick": "Genera %s FE por tick",
+  "tooltip.ad_astra.energy_in": "Entrada: %s FE/t",
+  "tooltip.ad_astra.energy_out": "Salida: %s FE/t",
+  "tooltip.ad_astra.energy_per_tick": "%s FE/t",
+  "tooltip.ad_astra.energy_transfer_tick": "Transferencia: %s FE/t",
+  "tooltip.ad_astra.energy_use_per_tick": "Usa %s FE por tick",
+  "tooltip.ad_astra.max_energy_in": "Entrada máxima: %s FE/t",
+  "tooltip.ad_astra.max_energy_out": "Salida máxima: %s FE/t",
+  "tooltip.ad_astra.max_generation": "Máximo: %s FE/t",
+  "tooltip.ad_astra.max_fluid_in": "Entrada máxima: %s mB/t",
+  "tooltip.ad_astra.max_fluid_out": "Salida máxima: %s mB/t",
+  "tooltip.ad_astra.fluid": "%s mB / %s mB %s",
+  "tooltip.ad_astra.fluid_generation_per_iteration": "Genera %s mB por iteración",
+  "tooltip.ad_astra.fluid_in": "Entrada: %s mB/t",
+  "tooltip.ad_astra.fluid_out": "Salida: %s mB/t",
+  "tooltip.ad_astra.fluid_per_tick": "%s mB/t",
+  "tooltip.ad_astra.fluid_transfer_tick": "Transferencia: %s mB/t",
+  "tooltip.ad_astra.fluid_use_per_iteration": "Usa %s mB por iteración"
+}

kubejs/assets/ad_astra/lang/ja_jp.json

@@ -1,7 +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.moon_sand": "月の砂",
+  "block.ad_astra.moon_sand": "灰色の砂",
   "block.ad_astra.moon_stone": "斜長岩",
   "block.ad_astra.moon_cobblestone": "斜長岩の丸石",
   "block.ad_astra.moon_cobblestone_slab": "斜長岩の丸石のハーフブロック",

kubejs/assets/ad_astra/lang/ru_ru.json

@@ -111,16 +111,16 @@
   "block.ad_astra.glacio_globe": "Глобус Европы",
   "entity.ad_astra.corrupted_lunarian": "Лунный зомби",
   "entity.ad_astra.martian_raptor": "Скелетообразный раптор",
-  "entity.ad_astra.tier_1_rocket": "Красная алюминиево-стальная ракета",
+  "entity.ad_astra.tier_1_rocket": "Легкая ракета R (алюмосталь)",
-  "entity.ad_astra.tier_2_rocket": "ASM 4914 Titanium Rocket",
+  "entity.ad_astra.tier_2_rocket": "Прочная ракета ASM 4914 (титан)",
-  "entity.ad_astra.tier_3_rocket": "45-Ti Tungstensteel Rocket",
+  "entity.ad_astra.tier_3_rocket": "Тяжёлая ракета 45-Ti (вольфрамосталь)",
   "entity.ad_astra.tier_1_rover": "Вездеход",
   "fluid_type.ad_astra.oxygen": "Искуственный воздух",
   "item.ad_astra.steel_cable": "Обычный RF кабель",
   "item.ad_astra.desh_cable": "Улучшенный RF кабель",
-  "item.ad_astra.tier_1_rocket": "Красная алюминиево-стальная ракета",
+  "item.ad_astra.tier_1_rocket": "Легкая ракета R (алюмосталь)",
-  "item.ad_astra.tier_2_rocket": "ASM 4914 Titanium Rocket",
+  "item.ad_astra.tier_2_rocket": "Прочная ракета ASM 4914 (титан)",
-  "item.ad_astra.tier_3_rocket": "45-Ti Tungstensteel Rocket",
+  "item.ad_astra.tier_3_rocket": "Тяжёлая ракета 45-Ti (вольфрамосталь)",
   "item.ad_astra.oxygen_bucket": "Ведро с искуственным воздухом",
   "item.ad_astra.tier_1_rover": "Вездеход",
   "item.ad_astra.photovoltaic_etrium_cell": "Улучшенная фотоэлектрическая ячейка",

kubejs/assets/ad_astra/lang/uk_ua.json

@@ -2,7 +2,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_sand": "Сірий пісок",
   "block.ad_astra.moon_stone": "Необроблений Анортозит",
   "block.ad_astra.moon_cobblestone": "Анортоцитовий кругляк",
   "block.ad_astra.moon_cobblestone_slab": "Анортоцитова круглякова плита",

kubejs/assets/ad_astra/lang/zh_cn.json

@@ -2,7 +2,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_sand": "灰沙",
   "block.ad_astra.moon_stone": "天然斜长岩",
   "block.ad_astra.moon_cobblestone": "斜长岩圆石",
   "block.ad_astra.moon_cobblestone_slab": "斜长岩圆石台阶",

kubejs/assets/additionalplacements/lang/de_de.json

@@ -0,0 +1,33 @@
+{
+  "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.",
+  "tooltip.additionalplacements.vertical_placement": "Kann vertikal platziert werden",
+  "tooltip.additionalplacements.stair_connections.all_connections": "Erlaubt gemischte vertikale-horizontale Verbindungen (relativ zur Platzierung)",
+  "tooltip.additionalplacements.stair_connections.no_mixed_connections": "Erlaubt vertikale Verbindungen (relativ zur Platzierung)",
+  "tooltip.additionalplacements.stair_connections.no_vertical_connections": "Erlaubt keine vertikalen Verbindungen (relativ zur Platzierung)",
+  "tooltip.additionalplacements.ceiling_placement": "Kann an Decken platziert werden",
+  "msg.additionalplacements.mismatchedtags.0": "[Additional Placements] Fehlende und/oder zusätzliche Tags an generierten Blöcken gefunden. Verwende \"",
+  "msg.additionalplacements.mismatchedtags.1": "\" , um die Tags zu generieren. Um die Tags danach zu generieren, dann \"",
+  "msg.additionalplacements.mismatchedtags.2": "\" ,um sie neu zu laden (oder lade die Welt neu wenn das nicht funktioniert). Überprüfe die Game Output Logs für mehr Details oder bearbeite die Config, um diese Nachricht auszuschalten.",
+  "msg.additionalplacements.generate.failure.definition": "Fehler beim generieren des Datapack: fehlgeschlagen die Pack Definition zu kopieren",
+  "msg.additionalplacements.generate.failure.tag": "Fehler beim generieren des Datapack: fehlgeschlagen den Tag %s zu speichern",
+  "msg.additionalplacements.generate.failure.initialization": "Fehler beim generieren des Datapack: fehlgeschlagen das Datapack zu initialisieren",
+  "msg.additionalplacements.generate.success": "Exportieren der Tags abgeschlossen",
+  "msg.additionalplacements.generate.notfixed": "Automatisches erstellen der Tags konnte nicht Tag Fehlübereinstimmungen lösen. Manuelle Korrektion wird benötigt. Stell sicher, dass Tag-Mismatch Logging eingeschaltet ist und überprüfe die Game Output Logs. Wissen über das Erstellen von Datapacks und Wissen über das Erstellen und Löschen von Block Tags wird vorausgesetzt.",
+  "key.categories.additionalplacements": "Zusätzliche Platzierungen",
+  "key.additionalplacements.placement_toggle": "Schalte Platzierungslogik um",
+  "msg.additionalplacements.placement_enable": "Zusätzliche Platzierungslogik eingeschaltet",
+  "msg.additionalplacements.placement_disable": "Zusätzliche Platzierungslogik ausgeschaltet",
+  "msg.additionalplacements.disconnected": "Zusätzliche Platzierungskonfigurationskonflikt",
+  "msg.additionalplacements.errors.type": "Die folgenden Generierungstypen lehnten die Verbindung ab:",
+  "msg.additionalplacements.errors.client": "Client-side abgelehnt:",
+  "msg.additionalplacements.errors.server": "Server-side abgelehnt:",
+  "msg.additionalplacements.stairs.data_not_found": "Treppenverbindungen Konfigurationsdata konnte nicht vom Client empfangen werden",
+  "msg.additionalplacements.stairs.connections_type_not_found": "Unbekannte Treppenverbindung Typ %s",
+  "msg.additionalplacements.stairs.mismatched.header": "Die folgenden Treppen haben den falschen Verbindungstyp. Sie müssen:",
+  "additionalplacements.stairs.connections_type.all_connections": "Alle Verbindungen zugelassen",
+  "additionalplacements.stairs.connections_type.no_mixed_connections": "Keine gemischten Verbindungen erlaubt",
+  "additionalplacements.stairs.connections_type.no_vertical_connections": "Keine vertikalen Verbindungen erlaubt",
+  "msg.additionalplacements.stairs.mismatched.footer": "Um zu diesen Server verbinden zu können, korrigier die Einträge in config/additionalplacements-bootup.toml und starte das Spiel neu.",
+  "msg.additionalplacements.local_world_notice": "Merke an: Wenn du versucht hast einen Local Save zu laden, ist die Welt immer noch im hintergrund aktiv. Bitte starte das Spiel neu, um dies zu beheben.",
+  "commands.ap_stairs_state_debug.wrong_block": "%s ist kein valider Block, er muss eine Treppe mit mehreren Zuständen sein."
+}

kubejs/assets/additionalplacements/lang/ru_ru.json

@@ -0,0 +1,11 @@
+{
+  "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.",
+  "tooltip.additionalplacements.vertical_placement": "Может быть размещена вертикально",
+  "tooltip.additionalplacements.stair_connections.all_connections": "Позволяет вертикально-горизонтальные соединения (относительно места размещения)",
+  "tooltip.additionalplacements.stair_connections.no_mixed_connections": "Позволяет вертикальные соединения (относительно места размещения)",
+  "tooltip.additionalplacements.stair_connections.no_vertical_connections": "Не позволяет вертикальные соединения (относительно места размещения)",
+  "tooltip.additionalplacements.ceiling_placement": "Может быть размещена на потолок",
+  "key.additionalplacements.placement_toggle": "Переключить логика размещения",
+  "msg.additionalplacements.placement_enable": "Дополнительная логика размещения включена",
+  "msg.additionalplacements.placement_disable": "Дополнительная логика размещения выключена"
+}

kubejs/assets/ae2/lang/de_de.json

@@ -0,0 +1,23 @@
+{
+  "__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": "Fertigungspressen kann man durch das Zerstören eines Mysteriösen Würfels bekommen. Mysteriöse Würfel sind im Zentrum eines Meteorit, welche man auf dem Mond finden kann.",
+  "gui.advanced_ae.AdvPatternProvider": "",
+  "gui.expandedae.exp_pattern_provider": "",
+  "item.ae2.sky_dust": "Suevit Staub",
+  "block.ae2.sky_stone_block": "Rauer Suevit",
+  "block.ae2.sky_stone_stairs": "Suevittreppe",
+  "block.ae2.sky_stone_wall": "Suevitwand",
+  "block.ae2.sky_stone_slab": "Suevitstufe",
+  "block.ae2.smooth_sky_stone_block": "Glatter Suevit",
+  "block.ae2.smooth_sky_stone_stairs": "Glatte Suevittreppe",
+  "block.ae2.smooth_sky_stone_wall": "Glatte Suevitwand",
+  "block.ae2.smooth_sky_stone_slab": "Glatte Suevitstufe",
+  "block.ae2.sky_stone_brick": "Suevitziegel",
+  "block.ae2.sky_stone_brick_stairs": "Suevitziegeltrebbe",
+  "block.ae2.sky_stone_brick_wall": "Suevitziegelwand",
+  "block.ae2.sky_stone_brick_slab": "Suevitziegelstufe",
+  "block.ae2.sky_stone_small_brick": "Kleine Suevitziegel",
+  "block.ae2.sky_stone_small_brick_stairs": "Kleine Suevitziegeltreppe",
+  "block.ae2.sky_stone_small_brick_wall": "Kleine Suevitziegelwand",
+  "block.ae2.sky_stone_small_brick_slab": "Kleine Suevitziegelstufe"
+}

kubejs/assets/ae2/lang/es_es.json

@@ -0,0 +1,23 @@
+{
+  "__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": "Las prensas de fabricación son obtenidas al romper un cubo misterioso. Los cubos misteriosos se ubican en el centro de meteoritos los cuales pueden ser hallados en La Luna.",
+  "gui.advanced_ae.AdvPatternProvider": "",
+  "gui.expandedae.exp_pattern_provider": "",
+  "item.ae2.sky_dust": "Polvo de suevita",
+  "block.ae2.sky_stone_block": "Suevita en bruto",
+  "block.ae2.sky_stone_stairs": "Escaleras de suevita",
+  "block.ae2.sky_stone_wall": "Muro de suevita",
+  "block.ae2.sky_stone_slab": "Losa de suevita",
+  "block.ae2.smooth_sky_stone_block": "Suevita lisa",
+  "block.ae2.smooth_sky_stone_stairs": "Escaleras de suevita lisas",
+  "block.ae2.smooth_sky_stone_wall": "Muro de suevita liso",
+  "block.ae2.smooth_sky_stone_slab": "Losa de suevita lisa",
+  "block.ae2.sky_stone_brick": "Ladrillos de suevita",
+  "block.ae2.sky_stone_brick_stairs": "Escaleras de ladrillos de suevita",
+  "block.ae2.sky_stone_brick_wall": "Muro de ladrillos de suevita",
+  "block.ae2.sky_stone_brick_slab": "Losa de ladrillos de suevita",
+  "block.ae2.sky_stone_small_brick": "Ladrillos pequeños de suevita",
+  "block.ae2.sky_stone_small_brick_stairs": "Escaleras de ladrillos pequeños de suevita",
+  "block.ae2.sky_stone_small_brick_wall": "Muro de ladrillos pequeños de suevita",
+  "block.ae2.sky_stone_small_brick_slab": "Losa de ladrillos pequeños de suevita"
+}

kubejs/assets/ae2/lang/ja_jp.json

@@ -0,0 +1,23 @@
+{
+  "__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": "Crafting Presses are obtained by breaking a Mysterious Cube. Mysterious Cubes are in the center of meteorites which can be found on the moon.",
+  "gui.advanced_ae.AdvPatternProvider": "",
+  "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": "スエバイトの小レンガのハーフブロック"
+}

kubejs/assets/ae2insertexportcard/lang/de_de.json

@@ -0,0 +1,8 @@
+{
+  "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.",
+  "itemGroup.ae2insertexportcard": "AE2 Eingabe-Ausgabe Karte",
+  "item.ae2insertexportcard.insert_card": "Eingabekarte",
+  "item.ae2insertexportcard.export_card": "Ausgabekarte",
+  "gui.ae2insertexportcard.whitelist": "Whitelist",
+  "gui.ae2insertexportcard.blacklist": "Blacklist"
+}

kubejs/assets/ae2insertexportcard/lang/ru_ru.json

@@ -0,0 +1,8 @@
+{
+  "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.",
+  "itemGroup.ae2insertexportcard": "AE2 Insert Export Card",
+  "item.ae2insertexportcard.insert_card": "Карта импорта",
+  "item.ae2insertexportcard.export_card": "Карта экспорта",
+  "gui.ae2insertexportcard.whitelist": "Белый список",
+  "gui.ae2insertexportcard.blacklist": "Чёрный список"
+}

kubejs/assets/afc/lang/de_de.json

@@ -0,0 +1,819 @@
+{
+  "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.",
+  "item.afc.wood.lumber.baobab": "Baobabbauholz",
+  "item.afc.wood.boat.baobab": "Baobabboot",
+  "item.afc.wood.chest_minecart.baobab": "Baobabtruhenlore",
+  "item.tfc.wood.support.baobab": "Baobabstütze",
+  "block.afc.wood.planks.baobab": "Baobabbretter",
+  "block.afc.wood.vertical_support.baobab": "Baobab Vertikale Stütze",
+  "block.afc.wood.horizontal_support.baobab": "Baobab Horizontalee Stütze",
+  "block.afc.wood.log.baobab": "Baobabbaumstamm",
+  "block.afc.wood.stripped_log.baobab": "Entrindeter Baobabbaumstamm",
+  "block.afc.wood.wood.baobab": "Baobabholz",
+  "block.afc.wood.stripped_wood.baobab": "Entrindetes Baobabholz",
+  "block.afc.wood.twig.baobab": "Baobabzweig",
+  "block.afc.wood.chest.baobab": "Baobabtruhe",
+  "block.afc.wood.trapped_chest.baobab": "Baobabredstonetruhe",
+  "block.afc.wood.sluice.baobab": "Baobabwaschrinne",
+  "block.afc.wood.barrel.baobab": "Baobabfass",
+  "block.afc.wood.lectern.baobab": "Baobablesepult",
+  "block.afc.wood.scribing_table.baobab": "Baobabanreißtisch",
+  "block.afc.wood.sewing_table.baobab": "Baobabnähtisch",
+  "block.afc.wood.sign.baobab": "Baobabschild",
+  "block.afc.wood.jar_shelf.baobab": "Baobab Einmachglasregal",
+  "block.afc.wood.jarbnet.baobab": "Baobab  Marmeladenregal",
+  "block.afc.wood.hanger.baobab": "Baobab Aufhänger",
+  "block.afc.wood.food_shelf.baobab": "Baobab Essensregal",
+  "block.afc.wood.wine_shelf.baobab": "Baobab Weinregal",
+  "block.afc.wood.barrel_press.baobab": "Baobab Fasspresse",
+  "block.afc.wood.stomping_barrel.baobab": "Baobab Stampffass",
+  "block.afc.wood.big_barrel.baobab": "Baobab Bottich",
+  "block.afc.wood.planks.baobab_bookshelf": "Baobabbücherregal",
+  "block.afc.wood.planks.baobab_door": "Baobabtür",
+  "block.afc.wood.planks.baobab_trapdoor": "Baobabfalltür",
+  "block.afc.wood.planks.baobab_fence": "Baobabzaun",
+  "block.afc.wood.planks.baobab_log_fence": "Baobabbaumstammzaun",
+  "block.afc.wood.planks.baobab_fence_gate": "Baobabzauntor",
+  "block.afc.wood.planks.baobab_button": "Baobabknopf",
+  "block.afc.wood.planks.baobab_pressure_plate": "Baobabdruckplatte",
+  "block.afc.wood.planks.baobab_slab": "Baobabstufe",
+  "block.afc.wood.planks.baobab_stairs": "Baobabtreppe",
+  "block.afc.wood.planks.baobab_tool_rack": "Baobabwerkzeugregal",
+  "block.afc.wood.planks.baobab_workbench": "Baobabwerkbank",
+  "block.afc.wood.planks.baobab_loom": "Baobabwebstuhl",
+  "block.afc.wood.planks.baobab_sign": "Baobabschild",
+  "item.afc.wood.lumber.cypress": "Zypressenbauholz",
+  "item.afc.wood.boat.cypress": "Zypressenboot",
+  "item.afc.wood.chest_minecart.cypress": "Zypressentruhenlore",
+  "item.tfc.wood.support.cypress": "Zypressenstütze",
+  "block.afc.wood.planks.cypress": "Zypressenbretter",
+  "block.afc.wood.vertical_support.cypress": "Zypressen Vertikale Stütze",
+  "block.afc.wood.horizontal_support.cypress": "Zypressen Horizontale Stütze",
+  "block.afc.wood.log.cypress": "Zypressenbaumstamm",
+  "block.afc.wood.stripped_log.cypress": "Entrindeter Zypressenbaumstamm",
+  "block.afc.wood.wood.cypress": "Zypressenholz",
+  "block.afc.wood.stripped_wood.cypress": "Entrindetes Zypressenholz",
+  "block.afc.wood.twig.cypress": "Zypressenzweig",
+  "block.afc.wood.chest.cypress": "Zypressentruhe",
+  "block.afc.wood.trapped_chest.cypress": "Zypressenredstonetruhe",
+  "block.afc.wood.sluice.cypress": "Zypressenwaschrinne",
+  "block.afc.wood.barrel.cypress": "Zypressenfass",
+  "block.afc.wood.lectern.cypress": "Zypressenlesepult",
+  "block.afc.wood.scribing_table.cypress": "Zypressenanreißtisch",
+  "block.afc.wood.sewing_table.cypress": "Zypressennähtisch",
+  "block.afc.wood.sign.cypress": "Zypressenschild",
+  "block.afc.wood.jar_shelf.cypress": "Zypressen Einmachglasregal",
+  "block.afc.wood.jarbnet.cypress": "Zypressen Marmeladenregal",
+  "block.afc.wood.hanger.cypress": "Zypressen Aufhänger",
+  "block.afc.wood.food_shelf.cypress": "Zypressen Essensregal",
+  "block.afc.wood.wine_shelf.cypress": "Zypressen Weinregal",
+  "block.afc.wood.barrel_press.cypress": "Zypressen Fasspresse",
+  "block.afc.wood.stomping_barrel.cypress": "Zypressen Stampffass",
+  "block.afc.wood.big_barrel.cypress": "Zypressen Bottich",
+  "block.afc.wood.planks.cypress_bookshelf": "Zypressenbücherregal",
+  "block.afc.wood.planks.cypress_door": "Zypressentür",
+  "block.afc.wood.planks.cypress_trapdoor": "Zypressenfalltür",
+  "block.afc.wood.planks.cypress_fence": "Zypressenzaun",
+  "block.afc.wood.planks.cypress_log_fence": "Zypressenbaumstammzaun",
+  "block.afc.wood.planks.cypress_fence_gate": "Zypressenzauntor",
+  "block.afc.wood.planks.cypress_button": "Zypressenknopf",
+  "block.afc.wood.planks.cypress_pressure_plate": "Zypressendruckplatte",
+  "block.afc.wood.planks.cypress_slab": "Zypressenstufe",
+  "block.afc.wood.planks.cypress_stairs": "Zypressentreppe",
+  "block.afc.wood.planks.cypress_tool_rack": "Zypressenwerkzeugregal",
+  "block.afc.wood.planks.cypress_workbench": "Zypressenwerkbank",
+  "block.afc.wood.planks.cypress_loom": "Zypressenwebstuhl",
+  "block.afc.wood.planks.cypress_sign": "Zypressenschild",
+  "item.afc.wood.lumber.eucalyptus": "Eukalyptusbauholz",
+  "item.afc.wood.boat.eucalyptus": "Eukalyptusboot",
+  "item.afc.wood.chest_minecart.eucalyptus": "Eukalyptustruhe Minecart",
+  "item.tfc.wood.support.eucalyptus": "Eukalyptusstütze",
+  "block.afc.wood.planks.eucalyptus": "Eukalyptusbretter",
+  "block.afc.wood.vertical_support.eucalyptus": "Eukalyptus Vertikale Stütze",
+  "block.afc.wood.horizontal_support.eucalyptus": "Eukalyptus Horizontale Stütze",
+  "block.afc.wood.log.eucalyptus": "Eukalyptusbaumstamm",
+  "block.afc.wood.stripped_log.eucalyptus": "Entrindeter Eukalyptusbaumstamm",
+  "block.afc.wood.wood.eucalyptus": "Eukalyptusholz",
+  "block.afc.wood.stripped_wood.eucalyptus": "Entrindetes Eukalyptusholz",
+  "block.afc.wood.twig.eucalyptus": "Eukalyptuszweig",
+  "block.afc.wood.chest.eucalyptus": "Eukalyptustruhe",
+  "block.afc.wood.trapped_chest.eucalyptus": "Eukalyptusredstonetruhe",
+  "block.afc.wood.sluice.eucalyptus": "Eukalyptuswaschrinne",
+  "block.afc.wood.barrel.eucalyptus": "Eukalyptusfass",
+  "block.afc.wood.lectern.eucalyptus": "Eukalyptuslesepult",
+  "block.afc.wood.scribing_table.eucalyptus": "Eukalyptusanreißtisch",
+  "block.afc.wood.sewing_table.eucalyptus": "Eukalyptusnähtisch",
+  "block.afc.wood.sign.eucalyptus": "Eukalyptusschild",
+  "block.afc.wood.jar_shelf.eucalyptus": "Eukalyptus Einmachglasregal",
+  "block.afc.wood.jarbnet.eucalyptus": "Eukalyptus Marmeladenregal",
+  "block.afc.wood.hanger.eucalyptus": "Eukalyptus Aufhänger",
+  "block.afc.wood.food_shelf.eucalyptus": "Eukalyptus Essensregal",
+  "block.afc.wood.wine_shelf.eucalyptus": "Eukalyptus Weinregal",
+  "block.afc.wood.barrel_press.eucalyptus": "Eukalyptus Fasspresse",
+  "block.afc.wood.stomping_barrel.eucalyptus": "Eukalyptus Stampffass",
+  "block.afc.wood.big_barrel.eucalyptus": "Eukalyptus Bottich",
+  "block.afc.wood.planks.eucalyptus_bookshelf": "Eukalyptusbücherregal",
+  "block.afc.wood.planks.eucalyptus_door": "Eukalyptustür",
+  "block.afc.wood.planks.eucalyptus_trapdoor": "Eukalyptusfalltür",
+  "block.afc.wood.planks.eucalyptus_fence": "Eukalyptuszaun",
+  "block.afc.wood.planks.eucalyptus_log_fence": "Eukalyptusbaumstammzaun",
+  "block.afc.wood.planks.eucalyptus_fence_gate": "Eukalyptuszauntor",
+  "block.afc.wood.planks.eucalyptus_button": "Eukalyptusknopf",
+  "block.afc.wood.planks.eucalyptus_pressure_plate": "Eukalyptusdruckplatte",
+  "block.afc.wood.planks.eucalyptus_slab": "Eukalyptusstufe",
+  "block.afc.wood.planks.eucalyptus_stairs": "Eukalyptustreppe",
+  "block.afc.wood.planks.eucalyptus_tool_rack": "Eukalyptuswerkzeugregal",
+  "block.afc.wood.planks.eucalyptus_workbench": "Eukalyptuswerkbank",
+  "block.afc.wood.planks.eucalyptus_loom": "Eukalyptuswebstuhl",
+  "block.afc.wood.planks.eucalyptus_sign": "Eukalyptusschild",
+  "item.afc.wood.lumber.fig": "Feigenbauholz",
+  "item.afc.wood.boat.fig": "Feigenboot",
+  "item.afc.wood.chest_minecart.fig": "Feigentruhe Minecart",
+  "item.tfc.wood.support.fig": "Feigenstütze",
+  "block.afc.wood.planks.fig": "Feigenbretter",
+  "block.afc.wood.vertical_support.fig": "Feigen Vertikale Stütze",
+  "block.afc.wood.horizontal_support.fig": "Feigen Horizontale Stütze",
+  "block.afc.wood.log.fig": "Feigenbaumstamm",
+  "block.afc.wood.stripped_log.fig": "Entrindeter Feigenbaumstamm",
+  "block.afc.wood.wood.fig": "Feigenholz",
+  "block.afc.wood.stripped_wood.fig": "Entrindetes Feigenholz",
+  "block.afc.wood.twig.fig": "Feigenzweig",
+  "block.afc.wood.chest.fig": "Feigentruhe",
+  "block.afc.wood.trapped_chest.fig": "Feigenredstonetruhe",
+  "block.afc.wood.sluice.fig": "Feigenwaschrinne",
+  "block.afc.wood.barrel.fig": "Feigenfass",
+  "block.afc.wood.lectern.fig": "Feigenlesepult",
+  "block.afc.wood.scribing_table.fig": "Feigenanreißtisch",
+  "block.afc.wood.sewing_table.fig": "Feigennähtisch",
+  "block.afc.wood.sign.fig": "Feigenschild",
+  "block.afc.wood.jar_shelf.fig": "Feigen Einmachglasregal",
+  "block.afc.wood.jarbnet.fig": "Feigen Marmeladenregal",
+  "block.afc.wood.hanger.fig": "Feigen Aufhänger",
+  "block.afc.wood.food_shelf.fig": "Feigen Essensregal",
+  "block.afc.wood.wine_shelf.fig": "Feigen Weinregal",
+  "block.afc.wood.barrel_press.fig": "Feigen Fasspresse",
+  "block.afc.wood.stomping_barrel.fig": "Feigen Stampffass",
+  "block.afc.wood.big_barrel.fig": "Feigen Bottich",
+  "block.afc.wood.planks.fig_bookshelf": "Feigenbücherregal",
+  "block.afc.wood.planks.fig_door": "Feigentür",
+  "block.afc.wood.planks.fig_trapdoor": "Feigenfalltür",
+  "block.afc.wood.planks.fig_fence": "Feigenzaun",
+  "block.afc.wood.planks.fig_log_fence": "Feigenbaumstammzaun",
+  "block.afc.wood.planks.fig_fence_gate": "Feigenzauntor",
+  "block.afc.wood.planks.fig_button": "Feigenknopf",
+  "block.afc.wood.planks.fig_pressure_plate": "Feigendruckplatte",
+  "block.afc.wood.planks.fig_slab": "Feigenstufe",
+  "block.afc.wood.planks.fig_stairs": "Feigentreppe",
+  "block.afc.wood.planks.fig_tool_rack": "Feigenwerkzeugregal",
+  "block.afc.wood.planks.fig_workbench": "Feigenwerkbank",
+  "block.afc.wood.planks.fig_loom": "Feigenwebstuhl",
+  "block.afc.wood.planks.fig_sign": "Feigenschild",
+  "item.afc.wood.lumber.hevea": "Kautschukbauholz",
+  "item.afc.wood.boat.hevea": "Kautschukboot",
+  "item.afc.wood.chest_minecart.hevea": "Kautschuktruhe Minecart",
+  "item.tfc.wood.support.hevea": "Kautschukstütze",
+  "block.afc.wood.planks.hevea": "Kautschukbretter",
+  "block.afc.wood.vertical_support.hevea": "Kautschuk Vertikale Stütze",
+  "block.afc.wood.horizontal_support.hevea": "Kautschuk Horizontale Stütze",
+  "block.afc.wood.log.hevea": "Kautschukbaumstamm",
+  "block.afc.wood.stripped_log.hevea": "Entrindeter Kautschukbaumstamm",
+  "block.afc.wood.wood.hevea": "Kautschukholz",
+  "block.afc.wood.stripped_wood.hevea": "Entrindetes Kautschukholz",
+  "block.afc.wood.twig.hevea": "Kautschukzweig",
+  "block.afc.wood.chest.hevea": "Kautschuktruhe",
+  "block.afc.wood.trapped_chest.hevea": "Kautschukredstonetruhe",
+  "block.afc.wood.sluice.hevea": "Kautschukwaschrinne",
+  "block.afc.wood.barrel.hevea": "Kautschukfass",
+  "block.afc.wood.lectern.hevea": "Kautschuklesepult",
+  "block.afc.wood.scribing_table.hevea": "Kautschukanreißtisch",
+  "block.afc.wood.sewing_table.hevea": "Kautschuknähtisch",
+  "block.afc.wood.sign.hevea": "Kautschukschild",
+  "block.afc.wood.jar_shelf.hevea": "Kautschuk Einmachglasregal",
+  "block.afc.wood.jarbnet.hevea": "Kautschuk Marmeladenregal",
+  "block.afc.wood.hanger.hevea": "Kautschuk Aufhänger",
+  "block.afc.wood.food_shelf.hevea": "Kautschuk Essensregal",
+  "block.afc.wood.wine_shelf.hevea": "Kautschuk Weinregal",
+  "block.afc.wood.barrel_press.hevea": "Kautschuk Fasspresse",
+  "block.afc.wood.stomping_barrel.hevea": "Kautschuk Stampffass",
+  "block.afc.wood.big_barrel.hevea": "Kautschuk Bottich",
+  "block.afc.wood.planks.hevea_bookshelf": "Kautschukbücherregal",
+  "block.afc.wood.planks.hevea_door": "Kautschuktür",
+  "block.afc.wood.planks.hevea_trapdoor": "Kautschukfalltür",
+  "block.afc.wood.planks.hevea_fence": "Kautschukzaun",
+  "block.afc.wood.planks.hevea_log_fence": "Kautschukbaumstammzaun",
+  "block.afc.wood.planks.hevea_fence_gate": "Kautschukzauntor",
+  "block.afc.wood.planks.hevea_button": "Kautschukknopf",
+  "block.afc.wood.planks.hevea_pressure_plate": "Kautschukdruckplatte",
+  "block.afc.wood.planks.hevea_slab": "Kautschukstufe",
+  "block.afc.wood.planks.hevea_stairs": "Kautschuktreppe",
+  "block.afc.wood.planks.hevea_tool_rack": "Kautschukwerkzeugregal",
+  "block.afc.wood.planks.hevea_workbench": "Kautschukwerkbank",
+  "block.afc.wood.planks.hevea_loom": "Kautschukwebstuhl",
+  "block.afc.wood.planks.hevea_sign": "Kautschukschild",
+  "item.afc.wood.lumber.mahogany": "Mahagonibauholz",
+  "item.afc.wood.boat.mahogany": "Mahagoniboot",
+  "item.afc.wood.chest_minecart.mahogany": "Mahagonitruhe Minecart",
+  "item.tfc.wood.support.mahogany": "Mahagonistütze",
+  "block.afc.wood.planks.mahogany": "Mahagonibretter",
+  "block.afc.wood.vertical_support.mahogany": "Mahagoni Vertikale Stütze",
+  "block.afc.wood.horizontal_support.mahogany": "Mahagoni Horizontale Stütze",
+  "block.afc.wood.log.mahogany": "Mahagonibaumstamm",
+  "block.afc.wood.stripped_log.mahogany": "Entrindeter Mahagonibaumstamm",
+  "block.afc.wood.wood.mahogany": "Mahagoniholz",
+  "block.afc.wood.stripped_wood.mahogany": "Entrindetes Mahagoniholz",
+  "block.afc.wood.twig.mahogany": "Mahagonizweig",
+  "block.afc.wood.chest.mahogany": "Mahagonitruhe",
+  "block.afc.wood.trapped_chest.mahogany": "Mahagoniredstonetruhe",
+  "block.afc.wood.sluice.mahogany": "Mahagoniwaschrinne",
+  "block.afc.wood.barrel.mahogany": "Mahagonifass",
+  "block.afc.wood.lectern.mahogany": "Mahagonilesepult",
+  "block.afc.wood.scribing_table.mahogany": "Mahagonianreißtisch",
+  "block.afc.wood.sewing_table.mahogany": "Mahagoninähtisch",
+  "block.afc.wood.water_wheel.mahogany": "Mahagoni Water Wheel",
+  "block.afc.wood.encased_axle.mahogany": "Mahagoni Encased Axle",
+  "block.afc.wood.gear_box.mahogany": "Mahagoni Gear Box",
+  "block.afc.wood.sign.mahogany": "Mahagonischild",
+  "block.afc.wood.jar_shelf.mahogany": "Mahagoni Einmachglasregal",
+  "block.afc.wood.jarbnet.mahogany": "Mahagoni Marmeladenregal",
+  "block.afc.wood.hanger.mahogany": "Mahagoni Aufhänger",
+  "block.afc.wood.food_shelf.mahogany": "Mahagoni Essensregal",
+  "block.afc.wood.wine_shelf.mahogany": "Mahagoni Weinregal",
+  "block.afc.wood.barrel_press.mahogany": "Mahagoni Fasspresse",
+  "block.afc.wood.stomping_barrel.mahogany": "Mahagoni Stampffass",
+  "block.afc.wood.big_barrel.mahogany": "Mahagoni Bottich",
+  "block.afc.wood.planks.mahogany_bookshelf": "Mahagonibücherregal",
+  "block.afc.wood.planks.mahogany_door": "Mahagonitür",
+  "block.afc.wood.planks.mahogany_trapdoor": "Mahagonifalltür",
+  "block.afc.wood.planks.mahogany_fence": "Mahagonizaun",
+  "block.afc.wood.planks.mahogany_log_fence": "Mahagonibaumstammzaun",
+  "block.afc.wood.planks.mahogany_fence_gate": "Mahagonizauntor",
+  "block.afc.wood.planks.mahogany_button": "Mahagoniknopf",
+  "block.afc.wood.planks.mahogany_pressure_plate": "Mahagonidruckplatte",
+  "block.afc.wood.planks.mahogany_slab": "Mahagonistufe",
+  "block.afc.wood.planks.mahogany_stairs": "Mahagonitreppe",
+  "block.afc.wood.planks.mahogany_tool_rack": "Mahagoniwerkzeugregal",
+  "block.afc.wood.planks.mahogany_workbench": "Mahagoniwerkbank",
+  "block.afc.wood.planks.mahogany_loom": "Mahagoniwebstuhl",
+  "block.afc.wood.planks.mahogany_sign": "Mahagonischild",
+  "item.afc.wood.lumber.teak": "Teakbauholz",
+  "item.afc.wood.boat.teak": "Teakboot",
+  "item.afc.wood.chest_minecart.teak": "Teaktruhe Minecart",
+  "item.tfc.wood.support.teak": "Teakstütze",
+  "block.afc.wood.planks.teak": "Teakbretter",
+  "block.afc.wood.vertical_support.teak": "Teak Vertikale Stütze",
+  "block.afc.wood.horizontal_support.teak": "Teak Horizontale Stütze",
+  "block.afc.wood.log.teak": "Teakbaumstamm",
+  "block.afc.wood.stripped_log.teak": "Entrindeter Teakbaumstamm",
+  "block.afc.wood.wood.teak": "Teakholz",
+  "block.afc.wood.stripped_wood.teak": "Entrindetes Teakholz",
+  "block.afc.wood.twig.teak": "Teakzweig",
+  "block.afc.wood.chest.teak": "Teaktruhe",
+  "block.afc.wood.trapped_chest.teak": "Teakredstonetruhe",
+  "block.afc.wood.sluice.teak": "Teakwaschrinne",
+  "block.afc.wood.barrel.teak": "Teakfass",
+  "block.afc.wood.lectern.teak": "Teaklesepult",
+  "block.afc.wood.scribing_table.teak": "Teakanreißtisch",
+  "block.afc.wood.sewing_table.teak": "Teaknähtisch",
+  "block.afc.wood.sign.teak": "Teakschild",
+  "block.afc.wood.jar_shelf.teak": "Teak Einmachglasregal",
+  "block.afc.wood.jarbnet.teak": "Teak Marmeladenregal",
+  "block.afc.wood.hanger.teak": "Teak Aufhänger",
+  "block.afc.wood.food_shelf.teak": "Teak Essensregal",
+  "block.afc.wood.wine_shelf.teak": "Teak Weinregal",
+  "block.afc.wood.barrel_press.teak": "Teak Fasspresse",
+  "block.afc.wood.stomping_barrel.teak": "Teak Stampffass",
+  "block.afc.wood.big_barrel.teak": "Teak Bottich",
+  "block.afc.wood.planks.teak_bookshelf": "Teakbücherregal",
+  "block.afc.wood.planks.teak_door": "Teaktür",
+  "block.afc.wood.planks.teak_trapdoor": "Teakfalltür",
+  "block.afc.wood.planks.teak_fence": "Teakzaun",
+  "block.afc.wood.planks.teak_log_fence": "Teakbaumstammzaun",
+  "block.afc.wood.planks.teak_fence_gate": "Teakzauntor",
+  "block.afc.wood.planks.teak_button": "Teakknopf",
+  "block.afc.wood.planks.teak_pressure_plate": "Teakdruckplatte",
+  "block.afc.wood.planks.teak_slab": "Teakstufe",
+  "block.afc.wood.planks.teak_stairs": "Teaktreppe",
+  "block.afc.wood.planks.teak_tool_rack": "Teakwerkzeugregal",
+  "block.afc.wood.planks.teak_workbench": "Teakwerkbank",
+  "block.afc.wood.planks.teak_loom": "Teakwebstuhl",
+  "block.afc.wood.planks.teak_sign": "Teakschild",
+  "item.afc.wood.lumber.tualang": "Tualangbauholz",
+  "item.afc.wood.boat.tualang": "Tualangboot",
+  "item.afc.wood.chest_minecart.tualang": "Tualangtruhe Minecart",
+  "item.tfc.wood.support.tualang": "Tualangstütze",
+  "block.afc.wood.planks.tualang": "Tualangbretter",
+  "block.afc.wood.vertical_support.tualang": "Tualang Vertikale Stütze",
+  "block.afc.wood.horizontal_support.tualang": "Tualang Horizontale Stütze",
+  "block.afc.wood.log.tualang": "Tualangbaumstamm",
+  "block.afc.wood.stripped_log.tualang": "Entrindeter Tualangbaumstamm",
+  "block.afc.wood.wood.tualang": "Tualangholz",
+  "block.afc.wood.stripped_wood.tualang": "Entrindetes Tualangholz",
+  "block.afc.wood.twig.tualang": "Tualangzweig",
+  "block.afc.wood.chest.tualang": "Tualangtruhe",
+  "block.afc.wood.trapped_chest.tualang": "Tualangredstonetruhe",
+  "block.afc.wood.sluice.tualang": "Tualangwaschrinne",
+  "block.afc.wood.barrel.tualang": "Tualangfass",
+  "block.afc.wood.lectern.tualang": "Tualanglesepult",
+  "block.afc.wood.scribing_table.tualang": "Tualanganreißtisch",
+  "block.afc.wood.sewing_table.tualang": "Tualangnähtisch",
+  "block.afc.wood.sign.tualang": "Tualangschild",
+  "block.afc.wood.jar_shelf.tualang": "Tualang Einmachglasregal",
+  "block.afc.wood.jarbnet.tualang": "Tualang Marmeladenregal",
+  "block.afc.wood.hanger.tualang": "Tualang Aufhänger",
+  "block.afc.wood.food_shelf.tualang": "Tualang Essensregal",
+  "block.afc.wood.wine_shelf.tualang": "Tualang Weinregal",
+  "block.afc.wood.barrel_press.tualang": "Tualang Fasspresse",
+  "block.afc.wood.stomping_barrel.tualang": "Tualang Stampffass",
+  "block.afc.wood.big_barrel.tualang": "Tualang Bottich",
+  "block.afc.wood.planks.tualang_bookshelf": "Tualangbücherregal",
+  "block.afc.wood.planks.tualang_door": "Tualangtür",
+  "block.afc.wood.planks.tualang_trapdoor": "Tualangfalltür",
+  "block.afc.wood.planks.tualang_fence": "Tualangzaun",
+  "block.afc.wood.planks.tualang_log_fence": "Tualangbaumstammzaun",
+  "block.afc.wood.planks.tualang_fence_gate": "Tualangzauntor",
+  "block.afc.wood.planks.tualang_button": "Tualangknopf",
+  "block.afc.wood.planks.tualang_pressure_plate": "Tualangdruckplatte",
+  "block.afc.wood.planks.tualang_slab": "Tualangstufe",
+  "block.afc.wood.planks.tualang_stairs": "Tualangtreppe",
+  "block.afc.wood.planks.tualang_tool_rack": "Tualangwerkzeugregal",
+  "block.afc.wood.planks.tualang_workbench": "Tualangwerkbank",
+  "block.afc.wood.planks.tualang_loom": "Tualangwebstuhl",
+  "block.afc.wood.planks.tualang_sign": "Tualangschild",
+  "item.afc.wood.lumber.ipe": "Ipebauholz",
+  "item.afc.wood.boat.ipe": "Ipeboot",
+  "item.afc.wood.chest_minecart.ipe": "Ipetruhe Minecart",
+  "item.tfc.wood.support.ipe": "Ipestütze",
+  "block.afc.wood.planks.ipe": "Ipebretter",
+  "block.afc.wood.vertical_support.ipe": "Ipe Vertikale Stütze",
+  "block.afc.wood.horizontal_support.ipe": "Ipe Horizontale Stütze",
+  "block.afc.wood.log.ipe": "Ipebaumstamm",
+  "block.afc.wood.stripped_log.ipe": "Entrindeter Ipebaumstamm",
+  "block.afc.wood.wood.ipe": "Ipeholz",
+  "block.afc.wood.stripped_wood.ipe": "Entrindetes Ipeholz",
+  "block.afc.wood.twig.ipe": "Ipezweig",
+  "block.afc.wood.chest.ipe": "Ipetruhe",
+  "block.afc.wood.trapped_chest.ipe": "Iperedstonetruhe",
+  "block.afc.wood.sluice.ipe": "Ipewaschrinne",
+  "block.afc.wood.barrel.ipe": "Ipefass",
+  "block.afc.wood.lectern.ipe": "Ipelesepult",
+  "block.afc.wood.scribing_table.ipe": "Ipeanreißtisch",
+  "block.afc.wood.sewing_table.ipe": "Ipenähtisch",
+  "block.afc.wood.sign.ipe": "Ipeschild",
+  "block.afc.wood.jar_shelf.ipe": "Ipe Einmachglasregal",
+  "block.afc.wood.jarbnet.ipe": "Ipe Marmeladenregal",
+  "block.afc.wood.hanger.ipe": "Ipe Aufhänger",
+  "block.afc.wood.food_shelf.ipe": "Ipe Essensregal",
+  "block.afc.wood.wine_shelf.ipe": "Ipe Weinregal",
+  "block.afc.wood.barrel_press.ipe": "Ipe Fasspresse",
+  "block.afc.wood.stomping_barrel.ipe": "Ipe Stampffass",
+  "block.afc.wood.big_barrel.ipe": "Ipe Bottich",
+  "block.afc.wood.planks.ipe_bookshelf": "Ipebücherregal",
+  "block.afc.wood.planks.ipe_door": "Ipetür",
+  "block.afc.wood.planks.ipe_trapdoor": "Ipefalltür",
+  "block.afc.wood.planks.ipe_fence": "Ipezaun",
+  "block.afc.wood.planks.ipe_log_fence": "Ipebaumstammzaun",
+  "block.afc.wood.planks.ipe_fence_gate": "Ipezauntor",
+  "block.afc.wood.planks.ipe_button": "Ipeknopf",
+  "block.afc.wood.planks.ipe_pressure_plate": "Ipedruckplatte",
+  "block.afc.wood.planks.ipe_slab": "Ipestufe",
+  "block.afc.wood.planks.ipe_stairs": "Ipetreppe",
+  "block.afc.wood.planks.ipe_tool_rack": "Ipewerkzeugregal",
+  "block.afc.wood.planks.ipe_workbench": "Ipewerkbank",
+  "block.afc.wood.planks.ipe_loom": "Ipewebstuhl",
+  "block.afc.wood.planks.ipe_sign": "Ipeschild",
+  "item.afc.wood.lumber.ironwood": "Eisenholzbauholz",
+  "item.afc.wood.boat.ironwood": "Eisenholzboot",
+  "item.afc.wood.chest_minecart.ironwood": "Eisenholztruhe Minecart",
+  "item.tfc.wood.support.ironwood": "Eisenholzstütze",
+  "block.afc.wood.planks.ironwood": "Eisenholzbretter",
+  "block.afc.wood.vertical_support.ironwood": "Eisenholz Vertikale Stütze",
+  "block.afc.wood.horizontal_support.ironwood": "Eisenholz Horizontale Stütze",
+  "block.afc.wood.log.ironwood": "Eisenholzbaumstamm",
+  "block.afc.wood.stripped_log.ironwood": "Entrindeter Eisenholzbaumstamm",
+  "block.afc.wood.wood.ironwood": "Eisenholzholz",
+  "block.afc.wood.stripped_wood.ironwood": "Entrindetes Eisenholzholz",
+  "block.afc.wood.twig.ironwood": "Eisenholzzweig",
+  "block.afc.wood.chest.ironwood": "Eisenholztruhe",
+  "block.afc.wood.trapped_chest.ironwood": "Eisenholzredstonetruhe",
+  "block.afc.wood.sluice.ironwood": "Eisenholzwaschrinne",
+  "block.afc.wood.barrel.ironwood": "Eisenholzfass",
+  "block.afc.wood.lectern.ironwood": "Eisenholzlesepult",
+  "block.afc.wood.scribing_table.ironwood": "Eisenholzanreißtisch",
+  "block.afc.wood.sewing_table.ironwood": "Eisenholznähtisch",
+  "block.afc.wood.sign.ironwood": "Eisenholzschild",
+  "block.afc.wood.jar_shelf.ironwood": "Eisenholz Einmachglasregal",
+  "block.afc.wood.jarbnet.ironwood": "Eisenholz Marmeladenregal",
+  "block.afc.wood.hanger.ironwood": "Eisenholz Aufhänger",
+  "block.afc.wood.food_shelf.ironwood": "Eisenholz Essensregal",
+  "block.afc.wood.wine_shelf.ironwood": "Eisenholz Weinregal",
+  "block.afc.wood.barrel_press.ironwood": "Eisenholz Fasspresse",
+  "block.afc.wood.stomping_barrel.ironwood": "Eisenholz Stampffass",
+  "block.afc.wood.big_barrel.ironwood": "Eisenholz Bottich",
+  "block.afc.wood.planks.ironwood_bookshelf": "Eisenholzbücherregal",
+  "block.afc.wood.planks.ironwood_door": "Eisenholztür",
+  "block.afc.wood.planks.ironwood_trapdoor": "Eisenholzfalltür",
+  "block.afc.wood.planks.ironwood_fence": "Eisenholzzaun",
+  "block.afc.wood.planks.ironwood_log_fence": "Eisenholzbaumstammzaun",
+  "block.afc.wood.planks.ironwood_fence_gate": "Eisenholzzauntor",
+  "block.afc.wood.planks.ironwood_button": "Eisenholzknopf",
+  "block.afc.wood.planks.ironwood_pressure_plate": "Eisenholzdruckplatte",
+  "block.afc.wood.planks.ironwood_slab": "Eisenholzstufe",
+  "block.afc.wood.planks.ironwood_stairs": "Eisenholztreppe",
+  "block.afc.wood.planks.ironwood_tool_rack": "Eisenholzwerkzeugregal",
+  "block.afc.wood.planks.ironwood_workbench": "Eisenholzwerkbank",
+  "block.afc.wood.planks.ironwood_loom": "Eisenholzwebstuhl",
+  "block.afc.wood.planks.ironwood_sign": "Eisenholzschild",
+  "block.afc.wood.leaves.live_oak": "Lebende Eichenblätter",
+  "block.afc.wood.sapling.live_oak": "Lebender Eichensetzling",
+  "block.afc.wood.potted_sapling.live_oak": "Eingetopfter Lebender Eichensetzling",
+  "block.afc.wood.fallen_leaves.live_oak": "Lebende Eichelaub",
+  "block.afc.wood.leaves.redcedar": "Zedernblätter",
+  "block.afc.wood.sapling.redcedar": "Zedernsetzling",
+  "block.afc.wood.potted_sapling.redcedar": "Eingetopfter Zedernsetzling",
+  "block.afc.wood.fallen_leaves.redcedar": "Zederlaub",
+  "block.afc.wood.leaves.balsam_fir": "Balsam-Tannenblätter",
+  "block.afc.wood.sapling.balsam_fir": "Balsam-Tannensetzling",
+  "block.afc.wood.potted_sapling.balsam_fir": "Eingetopfter Balsam-Tannensetzling",
+  "block.afc.wood.fallen_leaves.balsam_fir": "Balsam Tannelaub",
+  "block.afc.wood.leaves.tamarack": "Lärchenblätter",
+  "block.afc.wood.sapling.tamarack": "Lärchensetzling",
+  "block.afc.wood.potted_sapling.tamarack": "Eingetopfter Lärchensetzling",
+  "block.afc.wood.fallen_leaves.tamarack": "Lärchelaub",
+  "block.afc.wood.leaves.black_spruce": "Schwarz-Fichtenblätter",
+  "block.afc.wood.sapling.black_spruce": "Schwarz-Fichtensetzling",
+  "block.afc.wood.potted_sapling.black_spruce": "Eingetopfter Schwarz-Fichtensetzling",
+  "block.afc.wood.fallen_leaves.black_spruce": "Schwarz-Fichtelaub",
+  "block.afc.wood.leaves.mahogany": "Mahagoniblätter",
+  "block.afc.wood.sapling.mahogany": "Mahagonisetzling",
+  "block.afc.wood.potted_sapling.mahogany": "Eingetopfter Mahagonisetzling",
+  "block.afc.wood.fallen_leaves.mahogany": "Mahagonilaub",
+  "block.afc.wood.leaves.gum_arabic": "Gummiarabikumblätter",
+  "block.afc.wood.sapling.gum_arabic": "Gummiarabikumsetzling",
+  "block.afc.wood.potted_sapling.gum_arabic": "Eingetopfter Gummiarabikumsetzling",
+  "block.afc.wood.fallen_leaves.gum_arabic": "Gummiarabikumlaub",
+  "block.afc.wood.leaves.hevea": "Kautschukblätter",
+  "block.afc.wood.sapling.hevea": "Kautschuksetzling",
+  "block.afc.wood.potted_sapling.hevea": "Eingetopfter Kautschuksetzling",
+  "block.afc.wood.fallen_leaves.hevea": "Kautschuklaub",
+  "block.afc.wood.leaves.tualang": "Tualangblätter",
+  "block.afc.wood.sapling.tualang": "Tualangsetzling",
+  "block.afc.wood.potted_sapling.tualang": "Eingetopfter Tualangsetzling",
+  "block.afc.wood.fallen_leaves.tualang": "Tualanglaub",
+  "block.afc.wood.leaves.baobab": "Baobabblätter",
+  "block.afc.wood.sapling.baobab": "Baobabsetzling",
+  "block.afc.wood.potted_sapling.baobab": "Eingetopfter Baobabsetzling",
+  "block.afc.wood.fallen_leaves.baobab": "Baobablaub",
+  "block.afc.wood.leaves.acacia_koa": "Koa-Akazienblätter",
+  "block.afc.wood.sapling.acacia_koa": "Koa-Akaziensetzling",
+  "block.afc.wood.potted_sapling.acacia_koa": "Eingetopfter Koa-Akaziensetzling",
+  "block.afc.wood.fallen_leaves.acacia_koa": "Koa-Akazielaub",
+  "block.afc.wood.leaves.mpingo_blackwood": "Grenadillblätter",
+  "block.afc.wood.sapling.mpingo_blackwood": "Grenadillsetzling",
+  "block.afc.wood.potted_sapling.mpingo_blackwood": "Eingetopfter Grenadillsetzling",
+  "block.afc.wood.fallen_leaves.mpingo_blackwood": "Grenadilllaub",
+  "block.afc.wood.leaves.mountain_fir": "Bergfichtenblätter",
+  "block.afc.wood.sapling.mountain_fir": "Bergfichtensetzling",
+  "block.afc.wood.potted_sapling.mountain_fir": "Eingetopfter Bergfichtensetzling",
+  "block.afc.wood.fallen_leaves.mountain_fir": "Bergfichtenlaub",
+  "block.afc.wood.leaves.scrub_hickory": "Buschhickoryblätter",
+  "block.afc.wood.sapling.scrub_hickory": "Buschhickorysetzling",
+  "block.afc.wood.potted_sapling.scrub_hickory": "Eingetopfter Buschhickorysetzling",
+  "block.afc.wood.fallen_leaves.scrub_hickory": "Buschhickorylaub",
+  "block.afc.wood.leaves.bigleaf_maple": "Oregon-Ahornblätter",
+  "block.afc.wood.sapling.bigleaf_maple": "Oregon-Ahornsetzling",
+  "block.afc.wood.potted_sapling.bigleaf_maple": "Eingetopfter Oregon-Ahornsetzling",
+  "block.afc.wood.fallen_leaves.bigleaf_maple": "Oregon-Ahornlaub",
+  "block.afc.wood.leaves.weeping_maple": "Trauer-Ahornblätter",
+  "block.afc.wood.sapling.weeping_maple": "Trauer-Ahornsetzling",
+  "block.afc.wood.potted_sapling.weeping_maple": "Eingetopfter Trauer-Ahornsetzling",
+  "block.afc.wood.fallen_leaves.weeping_maple": "Trauer-Ahornlaub",
+  "block.afc.wood.leaves.black_oak": "Schwarzeichenblätter",
+  "block.afc.wood.sapling.black_oak": "Schwarzeichensetzling",
+  "block.afc.wood.potted_sapling.black_oak": "Eingetopfter Schwarzeichensetzling",
+  "block.afc.wood.fallen_leaves.black_oak": "Schwarzeichenlaub",
+  "block.afc.wood.leaves.stone_pine": "Steinkiefernblätter",
+  "block.afc.wood.sapling.stone_pine": "Steinkiefernsetzling",
+  "block.afc.wood.potted_sapling.stone_pine": "Eingetopfter Steinkiefernsetzling",
+  "block.afc.wood.fallen_leaves.stone_pine": "Steinkiefernlaub",
+  "block.afc.wood.leaves.red_pine": "Rot-Kiefernblätter",
+  "block.afc.wood.sapling.red_pine": "Rot-Kiefernsetzling",
+  "block.afc.wood.potted_sapling.red_pine": "Eingetopfter Rot-Kiefernsetzling",
+  "block.afc.wood.fallen_leaves.red_pine": "Rot-Kiefernlaub",
+  "block.afc.wood.leaves.giant_rosewood": "Riesen-Rosenholzblätter",
+  "block.afc.wood.sapling.giant_rosewood": "Riesen-Rosenholzsetzling",
+  "block.afc.wood.potted_sapling.giant_rosewood": "Eingetopfter Riesen-Rosenholzsetzling",
+  "block.afc.wood.fallen_leaves.giant_rosewood": "Riesen-Rosenholzlaub",
+  "block.afc.wood.leaves.coast_spruce": "Küsten-Fichtenblätter",
+  "block.afc.wood.sapling.coast_spruce": "Küsten-Fichtensetzling",
+  "block.afc.wood.potted_sapling.coast_spruce": "Eingetopfter Küsten-Fichtensetzling",
+  "block.afc.wood.fallen_leaves.coast_spruce": "Küsten-Fichtenlaub",
+  "block.afc.wood.leaves.sitka_spruce": "Sitka-Fichtenblätter",
+  "block.afc.wood.sapling.sitka_spruce": "Sitka-Fichtensetzling",
+  "block.afc.wood.potted_sapling.sitka_spruce": "Eingetopfter Sitka-Fichtensetzling",
+  "block.afc.wood.fallen_leaves.sitka_spruce": "Sitka-Fichtenlaub",
+  "block.afc.wood.leaves.atlas_cedar": "Atlas-Zedernblätter",
+  "block.afc.wood.sapling.atlas_cedar": "Atlas-Zedernsetzling",
+  "block.afc.wood.potted_sapling.atlas_cedar": "Eingetopfter Atlas-Zedernsetzling",
+  "block.afc.wood.fallen_leaves.atlas_cedar": "Atlas-Zedernlaub",
+  "block.afc.wood.leaves.weeping_willow": "Echte Trauerweidenblätter",
+  "block.afc.wood.sapling.weeping_willow": "Echte Trauerweidensetzling",
+  "block.afc.wood.potted_sapling.weeping_willow": "Eingetopfter Echte Trauerweidensetzling",
+  "block.afc.wood.fallen_leaves.weeping_willow": "Echte Trauerweidenlaub",
+  "block.afc.wood.leaves.rainbow_eucalyptus": "Regenbogenbaumblätter",
+  "block.afc.wood.sapling.rainbow_eucalyptus": "Regenbogenbaumsetzling",
+  "block.afc.wood.potted_sapling.rainbow_eucalyptus": "Eingetopfter Regenbogenbaumsetzling",
+  "block.afc.wood.fallen_leaves.rainbow_eucalyptus": "Regenbogenbaumlaub",
+  "block.afc.wood.leaves.mountain_ash": "Ebereschenblätter",
+  "block.afc.wood.sapling.mountain_ash": "Ebereschensetzling",
+  "block.afc.wood.potted_sapling.mountain_ash": "Eingetopfter Ebereschensetzling",
+  "block.afc.wood.fallen_leaves.mountain_ash": "Ebereschenlaub",
+  "block.afc.wood.leaves.weeping_cypress": "Tränen-Zypressenblätter",
+  "block.afc.wood.sapling.weeping_cypress": "Tränen-Zypressensetzling",
+  "block.afc.wood.potted_sapling.weeping_cypress": "Eingetopfter Tränen-Zypressensetzling",
+  "block.afc.wood.fallen_leaves.weeping_cypress": "Tränen-Zypressenlaub",
+  "block.afc.wood.leaves.bald_cypress": "Echte Sumpfzypressenblätter",
+  "block.afc.wood.sapling.bald_cypress": "Echte Sumpfzypressensetzling",
+  "block.afc.wood.potted_sapling.bald_cypress": "Eingetopfter Echte Sumpfzypressensetzling",
+  "block.afc.wood.fallen_leaves.bald_cypress": "Echte Sumpfzypressenlaub",
+  "block.afc.wood.leaves.coast_redwood": "Küstenmammutbaumblätter",
+  "block.afc.wood.sapling.coast_redwood": "Küstenmammutbaumsetzling",
+  "block.afc.wood.potted_sapling.coast_redwood": "Eingetopfter Küstenmammutbaumsetzling",
+  "block.afc.wood.fallen_leaves.coast_redwood": "Küstenmammutbaumlaub",
+  "block.afc.wood.leaves.rubber_fig": "Gummifeigenblätter",
+  "block.afc.wood.sapling.rubber_fig": "Gummifeigensetzling",
+  "block.afc.wood.potted_sapling.rubber_fig": "Eingetopfter Gummifeigensetzling",
+  "block.afc.wood.fallen_leaves.rubber_fig": "Gummifeigenlaub",
+  "block.afc.wood.leaves.sapele_mahogany": "Sapeliblätter",
+  "block.afc.wood.sapling.sapele_mahogany": "Sapelisetzling",
+  "block.afc.wood.potted_sapling.sapele_mahogany": "Eingetopfter Sapelisetzling",
+  "block.afc.wood.fallen_leaves.sapele_mahogany": "Sapelilaub",
+  "block.afc.wood.leaves.small_leaf_mahogany": "Westindische Mahagoniblätter",
+  "block.afc.wood.sapling.small_leaf_mahogany": "Westindischer Mahagonisetzling",
+  "block.afc.wood.potted_sapling.small_leaf_mahogany": "Eingetopfter Westindischer Mahagonisetzling",
+  "block.afc.wood.fallen_leaves.small_leaf_mahogany": "Westindisches Mahagonilaub",
+  "block.afc.wood.leaves.red_silk_cotton": "Asiatische Kapokbaumblätter",
+  "block.afc.wood.sapling.red_silk_cotton": "Asiatischer Kapokbaumsetzling",
+  "block.afc.wood.potted_sapling.red_silk_cotton": "Eingetopfter Asiatischer Kapokbaumsetzling",
+  "block.afc.wood.fallen_leaves.red_silk_cotton": "Asiatische Kapokbaumlaub",
+  "block.afc.wood.leaves.shisham_rosewood": "Sheeshamblätter",
+  "block.afc.wood.sapling.shisham_rosewood": "Sheeshamsetzling",
+  "block.afc.wood.potted_sapling.shisham_rosewood": "Eingetopfter Sheeshamsetzling",
+  "block.afc.wood.fallen_leaves.shisham_rosewood": "Sheeshamlaub",
+  "block.afc.wood.leaves.mulga_blackwood": "Mulgablätter",
+  "block.afc.wood.sapling.mulga_blackwood": "Mulgasetzling",
+  "block.afc.wood.potted_sapling.mulga_blackwood": "Eingetopfter Mulgasetzling",
+  "block.afc.wood.fallen_leaves.mulga_blackwood": "Mulgalaub",
+  "block.afc.wood.leaves.poplar": "Pappelblätter",
+  "block.afc.wood.sapling.poplar": "Pappelsetzling",
+  "block.afc.wood.potted_sapling.poplar": "Eingetopfter Pappelsetzling",
+  "block.afc.wood.fallen_leaves.poplar": "Pappellaub",
+  "block.afc.wood.leaves.iroko_teak": "Iroko Teakblätter",
+  "block.afc.wood.sapling.iroko_teak": "Iroko Teaksetzling",
+  "block.afc.wood.potted_sapling.iroko_teak": "Eingetopfter Iroko Teaksetzling",
+  "block.afc.wood.fallen_leaves.iroko_teak": "Iroko Teaklaub",
+  "block.afc.wood.leaves.flame_of_the_forest": "Malabar-Lackbaumblätter",
+  "block.afc.wood.sapling.flame_of_the_forest": "Malabar-Lackbaumsetzling",
+  "block.afc.wood.potted_sapling.flame_of_the_forest": "Eingetopfter Malabar-Lackbaumsetzling",
+  "block.afc.wood.fallen_leaves.flame_of_the_forest": "Malabar-Lackbaumlaub",
+  "block.afc.wood.leaves.lebombo_ironwood": "Lebombo Eisenholzblätter",
+  "block.afc.wood.sapling.lebombo_ironwood": "Lebombo Eisenholzsetzling",
+  "block.afc.wood.potted_sapling.lebombo_ironwood": "Eingetopfter Lebombo Eisenholzsetzling",
+  "block.afc.wood.fallen_leaves.lebombo_ironwood": "Lebombo Eisenholzlaub",
+  "block.afc.wood.leaves.horsetail_ironwood": "Kängurubaumblätter",
+  "block.afc.wood.sapling.horsetail_ironwood": "Kängurubaumsetzling",
+  "block.afc.wood.potted_sapling.horsetail_ironwood": "Eingetopfter Kängurubaumsetzling",
+  "block.afc.wood.fallen_leaves.horsetail_ironwood": "Kängurubaumlaub",
+  "block.afc.wood.leaves.jaggery_palm": "Jaggery Palmenblätter",
+  "block.afc.wood.sapling.jaggery_palm": "Jaggery Palmensetzling",
+  "block.afc.wood.potted_sapling.jaggery_palm": "Eingetopfter Jaggery Palmensetzling",
+  "block.afc.wood.fallen_leaves.jaggery_palm": "Jaggery Palmenlaub",
+  "block.afc.wood.log.black_oak": "Schwarzeichenbaumstamm",
+  "block.afc.wood.wood.black_oak": "Schwarzeichenholz",
+  "block.afc.wood.twig.black_oak": "Schwarzeichenzweig",
+  "block.afc.wood.log.redcedar": "Zedernbaumstamm",
+  "block.afc.wood.wood.redcedar": "Zedernholz",
+  "block.afc.wood.twig.redcedar": "Zedernzweig",
+  "block.afc.wood.log.rainbow_eucalyptus": "Regenbogenbaumbaumstamm",
+  "block.afc.wood.wood.rainbow_eucalyptus": "Regenbogenbaumholz",
+  "block.afc.wood.twig.rainbow_eucalyptus": "Regenbogenbaumzweig",
+  "block.afc.wood.log.gum_arabic": "Gummiarabikumbaumstamm",
+  "block.afc.wood.wood.gum_arabic": "Gummiarabikumholz",
+  "block.afc.wood.twig.gum_arabic": "Gummiarabikumzweig",
+  "block.afc.wood.log.rubber_fig": "Gummifeigenbaumstamm",
+  "block.afc.wood.wood.rubber_fig": "Gummifeigenholz",
+  "block.afc.wood.twig.rubber_fig": "Gummifeigenzweig",
+  "block.afc.wood.log.poplar": "Pappelbaumstamm",
+  "block.afc.wood.wood.poplar": "Pappelholz",
+  "block.afc.wood.twig.poplar": "Pappelzweig",
+  "block.afc.wood.log.ancient_baobab": "Antiker Baobabbaumstamm",
+  "block.afc.wood.wood.ancient_baobab": "Antikes Baobabholz",
+  "block.afc.wood.planks.hanging_sign.copper.baobab": "Kupfer Baobab Hängeschild",
+  "block.afc.wood.planks.hanging_sign.bronze.baobab": "Bronze Baobab Hängeschild",
+  "block.afc.wood.planks.hanging_sign.black_bronze.baobab": "Schwarzbronze Baobab Hängeschild",
+  "block.afc.wood.planks.hanging_sign.bismuth_bronze.baobab": "Bismutbronze Baobab Hängeschild",
+  "block.afc.wood.planks.hanging_sign.wrought_iron.baobab": "Gusseisen Baobab Hängeschild",
+  "block.afc.wood.planks.hanging_sign.steel.baobab": "Steel Baobab Hängeschild",
+  "block.afc.wood.planks.hanging_sign.black_steel.baobab": "Schwarzstahl Baobab Hängeschild",
+  "block.afc.wood.planks.hanging_sign.red_steel.baobab": "Rotstahl Baobab Hängeschild",
+  "block.afc.wood.planks.hanging_sign.blue_steel.baobab": "Blaustahl Baobab Hängeschild",
+  "entity.afc.boat.baobab": "Baobabboot",
+  "block.afc.wood.log.ancient_cypress": "Antiker Zypressebaumstamm",
+  "block.afc.wood.wood.ancient_cypress": "Antikes Zypresseholz",
+  "block.afc.wood.planks.hanging_sign.copper.cypress": "Kupfer Zypresse Hängeschild",
+  "block.afc.wood.planks.hanging_sign.bronze.cypress": "Bronze Zypresse Hängeschild",
+  "block.afc.wood.planks.hanging_sign.black_bronze.cypress": "Schwarzbronze Zypresse Hängeschild",
+  "block.afc.wood.planks.hanging_sign.bismuth_bronze.cypress": "Bismutbronze Zypresse Hängeschild",
+  "block.afc.wood.planks.hanging_sign.wrought_iron.cypress": "Gusseisen Zypresse Hängeschild",
+  "block.afc.wood.planks.hanging_sign.steel.cypress": "Steel Zypresse Hängeschild",
+  "block.afc.wood.planks.hanging_sign.black_steel.cypress": "Schwarzstahl Zypresse Hängeschild",
+  "block.afc.wood.planks.hanging_sign.red_steel.cypress": "Rotstahl Zypresse Hängeschild",
+  "block.afc.wood.planks.hanging_sign.blue_steel.cypress": "Blaustahl Zypresse Hängeschild",
+  "entity.afc.boat.cypress": "Zypresseboot",
+  "block.afc.wood.log.ancient_eucalyptus": "Antiker Eukalyptusbaumstamm",
+  "block.afc.wood.wood.ancient_eucalyptus": "Antikes Eukalyptusholz",
+  "block.afc.wood.planks.hanging_sign.copper.eucalyptus": "Kupfer Eukalyptus Hängeschild",
+  "block.afc.wood.planks.hanging_sign.bronze.eucalyptus": "Bronze Eukalyptus Hängeschild",
+  "block.afc.wood.planks.hanging_sign.black_bronze.eucalyptus": "Schwarzbronze Eukalyptus Hängeschild",
+  "block.afc.wood.planks.hanging_sign.bismuth_bronze.eucalyptus": "Bismutbronze Eukalyptus Hängeschild",
+  "block.afc.wood.planks.hanging_sign.wrought_iron.eucalyptus": "Gusseisen Eukalyptus Hängeschild",
+  "block.afc.wood.planks.hanging_sign.steel.eucalyptus": "Steel Eukalyptus Hängeschild",
+  "block.afc.wood.planks.hanging_sign.black_steel.eucalyptus": "Schwarzstahl Eukalyptus Hängeschild",
+  "block.afc.wood.planks.hanging_sign.red_steel.eucalyptus": "Rotstahl Eukalyptus Hängeschild",
+  "block.afc.wood.planks.hanging_sign.blue_steel.eucalyptus": "Blaustahl Eukalyptus Hängeschild",
+  "entity.afc.boat.eucalyptus": "Eukalyptusboot",
+  "block.afc.wood.log.ancient_fig": "Antiker Feigenbaumstamm",
+  "block.afc.wood.wood.ancient_fig": "Antikes Feigenholz",
+  "block.afc.wood.planks.hanging_sign.copper.fig": "Kupfer Feigen Hängeschild",
+  "block.afc.wood.planks.hanging_sign.bronze.fig": "Bronze Feigen Hängeschild",
+  "block.afc.wood.planks.hanging_sign.black_bronze.fig": "Schwarzbronze Feigen Hängeschild",
+  "block.afc.wood.planks.hanging_sign.bismuth_bronze.fig": "Bismutbronze Feigen Hängeschild",
+  "block.afc.wood.planks.hanging_sign.wrought_iron.fig": "Gusseisen Feigen Hängeschild",
+  "block.afc.wood.planks.hanging_sign.steel.fig": "Steel Feigen Hängeschild",
+  "block.afc.wood.planks.hanging_sign.black_steel.fig": "Schwarzstahl Feigen Hängeschild",
+  "block.afc.wood.planks.hanging_sign.red_steel.fig": "Rotstahl Feigen Hängeschild",
+  "block.afc.wood.planks.hanging_sign.blue_steel.fig": "Blaustahl Feigen Hängeschild",
+  "entity.afc.boat.fig": "Feigenboot",
+  "block.afc.wood.log.ancient_hevea": "Antiker Kautschukbaumstamm",
+  "block.afc.wood.wood.ancient_hevea": "Antikes Kautschukholz",
+  "block.afc.wood.planks.hanging_sign.copper.hevea": "Kupfer Kautschuk Hängeschild",
+  "block.afc.wood.planks.hanging_sign.bronze.hevea": "Bronze Kautschuk Hängeschild",
+  "block.afc.wood.planks.hanging_sign.black_bronze.hevea": "Schwarzbronze Kautschuk Hängeschild",
+  "block.afc.wood.planks.hanging_sign.bismuth_bronze.hevea": "Bismutbronze Kautschuk Hängeschild",
+  "block.afc.wood.planks.hanging_sign.wrought_iron.hevea": "Gusseisen Kautschuk Hängeschild",
+  "block.afc.wood.planks.hanging_sign.steel.hevea": "Steel Kautschuk Hängeschild",
+  "block.afc.wood.planks.hanging_sign.black_steel.hevea": "Schwarzstahl Kautschuk Hängeschild",
+  "block.afc.wood.planks.hanging_sign.red_steel.hevea": "Rotstahl Kautschuk Hängeschild",
+  "block.afc.wood.planks.hanging_sign.blue_steel.hevea": "Blaustahl Kautschuk Hängeschild",
+  "entity.afc.boat.hevea": "Kautschukboot",
+  "block.afc.wood.log.ancient_mahogany": "Antiker Mahagonibaumstamm",
+  "block.afc.wood.wood.ancient_mahogany": "Antikes Mahagoniholz",
+  "block.afc.wood.planks.hanging_sign.copper.mahogany": "Kupfer Mahagoni Hängeschild",
+  "block.afc.wood.planks.hanging_sign.bronze.mahogany": "Bronze Mahagoni Hängeschild",
+  "block.afc.wood.planks.hanging_sign.black_bronze.mahogany": "Schwarzbronze Mahagoni Hängeschild",
+  "block.afc.wood.planks.hanging_sign.bismuth_bronze.mahogany": "Bismutbronze Mahagoni Hängeschild",
+  "block.afc.wood.planks.hanging_sign.wrought_iron.mahogany": "Gusseisen Mahagoni Hängeschild",
+  "block.afc.wood.planks.hanging_sign.steel.mahogany": "Steel Mahagoni Hängeschild",
+  "block.afc.wood.planks.hanging_sign.black_steel.mahogany": "Schwarzstahl Mahagoni Hängeschild",
+  "block.afc.wood.planks.hanging_sign.red_steel.mahogany": "Rotstahl Mahagoni Hängeschild",
+  "block.afc.wood.planks.hanging_sign.blue_steel.mahogany": "Blaustahl Mahagoni Hängeschild",
+  "entity.afc.boat.mahogany": "Mahagoniboot",
+  "block.afc.wood.log.ancient_teak": "Antiker Teakbaumstamm",
+  "block.afc.wood.wood.ancient_teak": "Antikes Teakholz",
+  "block.afc.wood.planks.hanging_sign.copper.teak": "Kupfer Teak Hängeschild",
+  "block.afc.wood.planks.hanging_sign.bronze.teak": "Bronze Teak Hängeschild",
+  "block.afc.wood.planks.hanging_sign.black_bronze.teak": "Schwarzbronze Teak Hängeschild",
+  "block.afc.wood.planks.hanging_sign.bismuth_bronze.teak": "Bismutbronze Teak Hängeschild",
+  "block.afc.wood.planks.hanging_sign.wrought_iron.teak": "Gusseisen Teak Hängeschild",
+  "block.afc.wood.planks.hanging_sign.steel.teak": "Steel Teak Hängeschild",
+  "block.afc.wood.planks.hanging_sign.black_steel.teak": "Schwarzstahl Teak Hängeschild",
+  "block.afc.wood.planks.hanging_sign.red_steel.teak": "Rotstahl Teak Hängeschild",
+  "block.afc.wood.planks.hanging_sign.blue_steel.teak": "Blaustahl Teak Hängeschild",
+  "entity.afc.boat.teak": "Teakboot",
+  "block.afc.wood.log.ancient_tualang": "Antiker Tualangbaumstamm",
+  "block.afc.wood.wood.ancient_tualang": "Antikes Tualangholz",
+  "block.afc.wood.planks.hanging_sign.copper.tualang": "Kupfer Tualang Hängeschild",
+  "block.afc.wood.planks.hanging_sign.bronze.tualang": "Bronze Tualang Hängeschild",
+  "block.afc.wood.planks.hanging_sign.black_bronze.tualang": "Schwarzbronze Tualang Hängeschild",
+  "block.afc.wood.planks.hanging_sign.bismuth_bronze.tualang": "Bismutbronze Tualang Hängeschild",
+  "block.afc.wood.planks.hanging_sign.wrought_iron.tualang": "Gusseisen Tualang Hängeschild",
+  "block.afc.wood.planks.hanging_sign.steel.tualang": "Steel Tualang Hängeschild",
+  "block.afc.wood.planks.hanging_sign.black_steel.tualang": "Schwarzstahl Tualang Hängeschild",
+  "block.afc.wood.planks.hanging_sign.red_steel.tualang": "Rotstahl Tualang Hängeschild",
+  "block.afc.wood.planks.hanging_sign.blue_steel.tualang": "Blaustahl Tualang Hängeschild",
+  "entity.afc.boat.tualang": "Tualangboot",
+  "block.afc.wood.log.ancient_ipe": "Antiker Ipebaumstamm",
+  "block.afc.wood.wood.ancient_ipe": "Antikes Ipeholz",
+  "block.afc.wood.planks.hanging_sign.copper.ipe": "Kupfer Ipe Hängeschild",
+  "block.afc.wood.planks.hanging_sign.bronze.ipe": "Bronze Ipe Hängeschild",
+  "block.afc.wood.planks.hanging_sign.black_bronze.ipe": "Schwarzbronze Ipe Hängeschild",
+  "block.afc.wood.planks.hanging_sign.bismuth_bronze.ipe": "Bismutbronze Ipe Hängeschild",
+  "block.afc.wood.planks.hanging_sign.wrought_iron.ipe": "Gusseisen Ipe Hängeschild",
+  "block.afc.wood.planks.hanging_sign.steel.ipe": "Steel Ipe Hängeschild",
+  "block.afc.wood.planks.hanging_sign.black_steel.ipe": "Schwarzstahl Ipe Hängeschild",
+  "block.afc.wood.planks.hanging_sign.red_steel.ipe": "Rotstahl Ipe Hängeschild",
+  "block.afc.wood.planks.hanging_sign.blue_steel.ipe": "Blaustahl Ipe Hängeschild",
+  "entity.afc.boat.ipe": "Ipeboot",
+  "block.afc.wood.log.ancient_ironwood": "Antiker Eisenholzbaumstamm",
+  "block.afc.wood.wood.ancient_ironwood": "Antikes Eisenholzholz",
+  "block.afc.wood.planks.hanging_sign.copper.ironwood": "Kupfer Eisenholz Hängeschild",
+  "block.afc.wood.planks.hanging_sign.bronze.ironwood": "Bronze Eisenholz Hängeschild",
+  "block.afc.wood.planks.hanging_sign.black_bronze.ironwood": "Schwarzbronze Eisenholz Hängeschild",
+  "block.afc.wood.planks.hanging_sign.bismuth_bronze.ironwood": "Bismutbronze Eisenholz Hängeschild",
+  "block.afc.wood.planks.hanging_sign.wrought_iron.ironwood": "Gusseisen Eisenholz Hängeschild",
+  "block.afc.wood.planks.hanging_sign.steel.ironwood": "Steel Eisenholz Hängeschild",
+  "block.afc.wood.planks.hanging_sign.black_steel.ironwood": "Schwarzstahl Eisenholz Hängeschild",
+  "block.afc.wood.planks.hanging_sign.red_steel.ironwood": "Rotstahl Eisenholz Hängeschild",
+  "block.afc.wood.planks.hanging_sign.blue_steel.ironwood": "Blaustahl Eisenholz Hängeschild",
+  "entity.afc.boat.ironwood": "Eisenholzboot",
+  "block.afc.wood.log.ancient_black_oak": "Antiker Schwarzeichenbaumstamm",
+  "block.afc.wood.wood.ancient_black_oak": "Antikes Schwarzeichenholz",
+  "block.afc.wood.log.ancient_gum_arabic": "Antiker Gummiarabikumbaumstamm",
+  "block.afc.wood.wood.ancient_gum_arabic": "Antikes Gummiarabikumholz",
+  "block.afc.wood.log.ancient_rainbow_eucalyptus": "Antiker Regenbogenbaumbaumstamm",
+  "block.afc.wood.wood.ancient_rainbow_eucalyptus": "Antikes Regenbogenbaumholz",
+  "block.afc.wood.log.ancient_redcedar": "Antiker Rotzedernbaumstamm",
+  "block.afc.wood.wood.ancient_redcedar": "Antikes Rotzedernholz",
+  "block.afc.wood.log.ancient_acacia": "Antiker Akazienbaumstamm",
+  "block.afc.wood.wood.ancient_acacia": "Antikes Akazienholz",
+  "block.afc.wood.log.ancient_ash": "Antiker Eschenbaumstamm",
+  "block.afc.wood.wood.ancient_ash": "Antikes Eschenholz",
+  "block.afc.wood.log.ancient_aspen": "Antiker Espenbaumstamm",
+  "block.afc.wood.wood.ancient_aspen": "Antikes Espenholz",
+  "block.afc.wood.log.ancient_birch": "Antiker Birkenbaumstamm",
+  "block.afc.wood.wood.ancient_birch": "Antikes Birkenholz",
+  "block.afc.wood.log.ancient_blackwood": "Antiker Schwarzholzbaumstamm",
+  "block.afc.wood.wood.ancient_blackwood": "Antikes Schwarzholzholz",
+  "block.afc.wood.log.ancient_chestnut": "Antiker Kastaniebaumstamm",
+  "block.afc.wood.wood.ancient_chestnut": "Antikes Kastanieholz",
+  "block.afc.wood.log.ancient_douglas_fir": "Antiker Douglasienbaumstamm",
+  "block.afc.wood.wood.ancient_douglas_fir": "Antikes Douglasienholz",
+  "block.afc.wood.log.ancient_hickory": "Antiker Nussbaumbaumstamm",
+  "block.afc.wood.wood.ancient_hickory": "Antikes Nussbaumholz",
+  "block.afc.wood.log.ancient_kapok": "Antiker Kapokbaumstamm",
+  "block.afc.wood.wood.ancient_kapok": "Antikes Kapokholz",
+  "block.afc.wood.log.ancient_maple": "Antiker Ahornbaumstamm",
+  "block.afc.wood.wood.ancient_maple": "Antikes Ahornholz",
+  "block.afc.wood.log.ancient_oak": "Antiker Eichenbaumstamm",
+  "block.afc.wood.wood.ancient_oak": "Antikes Eichenholz",
+  "block.afc.wood.log.ancient_palm": "Antiker Palmenbaumstamm",
+  "block.afc.wood.wood.ancient_palm": "Antikes Palmenholz",
+  "block.afc.wood.log.ancient_pine": "Antiker Kiefernbaumstamm",
+  "block.afc.wood.wood.ancient_pine": "Antikes Kiefernholz",
+  "block.afc.wood.log.ancient_rosewood": "Antiker Palisanderbaumstamm",
+  "block.afc.wood.wood.ancient_rosewood": "Antikes Palisanderholz",
+  "block.afc.wood.log.ancient_sequoia": "Antiker Mammutbaumbaumstamm",
+  "block.afc.wood.wood.ancient_sequoia": "Antikes Mammutbaumholz",
+  "block.afc.wood.log.ancient_spruce": "Antiker Fichtenbaumstamm",
+  "block.afc.wood.wood.ancient_spruce": "Antikes Fichtenholz",
+  "block.afc.wood.log.ancient_sycamore": "Antiker Platanenbaumstamm",
+  "block.afc.wood.wood.ancient_sycamore": "Antiker Platanenholz",
+  "block.afc.wood.log.ancient_white_cedar": "Antiker Weißzedernbaumstamm",
+  "block.afc.wood.wood.ancient_white_cedar": "Antikes Weißzedernholz",
+  "block.afc.wood.log.ancient_willow": "Antiker Weidenbaumstamm",
+  "block.afc.wood.wood.ancient_willow": "Antikes Weidenholz",
+  "block.afc.wood.sapling.ipe": "Gelber Ipesetzling",
+  "block.afc.wood.potted_sapling.ipe": "Eingetopfter Gelber Ipesetzling",
+  "block.afc.wood.leaves.ipe": "Gelbe Ipeblätter",
+  "block.afc.wood.fallen_leaves.ipe": "Gelbes Ipelaub",
+  "block.afc.wood.sapling.ironwood": "Königs Eisenholzsetzling",
+  "block.afc.wood.potted_sapling.ironwood": "Eingetopfter Königs Eisenholzsetzling",
+  "block.afc.wood.fallen_leaves.ironwood": "Königs Eisenholzlaub",
+  "block.afc.wood.leaves.ironwood": "Königs Eisenholzblätter",
+  "block.afc.wood.sapling.cypress": "Schlanke Zypressesetzling",
+  "block.afc.wood.potted_sapling.cypress": "Eingetopfter Schlanke Zypressesetzling",
+  "block.afc.wood.fallen_leaves.cypress": "Schlanke Zypresselaub",
+  "block.afc.wood.leaves.cypress": "Schlanke Zypresseblätter",
+  "block.afc.wood.sapling.teak": "Wahre Teaksetzling",
+  "block.afc.wood.potted_sapling.teak": "Eingetopfter Wahre Teaksetzling",
+  "block.afc.wood.fallen_leaves.teak": "Wahre Teaklaub",
+  "block.afc.wood.leaves.teak": "Wahre Teakblätter",
+  "block.afc.wood.sapling.eucalyptus": "Blauer Eukalyptussetzling",
+  "block.afc.wood.potted_sapling.eucalyptus": "Eingetopfter Blauer Eukalyptussetzling",
+  "block.afc.wood.fallen_leaves.eucalyptus": "Blauer Eukalyptuslaub",
+  "block.afc.wood.leaves.eucalyptus": "Blauer Eukalyptusblätter",
+  "block.afc.wood.sapling.fig": "Rostige Feigensetzling",
+  "block.afc.wood.potted_sapling.fig": "Eingetopfter Rostige Feigensetzling",
+  "block.afc.wood.fallen_leaves.fig": "Rostige Feigenlaub",
+  "block.afc.wood.leaves.fig": "Rostige Feigenblätter",
+  "block.afc.tree_tap": "Zapfhahn",
+  "item.afc.rubber_bar": "Gummibarren",
+  "item.afc.maple_sugar": "Ahornzucker",
+  "item.afc.birch_sugar": "Birkenzucker",
+  "fluid.afc.latex": "Latex",
+  "fluid.afc.maple_sap": "Ahornharz",
+  "fluid.afc.maple_sap_concentrate": "Konzentriertes Ahornharz",
+  "fluid.afc.maple_syrup": "Ahornsirup",
+  "fluid.afc.birch_sap": "Birkenharz",
+  "fluid.afc.birch_sap_concentrate": "Konzentriertes Birkenharz",
+  "fluid.afc.birch_syrup": "Birkensirup",
+  "itemGroup.afc_creative_mode_tab": "ArborFirmaCraft",
+  "tfc.jei.tree_tap": "Baumzapfen",
+  "tooltip.afc.tap.no_recipe": "Kein Rezept für diesen Eintrag gefunden",
+  "tooltip.afc.tap.fluid": "Flüssigkeit: ",
+  "tooltip.afc.tap.amount": "Menge: ",
+  "tooltip.afc.tap.temp_range": "Temperaturbereich: ",
+  "tooltip.afc.tap.spring": "Quelle: ",
+  "tooltip.afc.tap.current_temp": "Derzeitige Temperatur: %s",
+  "tooltip.afc.tap.efficiency": "Effizienz: ",
+  "config.jade.plugin_afc.tap": "AFC Zapfhahn Jade Information"
+}

kubejs/assets/afc/lang/ru_ru.json

@@ -1,6 +1,5 @@
 {
   "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.",
-  "comment_data.13.10.25": "Строчки без перевода: 565-568, 759-766, 711-774",
   "item.afc.wood.lumber.baobab": "Баобабовая доска",
   "item.afc.wood.chest_minecart.baobab": "Вагонетка с сундуком из баобаба",
   "item.tfc.wood.support.baobab": "Опора из баобаба",
@@ -463,10 +462,10 @@
   "block.afc.wood.sapling.mountain_fir": "Саженец субальпийской пихты",
   "block.afc.wood.potted_sapling.mountain_fir": "Саженец субальпийской пихты в горшке",
   "block.afc.wood.fallen_leaves.mountain_fir": "Опавшие листья субальпийской пихты",
-  "block.afc.wood.leaves.scrub_hickory": "Scrub Hickory Leaves",
+  "block.afc.wood.leaves.scrub_hickory": "Листья карии флоридской",
-  "block.afc.wood.sapling.scrub_hickory": "Scrub Hickory Sapling",
+  "block.afc.wood.sapling.scrub_hickory": "Саженец карии флоридской ",
-  "block.afc.wood.potted_sapling.scrub_hickory": "Scrub Hickory Potted Sapling",
+  "block.afc.wood.potted_sapling.scrub_hickory": "Саженец карии флоридской в горшке",
-  "block.afc.wood.fallen_leaves.scrub_hickory": "Scrub Hickory Fallen Leaves",
+  "block.afc.wood.fallen_leaves.scrub_hickory": "Опавшие листья карии флоридской",
   "block.afc.wood.leaves.bigleaf_maple": "Листья крупнолистного клёна",
   "block.afc.wood.sapling.bigleaf_maple": "Саженец крупнолистного клёна",
   "block.afc.wood.potted_sapling.bigleaf_maple": "Саженец крупнолистного клёна в горшке",
@@ -563,10 +562,10 @@
   "block.afc.wood.sapling.flame_of_the_forest": "Саженец лесного пламени",
   "block.afc.wood.potted_sapling.flame_of_the_forest": "Саженец лесного пламени в горшке",
   "block.afc.wood.fallen_leaves.flame_of_the_forest": "Опавшие листья лесного пламени",
-  "block.afc.wood.leaves.lebombo_ironwood": "Lebombo Ironwood Leaves",
+  "block.afc.wood.leaves.lebombo_ironwood": "Листья лебомбо айронвуд",
-  "block.afc.wood.sapling.lebombo_ironwood": "Lebombo Ironwood Sapling",
+  "block.afc.wood.sapling.lebombo_ironwood": "Саженец лебомбо айронвуд",
-  "block.afc.wood.potted_sapling.lebombo_ironwood": "Lebombo Ironwood Potted Sapling",
+  "block.afc.wood.potted_sapling.lebombo_ironwood": "Саженец лебомбо айронвуд",
-  "block.afc.wood.fallen_leaves.lebombo_ironwood": "Lebombo Ironwood Fallen Leaves",
+  "block.afc.wood.fallen_leaves.lebombo_ironwood": "Опавшие листья лебомбо айронвуд",
   "block.afc.wood.leaves.horsetail_ironwood": "Листья хвощевидного железного дерева",
   "block.afc.wood.sapling.horsetail_ironwood": "Саженец хвощевидного железного дерева",
   "block.afc.wood.potted_sapling.horsetail_ironwood": "Саженец хвощевидного железного дерева в горшке",
@@ -757,22 +756,22 @@
   "block.afc.wood.potted_sapling.ironwood": "Саженец верховного железного дерева в горшке",
   "block.afc.wood.fallen_leaves.ironwood": "Опавшие листья верховного железного дерева",
   "block.afc.wood.leaves.ironwood": "Листья верховного железного дерева",
-  "block.afc.wood.sapling.cypress": "Slender Cypress Sapling",
+  "block.afc.wood.sapling.cypress": "Саженец хиноки",
-  "block.afc.wood.potted_sapling.cypress": "Slender Cypress Potted Sapling",
+  "block.afc.wood.potted_sapling.cypress": "Саженец хиноки в горшке",
-  "block.afc.wood.fallen_leaves.cypress": "Slender Cypress Fallen Leaves",
+  "block.afc.wood.fallen_leaves.cypress": "Опавшие листья хиноки",
-  "block.afc.wood.leaves.cypress": "Slender Cypress Leaves",
+  "block.afc.wood.leaves.cypress": "Листья хиноки",
-  "block.afc.wood.sapling.teak": "True Teak Sapling",
+  "block.afc.wood.sapling.teak": "Саженец тектоны великой",
-  "block.afc.wood.potted_sapling.teak": "True Teak Potted Sapling",
+  "block.afc.wood.potted_sapling.teak": "Саженец тектоны великой в горшке",
-  "block.afc.wood.fallen_leaves.teak": "True Teak Fallen Leaves",
+  "block.afc.wood.fallen_leaves.teak": "Опавшие листья тектоны великой",
-  "block.afc.wood.leaves.teak": "True Teak Leaves",
+  "block.afc.wood.leaves.teak": "Листья тектоны великой",
   "block.afc.wood.sapling.eucalyptus": "Саженец голубого эвкалипта",
   "block.afc.wood.potted_sapling.eucalyptus": "Саженец голубого эвкалипта в горшке",
   "block.afc.wood.fallen_leaves.eucalyptus": "Опавшие листья голубого эвкалипта",
   "block.afc.wood.leaves.eucalyptus": "Листья голубого эвкалипта",
-  "block.afc.wood.sapling.fig": "Rusty Fig Sapling",
+  "block.afc.wood.sapling.fig": "Саженец фикуса рубигиноза",
-  "block.afc.wood.potted_sapling.fig": "Rusty Fig Potted Sapling",
+  "block.afc.wood.potted_sapling.fig": "Саженец фикуса рубигиноза в горшке",
-  "block.afc.wood.fallen_leaves.fig": "Rusty Fig Fallen Leaves",
+  "block.afc.wood.fallen_leaves.fig": "Опавшие листья фикуса рубигиноза",
-  "block.afc.wood.leaves.fig": "Rusty Fig Leaves",
+  "block.afc.wood.leaves.fig": "Листья фикуса рубигиноза",
   "block.afc.tree_tap": "Краник для подсочки",
   "item.afc.rubber_bar": "Резина (Слиток)",
   "item.afc.maple_sugar": "Кленовый сахар",

kubejs/assets/ags_modernmarkings/lang/de_de.json

@@ -0,0 +1,125 @@
+{
+  "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.",
+  "item.ags_modernmarkings.chalk": "Kreide",
+  "block.ags_modernmarkings.floor_marking_nostep": "Kein Zugang Bodenmarkierung",
+  "block.ags_modernmarkings.floor_marking_white_arrow": "Weißer Pfeil Bodenmarkierung",
+  "block.ags_modernmarkings.floor_marking_white_double_arrow": "Weißer Doppelpfeil Bodenmarkierung",
+  "block.ags_modernmarkings.floor_marking_white_lane": "Weiße Spur Bodenmarkierung",
+  "block.ags_modernmarkings.floor_marking_white_square": "Weißes Viereck Bodenmarkierung",
+  "block.ags_modernmarkings.floor_marking_yellow_arrow": "Gelber Pfeil Bodenmarkierung",
+  "block.ags_modernmarkings.floor_marking_yellow_sideline": "Gelbe Seitenlinie Bodenmarkierung",
+  "block.ags_modernmarkings.floor_marking_yellow_square": "Gelbes Viereck Bodenmarkierung",
+  "block.ags_modernmarkings.floor_marking_yellow_stripes": "Gelbe Streifen Bodenmarkierung",
+  "block.ags_modernmarkings.floor_marking_black_singleline": "Schwarze Linie Bodenmarkierung",
+  "block.ags_modernmarkings.floor_marking_blue_singleline": "Blaue Linie Bodenmarkierung",
+  "block.ags_modernmarkings.floor_marking_green_singleline": "Grüne Linie Bodenmarkierung",
+  "block.ags_modernmarkings.floor_marking_orange_singleline": "Orange Linie Bodenmarkierung",
+  "block.ags_modernmarkings.floor_marking_white_singleline": "Weiße Linie Bodenmarkierung",
+  "block.ags_modernmarkings.floor_marking_yellow_singleline": "Gelbe Linie Bodenmarkierung",
+  "block.ags_modernmarkings.floor_marking_red_singleline": "Rote Linie Bodenmarkierung",
+  "block.ags_modernmarkings.floor_marking_black_corner": "Schwarze Ecke Bodenmarkierung",
+  "block.ags_modernmarkings.floor_marking_blue_corner": "Blaue Ecke Bodenmarkierung",
+  "block.ags_modernmarkings.floor_marking_green_corner": "Grüne Ecke Bodenmarkierung",
+  "block.ags_modernmarkings.floor_marking_orange_corner": "Orange Ecke Bodenmarkierung",
+  "block.ags_modernmarkings.floor_marking_white_corner": "Weiße Ecke Bodenmarkierung",
+  "block.ags_modernmarkings.floor_marking_yellow_corner": "Gelbe Ecke Bodenmarkierung",
+  "block.ags_modernmarkings.floor_marking_red_corner": "Rote Ecke Bodenmarkierung",
+  "block.ags_modernmarkings.floor_marking_yellow_hazardline": "Gelbe Gefahrenlinie Bodenmarkierung",
+  "block.ags_modernmarkings.floor_marking_red_hazardline": "Rote Gefahrenlinie Bodenmarkierung",
+  "block.ags_modernmarkings.floor_marking_whiteblack_hazardline": "Weiße Gefahrenlinie Bodenmarkierung",
+  "block.ags_modernmarkings.floor_marking_noentry": "Kein Zutritt Bodenmarkierung",
+  "block.ags_modernmarkings.floor_marking_redx": "Rotes Kreuz Bodenmarkierung",
+  "block.ags_modernmarkings.floor_marking_danger_red": "Rote Gefahr Bodenmarkierung",
+  "block.ags_modernmarkings.floor_marking_danger_yellow": "Gelbe Gefahr Bodenmarkierung",
+  "block.ags_modernmarkings.floor_marking_white_lane_cross": "Weiße Spurenkreuz Bodenmarkierung",
+  "block.ags_modernmarkings.floor_marking_yellow_lane": "Gelbe Spur Bodenmarkierung",
+  "block.ags_modernmarkings.floor_marking_exit": "Ausgang Bodenmarkierung",
+  "block.ags_modernmarkings.wall_marking_number_0": "0 Wandmarkierung",
+  "block.ags_modernmarkings.wall_marking_number_1": "1 Wandmarkierung",
+  "block.ags_modernmarkings.wall_marking_number_2": "2 Wandmarkierung",
+  "block.ags_modernmarkings.wall_marking_number_3": "3 Wandmarkierung",
+  "block.ags_modernmarkings.wall_marking_number_4": "4 Wandmarkierung",
+  "block.ags_modernmarkings.wall_marking_number_5": "5 Wandmarkierung",
+  "block.ags_modernmarkings.wall_marking_number_6": "6 Wandmarkierung",
+  "block.ags_modernmarkings.wall_marking_number_7": "7 Wandmarkierung",
+  "block.ags_modernmarkings.wall_marking_number_8": "8 Wandmarkierung",
+  "block.ags_modernmarkings.wall_marking_number_9": "9 Wandmarkierung",
+  "block.ags_modernmarkings.wall_marking_number_no": "Nr. Wandmarkierung",
+  "block.ags_modernmarkings.wall_marking_number_numero": "Numero Wandmarkierung",
+  "block.ags_modernmarkings.wall_marking_number_dash": "- Wandmarkierung",
+  "block.ags_modernmarkings.wall_marking_number_comma": "Komma Wandmarkierung",
+  "block.ags_modernmarkings.wall_marking_number_period": "Punkt Wandmarkierung",
+  "block.ags_modernmarkings.wall_marking_exclamation_mark": "Ausrufezeichen Wandmarkierung",
+  "block.ags_modernmarkings.wall_marking_question_mark": "Fragezeichen Wandmarkierung",
+  "block.ags_modernmarkings.wall_marking_arrowleft": "Linker-Pfeil Wandmarkierung",
+  "block.ags_modernmarkings.wall_marking_arrowright": "Rechter-Pfeil Wandmarkierung",
+  "block.ags_modernmarkings.wall_marking_hazardline_right": "Gefahrenlinie Rechte Ecke Wandmarkierung",
+  "block.ags_modernmarkings.wall_marking_hazardline_left": "Gefahrenlinie Linke Ecke Wandmarkierung",
+  "block.ags_modernmarkings.wall_marking_warning_danger": "Warnung Wandmarkierung",
+  "block.ags_modernmarkings.wall_marking_exit": "Ausgang Wandmarkierung",
+  "block.ags_modernmarkings.wall_marking_hazard_diamond": "Gefahrendiamant Wandmarkierung",
+  "block.ags_modernmarkings.wall_marking_symbol_production": "Produktion Wandsymbol",
+  "block.ags_modernmarkings.wall_marking_symbol_radiation": "Strahlung Wandsymbol",
+  "block.ags_modernmarkings.wall_marking_symbol_pinch": "Quetschkante Wandsymbol",
+  "block.ags_modernmarkings.wall_marking_symbol_frost": "Frost Wandsymbol",
+  "block.ags_modernmarkings.wall_marking_symbol_chemical": "Chemisches Wandsymbol",
+  "block.ags_modernmarkings.wall_marking_symbol_electric": "Elektrisches Wandsymbol",
+  "block.ags_modernmarkings.wall_marking_symbol_storage": "Lager Wandsymbol",
+  "block.ags_modernmarkings.wall_marking_symbol_fire": "Feuer Wandsymbol",
+  "block.ags_modernmarkings.wall_marking_symbol_magic": "Magie Wandsymbol",
+  "block.ags_modernmarkings.wall_marking_symbol_gears": "Zahnräder Wandsymbol",
+  "block.ags_modernmarkings.wall_marking_symbol_laser": "Laser Wandsymbol",
+  "block.ags_modernmarkings.wall_marking_symbol_fluid": "Flüssigkeiten Wandsymbol",
+  "block.ags_modernmarkings.wall_marking_symbol_mob": "Monster Wandsymbol",
+  "block.ags_modernmarkings.wall_marking_symbol_yellow_production": "Gelbes Produktion Wandsymbol",
+  "block.ags_modernmarkings.wall_marking_symbol_yellow_radiation": "Gelbes Strahlung Wandsymbol",
+  "block.ags_modernmarkings.wall_marking_symbol_yellow_pinch": "Gelbes Quetschkante Wandsymbol",
+  "block.ags_modernmarkings.wall_marking_symbol_yellow_frost": "Gelbes Frost Wandsymbol",
+  "block.ags_modernmarkings.wall_marking_symbol_yellow_chemical": "Gelbes Chemisches Wandsymbol",
+  "block.ags_modernmarkings.wall_marking_symbol_yellow_electric": "Gelbes Elektrisches Wandsymbol",
+  "block.ags_modernmarkings.wall_marking_symbol_yellow_storage": "Gelbes Lager Wandsymbol",
+  "block.ags_modernmarkings.wall_marking_symbol_yellow_fire": "Gelbes Feuer Wandsymbol",
+  "block.ags_modernmarkings.wall_marking_symbol_yellow_magic": "Gelbes Magie Wandsymbol",
+  "block.ags_modernmarkings.wall_marking_symbol_yellow_gears": "Gelbes Zahnräder Wandsymbol",
+  "block.ags_modernmarkings.wall_marking_symbol_yellow_laser": "Gelbes Laser Wandsymbol",
+  "block.ags_modernmarkings.wall_marking_symbol_yellow_fluid": "Gelbes Flüssigkeiten Wandsymbol",
+  "block.ags_modernmarkings.wall_marking_symbol_yellow_mob": "Gelbes Monster Wandsymbol",
+  "block.ags_modernmarkings.wall_marking_symbol_jeo": "Just Enough Opinions Podcast Symbol",
+  "block.ags_modernmarkings.wall_marking_voltage_steam": "Dampfstufe Wandsymbol",
+  "block.ags_modernmarkings.wall_marking_voltage_ulv": "Ultra-Niedrige Spannung Wandsymbol",
+  "block.ags_modernmarkings.wall_marking_voltage_lv": "Niedrige Spannung Wandsymbol",
+  "block.ags_modernmarkings.wall_marking_voltage_mv": "Mittlere Spannung Wandsymbol",
+  "block.ags_modernmarkings.wall_marking_voltage_hv": "Hohe Spannung Wandsymbol",
+  "block.ags_modernmarkings.wall_marking_voltage_ev": "Extreme Spannung Wandsymbol",
+  "block.ags_modernmarkings.wall_marking_voltage_iv": "Verrückte Spannung Wandsymbol",
+  "block.ags_modernmarkings.wall_marking_voltage_luv": "Irre Spannung Wandsymbol",
+  "block.ags_modernmarkings.wall_marking_voltage_zpm": "Zero Point Modul Spannung Wandsymbol",
+  "block.ags_modernmarkings.wall_marking_voltage_uv": "Ultra Spannung Wandsymbol",
+  "block.ags_modernmarkings.wall_marking_voltage_uhv": "Ultra-Hohe Spannung Wandsymbol",
+  "block.ags_modernmarkings.wall_marking_voltage_uev": "Ultra-Extreme Spannung Wandsymbol",
+  "block.ags_modernmarkings.wall_marking_voltage_uiv": "Ultra-Verrückte Spannung Wandsymbol",
+  "block.ags_modernmarkings.wall_marking_voltage_umv": "Ultra-Irre Spannung Wandsymbol",
+  "block.ags_modernmarkings.wall_marking_voltage_uxv": "Ultra-ZPM Spannung Wandsymbol",
+  "block.ags_modernmarkings.wall_marking_voltage_max": "MAXIMALE Spannung Wandsymbol",
+  "block.ags_modernmarkings.wall_marking_voltage_pert": "Pro Tick Wandsymbol",
+  "block.ags_modernmarkings.wall_marking_voltage_eu": "EU Wandsymbol",
+  "block.ags_modernmarkings.wall_marking_voltage_rf": "RF Wandsymbol",
+  "block.ags_modernmarkings.wall_marking_voltage_fe": "FE Wandsymbol",
+  "creativetab.floor_markings": "Bodenmarkierungen",
+  "creativetab.wall_markings": "Wandmarkierungen",
+  "tooltip.ags_modernmarkings.floormarkingbasic": "eine Bodenmarkierung",
+  "tooltip.ags_modernmarkings.floormarking_redline": "Defekte, Schrott und Rote Markierungsareale",
+  "tooltip.ags_modernmarkings.floormarking_yellowline": "Gassen, Straßenmarkierungen und Arbeitszellen",
+  "tooltip.ags_modernmarkings.floormarking_orangeline": "Zeug gehalten für Inspektion",
+  "tooltip.ags_modernmarkings.floormarking_greenline": "Herstellung-Fertige Güter",
+  "tooltip.ags_modernmarkings.floormarking_blueline": "Herstellung-Rohe Materialien",
+  "tooltip.ags_modernmarkings.floormarking_whiteline": "Andersweitig nicht Farbkodiertes Zeug",
+  "tooltip.ags_modernmarkings.floormarking_blackline": "Herstellung-Arbeit im Gange",
+  "tooltip.ags_modernmarkings.floormarking_yellowhazard": "könnte eine physische/lebensbedrohliche Gefahr sein",
+  "tooltip.ags_modernmarkings.floormarking_redhazard": "für Sicherheitszwecke freihalten",
+  "tooltip.ags_modernmarkings.floormarking_whitehazard": "für Operationszwecke freihalten",
+  "tooltip.ags_modernmarkings.wallmarking_basic": "eine Wandmarkierung",
+  "tooltip.ags_modernmarkings.wallmarking_power": "Wandmarkierung für Strom",
+  "tooltip.ags_modernmarkings.wallmarking_jeo": "Produktplatzierung!",
+  "tooltip.ags_modernmarkings.wallmarking_diamond": "NFPA 704, wird verwendet, um über das Risiko von gefährlichen Stoffen zu berichten."
+}

kubejs/assets/alekiroofs/lang/de_de.json

@@ -0,0 +1,15 @@
+{
+  "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.",
+  "block.alekiroofs.baobab_roofing": "Baobachbedachung",
+  "block.alekiroofs.crimson_roofing": "Karmesinbedachung",
+  "block.alekiroofs.cypress_roofing": "Zypressenbedachung",
+  "block.alekiroofs.eucalyptus_roofing": "Eukalyptusbedachung",
+  "block.alekiroofs.fig_roofing": "Feigenbedachung",
+  "block.alekiroofs.hevea_roofing": "Kautschukbedachung",
+  "block.alekiroofs.ipe_roofing": "Ipebedachung",
+  "block.alekiroofs.ironwood_roofing": "Eisenholzbedachung",
+  "block.alekiroofs.mahogany_roofing": "Mahoganibedachung",
+  "block.alekiroofs.teak_roofing": "Teakbedachung",
+  "block.alekiroofs.tualang_roofing": "Tualangbedachung",
+  "block.alekiroofs.warped_roofing": "Wirrbedachung"
+}

kubejs/assets/alekiships/lang/de_de.json

@@ -0,0 +1,123 @@
+{
+  "__COMMENT__": "This file was auto generated by the LanguageMerger, read the file \".README IF TRANSLATING\" found in \"minecraft/kubejs\" for more information.",
+  "alekiships.advancements.armor_stand_on_boat.description": "Platziere einen leblosen Gefährten auf dein Boot",
+  "alekiships.advancements.armor_stand_on_boat.title": "Wilson!!!!!!!",
+  "alekiships.advancements.cannon.description": "Stelle eine Kanone her",
+  "alekiships.advancements.cannon.title": "Eingehendes kanonisches Ereignis",
+  "alekiships.advancements.dye_ship_black.description": "Benenne ein Schiff die Black Pearl",
+  "alekiships.advancements.dye_ship_black.title": "Das ist der beste Pirate, den ich je gesehen habe",
+  "alekiships.advancements.full_broadside.description": "Feuer eine neue Breitseite",
+  "alekiships.advancements.full_broadside.title": "Meister und Kommandant",
+  "alekiships.advancements.ride_barrel.description": "Reite ein Fass",
+  "alekiships.advancements.ride_barrel.title": "Verloren auf See",
+  "alekiships.advancements.rowboat_completed.description": "Baue ein Ruderboot",
+  "alekiships.advancements.rowboat_completed.title": "Der Montlake Schnitt",
+  "alekiships.advancements.sloop_completed.description": "Baue eine Schaluppe",
+  "alekiships.advancements.sloop_completed.title": "Yesler's Werft",
+  "alekiships.config.server.windAffectsBoatsWithNoAnchor": "Wind Beeinflusst Boote Ohne Anker",
+  "alekiships.failed_multiblock_detection": "Keine Valide Rumpfstruktur Gefunden",
+  "alekiships.jade.compartment_block": "%smodul",
+  "block.alekiships.cleat": "Klampe",
+  "block.alekiships.oarlock": "Ruderdolle",
+  "block.alekiships.watercraft_frame_angled": "Geneigtes Schiffsbaugerüst",
+  "block.alekiships.watercraft_frame_flat": "Flaches Schiffsbaugerüst",
+  "block.alekiships.wood.watercraft_frame.angled.acacia": "Akazien Geneigtes Schiffsbaugerüst",
+  "block.alekiships.wood.watercraft_frame.angled.bamboo": "Bambus Geneigtes Schiffsbaugerüst",
+  "block.alekiships.wood.watercraft_frame.angled.birch": "Birken Geneigtes Schiffsbaugerüst",
+  "block.alekiships.wood.watercraft_frame.angled.cherry": "Kirschen Geneigtes Schiffsbaugerüst",
+  "block.alekiships.wood.watercraft_frame.angled.crimson": "Karmesin Geneigtes Schiffsbaugerüst",
+  "block.alekiships.wood.watercraft_frame.angled.dark_oak": "Schwarzeichen Geneigtes Schiffsbaugerüst",
+  "block.alekiships.wood.watercraft_frame.angled.jungle": "Jungel Geneigtes Schiffsbaugerüst",
+  "block.alekiships.wood.watercraft_frame.angled.mangrove": "Mangroven Geneigtes Schiffsbaugerüst",
+  "block.alekiships.wood.watercraft_frame.angled.oak": "Eiche Geneigtes Schiffsbaugerüst",
+  "block.alekiships.wood.watercraft_frame.angled.spruce": "Fichten Geneigtes Schiffsbaugerüst",
+  "block.alekiships.wood.watercraft_frame.angled.warped": "Wirr Geneigtes Schiffsbaugerüst",
+  "block.alekiships.wood.watercraft_frame.flat.acacia": "Akazien Flaches Schiffsbaugerüst",
+  "block.alekiships.wood.watercraft_frame.flat.bamboo": "Bambus Flaches Schiffsbaugerüst",
+  "block.alekiships.wood.watercraft_frame.flat.birch": "Birken Flaches Schiffsbaugerüst",
+  "block.alekiships.wood.watercraft_frame.flat.cherry": "Kirschen Flaches Schiffsbaugerüst",
+  "block.alekiships.wood.watercraft_frame.flat.crimson": "Karmesin Flaches Schiffsbaugerüst",
+  "block.alekiships.wood.watercraft_frame.flat.dark_oak": "Schwarzeichen Flaches Schiffsbaugerüst",
+  "block.alekiships.wood.watercraft_frame.flat.jungle": "Jungel Flaches Schiffsbaugerüst",
+  "block.alekiships.wood.watercraft_frame.flat.mangrove": "Mangroven Flaches Schiffsbaugerüst",
+  "block.alekiships.wood.watercraft_frame.flat.oak": "Eiche Flaches Schiffsbaugerüst",
+  "block.alekiships.wood.watercraft_frame.flat.spruce": "Fichten Flaches Schiffsbaugerüst",
+  "block.alekiships.wood.watercraft_frame.flat.warped": "Wirr Flaches Schiffsbaugerüst",
+  "config.jade.plugin_alekiships.block": "Blockmodul",
+  "config.jade.plugin_alekiships.brewing_stand": "Braustandmodul",
+  "config.jade.plugin_alekiships.furnace": "Ofenmodul",
+  "config.jade.plugin_alekiships.jukebox": "Plattenspielermodul",
+  "config.jade.plugin_alekiships.note_block": "Notenblockmodul",
+  "creativetab.alekiships_tab": "aleki's Nifty Ships",
+  "eject_passengers": "um rauszuwerfen",
+  "entity.alekiships.cannon": "Kanone",
+  "entity.alekiships.cannonball": "Kanonenkugel",
+  "entity.alekiships.compartment_barrel": "Fassmodul",
+  "entity.alekiships.compartment_blast_furnace": "Schmelzofenmodul",
+  "entity.alekiships.compartment_block": "Blockmodul",
+  "entity.alekiships.compartment_brewing_stand": "Braustandmodul",
+  "entity.alekiships.compartment_cartography_table": "Kartentischmodul",
+  "entity.alekiships.compartment_chest": "Truhenmodul",
+  "entity.alekiships.compartment_crafting_table": "Werkbankmodul",
+  "entity.alekiships.compartment_empty": "Leeres Modul",
+  "entity.alekiships.compartment_ender_chest": "Endertruhenmodul",
+  "entity.alekiships.compartment_furnace": "Ofenmodul",
+  "entity.alekiships.compartment_grindstone": "Schleifsteinmodul",
+  "entity.alekiships.compartment_jukebox": "Plattenspielermodul",
+  "entity.alekiships.compartment_loom": "Webstuhlmodul",
+  "entity.alekiships.compartment_note_block": "Notenblockmodul",
+  "entity.alekiships.compartment_shulker_box": "Shulkerkistenmodul",
+  "entity.alekiships.compartment_smithing_table": "Schmiedetischmodul",
+  "entity.alekiships.compartment_smoker": "Räucherofenmodul",
+  "entity.alekiships.compartment_stonecutter": "Steinschneidermodul",
+  "entity.alekiships.rowboat.acacia": "Akazien Ruderboot",
+  "entity.alekiships.rowboat.bamboo": "Bambus Ruderboot",
+  "entity.alekiships.rowboat.birch": "Birken Ruderboot",
+  "entity.alekiships.rowboat.cherry": "Kirsch Ruderboot",
+  "entity.alekiships.rowboat.crimson": "Karmesin Ruderboot",
+  "entity.alekiships.rowboat.dark_oak": "Schwarzeichen Ruderboot",
+  "entity.alekiships.rowboat.jungle": "Jungel Ruderboot",
+  "entity.alekiships.rowboat.mangrove": "Mangrovenn Ruderboot",
+  "entity.alekiships.rowboat.oak": "Eiche Ruderboot",
+  "entity.alekiships.rowboat.spruce": "Fichten Ruderboot",
+  "entity.alekiships.rowboat.warped": "Wirr Ruderboot",
+  "entity.alekiships.sloop.acacia": "Akazien Schaluppe",
+  "entity.alekiships.sloop.bamboo": "Bambus Schaluppe",
+  "entity.alekiships.sloop.birch": "Birken Schaluppe",
+  "entity.alekiships.sloop.cherry": "Kirsch Schaluppe",
+  "entity.alekiships.sloop.crimson": "Karmesin Schaluppe",
+  "entity.alekiships.sloop.dark_oak": "Schwarzeichen Schaluppe",
+  "entity.alekiships.sloop.jungle": "Jungel Schaluppe",
+  "entity.alekiships.sloop.mangrove": "Mangrovenn Schaluppe",
+  "entity.alekiships.sloop.oak": "Eichen Schaluppe",
+  "entity.alekiships.sloop.spruce": "Fichten Schaluppe",
+  "entity.alekiships.sloop.warped": "Wirr Schaluppe",
+  "entity.alekiships.sloop_construction.acacia": "Akazien Schaluppe",
+  "entity.alekiships.sloop_construction.bamboo": "Bambus Schaluppe",
+  "entity.alekiships.sloop_construction.birch": "Birken Schaluppe",
+  "entity.alekiships.sloop_construction.cherry": "Kirschen Schaluppe",
+  "entity.alekiships.sloop_construction.crimson": "Karmesin Schaluppe",
+  "entity.alekiships.sloop_construction.dark_oak": "Schwarzeichen Schaluppe",
+  "entity.alekiships.sloop_construction.jungle": "Jungel Schaluppe",
+  "entity.alekiships.sloop_construction.mangrove": "Mangrovenn Schaluppe",
+  "entity.alekiships.sloop_construction.oak": "Eichen Schaluppe",
+  "entity.alekiships.sloop_construction.spruce": "Fichten Schaluppe",
+  "entity.alekiships.sloop_construction.warped": "Wirr Schaluppe",
+  "entity.alekiships.vehicle_anchor": "Anker",
+  "entity.alekiships.vehicle_cleat": "Klampe",
+  "entity.alekiships.vehicle_collider": "Fahrzeug",
+  "entity.alekiships.vehicle_construction": "Bauentität",
+  "entity.alekiships.vehicle_mast": "Mast",
+  "entity.alekiships.vehicle_part": "Fahrzeugteil",
+  "entity.alekiships.vehicle_switch_sail": "Segel",
+  "entity.alekiships.vehicle_switch_windlass": "Winde",
+  "item.alekiships.anchor": "Anker",
+  "item.alekiships.cannon": "Kanone",
+  "item.alekiships.cannonball": "Kanonenkugel",
+  "item.alekiships.music_disc_pirate_crafting": "Schalplatte",
+  "item.alekiships.music_disc_pirate_crafting.desc": "Captain Thrack - Pirate Crafting",
+  "item.alekiships.oar": "Ruder",
+  "item.alekiships.rowboat_icon_only": "Ruderboot (ICON ONLY)",
+  "item.alekiships.sloop_icon_only": "Schaluppe (ICON ONLY)",
+  "press_button": "Drücke"
+}

kubejs/assets/ambientsounds/basic/blockgroups/grass.json

@@ -1,6 +1,3 @@
 [
-	"tfc:grass/loam",
+	"#tfc:plants"
-	"tfc:grass/silty_loam",
-	"tfc:grass/sandy_loam",
-	"tfc:grass/silt"
 ]

kubejs/assets/ambientsounds/basic/blockgroups/ice.json

@@ -3,6 +3,9 @@
     "minecraft:packed_ice",
     "minecraft:frosted_ice",
     "minecraft:blue_ice",
+    "tfg:dry_ice",
+    "tfg:mars_ice",
+    "ad_astra:permafrost",
     "tfc:sea_ice",
     "tfc:ice_pile"
 ]

kubejs/assets/ambientsounds/basic/blockgroups/log.json

@@ -1,9 +1,20 @@
 [
     "tfc:wood/log/oak",
+    "tfc:wood/wood/oak",
     "tfc:wood/log/birch",
+    "tfc:wood/wood/birch",
     "tfc:wood/log/chestnut",
+    "tfc:wood/wood/chestnut",
     "tfc:wood/log/maple",
+    "tfc:wood/wood/maple",
     "tfc:wood/log/sequoia",
+    "tfc:wood/wood/sequoia",
     "tfc:wood/log/sycamore",
-    "afc:wood/log/cypress"
+    "tfc:wood/wood/sycamore",
+    "afc:wood/log/cypress",
+    "afc:wood/wood/cypress",
+    "afc:wood/log/sycamore",
+    "afc:wood/wood/sycamore",
+    "afc:wood/log/rubber_fig",
+    "afc:wood/wood/rubber_fig"
 ]

kubejs/assets/ambientsounds/basic/blockgroups/log_jungle.json

@@ -1,7 +1,14 @@
 [
     "tfc:wood/log/kapok",
+    "tfc:wood/wood/kapok",
     "tfc:wood/log/rosewood",
+    "tfc:wood/wood/rosewood",
     "afc:wood/log/mahogany",
+    "afc:wood/wood/mahogany",
     "afc:wood/log/tualang",
-    "afc:wood/log/hevea"
+    "afc:wood/wood/tualang",
+    "afc:wood/log/hevea",
+    "afc:wood/wood/hevea",
+    "afc:wood/log/hickory",
+    "afc:wood/wood/hickory"
 ]

kubejs/assets/ambientsounds/basic/blockgroups/log_warm.json

@@ -1,9 +1,16 @@
 [
     "tfc:wood/log/blackwood",
+    "tfc:wood/wood/blackwood",
     "tfc:wood/log/acacia",
+    "tfc:wood/wood/acacia",
     "tfc:wood/log/palm",
+    "tfc:wood/wood/palm",
     "afc:wood/log/ironwood",
+    "afc:wood/wood/ironwood",
     "afc:wood/log/ipe",
+    "afc:wood/wood/ipe",
     "afc:wood/log/baobab",
-    "afc:wood/log/teak"
+    "afc:wood/wood/baobab",
+    "afc:wood/log/teak",
+    "afc:wood/wood/teak"
 ]

kubejs/assets/ambientsounds/basic/blockgroups/rock.json

@@ -0,0 +1,3 @@
+[
+    "#forge:stone"
+]

kubejs/assets/ambientsounds/basic/dimensions/ad_astra_mars.json

@@ -9,7 +9,7 @@
 	"regions": [
 		{
 			"name": "wind",
-			"volume": 0.3,
+			"volume": 0.5,
 			"bad-regions": [
 				"cave-ambience"
 			],

kubejs/assets/ambientsounds/basic/regions/forest.cold.json

@@ -1,7 +1,7 @@
 {
     "name": "forest.cold",
     "features": [
-        "tree"
+        "tree_cold"
     ],
     "bad-regions": [
         "rain"
@@ -66,8 +66,8 @@
                 "ambientsounds:animals.wolf"
             ],
             "pause": {
-                "min": 100,
+                "min": 12000,
-                "max": 600
+                "max": 72000
             },
             "day": 0
         },
@@ -78,7 +78,7 @@
                 "ambientsounds:animals.long-wolf"
             ],
             "pause": {
-                "min": 12000,
+                "min": 56000,
                 "max": 72000
             },
             "day": 0

kubejs/assets/ambientsounds/basic/regions/grass.json

@@ -25,7 +25,19 @@
         "ocean",
         "ocean_reef",
         "deep_ocean",
-        "deep_ocean_trench"
+        "deep_ocean_trench",
+        "sangnum_edge",
+        "sangnum_plains",
+        "sangnum_hills",
+        "rusticus_edge",
+        "rusticus_plains",
+        "rusticus_hills",
+        "amber_edge",
+        "amber_plains",
+        "amber_hills",
+        "martian_river",
+        "martian_mountains",
+        "martian_dune_edge"
     ],
     "sounds": [
         {

kubejs/assets/ambientsounds/basic/regions/jungle.json

@@ -1,7 +1,7 @@
 {
     "name": "jungle",
     "features": [
-        "wood_jungle"
+        "tree_jungle"
     ],
     "bad-biomes": [
         "mountain_lake",
@@ -12,7 +12,19 @@
         "ocean_reef",
         "deep_ocean",
         "deep_ocean_trench",
-        "rain"
+        "rain",
+        "sangnum_edge",
+        "sangnum_plains",
+        "sangnum_hills",
+        "rusticus_edge",
+        "rusticus_plains",
+        "rusticus_hills",
+        "amber_edge",
+        "amber_plains",
+        "amber_hills",
+        "martian_river",
+        "martian_mountains",
+        "martian_dune_edge"
     ],
     "sounds": [
         {

kubejs/assets/ambientsounds/basic/regions/lake.json

@@ -1,15 +1,13 @@
 {
 	"name": "lake",
 	"biomes": [
-		"river",
 		"lake",
 		"mountain_lake",
 		"old_mountain_lake",
 		"oceanic_mountain_lake",
 		"plateau_lake",
 		"volcanic_mountain_lake",
-		"volcanic_oceanic_mountain_lake",
+		"volcanic_oceanic_mountain_lake"
-		"martian_river"
 	],
 	"features": [
 		"water"
@@ -20,7 +18,21 @@
 			"files": [
 				"ambientsounds:water.ocean"
 			],
-			"volume": 0.4
+			"volume": 0.1
+		},
+		{
+			"name": "frog",
+			"category": "animal",
+			"files": [
+				"ambientsounds:animals.frog1",
+				"ambientsounds:animals.frog2"
+			],
+			"pause": {
+				"min": 2500,
+				"max": 7500
+			},
+			"day": 0.05,
+			"night": 0.15
 		}
 	]
 }

kubejs/assets/ambientsounds/basic/regions/martian_lake.json

@@ -0,0 +1,18 @@
+{
+	"name": "martian_lake",
+	"biomes": [
+		"martian_river"
+	],
+	"features": [
+		"water"
+	],
+	"sounds": [
+		{
+			"name": "ocean",
+			"files": [
+				"ambientsounds:water.ocean"
+			],
+			"volume": 0.1
+		}
+	]
+}

kubejs/assets/ambientsounds/basic/regions/plains.json

@@ -15,14 +15,28 @@
         "snow"
     ],
     "biomes": [
-        "lake",
+        "tfc:lake",
-        "plains",
+        "tfc:plains",
-        "highlands",
+        "tfc:highlands",
-        "hills",
+        "tfc:hills",
-        "old_mountains",
+        "tfc:old_mountains",
-        "rolling_hills",
+        "tfc:rolling_hills",
-        "plateau",
+        "tfc:plateau",
-        "plateau_lake"
+        "tfc:plateau_lake"
+    ],
+    "bad-biomes": [
+        "sangnum_edge",
+        "sangnum_plains",
+        "sangnum_hills",
+        "rusticus_edge",
+        "rusticus_plains",
+        "rusticus_hills",
+        "amber_edge",
+        "amber_plains",
+        "amber_hills",
+        "martian_river",
+        "martian_mountains",
+        "martian_dune_edge"
     ],
     "sounds": [
         {

kubejs/assets/ambientsounds/basic/regions/river.json

@@ -0,0 +1,18 @@
+{
+	"name": "river",
+	"biomes": [
+		"river"
+	],
+	"features": [
+		"water"
+	],
+	"sounds": [
+		{
+			"name": "ocean",
+			"files": [
+				"ambientsounds:water.ocean"
+			],
+			"volume": 0.65
+		}
+	]
+}

kubejs/assets/ambientsounds/basic/regions/savanna.json

@@ -91,8 +91,8 @@
                 "ambientsounds:animals.wolf"
             ],
             "pause": {
-                "min": 100,
+                "min": 12000,
-                "max": 600
+                "max": 72000
             },
             "day": 0
         },
@@ -103,7 +103,7 @@
                 "ambientsounds:animals.long-wolf"
             ],
             "pause": {
-                "min": 12000,
+                "min": 56000,
                 "max": 72000
             },
             "day": 0

kubejs/assets/ambientsounds/basic/regions/swamp.json

@@ -8,6 +8,20 @@
         "salt_marsh",
         "lowlands"
     ],
+    "bad-biomes": [
+        "sangnum_edge",
+        "sangnum_plains",
+        "sangnum_hills",
+        "rusticus_edge",
+        "rusticus_plains",
+        "rusticus_hills",
+        "amber_edge",
+        "amber_plains",
+        "amber_hills",
+        "martian_river",
+        "martian_mountains",
+        "martian_dune_edge"
+    ],
     "sounds": [
         {
             "name": "cricket-swamp",