Merge branch '0.5.0' into 143-integration-computercraft

2024-01-09 17:44:41 +07:00
parent 1f80d23b6b c9f77e22e6
commit fcf0c04540
93 changed files with 2162 additions and 5272 deletions
--- a/.github/ISSUE_TEMPLATE/en-00-crash-report.yml
+++ b/.github/ISSUE_TEMPLATE/en-00-crash-report.yml
@@ -1,12 +1,13 @@
 name: "[EN] Crash Report"
 description: Report a bug that crashes the game or prevents startup.
-labels: [ "1. type: сrash", "2. status: unverified" ]
+labels: [ "1. Type: Crash", "2. Status: Unverified" ]
 body:
  - type: input
    id: version
    attributes:
      label: Version modpack Used
-      description: Where the game crashed.
+      description: Write which version of the modpack you are using.
+      placeholder: "Example: 0.1.1"
    validations:
      required: true
  - type: input
--- a/.github/ISSUE_TEMPLATE/en-01-bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/en-01-bug-report.yml
@@ -1,15 +1,13 @@
 name: "[EN] Bug report"
 description: Report a bug where something is not working as expected, which does not crash the game.
-labels: [ "1. type: bug", "2. status: unverified" ]
+labels: [ "1. Type: Bug", "2. Status: Unverified" ]
 body:
-  - type: dropdown
+  - type: input
    id: version
    attributes:
-      label: Are you using the latest available version?
-      description: If not, update.
+      label: Version modpack Used
+      description: Write which version of the modpack you are using.
      placeholder: "Example: 0.1.1"
-      options:
-        - "Yes"
    validations:
      required: true
  - type: input
--- a/.github/ISSUE_TEMPLATE/en-02-feature-request.yml
+++ b/.github/ISSUE_TEMPLATE/en-02-feature-request.yml
@@ -1,12 +1,13 @@
 name: "[EN] Request a Feature"
 description: Request a new feature or a change to an existing one.
-labels: [ "1. type: feature" ]
+labels: [ "1. Type: Feature" ]
 body:
  - type: input
    id: version
    attributes:
      label: Version modpack Used
-      description: Where the game crashed.
+      description: Write which version of the modpack you are using.
+      placeholder: "Example: 0.1.1"
    validations:
      required: true
  - type: textarea
--- a/.github/ISSUE_TEMPLATE/en-03-question.yml
+++ b/.github/ISSUE_TEMPLATE/en-03-question.yml
@@ -1,6 +1,6 @@
 name: "[EN] Ask a Question"
 description: Ask a question regarding this project.
-labels: [ "1. type: question" ]
+labels: [ "1. Type: Question" ]
 body:
  - type: markdown
    attributes:
--- a/.github/ISSUE_TEMPLATE/ru-00-crash-report.yml
+++ b/.github/ISSUE_TEMPLATE/ru-00-crash-report.yml
@@ -1,12 +1,13 @@
 name: "[RU] Crash Report"
 description: Сообщите об ошибке, которая приводит к сбою игры или препятствует ее запуску.
-labels: [ "1. type: сrash", "2. status: unverified" ]
+labels: [ "1. Type: Crash", "2. Status: Unverified" ]
 body:
  - type: input
    id: version
    attributes:
-      label: Версия используемого модпака
-      description: Удостоверьтесь что у вас последняя версия
+      label: Версия модпака.
+      description: Напишите, какую версию модпака вы используете.
+      placeholder: "Пример: 0.1.1"
    validations:
      required: true
  - type: input
--- a/.github/ISSUE_TEMPLATE/ru-01-bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/ru-01-bug-report.yml
@@ -1,15 +1,13 @@
 name: "[RU] Отчет об ошибке"
 description: Сообщите об ошибке, когда что-то работает не так, как ожидалось, что не приводит к сбою игры.
-labels: [ "1. type: bug", "2. status: unverified" ]
+labels: [ "1. Type: Bug", "2. Status: Unverified" ]
 body:
  - type: input
    id: version
    attributes:
-      label: Версия модпака
+      label: Версия модпака.
      description: Напишите, какую версию модпака вы используете.
      placeholder: "Пример: 0.1.1"
-      options:
-        - "Yes"
    validations:
      required: true
  - type: input
--- a/.github/ISSUE_TEMPLATE/ru-02-feature-request.yml
+++ b/.github/ISSUE_TEMPLATE/ru-02-feature-request.yml
@@ -1,12 +1,13 @@
 name: "[RU] Запросить функцию"
 description: Запросите новую функцию или изменение существующей.
-labels: [ "1. type: feature" ]
+labels: [ "1. Type: Feature" ]
 body:
  - type: input
    id: version
    attributes:
-      label: Версия используемого модпака
-      description: Удостоверьтесь что у вас последняя версия
+      label: Версия модпака.
+      description: Напишите, какую версию модпака вы используете.
+      placeholder: "Пример: 0.1.1"
    validations:
      required: true
  - type: textarea
--- a/.github/ISSUE_TEMPLATE/ru-03-question.yml
+++ b/.github/ISSUE_TEMPLATE/ru-03-question.yml
@@ -1,6 +1,6 @@
 name: "[RU] Задайте вопрос"
 description: Задайте вопрос по этому проекту.
-labels: [ "1. type: question" ]
+labels: [ "1. Type: Question" ]
 body:
  - type: markdown
    attributes:
--- a/.github/buildtools/modpack/manifest.json
+++ b/.github/buildtools/modpack/manifest.json
@@ -177,7 +177,7 @@
    },
    {
      "projectID": 665658,
-      "fileID": 4982356,
+      "fileID": 5012164,
      "required": true
    },
    {
@@ -430,6 +430,11 @@
      "fileID": 4987747,
      "required": true
    },
+    {
+      "projectID": 513402,
+      "fileID": 5012402,
+      "required": true
+    },
    {
      "projectID": 940350,
      "fileID": 4922586,
@@ -460,11 +465,6 @@
      "fileID": 4776833,
      "required": true
    },
-    {
-      "projectID": 513402,
-      "fileID": 5010415,
-      "required": true
-    },
    {
      "projectID": 223794,
      "fileID": 4997114,
--- a/.github/buildtools/modpack/modlist.html
+++ b/.github/buildtools/modpack/modlist.html
@@ -82,13 +82,13 @@
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/embeddium">Embeddium (by embeddedt)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/playerrevive">PlayerRevive (by CreativeMD)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/firmacivilization">Firma: Civilization (TFC) (by alekiponi)</a></li>
+<li><a href="https://www.curseforge.com/minecraft/mc-mods/terrafirmagreg-core">TerraFirmaGreg Core (by Exception)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/tfc-ambiental-second-edition">TFC Ambiental: Second edition (by LobsterJonn)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/starlight-forge">Starlight (Forge) (by Spottedstar)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/fastsuite">FastSuite (by Shadows_of_Fire)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/exposure">Exposure (by mortuusars)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/betterf3">BetterF3 (by cominixo)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/fancymenu-forge">FancyMenu [Forge] (by Keksuccino)</a></li>
-<li><a href="https://www.curseforge.com/minecraft/mc-mods/terrafirmagreg-core">TerraFirmaGreg Core (by Exception)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/applied-energistics-2">Applied Energistics 2 (by thetechnici4n)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/chatimage">ChatImage (by kulujun)</a></li>
 <li><a href="https://www.curseforge.com/minecraft/mc-mods/ftb-essentials-forge">FTB Essentials (Forge & Fabric) (by FTB)</a></li>
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,8 +18,7 @@ jobs:
    outputs:
      project_name: ${{ steps.info.outputs.project_name }}
      project_version: ${{ steps.info.outputs.project_version }}
-      mcversion: ${{ steps.info.outputs.mcversion }}
-      tag: ${{ steps.version.outputs.tag }}
+      mc_version: ${{ steps.info.outputs.mc_version }}
      changelog: ${{ steps.changelog.outputs.description }}
    
    steps:
@@ -46,8 +45,8 @@ jobs:
          project_name=`echo $(jq -r '.name' <<< "$manifestjson")`
          echo "project_name=$project_name" >> $GITHUB_OUTPUT

-          mcversion=`echo $(jq -r '.minecraft.version' <<< "$manifestjson")`
-          echo "mcversion=$mcversion" >> $GITHUB_OUTPUT
+          mc_version=`echo $(jq -r '.minecraft.version' <<< "$manifestjson")`
+          echo "mc_version=$mc_version" >> $GITHUB_OUTPUT

          if [[ ${{ startsWith(github.ref, 'refs/tags/') }} == true ]]; then
            echo "project_version=${{ steps.version.outputs.tag }}" >> $GITHUB_OUTPUT
@@ -179,8 +178,7 @@ jobs:
    with:
      project_name: ${{ needs.modpack-info.outputs.project_name }}
      project_version: ${{ needs.modpack-info.outputs.project_version }}
-      mcversion: ${{ needs.modpack-info.outputs.mcversion }}
-      tag: ${{ needs.modpack-info.outputs.tag }}
+      mc_version: ${{ needs.modpack-info.outputs.mc_version }}
      changelog: ${{ needs.modpack-info.outputs.changelog }}
    secrets: inherit

--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -10,10 +10,7 @@ on:
      project_version:
        required: true
        type: string
-      mcversion:
-        required: true
-        type: string
-      tag:
+      mc_version:
        required: true
        type: string
      changelog:
@@ -23,7 +20,7 @@ on:
 env:
  CF_PROJECT_ID: "385053"
  MODRINTH_PROJECT_ID: "75JuuMzk"
-  RELEASE_TYPE: "beta"
+  RELEASE_TYPE: "BETA"

 jobs:
  release-curseforge:
@@ -57,7 +54,7 @@ jobs:
          modpack-server-path: ${{ inputs.project_name }}-${{ inputs.project_version }}-server.zip
          changelog: ${{ inputs.changelog }}
          changelog-format: markdown
-          game-version: ${{ inputs.mcversion }}
+          game-version: ${{ inputs.mc_version }}
          display-name: ${{ inputs.project_name }}-${{ inputs.project_version }}
          server-display-name: ${{ inputs.project_name }}-${{ inputs.project_version }}-server
          release-type: ${{ env.RELEASE_TYPE }}
@@ -67,10 +64,17 @@ jobs:
        with:
          webhook-url: ${{secrets.RELEASES_1_20}}
          username: "TerraFirmaGreg"
-          avatar-url: "https://raw.githubusercontent.com/TerraFirmaGreg-Team/.github/main/branding/logo_new_year.png"
+          avatar-url: "https://raw.githubusercontent.com/TerraFirmaGreg-Team/.github/main/branding/curseforge_logo.png"
          embed-title: Release ${{ inputs.project_version }}
-          embed-url: https://github.com/TerraFirmaGreg-Team/TFG-Modpack-1.20.x/releases/tag/${{ inputs.tag }}
-          embed-description: ${{ inputs.changelog }}
+          embed-url: https://github.com/TerraFirmaGreg-Team/TFG-Modpack-1.20.x/releases/tag/${{ inputs.project_version }}
+          embed-thumbnail-url: https://raw.githubusercontent.com/TerraFirmaGreg-Team/.github/main/branding/logo_new_year.png
+          embed-description: |
+            **Release Type**: `${{ env.RELEASE_TYPE }}`
+            **GameVersion**: `${{ inputs.mc_version }}`
+            **Website Link**: [CurseForge](https://www.curseforge.com/minecraft/modpacks/terrafirmagreg/files/${{ steps.cf_release.outputs.id }})
+
+            **Changelog**
+            ```${{ inputs.changelog }}```
          embed-color: 5814783

  release-github:
@@ -88,12 +92,12 @@ jobs:
          prerelease: false
          generate_release_notes: true
          name: ${{ inputs.project_version }}
-          body: ${{ inputs.changelog }}
+          body: ${{ inputs.CHANGELOG }}
          files: |
            ${{ inputs.project_name }}-${{ inputs.project_version }}-cf.zip
            ${{ inputs.project_name }}-${{ inputs.project_version }}-mmc.zip
            ${{ inputs.project_name }}-${{ inputs.project_version }}-server.zip
-          tag_name: ${{ inputs.tag }}
+          tag_name: ${{ inputs.project_version }}
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

@@ -126,9 +130,9 @@ jobs:
  #         project-id: ${{ env.MODRINTH_PROJECT_ID }}
  #         modpack-path: ${{ inputs.project_name }}-${{ inputs.project_version }}-mrd.zip
  #         modpack-server-path: ${{ inputs.project_name }}-${{ inputs.project_version }}-server.zip
-  #         changelog: "${{ inputs.changelog }}"
+  #         changelog: "${{ inputs.CHANGELOG }}"
  #         changelog-format: markdown
-  #         game-version: ${{ inputs.mcversion }}
+  #         game-version: ${{ inputs.mc_version }}
  #         display-name: ${{ inputs.project_name }}-${{ inputs.project_version }}
  #         server-display-name: ${{ inputs.project_name }}-${{ inputs.project_version }}-server
  #         release-type: ${{ env.RELEASE_TYPE }}
@@ -144,8 +148,8 @@ jobs:
      - name: close-fixed-in-dev
        uses: juraj-hrivnak/close-issues-based-on-label@master
        env:
-          LABEL: "2. status: fixed in dev"
-          VERSION: ${{ inputs.tag }}
+          LABEL: "2. Status: Fixed in Dev"
+          VERSION: ${{ inputs.project_version }}
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

      
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,43 @@
 # Changelog

+## [0.4.4] - Unreleased
+### Изменения
+- Исправлены текстуры ванильных кусков руды.
+- Исправлены рецепты декрафта через продувку в воде из create у грязной пыль.
+- Обновлен интерфейс.
+- REI заменен на EMI.
+- Добавлены оголовья для Spade.
+- Добавлена ковка для Spade.
+- MiningHammer теперь делаются из 2 слитков, значит их можно получить до создания экструдера.
+- Добавлено больше рецептов через водную продувку из create gt руды.
+- Добавлено больше рецептов через бросание в воду AE2.
+- Исправлен баг, когда отлично выкованный статус на оголовии не перекладывался на сам инструмент.
+- Исправление рецептов терминалов AE2.
+- Добавлены 2 новые жилы, Oilsands и Spodumene, подробнее в таблице Excel.
+- Обновлены 5 жил, подробнее в таблице Excel, там можно посмотреть изменения.
+- Добавлена жидкостная жила с fresh водой.
+- Интеграция ComputerCraft.
+
+## [0.4.3] - 06.01.2024
+### Изменения
+- Исправлен рецепт точного механизма из Create.
+- Исправлен рецепт ремня из Create.
+- Исправлен рецепт молотильных камней из Create.
+- Исправлен рецепт хранилища из Create.
+- Теперь помпа Create не уничтожает жидкости при их выкачивании.
+- Теперь помпы и трубы Create не могут устанавливать воду (источник).
+- Исправлены рецепты стальных машин.
+- Исправлна работа XaeroMinimap и Worldmap с блоками травы TFC (если она у вас была серая, то фикс автоматически начнет работать, если вы переключали режим, то верните на Accurate).
+- Исправлена работа дополнения для TFC-Ambiental, теперь все температуры от дополнительных источников работают верно.
+- Исправлены некоторые эффекты у Enchanced Visuals.
+- Скрыты цветные рюкзаки, чтобы не вводить пользователей в заблуждение, тк рецепты с покраской не работают.
+- Исправлена групировка предметов GT в REI.
+- Исправлено наложение для руд в GT.
+- Исправлены ссылки в кнопках на главном меню.
+### Обновленные моды
+- TerraFirmaGreg-Core -> 0.2.10
+- canary -> 0.3.1
+
 ## [0.4.2] - 05.01.2024
 ### Изменения
 - Исправлен вылет игры при нахождении рядом с бойлерами.
--- a/README.md
+++ b/README.md
@@ -1,15 +1,15 @@
 # TerraFirmaGreg - 1.20.x

 <div align="center">
-  <a href="https://github.com/TerraFirmaGreg-Team/TFG-Modpack-1.20.x">
-    <img src="https://github.com/TerraFirmaGreg-Team/.github/blob/4980f6f22fd8a7ecab65230b87964c8db23efbc2/branding/logo.png?raw=true" alt="Logo" height="75">
+  <a href="https://github.com/TerraFirmaGreg-Team/Modpack-1.20.x">
+    <img src="https://github.com/TerraFirmaGreg-Team/.github/blob/main/branding/logo.png?raw=true" alt="Logo" height="75">
  </a>
  <br/>

  <a href="https://discord.gg/terrafirmagreg">
  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges/assets/compact-minimal/social/discord-singular_vector.svg" alt="Chat on Discord"></a>

-  <a href="https://www.curseforge.com/minecraft/modpacks/terrafirmagreg/files?page=1&pageSize=20&version=1.20.2">
+  <a href="https://www.curseforge.com/minecraft/modpacks/terrafirmagreg/files?page=1&pageSize=20&version=1.20.1">
  <img src="https://cdn.jsdelivr.net/npm/@intergrav/devins-badges/assets/compact-minimal/available/curseforge_vector.svg" alt="Available on СurseForge"></a>
  <br/>
  <p align="center">
@@ -40,7 +40,7 @@ Also in the modpack there are other interesting mods that will allow you to pass
 - [GregTech Modern](https://www.curseforge.com/minecraft/mc-mods/gregtechceu-modern)
 - [Applied Energistics](https://www.curseforge.com/minecraft/mc-mods/ae2)
 - [Create](https://www.curseforge.com/minecraft/mc-mods/create)
- [AdAstra](https://www.curseforge.com/minecraft/mc-mods/ad-astra)
+- [Gregicality Rocketry](https://www.curseforge.com/minecraft/mc-mods/gcyr)


 and others, also all these mods have addons to diversify the gameplay even more! To make it easier for you to start developing in this complex world, there are quests in the modpack, with the help of them you can get used to this unfriendly world.
--- a/config/dynamic_lights_reforged.toml
+++ b/config/dynamic_lights_reforged.toml
@@ -1,11 +0,0 @@
-
-#Dynamic Lights Settings
-[Settings]
-
-	[Settings."Lighting Settings"]
-		"Dynamic TileEntity Lighting" = true
-		"Only Update On Position Change" = true
-		#Allowed Values: OFF, SLOW, FAST, REALTIME
-		"Quality Mode (OFF, SLOW, FAST, REALTIME)" = "FAST"
-		"Dynamic Entity Lighting" = true
-
--- a/config/embeddium++.toml
+++ b/config/embeddium++.toml
@@ -11,7 +11,7 @@
 	#You can configure FPS overlay at the corner
 	[EmbeddiumPlus.fps_overlay]
 		#Allowed Values: OFF, SIMPLE, ADVANCED
-		DisplayMode = "ADVANCED"
+		DisplayMode = "OFF"
 		OverlayMargin = 12

 	#Configure max BlockEntity distance
@@ -30,7 +30,7 @@
 		#Allowed Values: OFF, FAST, FANCY
 		ChunkFadeInQuality = "FANCY"
 		#Allowed Values: WINDOWED, BORDERLESS, FULLSCREEN
-		BorderlessFullscreen = "FULLSCREEN"
+		BorderlessFullscreen = "WINDOWED"
 		ExtendedServerViewDistance = true

 	#Configure max Entity distance
--- a/config/emi.css
+++ b/config/emi.css
@@ -0,0 +1,462 @@
+/** EMI Config */
+
+#general {
+	/**
+	 * Whether EMI is enabled and visible.
+	 */
+	enabled: true;
+
+	/**
+	 * Whether cheating in items is enabled.
+	 */
+	cheat-mode: true;
+
+	/**
+	 * How much EMI should use tooltips and popups to show controls and information.
+	 */
+	help-level: normal;
+
+	/**
+	 * Where EMI should pull stacks from to populate the index.
+	 */
+	index-source: creative;
+
+	/**
+	 * Whether normal search queries should include the tooltip.
+	 */
+	search-tooltip-by-default: true;
+
+	/**
+	 * Whether normal search queries should include the mod name.
+	 */
+	search-mod-name-by-default: false;
+
+	/**
+	 * Whether normal search queries should include the stack's tags.
+	 */
+	search-tags-by-default: false;
+}
+
+#ui {
+	/**
+	 * Which action should be performed when clicking the recipe book.
+	 */
+	recipe-book-action: toggle-craftables;
+
+	/**
+	 * Where to display status effects in the inventory.
+	 */
+	effect-location: top;
+
+	/**
+	 * Whether to display a gray overlay when hovering over a stack.
+	 */
+	show-hover-overlay: true;
+
+	/**
+	 * Whether to add mod name to tooltips
+	 */
+	append-mod-id: true;
+
+	/**
+	 * Whether to add mod name to item tooltips, in case another mod provides behavior
+	 */
+	append-item-mod-id: true;
+
+	/**
+	 * Prevents recipes being quick crafted from shifting around under the cursor.
+	 */
+	miscraft-prevention: true;
+
+	/**
+	 * The unit to display fluids as.
+	 */
+	fluid-unit: millibuckets;
+
+	/**
+	 * Whether to use the batched render system. Batching is faster, but may have
+	 * incompatibilities with shaders or other mods.
+	 */
+	use-batched-renderer: true;
+
+	/**
+	 * Whether to have the search bar in the center of the screen, instead of to the
+	 * side.
+	 */
+	center-search-bar: true;
+
+	/**
+	 * Which sidebar type to switch to when searching.
+	 */
+	search-sidebar-focus: index;
+
+	/**
+	 * Which sidebar type to focus when the search is empty.
+	 */
+	empty-search-sidebar-focus: none;
+
+	/**
+	 * The amount of vertical margin to give in the recipe screen.
+	 */
+	vertical-margin: 20;
+
+	/**
+	 * The minimum width of the recipe screen in pixels. Controls how many tabs there
+	 * can be, and where the page switching buttons go. The default is 176, the width
+	 * of most screens.
+	 */
+	minimum-recipe-screen-width: 176;
+
+	/**
+	 * Where to show workstations in the recipe screen
+	 */
+	workstation-location: bottom;
+
+	/**
+	 * Display cost per batch when hovering a recipe output
+	 */
+	show-cost-per-batch: true;
+
+	/**
+	 * Whether recipes should have a button to set as default.
+	 */
+	recipe-default-button: true;
+
+	/**
+	 * Whether recipes should have a button to show the recipe tree.
+	 */
+	recipe-tree-button: true;
+
+	/**
+	 * Whether recipes should have a button to fill the ingredients in a handler.
+	 */
+	recipe-fill-button: true;
+
+	/**
+	 * Whether recipes should have a button to take a screenshot of the recipe.
+	 */
+	recipe-screenshot-button: false;
+
+	/**
+	 * The GUI scale at which recipe screenshots are saved. Use 0 to use the current
+	 * GUI scale.
+	 */
+	recipe-screenshot-scale: 0;
+
+	/**
+	 * The pages in the left sidebar
+	 */
+	left-sidebar-pages: favorites;
+
+	/**
+	 * The subpanels in the left sidebar
+	 */
+	left-sidebar-subpanels: none;
+
+	/**
+	 * How many columns and rows of ingredients to limit the left sidebar to
+	 */
+	left-sidebar-size: 12, 100;
+
+	/**
+	 * How much space to maintain between the left sidebar and obstructions, in pixels
+	 */
+	left-sidebar-margins: 2, 2, 2, 2;
+
+	/**
+	 * Where to position the left sidebar
+	 */
+	left-sidebar-align: left, top;
+
+	/**
+	 * Whether to render the header buttons and page count for the left sidebar
+	 */
+	left-sidebar-header: visible;
+
+	/**
+	 * Which theme to use for the left sidebar
+	 */
+	left-sidebar-theme: transparent;
+
+	/**
+	 * The pages in the right sidebar
+	 */
+	right-sidebar-pages: index, craftables;
+
+	/**
+	 * The subpanels in the right sidebar
+	 */
+	right-sidebar-subpanels: none;
+
+	/**
+	 * How many columns and rows of ingredients to limit the right sidebar to
+	 */
+	right-sidebar-size: 12, 100;
+
+	/**
+	 * How much space to maintain between the right sidebar and obstructions, in pixels
+	 */
+	right-sidebar-margins: 2, 2, 2, 2;
+
+	/**
+	 * Where to position the right sidebar
+	 */
+	right-sidebar-align: right, top;
+
+	/**
+	 * Whether to render the header buttons and page count for the right sidebar
+	 */
+	right-sidebar-header: visible;
+
+	/**
+	 * Which theme to use for the right sidebar
+	 */
+	right-sidebar-theme: transparent;
+
+	/**
+	 * The pages in the top sidebar
+	 */
+	top-sidebar-pages: none;
+
+	/**
+	 * The subpanels in the top sidebar
+	 */
+	top-sidebar-subpanels: none;
+
+	/**
+	 * How many columns and rows of ingredients to limit the top sidebar to
+	 */
+	top-sidebar-size: 9, 9;
+
+	/**
+	 * How much space to maintain between the top sidebar and obstructions, in pixels
+	 */
+	top-sidebar-margins: 2, 2, 2, 2;
+
+	/**
+	 * Where to position the top sidebar
+	 */
+	top-sidebar-align: center, center;
+
+	/**
+	 * Whether to render the header buttons and page count for the top sidebar
+	 */
+	top-sidebar-header: visible;
+
+	/**
+	 * Which theme to use for the top sidebar
+	 */
+	top-sidebar-theme: transparent;
+
+	/**
+	 * The pages in the bottom sidebar
+	 */
+	bottom-sidebar-pages: none;
+
+	/**
+	 * The subpanels in the bottom sidebar
+	 */
+	bottom-sidebar-subpanels: none;
+
+	/**
+	 * How many columns and rows of ingredients to limit the bottom sidebar to
+	 */
+	bottom-sidebar-size: 9, 9;
+
+	/**
+	 * How much space to maintain between the bottom sidebar and obstructions, in
+	 * pixels
+	 */
+	bottom-sidebar-margins: 2, 2, 2, 2;
+
+	/**
+	 * Where to position the bottom sidebar
+	 */
+	bottom-sidebar-align: center, center;
+
+	/**
+	 * Whether to render the header buttons and page count for the bottom sidebar
+	 */
+	bottom-sidebar-header: visible;
+
+	/**
+	 * Which theme to use for the bottom sidebar
+	 */
+	bottom-sidebar-theme: transparent;
+}
+
+#binds {
+	/**
+	 * Toggle the visibility of EMI.
+	 */
+	toggle-visibility: "ctrl key.keyboard.o";
+
+	/**
+	 * Focuse the search bar.
+	 */
+	focus-search: "ctrl key.keyboard.f";
+
+	/**
+	 * Clears the search bar.
+	 */
+	clear-search: "key.keyboard.unknown";
+
+	/**
+	 * Display the recipes for creating a stack.
+	 */
+	view-recipes: "key.keyboard.r";
+	view-recipes: "key.mouse.left";
+
+	/**
+	 * Display the recipes that can be created using a stack.
+	 */
+	view-uses: "key.keyboard.u";
+	view-uses: "key.mouse.right";
+
+	/**
+	 * Favorite the item to display on the side of the screen opposite of recipies for
+	 * quick access.
+	 */
+	favorite: "key.keyboard.a";
+
+	/**
+	 * Set the default recipe for a given stack in the output of a recipe to that
+	 * recipe.
+	 */
+	default-stack: "ctrl key.mouse.left";
+
+	/**
+	 * Display the recipe tree for a given stack.
+	 */
+	view-stack-tree: "key.keyboard.unknown";
+
+	/**
+	 * Display the recipe tree.
+	 */
+	view-tree: "key.keyboard.unknown";
+
+	/**
+	 * Return to the previous page in EMI.
+	 */
+	back: "key.keyboard.backspace";
+
+	/**
+	 * Return to the next page in EMI after going back.
+	 */
+	forward: "key.keyboard.unknown";
+
+	/**
+	 * When on a stack with an associated recipe:
+	 * Move ingredients for a single result.
+	 */
+	craft-one: "key.mouse.left";
+
+	/**
+	 * When on a stack with an associated recipe:
+	 * Move ingredients for as many results as possible.
+	 */
+	craft-all: "shift key.mouse.left";
+
+	/**
+	 * When on a stack with an associated recipe:
+	 * Move ingredients for a single result and put in inventory if possible.
+	 */
+	craft-one-to-inventory: "key.keyboard.unknown";
+
+	/**
+	 * When on a stack with an associated recipe:
+	 * Move ingredients for as many results as possible and put in inventory if
+	 * possible.
+	 */
+	craft-all-to-inventory: "key.keyboard.unknown";
+
+	/**
+	 * When on a stack with an associated recipe:
+	 * Move ingredients for a single result and put in cursor if possible.
+	 */
+	craft-one-to-cursor: "ctrl key.mouse.left";
+
+	/**
+	 * Display the recipe that will be used to craft on a stack with no recipe context.
+	 */
+	show-craft: "key.keyboard.left.shift";
+
+	/**
+	 * Cheat in one of an item into the inventory.
+	 */
+	cheat-one-to-inventory: "ctrl key.mouse.right";
+
+	/**
+	 * Cheat in a stack of an item into the inventory.
+	 */
+	cheat-stack-to-inventory: "ctrl key.mouse.left";
+
+	/**
+	 * Cheat in one of an item into the cursor.
+	 */
+	cheat-one-to-cursor: "ctrl key.mouse.middle";
+
+	/**
+	 * Cheat in a stack of an item into the cursor.
+	 */
+	cheat-stack-to-cursor: "key.keyboard.unknown";
+
+	/**
+	 * Delete the stack in the cursor when hovering the index
+	 */
+	delete-cursor-stack: "key.mouse.left";
+
+	/**
+	 * Copies the hovered recipe's ID to the clipboard
+	 */
+	copy-recipe-id: "key.keyboard.unknown";
+
+	/**
+	 * In edit mode, hide the hovered stack
+	 */
+	hide-stack: "ctrl key.mouse.left";
+
+	/**
+	 * In edit mode, hide stacks with the hovered stack's id
+	 */
+	hide-stack-by-id: "ctrl shift key.mouse.left";
+}
+
+#dev {
+	/**
+	 * Whether development functions should be enabled. Not recommended for general
+	 * play.
+	 */
+	dev-mode: false;
+
+	/**
+	 * Whether editing the index is enabled
+	 */
+	edit-mode: false;
+
+	/**
+	 * Whether to log untranslated tags as warnings.
+	 */
+	log-untranslated-tags: false;
+
+	/**
+	 * Whether to log ingredients that don't have a representative tag as warnings.
+	 */
+	log-non-tag-ingredients: false;
+
+	/**
+	 * Whether hovering the output of a recipe should show the recipe's EMI ID.
+	 */
+	show-recipe-ids: true;
+
+	/**
+	 * Whether stacks in the index should display a highlight if they have a recipe
+	 * default.
+	 */
+	highlight-defaulted: false;
+
+	/**
+	 * Whether to display exclusion areas
+	 */
+	highlight-exclusion-areas: false;
+}
--- a/config/enhancedvisuals-client.json
+++ b/config/enhancedvisuals-client.json
@@ -305,7 +305,7 @@
      "damageBlackList": []
    },
    "slender": {
-      "enabled": true,
+      "enabled": false,
      "opacity": 1.0,
      "defaultIntensity": 0,
      "maxIntensity": 0.3,
@@ -333,7 +333,7 @@
    },
    "heartbeat": {
      "enabled": true,
-      "opacity": 1.0,
+      "opacity": 0.15447155,
      "useHealthPercentage": false,
      "maxHealth": 6,
      "maxHealthPercentage": 0.15,
@@ -343,7 +343,7 @@
      "heartbeatBlurDuration": 5,
      "minHeartbeatLength": 15,
      "heartbeatTimeFactor": 100.0,
-      "heartbeatVolume": 1.0,
+      "heartbeatVolume": 0.2,
      "lowhealth": {
        "disabled": false,
        "opacity": 1.0,
--- a/config/fancymenu/customizablemenus.txt
+++ b/config/fancymenu/customizablemenus.txt
@@ -3,9 +3,9 @@ type = customizablemenus
 de.keksuccino.drippyloadingscreen.customization.DrippyOverlayScreen {
 }

-net.minecraft.client.gui.screens.TitleScreen {
-}
-
 net.minecraft.client.gui.screens.PauseScreen {
 }

+net.minecraft.client.gui.screens.TitleScreen {
+}
+
--- a/config/fancymenu/customization/loading_screen.txt
+++ b/config/fancymenu/customization/loading_screen.txt
@@ -9,7 +9,7 @@ customization-meta {
 }

 customization {
-  name = tfgslideshow
+  name = main_menu
  action = setbackgroundslideshow
 }

@@ -55,7 +55,7 @@ customization {
 }

 customization {
-  path = kubejs/assets/tfg/textures/gui/logo-512x512.png
+  path = kubejs/assets/tfg/textures/gui/logo_512x512.png
  orientation = mid-centered
  x = -50
  width = 100
--- a/config/fancymenu/customization/main_menu.txt
+++ b/config/fancymenu/customization/main_menu.txt
@@ -9,7 +9,7 @@ customization-meta {
 }

 customization {
-  name = tfgslideshow
+  name = main_menu
  action = setbackgroundslideshow
 }

@@ -18,6 +18,14 @@ customization {
  action = backgroundoptions
 }

+customization {
+  identifier = %id=button_compatibility_id:mc_titlescreen_copyright_button%
+  orientation = bottom-left
+  x = 2
+  action = movebutton
+  y = -10
+}
+
 customization {
  identifier = %id=button_compatibility_id:mc_titlescreen_multiplayer_button%
  orientation = mid-centered
@@ -37,9 +45,6 @@ customization {
  identifier = %id=button_compatibility_id:mc_titlescreen_multiplayer_button%
  loopbackgroundanimations = true
  restartbackgroundanimations = true
-  action = setbuttontexture
-  backgroundhovered = kubejs/assets/tfg/textures/gui/button98x20_hovered.png
-  backgroundnormal = kubejs/assets/tfg/textures/gui/button98x20.png
 }

 customization {
@@ -65,7 +70,7 @@ customization {
  loopbackgroundanimations = true
  restartbackgroundanimations = true
  action = setbuttontexture
-  backgroundnormal = kubejs/assets/tfg/textures/gui/mdr_logo.png
+  backgroundnormal = kubejs/assets/tfg/textures/gui/modrinth_logo.png
 }

 customization {
@@ -80,9 +85,6 @@ customization {
  identifier = %id=button_compatibility_id:mc_titlescreen_options_button%
  loopbackgroundanimations = true
  restartbackgroundanimations = true
-  action = setbuttontexture
-  backgroundhovered = kubejs/assets/tfg/textures/gui/button98x20_hovered.png
-  backgroundnormal = kubejs/assets/tfg/textures/gui/button98x20.png
 }

 customization {
@@ -97,9 +99,6 @@ customization {
  identifier = %id=button_compatibility_id:mc_titlescreen_quit_button%
  loopbackgroundanimations = true
  restartbackgroundanimations = true
-  action = setbuttontexture
-  backgroundhovered = kubejs/assets/tfg/textures/gui/button98x20_hovered.png
-  backgroundnormal = kubejs/assets/tfg/textures/gui/button98x20.png
 }

 customization {
@@ -123,13 +122,11 @@ customization {
  y = -51
 }

+
 customization {
  identifier = %id=button_compatibility_id:mc_titlescreen_singleplayer_button%
  loopbackgroundanimations = true
  restartbackgroundanimations = true
-  action = setbuttontexture
-  backgroundhovered = kubejs/assets/tfg/textures/gui/button_hovered.png
-  backgroundnormal = kubejs/assets/tfg/textures/gui/button.png
 }

 customization {
@@ -144,9 +141,6 @@ customization {
  identifier = %id=button_compatibility_id:forge_titlescreen_mods_button%
  loopbackgroundanimations = true
  restartbackgroundanimations = true
-  action = setbuttontexture
-  backgroundhovered = kubejs/assets/tfg/textures/gui/button98x20_hovered.png
-  backgroundnormal = kubejs/assets/tfg/textures/gui/button98x20.png
 }

 customization {
@@ -234,7 +228,6 @@ customization {
  orientation = mid-centered
  restartbackgroundanimations = true
  buttonaction = joinserver;tfg2.terrafirmagreg.su%btnaction_splitter_fm%
-  backgroundhovered = kubejs/assets/tfg/textures/gui/button98x20_hovered.png
  label = Offical Server
  loopbackgroundanimations = true
  x = 47
@@ -242,12 +235,11 @@ customization {
  action = addbutton
  actionid = 6514e312-8243-47af-a516-89743d8ca1af1699692677651
  y = -28
-  backgroundnormal = kubejs/assets/tfg/textures/gui/button98x20.png
  height = 20
 }

 customization {
-  path = kubejs/assets/tfg/textures/gui/logo-512x512.png
+  path = kubejs/assets/tfg/textures/gui/logo_512x512.png
  orientation = mid-centered
  x = -177
  width = 117
@@ -260,8 +252,8 @@ customization {
 customization {
  orientation = mid-centered
  restartbackgroundanimations = true
-  buttonaction = openlink;https://www.curseforge.com/minecraft/modpacks/tfg%btnaction_splitter_fm%
-  backgroundhovered = kubejs/assets/tfg/textures/gui/curse_logo_hovered.png
+  buttonaction = openlink;https://www.curseforge.com/minecraft/modpacks/terrafirmagreg%btnaction_splitter_fm%
+  backgroundhovered = kubejs/assets/tfg/textures/gui/curseforge_logo_hovered.png
  label = 
  loopbackgroundanimations = true
  x = 47
@@ -269,15 +261,15 @@ customization {
  action = addbutton
  actionid = 9f789963-f2dc-46f7-a57b-9c4de545a6ff1699691707372
  y = 18
-  backgroundnormal = kubejs/assets/tfg/textures/gui/curse_logo.png
+  backgroundnormal = kubejs/assets/tfg/textures/gui/curseforge_logo.png
  height = 20
 }

 customization {
  orientation = mid-centered
  restartbackgroundanimations = true
-  buttonaction = openlink;https://discord.gg/AEaCzCTUwQ%btnaction_splitter_fm%
-  backgroundhovered = kubejs/assets/tfg/textures/gui/ds_logo_hovered.png
+  buttonaction = openlink;https://discord.gg/terrafirmagreg%btnaction_splitter_fm%
+  backgroundhovered = kubejs/assets/tfg/textures/gui/discord_logo_hovered.png
  label = 
  loopbackgroundanimations = true
  x = 125
@@ -285,15 +277,15 @@ customization {
  action = addbutton
  actionid = 57a283ec-1941-4101-b14b-f2188e8660671699691708296
  y = 18
-  backgroundnormal = kubejs/assets/tfg/textures/gui/ds_logo.png
+  backgroundnormal = kubejs/assets/tfg/textures/gui/discord_logo.png
  height = 20
 }

 customization {
  orientation = mid-centered
  restartbackgroundanimations = true
-  buttonaction = openlink;https://github.com/tfg-Team/TFG-Modpack-1.20.x%btnaction_splitter_fm%
-  backgroundhovered = kubejs/assets/tfg/textures/gui/git_logo_hovered.png
+  buttonaction = openlink;https://github.com/TerraFirmaGreg-Team/Modpack-1.20.x%btnaction_splitter_fm%
+  backgroundhovered = kubejs/assets/tfg/textures/gui/github_logo_hovered.png
  label = 
  loopbackgroundanimations = true
  x = 100
@@ -301,15 +293,15 @@ customization {
  action = addbutton
  actionid = 91b4ae84-eed0-47a3-8fe9-6957c02d2c621699691709167
  y = 18
-  backgroundnormal = kubejs/assets/tfg/textures/gui/git_logo.png
+  backgroundnormal = kubejs/assets/tfg/textures/gui/github_logo.png
  height = 20
 }

 customization {
  orientation = mid-centered
  restartbackgroundanimations = true
-  buttonaction = openlink;https://modrinth.com/modpack/tfg%btnaction_splitter_fm%
-  backgroundhovered = kubejs/assets/tfg/textures/gui/mdr_logo_hovered.png
+  buttonaction = openlink;https://modrinth.com/modpack/terrafirmagreg%btnaction_splitter_fm%
+  backgroundhovered = kubejs/assets/tfg/textures/gui/modrinth_logo_hovered.png
  label = 
  loopbackgroundanimations = true
  x = 72
@@ -317,7 +309,7 @@ customization {
  action = addbutton
  actionid = 6514e312-8243-47af-a516-89743d8ca1af1699692677651
  y = 18
-  backgroundnormal = kubejs/assets/tfg/textures/gui/mdr_logo.png
+  backgroundnormal = kubejs/assets/tfg/textures/gui/modrinth_logo.png
  height = 20
 }

@@ -326,7 +318,7 @@ customization {
  enable_scrolling = true
  shadow = true
  scale = 1.0
-  source = Forge {"placeholder":"modversion","values":{"modid":"forge"}}%n%Minecraft {"placeholder":"mcversion"}%n%{"placeholder":"loadedmods"} mods loaded%n%Modpack Version: §cDEV§r%n%Latest Modpack Version: §b{"placeholder":"json","values":{"source":"https://api.github.com/repos/tfg-Team/TFG-Modpack-1.20.x/releases/latest","json_path":"$.tag_name"}}§r
+  source = Forge {"placeholder":"modversion","values":{"modid":"forge"}}%n%Minecraft {"placeholder":"mcversion"}%n%{"placeholder":"loadedmods"} mods loaded%n%Modpack Version: §cDEV§r%n%Latest Modpack Version: §b{"placeholder":"json","values":{"source":"https://api.github.com/repos/TerraFirmaGreg-Team/Modpack-1.20.x/releases/latest","json_path":"$.tag_name"}}§r
  text_border = 0
  case_mode = normal
  source_mode = direct
@@ -335,8 +327,10 @@ customization {
  width = 163
  action = custom_layout_element:fancymenu_customization_item_text
  actionid = a5845307-9494-47b0-87c0-e398a680e9e01700129661006
-  y = -51
+  y = -61
  alignment = left
  height = 56
 }

+
+
--- a/config/fancymenu/slideshows/tfgslideshow/images/image_1.png
+++ b/config/fancymenu/slideshows/tfgslideshow/images/image_1.png
--- a/config/fancymenu/slideshows/tfgslideshow/images/image_10.png
+++ b/config/fancymenu/slideshows/tfgslideshow/images/image_10.png
--- a/config/fancymenu/slideshows/tfgslideshow/images/image_2.png
+++ b/config/fancymenu/slideshows/tfgslideshow/images/image_2.png
--- a/config/fancymenu/slideshows/tfgslideshow/images/image_3.png
+++ b/config/fancymenu/slideshows/tfgslideshow/images/image_3.png
--- a/config/fancymenu/slideshows/tfgslideshow/images/image_4.png
+++ b/config/fancymenu/slideshows/tfgslideshow/images/image_4.png
--- a/config/fancymenu/slideshows/tfgslideshow/images/image_5.png
+++ b/config/fancymenu/slideshows/tfgslideshow/images/image_5.png
--- a/config/fancymenu/slideshows/tfgslideshow/images/image_6.png
+++ b/config/fancymenu/slideshows/tfgslideshow/images/image_6.png
--- a/config/fancymenu/slideshows/tfgslideshow/images/image_7.png
+++ b/config/fancymenu/slideshows/tfgslideshow/images/image_7.png
--- a/config/fancymenu/slideshows/tfgslideshow/images/image_8.png
+++ b/config/fancymenu/slideshows/tfgslideshow/images/image_8.png
--- a/config/fancymenu/slideshows/tfgslideshow/images/image_9.png
+++ b/config/fancymenu/slideshows/tfgslideshow/images/image_9.png
--- a/config/fancymenu/slideshows/tfgslideshow/properties.txt
+++ b/config/fancymenu/slideshows/tfgslideshow/properties.txt
@@ -1,7 +1,7 @@
 type = slideshow

 slideshow-meta {
-   name = tfgslideshow
+   name = main_menu
   width = 1920
   height = 1080
   x = 0
--- a/config/ftbquests/quests/chapters/primitive_age.snbt
+++ b/config/ftbquests/quests/chapters/primitive_age.snbt
@@ -14,7 +14,7 @@
 				Count: 1b
 				id: "ftbquests:custom_icon"
 				tag: {
-					Icon: "tfg:textures/gui/logo-512x512.png"
+					Icon: "tfg:textures/gui/logo_512x512.png"
 				}
 			}
 			id: "76EF4D00586A8B74"
@@ -1059,6 +1059,9 @@
 					id: "gtceu:stone_axe"
 					tag: {
 						Damage: 0
+						GT.Tool: {
+							Damage: 0
+						}
 					}
 				}
 				type: "item"
@@ -1078,6 +1081,9 @@
 					id: "gtceu:stone_hoe"
 					tag: {
 						Damage: 0
+						GT.Tool: {
+							Damage: 0
+						}
 					}
 				}
 				type: "item"
@@ -1116,6 +1122,9 @@
 					id: "gtceu:stone_shovel"
 					tag: {
 						Damage: 0
+						GT.Tool: {
+							Damage: 0
+						}
 					}
 				}
 				type: "item"
@@ -1136,6 +1145,9 @@
 					id: "gtceu:stone_hammer"
 					tag: {
 						Damage: 0
+						GT.Tool: {
+							Damage: 0
+						}
 					}
 				}
 				type: "item"
@@ -1246,6 +1258,9 @@
 					id: "gtceu:stone_knife"
 					tag: {
 						Damage: 0
+						GT.Tool: {
+							Damage: 0
+						}
 					}
 				}
 				type: "item"
--- a/config/ftbquests/quests/data.snbt
+++ b/config/ftbquests/quests/data.snbt
@@ -13,7 +13,7 @@
 		Count: 1b
 		id: "ftbquests:custom_icon"
 		tag: {
-			Icon: "tfg:textures/gui/logo-512x512.png"
+			Icon: "tfg:textures/gui/logo_512x512.png"
 		}
 	}
 	lock_message: "e"
--- a/config/gtceu.yaml
+++ b/config/gtceu.yaml
@@ -138,6 +138,10 @@ machines:
  # Default: false
  doTerrainExplosion: true

+  # Energy use multiplier for electric items.
+  # Default: 100
+  energyUsageMultiplier: 100
+
  # Whether machines or boilers damage the terrain when they explode.
  # Note machines and boilers always explode when overloaded with power or met with special conditions, regardless of this config.
  # Default: true
@@ -215,6 +219,14 @@ client:
  # Default: true
  machinesEmissiveTextures: true

+  # Whether or not sounds should be played when using tools outside of crafting.
+  # Default: true
+  toolUseSounds: true
+
+  # Whether or not sounds should be played when crafting with tools.
+  # Default: true
+  toolCraftingSounds: true
+
  # The default color to overlay onto machines.
  # #FFFFFF is no coloring (default).
  # #D2DCFF is the classic blue from GT5.
@@ -225,6 +237,12 @@ client:
  # Default: true
  useVBO: true

+# Config options for Tools and Armor
+tools:
+  # Random chance for electric tools to take actual damage
+  # Default: 10%
+  rngDamageElectricTools: 10
+
 # Config options for Mod Compatibility
 compat:
  # Config options regarding GTEU compatibility with other energy systems
--- a/config/jade/sort-order.json
+++ b/config/jade/sort-order.json
@@ -157,6 +157,10 @@
  "create:exact_block": null,
  "create:filter": null,
  "create:goggles": null,
+  "gtceu:electric_container_provider": null,
+  "gtceu:workable_provider": null,
+  "gtceu:controllable_provider": null,
+  "gtceu:recipe_logic_provider": null,
  "tfc:barrel": null,
  "tfc:bellows": null,
  "tfc:sapling": null,
@@ -206,10 +210,6 @@
  "tfc:ocelot": null,
  "tfc:rabbit": null,
  "tfc:fishing_hook": null,
-  "gtceu:electric_container_provider": null,
-  "gtceu:workable_provider": null,
-  "gtceu:controllable_provider": null,
-  "gtceu:recipe_logic_provider": null,
  "minecraft:brewing_stand": null,
  "minecraft:beehive": null,
  "minecraft:command_block": null,
--- a/config/jei/blacklist.cfg
+++ b/config/jei/blacklist.cfg
--- a/config/jei/jei-client.ini
+++ b/config/jei/jei-client.ini
@@ -0,0 +1,141 @@
+[advanced]
+	# Description: Display search bar in the center
+	# Valid Values: [true, false]
+	# Default Value: false
+	CenterSearch = false
+
+	# Description: Set low-memory mode (makes search very slow, but uses less RAM)
+	# Valid Values: [true, false]
+	# Default Value: false
+	LowMemorySlowSearchEnabled = false
+
+	# Description: Enable cheating items into the hotbar by using the shift+number keys.
+	# Valid Values: [true, false]
+	# Default Value: false
+	CheatToHotbarUsingHotkeysEnabled = false
+
+	# Description: Enable adding new bookmarks to the front of the bookmark list.
+	# Valid Values: [true, false]
+	# Default Value: true
+	AddBookmarksToFrontEnabled = true
+
+	# Description: When looking up recipes with items that contain fluids, also look up recipes for the fluids.
+	# Valid Values: [true, false]
+	# Default Value: false
+	LookupFluidContents = false
+
+	# Description: How items should be handed to you
+	# Valid Values: [INVENTORY, MOUSE_PICKUP]
+	# Default Value: MOUSE_PICKUP
+	GiveMode = MOUSE_PICKUP
+
+	# Description: Max. recipe gui height
+	# Valid Values: Any integer greater than or equal to 175
+	# Default Value: 350
+	RecipeGuiHeight = 350
+
+
+[sorting]
+	# Description: Sorting order for the ingredient list
+	# Valid Values: A comma-separated list containing values of:
+	# [MOD_NAME, INGREDIENT_TYPE, ALPHABETICAL, CREATIVE_MENU, TAG, ARMOR, MAX_DURABILITY]
+	# Default Value: MOD_NAME, INGREDIENT_TYPE, CREATIVE_MENU
+	IngredientSortStages = MOD_NAME, INGREDIENT_TYPE, CREATIVE_MENU
+
+
+[search]
+	# Description: Search mode for Mod Names (prefix: @)
+	# Valid Values: [ENABLED, REQUIRE_PREFIX, DISABLED]
+	# Default Value: REQUIRE_PREFIX
+	ModNameSearchMode = REQUIRE_PREFIX
+
+	# Description: Search mode for Tooltips (prefix: #)
+	# Valid Values: [ENABLED, REQUIRE_PREFIX, DISABLED]
+	# Default Value: ENABLED
+	TooltipSearchMode = ENABLED
+
+	# Description: Search mode for Tag Names (prefix: $)
+	# Valid Values: [ENABLED, REQUIRE_PREFIX, DISABLED]
+	# Default Value: REQUIRE_PREFIX
+	TagSearchMode = REQUIRE_PREFIX
+
+	# Description: Search mode for Colors (prefix: ^)
+	# Valid Values: [ENABLED, REQUIRE_PREFIX, DISABLED]
+	# Default Value: DISABLED
+	ColorSearchMode = DISABLED
+
+	# Description: Search mode for resources locations (prefix: &)
+	# Valid Values: [ENABLED, REQUIRE_PREFIX, DISABLED]
+	# Default Value: DISABLED
+	ResourceLocationSearchMode = DISABLED
+
+	# Description: Search advanced tooltips (visible with F3+H)
+	# Valid Values: [true, false]
+	# Default Value: false
+	SearchAdvancedTooltips = false
+
+
+[IngredientList]
+	# Description: Max number of rows shown
+	# Valid Values: An integer in the range [1, 100] (inclusive)
+	# Default Value: 16
+	MaxRows = 16
+
+	# Description: Max number of columns shown
+	# Valid Values: An integer in the range [4, 100] (inclusive)
+	# Default Value: 9
+	MaxColumns = 9
+
+	# Description: Horizontal alignment of the ingredient grid inside the available area
+	# Valid Values: [LEFT, CENTER, RIGHT]
+	# Default Value: RIGHT
+	HorizontalAlignment = RIGHT
+
+	# Description: Vertical alignment of the ingredient grid inside the available area
+	# Valid Values: [TOP, CENTER, BOTTOM]
+	# Default Value: TOP
+	VerticalAlignment = TOP
+
+	# Description: Visibility of the top page buttons. Use AUTO_HIDE to only show it when there are multiple pages.
+	# Valid Values: [ENABLED, AUTO_HIDE, DISABLED]
+	# Default Value: ENABLED
+	ButtonNavigationVisibility = ENABLED
+
+	# Description: Set to true to draw a background texture behind the gui.
+	# Valid Values: [true, false]
+	# Default Value: false
+	DrawBackground = false
+
+
+[BookmarkList]
+	# Description: Max number of rows shown
+	# Valid Values: An integer in the range [1, 100] (inclusive)
+	# Default Value: 16
+	MaxRows = 16
+
+	# Description: Max number of columns shown
+	# Valid Values: An integer in the range [4, 100] (inclusive)
+	# Default Value: 9
+	MaxColumns = 9
+
+	# Description: Horizontal alignment of the ingredient grid inside the available area
+	# Valid Values: [LEFT, CENTER, RIGHT]
+	# Default Value: LEFT
+	HorizontalAlignment = LEFT
+
+	# Description: Vertical alignment of the ingredient grid inside the available area
+	# Valid Values: [TOP, CENTER, BOTTOM]
+	# Default Value: TOP
+	VerticalAlignment = TOP
+
+	# Description: Visibility of the top page buttons. Use AUTO_HIDE to only show it when there are multiple pages.
+	# Valid Values: [ENABLED, AUTO_HIDE, DISABLED]
+	# Default Value: ENABLED
+	ButtonNavigationVisibility = ENABLED
+
+	# Description: Set to true to draw a background texture behind the gui.
+	# Valid Values: [true, false]
+	# Default Value: false
+	DrawBackground = false
+
+
--- a/config/jei/jei-colors.ini
+++ b/config/jei/jei-colors.ini
@@ -0,0 +1,8 @@
+[colors]
+	# Description: Color values to search for
+	# Valid Values: A comma-separated list containing values of:
+	# Any color name and an RGB hex color, separated by a ':'
+	# Default Value: White:EEEEEE, LightBlue:7492CC, Cyan:00EEEE, Blue:2222DD, LapisBlue:25418B, Teal:008080, Yellow:CACB58, GoldenYellow:EED700, Orange:D97634, Pink:D1899D, HotPink:FC0FC0, Magenta:B24BBB, Purple:813EB9, EvilPurple:2E1649, Lavender:B57EDC, Indigo:480082, Sand:DBD3A0, Tan:BB9B63, LightBrown:A0522D, Brown:634B33, DarkBrown:3A2D13, LimeGreen:43B239, SlimeGreen:83CB73, Green:008000, DarkGreen:224D22, GrassGreen:548049, Red:963430, BrickRed:B0604B, NetherBrick:2A1516, Redstone:CE3E36, Black:181515, CharcoalGray:464646, IronGray:646464, Gray:808080, Silver:C0C0C0
+	SearchColors = White:EEEEEE, LightBlue:7492CC, Cyan:00EEEE, Blue:2222DD, LapisBlue:25418B, Teal:008080, Yellow:CACB58, GoldenYellow:EED700, Orange:D97634, Pink:D1899D, HotPink:FC0FC0, Magenta:B24BBB, Purple:813EB9, EvilPurple:2E1649, Lavender:B57EDC, Indigo:480082, Sand:DBD3A0, Tan:BB9B63, LightBrown:A0522D, Brown:634B33, DarkBrown:3A2D13, LimeGreen:43B239, SlimeGreen:83CB73, Green:008000, DarkGreen:224D22, GrassGreen:548049, Red:963430, BrickRed:B0604B, NetherBrick:2A1516, Redstone:CE3E36, Black:181515, CharcoalGray:464646, IronGray:646464, Gray:808080, Silver:C0C0C0
+
+
--- a/config/jei/jei-debug.ini
+++ b/config/jei/jei-debug.ini
@@ -0,0 +1,12 @@
+[debug]
+	# Description: Debug mode enabled
+	# Valid Values: [true, false]
+	# Default Value: false
+	DebugMode = false
+
+	# Description: Debug inputs enabled
+	# Valid Values: [true, false]
+	# Default Value: false
+	DebugInputs = false
+
+
--- a/config/jei/jei-mod-id-format.ini
+++ b/config/jei/jei-mod-id-format.ini
@@ -0,0 +1,11 @@
+[modname]
+	# Description: Formatting for mod name tooltip
+	# Valid Values: A chat formatting string.
+	# Use these formatting colors:
+	# black dark_blue dark_green dark_aqua dark_red dark_purple gold gray dark_gray blue green aqua red light_purple yellow white
+	# With these formatting options:
+	# obfuscated bold strikethrough underline italic
+	# Default Value: blue italic
+	ModNameFormat = blue italic
+
+
--- a/config/jei/recipe-category-sort-order.ini
+++ b/config/jei/recipe-category-sort-order.ini
@@ -0,0 +1,83 @@
+minecraft:crafting
+minecraft:anvil
+minecraft:blasting
+minecraft:brewing
+minecraft:campfire
+minecraft:compostable
+minecraft:fuel
+minecraft:furnace
+minecraft:smithing
+minecraft:smoking
+minecraft:stonecutting
+ae2:attunement
+ae2:certus_growth
+ae2:charger
+ae2:condenser
+ae2:entropy
+ae2:inscriber
+ae2:item_transformation
+create:automatic_brewing
+create:automatic_packing
+create:automatic_shaped
+create:automatic_shapeless
+create:block_cutting
+create:crushing
+create:deploying
+create:draining
+create:fan_blasting
+create:fan_haunting
+create:fan_smoking
+create:fan_washing
+create:item_application
+create:mechanical_crafting
+create:milling
+create:mixing
+create:mystery_conversion
+create:packing
+create:pressing
+create:sandpaper_polishing
+create:sawing
+create:sequenced_assembly
+create:spout_filling
+create:wood_cutting
+createaddition:charging
+createaddition:liquid_burning
+createaddition:rolling
+exposure:photograph_printing
+exposure:photograph_stacking
+firmalife:drying
+firmalife:mixing_bowl
+firmalife:oven
+firmalife:smoking
+firmalife:vat
+ftbquests:loot_crate
+ftbquests:quest
+jei:information
+jumbofurnace:jumbo_furnace_upgrade
+jumbofurnace:jumbo_smelting
+morered:soldering
+tfc:alloying
+tfc:anvil
+tfc:blast_furnace
+tfc:bloomery
+tfc:casting
+tfc:chisel
+tfc:clay_knapping
+tfc:fire_clay_knapping
+tfc:glassworking
+tfc:goat_horn_knapping
+tfc:heating
+tfc:instant_barrel
+tfc:instant_fluid_barrel
+tfc:jam_pot
+tfc:leather_knapping
+tfc:loom
+tfc:pumpkin_knapping
+tfc:quern
+tfc:rock_knapping
+tfc:scraping
+tfc:sealed_barrel
+tfc:simple_pot
+tfc:soup_pot
+tfc:welding
+treetap:tap_extract
--- a/config/sophisticatedbackpacks-common.toml
+++ b/config/sophisticatedbackpacks-common.toml
@@ -2,5 +2,5 @@
 #Common Settings
 [common]
 	#Turns on/off loot added to various vanilla chest loot tables
-	chestLootEnabled = true
+	chestLootEnabled = false

--- a/config/sophisticatedcore-common.toml
+++ b/config/sophisticatedcore-common.toml
@@ -2,5 +2,5 @@
 #Common Settings
 [common]
 	#Disable / enable any items here (disables their recipes)
-	enabledItems = ["sophisticatedbackpacks:compacting_upgrade|true", "sophisticatedbackpacks:advanced_restock_upgrade|true", "sophisticatedbackpacks:diamond_backpack|true", "sophisticatedbackpacks:tank_upgrade|true", "sophisticatedbackpacks:auto_smoking_upgrade|true", "sophisticatedbackpacks:filter_upgrade|true", "sophisticatedbackpacks:advanced_compacting_upgrade|true", "sophisticatedbackpacks:feeding_upgrade|true", "sophisticatedbackpacks:advanced_pickup_upgrade|true", "sophisticatedbackpacks:smoking_upgrade|true", "sophisticatedbackpacks:everlasting_upgrade|true", "sophisticatedbackpacks:advanced_feeding_upgrade|true", "sophisticatedbackpacks:crafting_upgrade|true", "sophisticatedbackpacks:stack_upgrade_tier_4|true", "sophisticatedbackpacks:stack_upgrade_tier_2|true", "sophisticatedbackpacks:stack_upgrade_tier_3|true", "sophisticatedbackpacks:stack_upgrade_tier_1|true", "sophisticatedbackpacks:advanced_pump_upgrade|true", "sophisticatedbackpacks:refill_upgrade|true", "sophisticatedbackpacks:auto_blasting_upgrade|true", "sophisticatedbackpacks:void_upgrade|true", "sophisticatedbackpacks:advanced_refill_upgrade|true", "sophisticatedbackpacks:advanced_tool_swapper_upgrade|true", "sophisticatedbackpacks:smelting_upgrade|true", "sophisticatedbackpacks:battery_upgrade|true", "sophisticatedbackpacks:magnet_upgrade|true", "sophisticatedbackpacks:advanced_magnet_upgrade|true", "sophisticatedbackpacks:blasting_upgrade|true", "sophisticatedbackpacks:deposit_upgrade|true", "sophisticatedbackpacks:iron_backpack|true", "sophisticatedbackpacks:stonecutter_upgrade|true", "sophisticatedbackpacks:backpack|true", "sophisticatedbackpacks:tool_swapper_upgrade|true", "sophisticatedbackpacks:jukebox_upgrade|true", "sophisticatedbackpacks:advanced_filter_upgrade|true", "sophisticatedbackpacks:inception_upgrade|true", "sophisticatedbackpacks:xp_pump_upgrade|true", "sophisticatedbackpacks:auto_smelting_upgrade|true", "sophisticatedbackpacks:pickup_upgrade|true", "sophisticatedbackpacks:upgrade_base|true", "sophisticatedbackpacks:gold_backpack|true", "sophisticatedbackpacks:advanced_deposit_upgrade|true", "sophisticatedbackpacks:advanced_void_upgrade|true", "sophisticatedbackpacks:restock_upgrade|true", "sophisticatedbackpacks:pump_upgrade|true", "sophisticatedbackpacks:netherite_backpack|true", "sophisticatedbackpacks:anvil_upgrade|true"]
+	enabledItems = ["sophisticatedbackpacks:compacting_upgrade|false", "sophisticatedbackpacks:advanced_restock_upgrade|false", "sophisticatedbackpacks:diamond_backpack|false", "sophisticatedbackpacks:tank_upgrade|false", "sophisticatedbackpacks:auto_smoking_upgrade|false", "sophisticatedbackpacks:filter_upgrade|false", "sophisticatedbackpacks:advanced_compacting_upgrade|false", "sophisticatedbackpacks:feeding_upgrade|false", "sophisticatedbackpacks:advanced_pickup_upgrade|false", "sophisticatedbackpacks:smoking_upgrade|false", "sophisticatedbackpacks:everlasting_upgrade|false", "sophisticatedbackpacks:advanced_feeding_upgrade|false", "sophisticatedbackpacks:crafting_upgrade|false", "sophisticatedbackpacks:stack_upgrade_tier_4|false", "sophisticatedbackpacks:stack_upgrade_tier_2|false", "sophisticatedbackpacks:stack_upgrade_tier_3|false", "sophisticatedbackpacks:stack_upgrade_tier_1|false", "sophisticatedbackpacks:advanced_pump_upgrade|false", "sophisticatedbackpacks:refill_upgrade|false", "sophisticatedbackpacks:auto_blasting_upgrade|false", "sophisticatedbackpacks:void_upgrade|false", "sophisticatedbackpacks:advanced_refill_upgrade|false", "sophisticatedbackpacks:advanced_tool_swapper_upgrade|false", "sophisticatedbackpacks:smelting_upgrade|false", "sophisticatedbackpacks:battery_upgrade|false", "sophisticatedbackpacks:magnet_upgrade|false", "sophisticatedbackpacks:advanced_magnet_upgrade|false", "sophisticatedbackpacks:blasting_upgrade|false", "sophisticatedbackpacks:deposit_upgrade|false", "sophisticatedbackpacks:iron_backpack|false", "sophisticatedbackpacks:stonecutter_upgrade|false", "sophisticatedbackpacks:backpack|false", "sophisticatedbackpacks:tool_swapper_upgrade|false", "sophisticatedbackpacks:jukebox_upgrade|false", "sophisticatedbackpacks:advanced_filter_upgrade|false", "sophisticatedbackpacks:inception_upgrade|false", "sophisticatedbackpacks:anvil_upgrade|false", "sophisticatedbackpacks:xp_pump_upgrade|false", "sophisticatedbackpacks:auto_smelting_upgrade|false", "sophisticatedbackpacks:pickup_upgrade|false", "sophisticatedbackpacks:upgrade_base|false", "sophisticatedbackpacks:gold_backpack|false", "sophisticatedbackpacks:advanced_deposit_upgrade|false", "sophisticatedbackpacks:advanced_void_upgrade|false", "sophisticatedbackpacks:restock_upgrade|false", "sophisticatedbackpacks:pump_upgrade|false", "sophisticatedbackpacks:netherite_backpack|false"]

--- a/config/tfg.json
+++ b/config/tfg.json
@@ -6,6 +6,16 @@
    "gtceu",
    "firmalife",
    "ae2",
-    "ad_astra"
+    "sophisticatedbackpacks",
+    "computercraft",
+    "toolbelt",
+    "chiselsandbits",
+    "exposure",
+    "firmaciv",
+    "railways",
+    "jumbofurnace",
+    "ae2wtlib",
+    "ae2",
+    ""
  ]
 }
--- a/config/xaerominimap.txt
+++ b/config/xaerominimap.txt
@@ -30,7 +30,7 @@ waypointsIngameDistanceScale:0
 waypointsIngameNameScale:0
 waypointsIngameCloseScale:1.0
 antiAliasing:true
-blockColours:0
+blockColours:1
 lighting:true
 dotsStyle:0
 dotNameScale:1.0
--- a/config/xaerominimap_entities.json
+++ b/config/xaerominimap_entities.json
@@ -18,8 +18,8 @@
    "displayNameWhenIconFails": true,
    "entityNumber": 1000.0,
    "alwaysDisplayNametags": false,
-    "dotSize": 2.0,
    "startFadingAt": 0.0,
+    "dotSize": 2.0,
    "renderOverMinimapFrame": 1.0,
    "icons": 1.0,
    "names": 0.0,
--- a/defaultconfigs/create-server.toml
+++ b/defaultconfigs/create-server.toml
@@ -0,0 +1,517 @@
+
+#.
+#The Backbone of Create
+[infrastructure]
+	#.
+	#[in Ticks]
+	#The amount of time a server waits before sending out tickrate synchronization packets.
+	#These packets help animations to be more accurate when tps is below 20.
+	#Range: > 5
+	tickrateSyncTimer = 20
+
+#.
+#Packmakers' control panel for internal recipe compat
+[recipes]
+	#.
+	#.
+	#Allow the Mechanical Press to process entire stacks at a time.
+	bulkPressing = false
+	#.
+	#Allow the Mechanical Saw to process entire stacks at a time.
+	bulkCutting = false
+	#.
+	#Allow supported potions to be brewed by a Mechanical Mixer + Basin.
+	allowBrewingInMixer = true
+	#.
+	#Allow any shapeless crafting recipes to be processed by a Mechanical Mixer + Basin.
+	allowShapelessInMixer = true
+	#.
+	#Allow any single-ingredient 2x2 or 3x3 crafting recipes to be processed by a Mechanical Press + Basin.
+	allowShapedSquareInPress = true
+	#.
+	#Allow any standard crafting recipes to be processed by Mechanical Crafters.
+	allowRegularCraftingInCrafter = true
+	#.
+	#The Maximum amount of ingredients that can be used to craft Firework Rockets using Mechanical Crafters.
+	#Range: > 1
+	maxFireworkIngredientsInCrafter = 9
+	#.
+	#Allow any stonecutting recipes to be processed by a Mechanical Saw.
+	allowStonecuttingOnSaw = true
+	#.
+	#Allow any Druidcraft woodcutter recipes to be processed by a Mechanical Saw.
+	allowWoodcuttingOnSaw = true
+	#.
+	#Allow Spouts to interact with Casting Tables and Basins from Tinkers' Construct.
+	allowCastingBySpout = true
+	#.
+	#Display vanilla Log-stripping interactions in JEI.
+	displayLogStrippingRecipes = true
+	#.
+	#The amount of Light sources destroyed before Chromatic Compound turns into Refined Radiance.
+	#Range: > 1
+	lightSourceCountForRefinedRadiance = 10
+	#.
+	#Allow the standard in-world Refined Radiance recipes.
+	enableRefinedRadianceRecipe = true
+	#.
+	#Allow the standard in-world Shadow Steel recipe.
+	enableShadowSteelRecipe = true
+
+#.
+#Parameters and abilities of Create's kinetic mechanisms
+[kinetics]
+	#.
+	#.
+	#Disable the Stress mechanic altogether.
+	disableStress = false
+	#.
+	#Maximum length in blocks of mechanical belts.
+	#Range: > 5
+	maxBeltLength = 20
+	#.
+	#Damage dealt by active Crushing Wheels.
+	#Range: > 0
+	crushingDamage = 4
+	#.
+	#[in Revolutions per Minute]
+	#Maximum allowed rotation speed for any Kinetic Block.
+	#Range: > 64
+	maxRotationSpeed = 256
+	#.
+	#Select what mobs should ignore Deployers when attacked by them.
+	#Allowed Values: ALL, CREEPERS, NONE
+	ignoreDeployerAttacks = "CREEPERS"
+	#.
+	#Game ticks between Kinetic Blocks checking whether their source is still valid.
+	#Range: > 5
+	kineticValidationFrequency = 60
+	#.
+	#multiplier used for calculating exhaustion from speed when a crank is turned.
+	#Range: 0.0 ~ 1.0
+	crankHungerMultiplier = 0.009999999776482582
+	#.
+	#Amount of sail-type blocks required for a windmill to assemble successfully.
+	#Range: > 0
+	minimumWindmillSails = 8
+	#.
+	#Number of sail-type blocks required to increase windmill speed by 1RPM.
+	#Range: > 1
+	windmillSailsPerRPM = 8
+	#.
+	#Max Distance in blocks a Weighted Ejector can throw
+	#Range: > 0
+	maxEjectorDistance = 32
+	#.
+	#Time in ticks until the next item launched by an ejector scans blocks for potential collisions
+	#Range: > 10
+	ejectorScanInterval = 120
+
+	#.
+	#Encased Fan
+	[kinetics.encasedFan]
+		#.
+		#Maximum distance in blocks Fans can push entities.
+		#Range: > 5
+		fanPushDistance = 20
+		#.
+		#Maximum distance in blocks from where Fans can pull entities.
+		#Range: > 5
+		fanPullDistance = 20
+		#.
+		#Game ticks between Fans checking for anything blocking their air flow.
+		#Range: > 10
+		fanBlockCheckRate = 30
+		#.
+		#[in Revolutions per Minute]
+		#Rotation speed at which the maximum stats of fans are reached.
+		#Range: > 64
+		fanRotationArgmax = 256
+		#.
+		#Game ticks required for a Fan-based processing recipe to take effect.
+		#Range: > 0
+		fanProcessingTime = 150
+
+	#.
+	#Moving Contraptions
+	[kinetics.contraptions]
+		#.
+		#Maximum amount of blocks in a structure movable by Pistons, Bearings or other means.
+		#Range: > 1
+		maxBlocksMoved = 2048
+		#.
+		#[in Bytes]
+		#[0 to disable this limit]
+		#Maximum amount of data a contraption can have before it can't be synced with players.
+		#Un-synced contraptions will not be visible and will not have collision.
+		#Range: > 0
+		maxDataSize = 2000000
+		#.
+		#Maximum value of a chassis attachment range.
+		#Range: > 1
+		maxChassisRange = 16
+		#.
+		#Maximum amount of extension poles behind a Mechanical Piston.
+		#Range: > 1
+		maxPistonPoles = 64
+		#.
+		#Max length of rope available off a Rope Pulley.
+		#Range: > 1
+		maxRopeLength = 256
+		#.
+		#Maximum allowed distance of two coupled minecarts.
+		#Range: > 1
+		maxCartCouplingLength = 32
+		#.
+		#Maximum depth of blocks filled in using a Mechanical Roller.
+		#Range: > 1
+		rollerFillDepth = 12
+		#.
+		#Whether minecart contraptions can be picked up in survival mode.
+		survivalContraptionPickup = true
+		#.
+		#Configure how Spawner blocks can be moved by contraptions.
+		#Allowed Values: MOVABLE, NO_PICKUP, UNMOVABLE
+		movableSpawners = "NO_PICKUP"
+		#.
+		#Configure how Budding Amethyst can be moved by contraptions.
+		#Allowed Values: MOVABLE, NO_PICKUP, UNMOVABLE
+		amethystMovement = "NO_PICKUP"
+		#.
+		#Configure how Obsidian blocks can be moved by contraptions.
+		#Allowed Values: MOVABLE, NO_PICKUP, UNMOVABLE
+		movableObsidian = "UNMOVABLE"
+		#.
+		#Configure how Reinforced Deepslate blocks can be moved by contraptions.
+		#Allowed Values: MOVABLE, NO_PICKUP, UNMOVABLE
+		movableReinforcedDeepslate = "UNMOVABLE"
+		#.
+		#Whether items mined or harvested by contraptions should be placed in their mounted storage.
+		moveItemsToStorage = true
+		#.
+		#Whether harvesters should break crops that aren't fully grown.
+		harvestPartiallyGrown = false
+		#.
+		#Whether harvesters should replant crops after harvesting.
+		harvesterReplants = true
+		#.
+		#Whether minecart contraptions can be placed into container items.
+		minecartContraptionInContainers = false
+
+	#.
+	#Configure speed/capacity levels for requirements and indicators.
+	[kinetics.stats]
+		#.
+		#[in Revolutions per Minute]
+		#Minimum speed of rotation to be considered 'medium'
+		#Range: 0.0 ~ 4096.0
+		mediumSpeed = 30.0
+		#.
+		#[in Revolutions per Minute]
+		#Minimum speed of rotation to be considered 'fast'
+		#Range: 0.0 ~ 65535.0
+		fastSpeed = 100.0
+		#.
+		#[in Stress Units]
+		#Minimum stress impact to be considered 'medium'
+		#Range: 0.0 ~ 4096.0
+		mediumStressImpact = 4.0
+		#.
+		#[in Stress Units]
+		#Minimum stress impact to be considered 'high'
+		#Range: 0.0 ~ 65535.0
+		highStressImpact = 8.0
+		#.
+		#[in Stress Units]
+		#Minimum added Capacity by sources to be considered 'medium'
+		#Range: 0.0 ~ 4096.0
+		mediumCapacity = 256.0
+		#.
+		#[in Stress Units]
+		#Minimum added Capacity by sources to be considered 'high'
+		#Range: 0.0 ~ 65535.0
+		highCapacity = 1024.0
+
+	[kinetics.stressValues]
+
+		#.
+		#Fine tune the kinetic stats of individual components
+		[kinetics.stressValues.v2]
+
+			#.
+			#.
+			#[in Stress Units]
+			#Configure the individual stress impact of mechanical blocks. Note that this cost is doubled for every speed increase it receives.
+			[kinetics.stressValues.v2.impact]
+				display_board = 0.0
+				deployer = 4.0
+				mechanical_piston = 4.0
+				millstone = 4.0
+				mechanical_bearing = 4.0
+				clockwork_bearing = 4.0
+				cuckoo_clock = 1.0
+				speedometer = 0.0
+				copper_backtank = 4.0
+				mechanical_saw = 4.0
+				flywheel = 0.0
+				encased_chain_drive = 0.0
+				clutch = 0.0
+				encased_fan = 2.0
+				adjustable_chain_gearshift = 0.0
+				mechanical_pump = 4.0
+				crushing_wheel = 8.0
+				mechanical_mixer = 4.0
+				gantry_shaft = 0.0
+				rope_pulley = 4.0
+				rotation_speed_controller = 0.0
+				mechanical_arm = 2.0
+				netherite_backtank = 4.0
+				andesite_encased_shaft = 0.0
+				mechanical_press = 8.0
+				large_cogwheel = 0.0
+				mechanical_drill = 4.0
+				andesite_encased_large_cogwheel = 0.0
+				brass_encased_large_cogwheel = 0.0
+				mysterious_cuckoo_clock = 1.0
+				stressometer = 0.0
+				shaft = 0.0
+				brass_encased_shaft = 0.0
+				gearshift = 0.0
+				turntable = 4.0
+				sticky_mechanical_piston = 4.0
+				sequenced_gearshift = 0.0
+				weighted_ejector = 2.0
+				cogwheel = 0.0
+				andesite_encased_cogwheel = 0.0
+				belt = 0.0
+				brass_encased_cogwheel = 0.0
+				gearbox = 0.0
+				hose_pulley = 4.0
+				elevator_pulley = 4.0
+				mechanical_crafter = 2.0
+
+			#.
+			#[in Stress Units]
+			#Configure how much stress a source can accommodate for.
+			[kinetics.stressValues.v2.capacity]
+				copper_valve_handle = 8.0
+				hand_crank = 8.0
+				steam_engine = 1024.0
+				creative_motor = 16384.0
+				large_water_wheel = 128.0
+				water_wheel = 32.0
+				windmill_bearing = 512.0
+
+#.
+#Create's liquid manipulation tools
+[fluids]
+	#.
+	#.
+	#[in Buckets]
+	#The amount of liquid a tank can hold per block.
+	#Range: > 1
+	fluidTankCapacity = 8
+	#.
+	#[in Blocks]
+	#The maximum height a fluid tank can reach.
+	#Range: > 1
+	fluidTankMaxHeight = 32
+	#.
+	#[in Blocks]
+	#The maximum distance a mechanical pump can push or pull liquids on either side.
+	#Range: > 1
+	mechanicalPumpRange = 16
+	#.
+	#[in Blocks]
+	#The maximum distance a hose pulley can draw fluid blocks from.
+	#Range: > 1
+	hosePulleyRange = 128
+	#.
+	#[in Blocks]
+	#[-1 to disable this behaviour]
+	#The minimum amount of fluid blocks the hose pulley needs to find before deeming it an infinite source.
+	#Range: > -1
+	hosePulleyBlockThreshold = 0
+	#.
+	#Whether hose pulleys should continue filling up above-threshold sources.
+	fillInfinite = false
+	#.
+	#Configure which fluids can be drained infinitely.
+	#Allowed Values: ALLOW_ALL, DENY_ALL, ALLOW_BY_TAG, DENY_BY_TAG
+	bottomlessFluidMode = "ALLOW_BY_TAG"
+	#.
+	#Whether hose pulleys should be allowed to place fluid sources.
+	fluidFillPlaceFluidSourceBlocks = false
+	#.
+	#Whether open-ended pipes should be allowed to place fluid sources.
+	pipesPlaceFluidSourceBlocks = false
+
+#.
+#Tweaks for logistical components
+[logistics]
+	#.
+	#.
+	#The amount of ticks a funnel waits between item transferrals, when it is not re-activated by redstone.
+	#Range: > 1
+	defaultExtractionTimer = 8
+	#.
+	#The amount of ticks a portable storage interface waits for transfers until letting contraptions move along.
+	#Range: > 1
+	psiTimeout = 60
+	#.
+	#Maximum distance in blocks a Mechanical Arm can reach across.
+	#Range: > 1
+	mechanicalArmRange = 5
+	#.
+	#Maximum possible range in blocks of redstone link connections.
+	#Range: > 1
+	linkRange = 256
+	#.
+	#Maximum possible distance in blocks between data gatherers and their target.
+	#Range: > 1
+	displayLinkRange = 64
+	#.
+	#The total amount of stacks a vault can hold per block in size.
+	#Range: > 1
+	vaultCapacity = 20
+	#.
+	#The amount of ticks a brass tunnel waits between distributions.
+	#Range: 1 ~ 10
+	brassTunnelTimer = 10
+	#.
+	#Whether hostile mobs walking near a seat will start riding it.
+	seatHostileMobs = true
+
+#.
+#Everything related to Schematic tools
+[schematics]
+	#.
+	#.
+	#Whether placing a Schematic directly in Creative Mode should replace world blocks with Air
+	creativePrintIncludesAir = false
+	#.
+	#[in KiloBytes]
+	#The maximum allowed file size of uploaded Schematics.
+	#Range: > 16
+	maxSchematics = 256
+	#.
+	#[in Bytes]
+	#The maximum packet size uploaded Schematics are split into.
+	#Range: 256 ~ 32767
+	maxSchematicPacketSize = 1024
+	#.
+	#Amount of game ticks without new packets arriving until an active schematic upload process is discarded.
+	#Range: > 100
+	schematicIdleTimeout = 600
+
+	#.
+	#Schematicannon
+	[schematics.schematicannon]
+		#.
+		#Amount of game ticks between shots of the cannon. Higher => Slower
+		#Range: > 1
+		schematicannonDelay = 10
+		#.
+		#% of Schematicannon's Fuel filled by 1 Gunpowder.
+		#Range: 0.0 ~ 100.0
+		schematicannonGunpowderWorth = 20.0
+		#.
+		#% of Schematicannon's Fuel used for each fired block.
+		#Range: 0.0 ~ 100.0
+		schematicannonFuelUsage = 0.05000000074505806
+
+#.
+#Equipment and gadgets added by Create
+[equipment]
+	#.
+	#.
+	#The Maximum Distance to an active mirror for the symmetry wand to trigger.
+	#Range: > 10
+	maxSymmetryWandRange = 50
+	#.
+	#The Maximum Distance a Block placed by Create's placement assist will have to its interaction point.
+	#Range: > 3
+	placementAssistRange = 12
+	#.
+	#The Maximum Distance at which a Toolbox can interact with Players' Inventories.
+	#Range: > 1
+	toolboxRange = 10
+	#.
+	#The Maximum volume of Air that can be stored in a backtank = Seconds of underwater breathing
+	#Range: > 1
+	airInBacktank = 900
+	#.
+	#The volume of Air added by each level of the backtanks Capacity Enchantment
+	#Range: > 1
+	enchantedBacktankCapacity = 300
+	#.
+	#Amount of free Extendo Grip actions provided by one filled Copper Backtank. Set to 0 makes Extendo Grips unbreakable
+	#Range: > 0
+	maxExtendoGripActions = 1000
+	#.
+	#Amount of free Potato Cannon shots provided by one filled Copper Backtank. Set to 0 makes Potato Cannons unbreakable
+	#Range: > 0
+	maxPotatoCannonShots = 200
+
+#.
+#Create's builtin Railway systems
+[trains]
+	#.
+	#.
+	#Whether moving Trains can hurt colliding mobs and players.
+	trainsCauseDamage = true
+	#.
+	#Maximum length of track that can be placed as one batch or turn.
+	#Range: 16 ~ 128
+	maxTrackPlacementLength = 32
+	#.
+	#Maximum length of a Train Stations' assembly track.
+	#Range: > 5
+	maxAssemblyLength = 128
+	#.
+	#Maximum amount of bogeys assembled as a single Train.
+	#Range: > 1
+	maxBogeyCount = 20
+	#.
+	#Relative speed of a manually controlled Train compared to a Scheduled one.
+	#Range: 0.0 ~ 3.4028234663852886E38
+	manualTrainSpeedModifier = 0.75
+
+	#.
+	#Standard Trains
+	[trains.trainStats]
+		#.
+		#[in Blocks/Second]
+		#The top speed of any assembled Train.
+		#Range: 0.0 ~ 3.4028234663852886E38
+		trainTopSpeed = 28.0
+		#.
+		#[in Blocks/Second]
+		#The top speed of Trains during a turn.
+		#Range: 0.0 ~ 3.4028234663852886E38
+		trainTurningTopSpeed = 14.0
+		#.
+		#[in Blocks/Second²]
+		#The acceleration of any assembled Train.
+		#Range: 0.0 ~ 3.4028234663852886E38
+		trainAcceleration = 3.0
+
+	#.
+	#Powered Trains
+	[trains.poweredTrainStats]
+		#.
+		#[in Blocks/Second]
+		#The top speed of powered Trains.
+		#Range: 0.0 ~ 3.4028234663852886E38
+		poweredTrainTopSpeed = 40.0
+		#.
+		#[in Blocks/Second]
+		#The top speed of powered Trains during a turn.
+		#Range: 0.0 ~ 3.4028234663852886E38
+		poweredTrainTurningTopSpeed = 20.0
+		#.
+		#[in Blocks/Second²]
+		#The acceleration of powered Trains.
+		#Range: 0.0 ~ 3.4028234663852886E38
+		poweredTrainAcceleration = 3.0
+
--- a/defaultconfigs/sophisticatedbackpacks-server.toml
+++ b/defaultconfigs/sophisticatedbackpacks-server.toml
@@ -390,9 +390,9 @@
 	[server.entityBackpackAdditions]
 		#Chance of an entity spawning with Backpack
 		#Range: 0.0 ~ 1.0
-		chance = 0.01
+		chance = 0.0
 		#Turns on/off addition of loot into backpacks
-		addLoot = true
+		addLoot = false
 		#Turns on/off buffing the entity that wears backpack with potion effects. These are scaled based on how much loot is added.
 		buffWithPotionEffects = true
 		#Turns on/off buffing the entity that wears backpack with additional health. Health is scaled based on backpack tier the mob wears.
@@ -400,9 +400,9 @@
 		#Turns on/off equiping the entity that wears backpack with armor. What armor material and how enchanted is scaled based on backpack tier the mob wears.
 		equipWithArmor = true
 		#Map of entities that can spawn with backpack and related loot tables (if adding a loot is enabled) in format of "EntityRegistryName|LootTableName"
-		entityLootTableList = ["minecraft:creeper|minecraft:chests/desert_pyramid", "minecraft:drowned|minecraft:chests/shipwreck_treasure", "minecraft:enderman|minecraft:chests/end_city_treasure", "minecraft:evoker|minecraft:chests/woodland_mansion", "minecraft:husk|minecraft:chests/desert_pyramid", "minecraft:piglin|minecraft:chests/bastion_bridge", "minecraft:piglin_brute|minecraft:chests/bastion_treasure", "minecraft:pillager|minecraft:chests/pillager_outpost", "minecraft:skeleton|minecraft:chests/simple_dungeon", "minecraft:stray|minecraft:chests/igloo_chest", "minecraft:vex|minecraft:chests/woodland_mansion", "minecraft:vindicator|minecraft:chests/woodland_mansion", "minecraft:witch|minecraft:chests/buried_treasure", "minecraft:wither_skeleton|minecraft:chests/nether_bridge", "minecraft:zombie|minecraft:chests/simple_dungeon", "minecraft:zombie_villager|minecraft:chests/village/village_armorer", "minecraft:zombified_piglin|minecraft:chests/bastion_other"]
+		entityLootTableList = []
 		#List of music discs that are not supposed to be played by entities
-		discBlockList = ["botania:record_gaia_1", "botania:record_gaia_2"]
+		discBlockList = []
 		#Turns on/off a chance that the entity that wears backpack gets jukebox upgrade and plays a music disc.
 		playJukebox = true
 		#Determines whether backpack drops to fake players if killed by them in addition to real ones that it always drops to
--- a/kubejs/assets/gtceu/lang/ru_ru.json
+++ b/kubejs/assets/gtceu/lang/ru_ru.json
--- a/kubejs/assets/minecraft/textures/gui/slider.png
+++ b/kubejs/assets/minecraft/textures/gui/slider.png
--- a/kubejs/assets/minecraft/textures/gui/widgets.png
+++ b/kubejs/assets/minecraft/textures/gui/widgets.png
--- a/kubejs/assets/tfg/textures/gui/button.png
+++ b/kubejs/assets/tfg/textures/gui/button.png
--- a/kubejs/assets/tfg/textures/gui/button98x20.png
+++ b/kubejs/assets/tfg/textures/gui/button98x20.png
--- a/kubejs/assets/tfg/textures/gui/button98x20_hovered.png
+++ b/kubejs/assets/tfg/textures/gui/button98x20_hovered.png
--- a/kubejs/assets/tfg/textures/gui/button_hovered.png
+++ b/kubejs/assets/tfg/textures/gui/button_hovered.png
--- a/kubejs/assets/tfg/textures/gui/curseforge_logo.png
+++ b/kubejs/assets/tfg/textures/gui/curseforge_logo.png
--- a/kubejs/assets/tfg/textures/gui/curseforge_logo_hovered.png
+++ b/kubejs/assets/tfg/textures/gui/curseforge_logo_hovered.png
--- a/kubejs/assets/tfg/textures/gui/discord_logo.png
+++ b/kubejs/assets/tfg/textures/gui/discord_logo.png
--- a/kubejs/assets/tfg/textures/gui/discord_logo_hovered.png
+++ b/kubejs/assets/tfg/textures/gui/discord_logo_hovered.png
--- a/kubejs/assets/tfg/textures/gui/github_logo.png
+++ b/kubejs/assets/tfg/textures/gui/github_logo.png
--- a/kubejs/assets/tfg/textures/gui/github_logo_hovered.png
+++ b/kubejs/assets/tfg/textures/gui/github_logo_hovered.png
--- a/kubejs/assets/tfg/textures/gui/logo_512x512.png
+++ b/kubejs/assets/tfg/textures/gui/logo_512x512.png
--- a/kubejs/assets/tfg/textures/gui/modrinth_logo.png
+++ b/kubejs/assets/tfg/textures/gui/modrinth_logo.png
--- a/kubejs/assets/tfg/textures/gui/modrinth_logo_hovered.png
+++ b/kubejs/assets/tfg/textures/gui/modrinth_logo_hovered.png
--- a/kubejs/client_scripts/main_client_script.js
+++ b/kubejs/client_scripts/main_client_script.js
@@ -1,6 +1,6 @@
 // priority: 1

-REIEvents.hide('item', event => {
+JEIEvents.hideItems(event => {
    hideMinecraftStuff(event)
    hideTFCStuff(event)
    hideFirmaLifeStuff(event)
@@ -15,21 +15,16 @@ REIEvents.hide('item', event => {
    hideChiselAndBitsStuff(event)
 })

-REIEvents.groupEntries(event => {
-    groupGTCEUStuff(event)
-    groupTFCStuff(event)
-})
-
-REIEvents.removeCategories(event => {
+JEIEvents.removeCategories(event => {
    registerMinecraftCategories(event)
    registerGTCEUCategories(event)
    registerMoreRedCategories(event)
 })

-REIEvents.hide('fluid', event => {
+JEIEvents.hideFluids(event => {
    hideTFCFluids(event)
    hideFirmaLifeFluids(event)

    hideCreateFluids(event)
    hideCreateAdditionsFluids(event)
-})
+})
--- a/kubejs/client_scripts/mods/gtceu.js
+++ b/kubejs/client_scripts/mods/gtceu.js
@@ -7,6 +7,7 @@ const hideGTCEUStuff = (event) => {
 }

 const groupGTCEUStuff = (event) => {
+
    event.groupItemsByTag('tfg:rei_groups/dusts/pure', 'Pure Dusts', 'forge:pure_dusts')
    event.groupItemsByTag('tfg:rei_groups/dusts/impure', 'Impure Dusts', 'forge:impure_dusts')
    event.groupItemsByTag('tfg:rei_groups/dusts', 'Dusts', 'forge:dusts')
@@ -43,6 +44,7 @@ const groupGTCEUStuff = (event) => {
    event.groupItemsByTag('tfg:rei_groups/blocks/raw', 'Raw Material Blocks', 'forge:raw_blocks')
    event.groupItemsByTag('tfg:rei_groups/blocks/material_blocks', 'Material Blocks', 'forge:material_blocks')
    event.groupItemsByTag('tfg:rei_groups/blocks/frame', 'Frames', 'forge:frame_blocks')
+    

    event.groupItemsByTag('tfg:rei_groups/sword_heads', 'Sword Heads', 'forge:sword_heads')
    event.groupItemsByTag('tfg:rei_groups/butchery_knife_heads', 'Butchery Knife Heads', 'forge:butchery_knife_heads')
@@ -109,24 +111,32 @@ const groupGTCEUStuff = (event) => {
    event.groupItemsByTag('tfg:rei_groups/restrictive_pipes/large', 'Large Resctrictive Pipes', 'forge:restrictive_pipes/large')
    event.groupItemsByTag('tfg:rei_groups/restrictive_pipes/huge', 'Huge Resctrictive Pipes', 'forge:restrictive_pipes/huge')

-    event.groupItems("tfg:rei_groups/electric_furnace", "Electric Furnace", [/gtceu:.*_electric_furnace/,]);
-    event.groupItems("tfg:rei_groups/alloy_smelter", "Alloy Smelter", [/gtceu:.*_alloy_smelter/,]);
+
+    
+    event.groupItems("tfg:rei_groups/boiler", "Boiler", [/gtceu:.*_boiler/]);
+    event.groupItems("tfg:rei_groups/diode", "Diode", [/gtceu:(?!.*smd).*_diode/]);
+    event.groupItems("tfg:rei_groups/furnace", "Furnace", [/gtceu:(?!.*arc|.*blast).*_furnace/,]);
    event.groupItems("tfg:rei_groups/arc_furnace", "Arc Furnace", [/gtceu:.*_arc_furnace/,]);
-    event.groupItems("tfg:rei_groups/assembler", "Assembler", [/gtceu:.*_assembler/,]);
+    event.groupItems("tfg:rei_groups/centrifuge", "Centrifuge", [/gtceu:.(?!.*thermal).*_centrifuge/,]);
+    event.groupItems("tfg:rei_groups/thermal_centrifuge", "Thermal Centrifuge", [/gtceu:.*_thermal_centrifuge/,]);
+    event.groupItems("tfg:rei_groups/cutter", "Cutter", [/gtceu:(?!.*wire).*_cutter/,]);
+    event.groupItems("tfg:rei_groups/extruder", "Extruder", [/gtceu:.*_extruder(?!.*_mold)/,]);
+    event.groupItems("tfg:rei_groups/mixer", "Mixer", [/gtceu:(?!.*kinetic).*_mixer/,]);
+    event.groupItems("tfg:rei_groups/kinetic_mixer", "Kinetic Mixer", [/gtceu:.*_kinetic_mixer/,]);
+    event.groupItems("tfg:rei_groups/pump", "Pump", [/gtceu:(?!.*electric).*_pump/,]);
+    event.groupItems("tfg:rei_groups/alloy_smelter", "Alloy Smelter", [/gtceu:.*_alloy_smelter/,]);
+    event.groupItems("tfg:rei_groups/assembler", "Assembler", [/gtceu:.*_assembler$/,]);
    event.groupItems("tfg:rei_groups/autoclave", "Autoclave", [/gtceu:.*_autoclave/,]);
    event.groupItems("tfg:rei_groups/bender", "Bender", [/gtceu:.*_bender/,]);
    event.groupItems("tfg:rei_groups/brewery", "Brewery", [/gtceu:.*_brewery/,]);
    event.groupItems("tfg:rei_groups/canner", "Canner", [/gtceu:.*_canner/,]);
-    event.groupItems("tfg:rei_groups/centrifuge", "Centrifuge", [/gtceu:.*_centrifuge/,]);
    event.groupItems("tfg:rei_groups/chemical_bath", "Chemical Bath", [/gtceu:.*_chemical_bath/,]);
    event.groupItems("tfg:rei_groups/chemical_reactor", "Сhemical Reactor", [/gtceu:.*_chemical_reactor/,]);
    event.groupItems("tfg:rei_groups/compressor", "Compressor", [/gtceu:.*_compressor/,]);
-    event.groupItems("tfg:rei_groups/cutter", "Cutter", [/gtceu:.*_cutter/,]);
    event.groupItems("tfg:rei_groups/distillery", "Distillery", [/gtceu:.*_distillery/,]);
    event.groupItems("tfg:rei_groups/electrolyzer", "Electrolyzer", [/gtceu:.*_electrolyzer/,]);
    event.groupItems("tfg:rei_groups/electromagnetic_separator", "Electromagnetic Separator", [/gtceu:.*_electromagnetic_separator/,]);
    event.groupItems("tfg:rei_groups/extractor", "Extractor", [/gtceu:.*_extractor/,]);
-    event.groupItems("tfg:rei_groups/extruder", "Extruder", [/gtceu:.*_extruder/,]);
    event.groupItems("tfg:rei_groups/fermenter", "Fermenter", [/gtceu:.*_fermenter/,]);
    event.groupItems("tfg:rei_groups/laser_engraver", "Laser Engraver", [/gtceu:.*_laser_engraver/,]);
    event.groupItems("tfg:rei_groups/sifter", "Sifter", [/gtceu:.*_sifter/,]);
@@ -140,7 +150,6 @@ const groupGTCEUStuff = (event) => {
    event.groupItems("tfg:rei_groups/polarizer", "Polarizer", [/gtceu:.*_polarizer/,]);
    event.groupItems("tfg:rei_groups/packer", "Packer", [/gtceu:.*_packer/,]);
    event.groupItems("tfg:rei_groups/ore_washer", "Ore Washer", [/gtceu:.*_ore_washer/,]);
-    event.groupItems("tfg:rei_groups/mixer", "Mixer", [/gtceu:.*_mixer/,]);
    event.groupItems("tfg:rei_groups/lathe", "Lathe", [/gtceu:.*_lathe/,]);
    event.groupItems("tfg:rei_groups/forming_press", "Forming Press", [/gtceu:.*_forming_press/,]);
    event.groupItems("tfg:rei_groups/forge_hammer", "Forge Hammer", [/gtceu:.*_forge_hammer/,]);
@@ -152,21 +161,30 @@ const groupGTCEUStuff = (event) => {
    event.groupItems("tfg:rei_groups/super_tank", "Super Tankt", [/gtceu:.*_tank/,]);
    event.groupItems("tfg:rei_groups/crate", "Crate", [/gtceu:.*_crate/,]);
    event.groupItems("tfg:rei_groups/drum", "Drum", [/gtceu:.*_drum/,]);
-    event.groupItems("tfg:rei_groups/input_bus", "Input Bus", [/gtceu:.*_input_bus/,]);
-    event.groupItems("tfg:rei_groups/output_bus", "Output Bus", [/gtceu:.*_output_bus/,]);
-    event.groupItems("tfg:rei_groups/input_hatch", "Input Hatch", [/gtceu:.*_input_hatch/,]);
-    event.groupItems("tfg:rei_groups/output_hatch", "Output Hatch", [/gtceu:.*_output_hatch/,]);
-    event.groupItems("tfg:rei_groups/muffler_hatch", "Muffler Hatch", [/gtceu:.*_muffler_hatch/,]);
-    event.groupItems("tfg:rei_groups/energy_input_hatch", "Energy Input Hatch", [/gtceu:.*_energy_input_hatch/,]);
-    event.groupItems("tfg:rei_groups/energy_output_hatch", "Energy Output Hatch", [/gtceu:.*_energy_output_hatch/,]);
+    event.groupItems("tfg:rei_groups/input_bus", "Input Bus", [/gtceu:.*_input_bus$/,]);
+    event.groupItems("tfg:rei_groups/output_bus", "Output Bus", [/gtceu:.*_output_bus$/,]);
+    event.groupItems("tfg:rei_groups/input_hatch", "Input Hatch", [/gtceu:.(?!.*energy).*_input_hatch$/,]);
+    event.groupItems("tfg:rei_groups/output_hatch", "Output Hatch", [/gtceu:.(?!.*energy).*_output_hatch$/,]);
+    event.groupItems("tfg:rei_groups/input_hatch_4x", "Input Hatch 4x", [/gtceu:.(?!.*energy).*_input_hatch_4x/,]);
+    event.groupItems("tfg:rei_groups/output_hatch_4x", "Output Hatch 4x", [/gtceu:.(?!.*energy).*_output_hatch_4x/,]);
+    event.groupItems("tfg:rei_groups/input_hatch_9x", "Input Hatch 9x", [/gtceu:.(?!.*energy).*_input_hatch_9x/,]);
+    event.groupItems("tfg:rei_groups/output_hatch_9x", "Output Hatch 9x", [/gtceu:.(?!.*energy).*_output_hatch_9x/,]);
+    event.groupItems("tfg:rei_groups/muffler_hatch", "Muffler Hatch", [/gtceu:.*_muffler_hatch$/,]);
+    event.groupItems("tfg:rei_groups/energy_input_hatch", "Energy Input Hatch", [/gtceu:.*_energy_input_hatch$/,]);
+    event.groupItems("tfg:rei_groups/energy_output_hatch", "Energy Output Hatch", [/gtceu:.*_energy_output_hatch$/,]);
+    event.groupItems("tfg:rei_groups/energy_input_hatch_4a", "Energy Input Hatch 4a", [/gtceu:.*_energy_input_hatch_4a/,]);
+    event.groupItems("tfg:rei_groups/energy_output_hatch_4a", "Energy Output Hatch 4a", [/gtceu:.*_energy_output_hatch_4a/,]);
+    event.groupItems("tfg:rei_groups/energy_input_hatch_16a", "Energy Input Hatch 16a", [/gtceu:.*_energy_input_hatch_16a/,]);
+    event.groupItems("tfg:rei_groups/energy_output_hatch_16a", "Energy Output Hatch 16a", [/gtceu:.*_energy_output_hatch_16a/,]);
    event.groupItems("tfg:rei_groups/item_passthrough_hatch", "Item Passthrough Hatch", [/gtceu:.*_item_passthrough_hatch/,]);
    event.groupItems("tfg:rei_groups/fluid_passthrough_hatch", "Fluid Passthrough Hatch", [/gtceu:.*_fluid_passthrough_hatch/,]);
-    event.groupItems("tfg:rei_groups/diode", "diode", [/gtceu:.*_diode/,]);
+    event.groupItems("tfg:rei_groups/substation_input_hatch_64a", "Substation Input Hatch 64a", [/gtceu:.*substation_input_hatch_64a/,]);
+    event.groupItems("tfg:rei_groups/substation_output_hatch_64a", "Substation Output Hatch 64a", [/gtceu:.*_substation_output_hatch_64a/,]);
    event.groupItems("tfg:rei_groups/block_breaker", "Block Breaker", [/gtceu:.*_block_breaker/,]);
-    event.groupItems("tfg:rei_groups/pump", "Pump", [/gtceu:.*_pump/,]);
    event.groupItems("tfg:rei_groups/fisher", "Fisher", [/gtceu:.*_fisher/,]);
    event.groupItems("tfg:rei_groups/rotor_holder", "Rotor Holder", [/gtceu:.*_rotor_holder/,]);
    event.groupItems("tfg:rei_groups/miner", "Miner", [/gtceu:.*_miner/,]);
+    event.groupItems('tfg:rei_groups/firebox_casing', 'Firebox Casing', [/gtceu:.*_firebox_casing/]);
    event.groupItems("tfg:rei_groups/256a_laser_target_hatch", "256a Laser Target Hatch", [/gtceu:.*_256a_laser_target_hatch/,]);
    event.groupItems("tfg:rei_groups/256a_laser_source_hatch", "256a Laser Source Hatch", [/gtceu:.*_256a_laser_source_hatch/,]);
    event.groupItems("tfg:rei_groups/1024a_laser_target_hatch", "1024a Laser Target Hatch", [/gtceu:.*_1024a_laser_target_hatch/,]);
@@ -188,12 +206,14 @@ const groupGTCEUStuff = (event) => {
    event.groupItems("tfg:rei_groups/electric_gear_box_8a", "Electric Gear Box 8a", [/gtceu:.*_electric_gear_box_8a/,]);
    event.groupItems("tfg:rei_groups/electric_gear_box_16a", "Electric Gear Box 16a", [/gtceu:.*_electric_gear_box_16a/,]);
    event.groupItems("tfg:rei_groups/electric_gear_box_32a", "Electric Gear Box 32a", [/gtceu:.*electric_gear_box_32a/,]);
-    event.groupItems("tfg:rei_groups/kinetic_output_box", "kinetic Output Box", [/gtceu:.*_kinetic_output_box/,]);
-    event.groupItems("tfg:rei_groups/kinetic_input_box", "kinetic Input Box", [/gtceu:.*_kinetic_input_box/,]);
+    event.groupItems("tfg:rei_groups/kinetic_output_box", "Kinetic Output Box", [/gtceu:.*_kinetic_output_box/,]);
+    event.groupItems("tfg:rei_groups/kinetic_input_box", "Kinetic Input Box", [/gtceu:.*_kinetic_input_box/,]);
+    event.groupItems("tfg:rei_groups/parallel_hatch", "Parallel Hatch", [/gtceu:.*_parallel_hatch/,]);
+    event.groupItems("tfg:rei_groups/oxygen_spreader", "Oxygen Spreader", [/gcyr:.*oxygen_spreader/,]);

    event.groupItems("tfg:rei_groups/casting_mold", "Casting Mold", [/gtceu:.*_casting_mold/,]);
    event.groupItems("tfg:rei_groups/head_mold", "Head Mold", [/gtceu:.*_head_mold/,]);
-    event.groupItems("tfg:rei_groups/extruder_mold", "Extruder_mold", [/gtceu:.*_extruder_mold/,]);
+    event.groupItems("tfg:rei_groups/extruder_mold", "Extruder Mold", [/gtceu:.*_extruder_mold/,]);
    event.groupItems("tfg:rei_groups/electric_motor", "Electric Motor", [/gtceu:.*_electric_motor/,]);
    event.groupItems("tfg:rei_groups/fluid_regulator", "Fluid Regulator", [/gtceu:.*_fluid_regulator/,]);
    event.groupItems("tfg:rei_groups/conveyor_module", "Conveyor Module", [/gtceu:.*_conveyor_module/,]);
@@ -204,6 +224,15 @@ const groupGTCEUStuff = (event) => {
    event.groupItems("tfg:rei_groups/emitter", "Emitter", [/gtceu:.*_emitter/,]);
    event.groupItems("tfg:rei_groups/sensor", "Sensor", [/gtceu:.*_sensor/,]);
    event.groupItems("tfg:rei_groups/solar_panel", "Solar Panel", [/gtceu:.*_solar_panel/,]);
+    event.groupItems("tfg:rei_groups/credit", "Сredit", [/gtceu:.*_credit/,]);
+    
+    event.groupItems('tfg:rei_groups/coil_block', 'Coil Block', [/gtceu:.*_coil_block/]);
+    event.groupItems('tfg:rei_groups/machine_casing', 'Machine Casing', [/gtceu:.*_machine_casing/]);
+    event.groupItems('tfg:rei_groups/hermetic_casing', 'Hermetic Casin', [/gtceu:.*_hermetic_casing/]);
+    event.groupItems('tfg:rei_groups/pipe_casing', 'Pipe Casing', [/gtceu:.*_pipe_casing/]);
+    event.groupItems('tfg:rei_groups/gearbox', 'Gearbox', [/gtceu:.*_gearbox/]);
+    event.groupItems('tfg:rei_groups/turbine_casing', 'Turbine Casing', [/gtceu:.*_turbine_casing/]);
+    event.groupItems('tfg:rei_groups/firebox_casing', 'Firebox Casing', [/gtceu:.*_firebox_casing/]);

    event.groupItems('tfg:rei_groups/buckets', 'Buckets', [/gtceu:.*_bucket/]);
 }
--- a/kubejs/data/tfg/worldgen/configured_feature/vein/deep_magnetite.json
+++ b/kubejs/data/tfg/worldgen/configured_feature/vein/deep_magnetite.json
@@ -1,7 +1,7 @@
 {
  "type": "tfc:cluster_vein",
  "config": {
-    "rarity": 235,
+    "rarity": 205,
    "density": 0.3,
    "min_y": -64,
    "max_y": 30,
--- a/kubejs/data/tfg/worldgen/configured_feature/vein/deep_naquadah.json
+++ b/kubejs/data/tfg/worldgen/configured_feature/vein/deep_naquadah.json
@@ -1,7 +1,7 @@
 {
  "type": "tfc:cluster_vein",
  "config": {
-    "rarity": 380,
+    "rarity": 310,
    "density": 0.25,
    "min_y": -64,
    "max_y": -20,
--- a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_beryllium.json
+++ b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_beryllium.json
@@ -25,7 +25,11 @@
          },
          {
            "block": "gtceu:rhyolite_emerald_ore",
-            "weight": 65
+            "weight": 50
+          },
+          {
+            "block": "gtceu:rhyolite_thorium_ore",
+            "weight": 15
          }
        ]
      },
@@ -40,7 +44,11 @@
          },
          {
            "block": "gtceu:basalt_emerald_ore",
-            "weight": 65
+            "weight": 50
+          },
+          {
+            "block": "gtceu:basalt_thorium_ore",
+            "weight": 15
          }
        ]
      },
@@ -55,7 +63,11 @@
          },
          {
            "block": "gtceu:andesite_emerald_ore",
-            "weight": 65
+            "weight": 50
+          },
+          {
+            "block": "gtceu:andesite_thorium_ore",
+            "weight": 15
          }
        ]
      },
@@ -70,7 +82,11 @@
          },
          {
            "block": "gtceu:dacite_emerald_ore",
-            "weight": 65
+            "weight": 50
+          },
+          {
+            "block": "gtceu:dacite_thorium_ore",
+            "weight": 15
          }
        ]
      }
--- a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_garnierite.json
+++ b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_garnierite.json
@@ -15,7 +15,7 @@
        "with": [
          {
            "block": "gtceu:gabbro_garnierite_ore",
-            "weight": 40
+            "weight": 30
          },
          {
            "block": "gtceu:gabbro_nickel_ore",
@@ -27,7 +27,11 @@
          },
          {
            "block": "gtceu:gabbro_pentlandite_ore",
-            "weight": 30
+            "weight": 25
+          },
+          {
+            "block": "gtceu:gabbro_cobalt_ore",
+            "weight": 15
          }
        ]
      }
--- a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_lubricant.json
+++ b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_lubricant.json
@@ -15,11 +15,11 @@
        "with": [
          {
            "block": "gtceu:granite_soapstone_ore",
-            "weight": 35
+            "weight": 30
          },
          {
            "block": "gtceu:granite_talc_ore",
-            "weight": 25
+            "weight": 20
          },
          {
            "block": "gtceu:granite_glauconite_sand_ore",
@@ -28,6 +28,10 @@
          {
            "block": "gtceu:granite_pentlandite_ore",
            "weight": 15
+          },
+          {
+            "block": "gtceu:granite_trona_ore",
+            "weight": 10
          }
        ]
      },
@@ -38,11 +42,11 @@
        "with": [
          {
            "block": "gtceu:diorite_soapstone_ore",
-            "weight": 35
+            "weight": 30
          },
          {
            "block": "gtceu:diorite_talc_ore",
-            "weight": 25
+            "weight": 20
          },
          {
            "block": "gtceu:diorite_glauconite_sand_ore",
@@ -51,6 +55,10 @@
          {
            "block": "gtceu:diorite_pentlandite_ore",
            "weight": 15
+          },
+          {
+            "block": "gtceu:diorite_trona_ore",
+            "weight": 10
          }
        ]
      },
@@ -61,11 +69,11 @@
        "with": [
          {
            "block": "gtceu:gabbro_soapstone_ore",
-            "weight": 35
+            "weight": 30
          },
          {
            "block": "gtceu:gabbro_talc_ore",
-            "weight": 25
+            "weight": 20
          },
          {
            "block": "gtceu:gabbro_glauconite_sand_ore",
@@ -74,6 +82,10 @@
          {
            "block": "gtceu:gabbro_pentlandite_ore",
            "weight": 15
+          },
+          {
+            "block": "gtceu:gabbro_trona_ore",
+            "weight": 10
          }
        ]
      }
--- a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_oilsands.json
+++ b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_oilsands.json
@@ -0,0 +1,90 @@
+{
+  "type": "tfc:cluster_vein",
+  "config": {
+    "rarity": 170,
+    "density": 0.3,
+    "min_y": 20,
+    "max_y": 70,
+    "size": 55,
+    "random_name": "normal_oilsands",
+    "blocks": [
+      {
+        "replace": [
+          "tfc:rock/raw/shale"
+        ],
+        "with": [
+          {
+            "block": "gtceu:shale_oilsands_ore",
+            "weight": 100
+          }
+        ]
+      },
+      {
+        "replace": [
+          "tfc:rock/raw/claystone"
+        ],
+        "with": [
+          {
+            "block": "gtceu:claystone_oilsands_ore",
+            "weight": 100
+          }
+        ]
+      },
+      {
+        "replace": [
+          "tfc:rock/raw/limestone"
+        ],
+        "with": [
+          {
+            "block": "gtceu:limestone_oilsands_ore",
+            "weight": 100
+          }
+        ]
+      },
+      {
+        "replace": [
+          "tfc:rock/raw/conglomerate"
+        ],
+        "with": [
+          {
+            "block": "gtceu:conglomerate_oilsands_ore",
+            "weight": 100
+          }
+        ]
+      },
+      {
+        "replace": [
+          "tfc:rock/raw/dolomite"
+        ],
+        "with": [
+          {
+            "block": "gtceu:dolomite_oilsands_ore",
+            "weight": 100
+          }
+        ]
+      },
+      {
+        "replace": [
+          "tfc:rock/raw/chert"
+        ],
+        "with": [
+          {
+            "block": "gtceu:chert_oilsands_ore",
+            "weight": 100
+          }
+        ]
+      },
+      {
+        "replace": [
+          "tfc:rock/raw/chalk"
+        ],
+        "with": [
+          {
+            "block": "gtceu:chalk_oilsands_ore",
+            "weight": 100
+          }
+        ]
+      }
+    ]
+  }
+}
--- a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_olivine.json
+++ b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_olivine.json
@@ -18,7 +18,7 @@
            "weight": 35
          },
          {
-            "block": "gtceu:rhyolite_magnetite_ore",
+            "block": "gtceu:rhyolite_magnesite_ore",
            "weight": 25
          },
          {
@@ -41,7 +41,7 @@
            "weight": 35
          },
          {
-            "block": "gtceu:basalt_magnetite_ore",
+            "block": "gtceu:basalt_magnesite_ore",
            "weight": 25
          },
          {
@@ -64,7 +64,7 @@
            "weight": 35
          },
          {
-            "block": "gtceu:andesite_magnetite_ore",
+            "block": "gtceu:andesite_magnesite_ore",
            "weight": 25
          },
          {
@@ -87,7 +87,7 @@
            "weight": 35
          },
          {
-            "block": "gtceu:dacite_magnetite_ore",
+            "block": "gtceu:dacite_magnesite_ore",
            "weight": 25
          },
          {
@@ -110,7 +110,7 @@
            "weight": 35
          },
          {
-            "block": "gtceu:granite_magnetite_ore",
+            "block": "gtceu:granite_magnesite_ore",
            "weight": 25
          },
          {
@@ -133,7 +133,7 @@
            "weight": 35
          },
          {
-            "block": "gtceu:diorite_magnetite_ore",
+            "block": "gtceu:diorite_magnesite_ore",
            "weight": 25
          },
          {
@@ -156,7 +156,7 @@
            "weight": 35
          },
          {
-            "block": "gtceu:gabbro_magnetite_ore",
+            "block": "gtceu:gabbro_magnesite_ore",
            "weight": 25
          },
          {
--- a/kubejs/data/tfg/worldgen/configured_feature/vein/normal_spodumene.json
+++ b/kubejs/data/tfg/worldgen/configured_feature/vein/normal_spodumene.json
@@ -0,0 +1,221 @@
+{
+  "type": "tfc:disc_vein",
+  "config": {
+    "rarity": 180,
+    "density": 0.375,
+    "min_y": 20,
+    "max_y": 60,
+    "size": 35,
+    "height": 6,
+    "random_name": "normal_spodumene",
+    "blocks": [
+      {
+        "replace": [
+          "tfc:rock/raw/granite"
+        ],
+        "with": [
+          {
+            "block": "gtceu:granite_rock_salt_ore",
+            "weight": 20
+          },
+          {
+            "block": "gtceu:granite_salt_ore",
+            "weight": 30
+          },
+          {
+            "block": "gtceu:granite_lepidolite_ore",
+            "weight": 15
+          },
+          {
+            "block": "gtceu:granite_spodumene_ore",
+            "weight": 35
+          }
+        ]
+      },
+      {
+        "replace": [
+          "tfc:rock/raw/diorite"
+        ],
+        "with": [
+          {
+            "block": "gtceu:diorite_rock_salt_ore",
+            "weight": 20
+          },
+          {
+            "block": "gtceu:diorite_salt_ore",
+            "weight": 30
+          },
+          {
+            "block": "gtceu:diorite_lepidolite_ore",
+            "weight": 15
+          },
+          {
+            "block": "gtceu:diorite_spodumene_ore",
+            "weight": 35
+          }
+        ]
+      },
+      {
+        "replace": [
+          "tfc:rock/raw/gabbro"
+        ],
+        "with": [
+          {
+            "block": "gtceu:gabbro_rock_salt_ore",
+            "weight": 20
+          },
+          {
+            "block": "gtceu:gabbro_salt_ore",
+            "weight": 30
+          },
+          {
+            "block": "gtceu:gabbro_lepidolite_ore",
+            "weight": 15
+          },
+          {
+            "block": "gtceu:gabbro_spodumene_ore",
+            "weight": 35
+          }
+        ]
+      },
+      {
+        "replace": [
+          "tfc:rock/raw/quartzite"
+        ],
+        "with": [
+          {
+            "block": "gtceu:quartzite_rock_salt_ore",
+            "weight": 20
+          },
+          {
+            "block": "gtceu:quartzite_salt_ore",
+            "weight": 30
+          },
+          {
+            "block": "gtceu:quartzite_lepidolite_ore",
+            "weight": 15
+          },
+          {
+            "block": "gtceu:quartzite_spodumene_ore",
+            "weight": 35
+          }
+        ]
+      },
+      {
+        "replace": [
+          "tfc:rock/raw/slate"
+        ],
+        "with": [
+          {
+            "block": "gtceu:slate_rock_salt_ore",
+            "weight": 20
+          },
+          {
+            "block": "gtceu:slate_salt_ore",
+            "weight": 30
+          },
+          {
+            "block": "gtceu:slate_lepidolite_ore",
+            "weight": 15
+          },
+          {
+            "block": "gtceu:slate_spodumene_ore",
+            "weight": 35
+          }
+        ]
+      },
+      {
+        "replace": [
+          "tfc:rock/raw/phyllite"
+        ],
+        "with": [
+          {
+            "block": "gtceu:phyllite_rock_salt_ore",
+            "weight": 20
+          },
+          {
+            "block": "gtceu:phyllite_salt_ore",
+            "weight": 30
+          },
+          {
+            "block": "gtceu:phyllite_lepidolite_ore",
+            "weight": 15
+          },
+          {
+            "block": "gtceu:phyllite_spodumene_ore",
+            "weight": 35
+          }
+        ]
+      },
+      {
+        "replace": [
+          "tfc:rock/raw/schist"
+        ],
+        "with": [
+          {
+            "block": "gtceu:schist_rock_salt_ore",
+            "weight": 20
+          },
+          {
+            "block": "gtceu:schist_salt_ore",
+            "weight": 30
+          },
+          {
+            "block": "gtceu:schist_lepidolite_ore",
+            "weight": 15
+          },
+          {
+            "block": "gtceu:schist_spodumene_ore",
+            "weight": 35
+          }
+        ]
+      },
+      {
+        "replace": [
+          "tfc:rock/raw/gneiss"
+        ],
+        "with": [
+          {
+            "block": "gtceu:gneiss_rock_salt_ore",
+            "weight": 20
+          },
+          {
+            "block": "gtceu:gneiss_salt_ore",
+            "weight": 30
+          },
+          {
+            "block": "gtceu:gneiss_lepidolite_ore",
+            "weight": 15
+          },
+          {
+            "block": "gtceu:gneiss_spodumene_ore",
+            "weight": 35
+          }
+        ]
+      },
+      {
+        "replace": [
+          "tfc:rock/raw/marble"
+        ],
+        "with": [
+          {
+            "block": "gtceu:marble_rock_salt_ore",
+            "weight": 20
+          },
+          {
+            "block": "gtceu:marble_salt_ore",
+            "weight": 30
+          },
+          {
+            "block": "gtceu:marble_lepidolite_ore",
+            "weight": 15
+          },
+          {
+            "block": "gtceu:marble_spodumene_ore",
+            "weight": 35
+          }
+        ]
+      }
+    ]
+  }
+}
--- a/kubejs/data/tfg/worldgen/configured_feature/vein/surface_copper.json
+++ b/kubejs/data/tfg/worldgen/configured_feature/vein/surface_copper.json
@@ -15,7 +15,7 @@
        "with": [
          {
            "block": "gtceu:rhyolite_chalcopyrite_ore",
-            "weight": 70
+            "weight": 55
          },
          {
            "block": "gtceu:rhyolite_zeolite_ore",
@@ -24,6 +24,10 @@
          {
            "block": "gtceu:rhyolite_cassiterite_ore",
            "weight": 5
+          },
+          {
+            "block": "gtceu:rhyolite_realgar_ore",
+            "weight": 15
          }
        ]
      },
@@ -34,7 +38,7 @@
        "with": [
          {
            "block": "gtceu:basalt_chalcopyrite_ore",
-            "weight": 70
+            "weight": 55
          },
          {
            "block": "gtceu:basalt_zeolite_ore",
@@ -43,6 +47,10 @@
          {
            "block": "gtceu:basalt_cassiterite_ore",
            "weight": 5
+          },
+          {
+            "block": "gtceu:basalt_realgar_ore",
+            "weight": 15
          }
        ]
      },
@@ -53,7 +61,7 @@
        "with": [
          {
            "block": "gtceu:andesite_chalcopyrite_ore",
-            "weight": 70
+            "weight": 55
          },
          {
            "block": "gtceu:andesite_zeolite_ore",
@@ -62,6 +70,10 @@
          {
            "block": "gtceu:andesite_cassiterite_ore",
            "weight": 5
+          },
+          {
+            "block": "gtceu:andesite_realgar_ore",
+            "weight": 15
          }
        ]
      },
@@ -72,7 +84,7 @@
        "with": [
          {
            "block": "gtceu:dacite_chalcopyrite_ore",
-            "weight": 70
+            "weight": 55
          },
          {
            "block": "gtceu:dacite_zeolite_ore",
@@ -81,6 +93,10 @@
          {
            "block": "gtceu:dacite_cassiterite_ore",
            "weight": 5
+          },
+          {
+            "block": "gtceu:dacite_realgar_ore",
+            "weight": 15
          }
        ]
      }
--- a/kubejs/data/tfg/worldgen/placed_feature/vein/normal_oilsands.json
+++ b/kubejs/data/tfg/worldgen/placed_feature/vein/normal_oilsands.json
@@ -0,0 +1,4 @@
+{
+  "feature": "tfg:vein/normal_oilsands",
+  "placement": []
+}
--- a/kubejs/data/tfg/worldgen/placed_feature/vein/normal_spodumene.json
+++ b/kubejs/data/tfg/worldgen/placed_feature/vein/normal_spodumene.json
@@ -0,0 +1,4 @@
+{
+  "feature": "tfg:vein/normal_spodumene",
+  "placement": []
+}
--- a/kubejs/server_scripts/ae2/recipes.js
+++ b/kubejs/server_scripts/ae2/recipes.js
@@ -190,7 +190,7 @@ const registerAE2Recipes = (event) => {
        'FEF'
    ], {
        A: 'ae2:wireless_receiver',
-        B: 'ae2:crafting_terminal',
+        B: 'ae2:terminal',
        C: 'ae2:engineering_processor',
        D: '#forge:circuits/hv',
        E: 'gtceu:hv_lithium_battery',
--- a/kubejs/server_scripts/ae2wtlib/recipes.js
+++ b/kubejs/server_scripts/ae2wtlib/recipes.js
@@ -13,7 +13,7 @@ const registerAE2WTLibRecipes = (event) => {
    // Wireless Pattern Terminal
    event.recipes.gtceu.assembler('ae2wtlib:wireless_pattern_encoding_terminal')
        .itemInputs(
-            '2x ae2:dense_energy_cell',
+            '2x gtceu:hv_lithium_battery',
            'ae2:wireless_terminal',
            'ae2:pattern_encoding_terminal',
            '2x gtceu:luv_sensor',
@@ -27,7 +27,7 @@ const registerAE2WTLibRecipes = (event) => {
    // Pattern Access Terminal
    event.recipes.gtceu.assembler('ae2wtlib:wireless_pattern_access_terminal')
        .itemInputs(
-            '2x ae2:dense_energy_cell',
+            '2x gtceu:hv_lithium_battery',
            'ae2:wireless_terminal',
            'ae2:pattern_access_terminal',
            '2x gtceu:luv_sensor',
--- a/kubejs/server_scripts/chisel_and_bits/recipes.js
+++ b/kubejs/server_scripts/chisel_and_bits/recipes.js
@@ -101,7 +101,6 @@ const registerChiselAndBitsRecipes = (event) => {
        C: '#forge:smooth_stone_slab'
    }).id('tfg:chiselsandbits/shaped/pattern_scanner')

-
    // Удалятель герметика
    event.shaped('chiselsandbits:wrench', [
        ' AB', 
--- a/kubejs/server_scripts/create/recipes.js
+++ b/kubejs/server_scripts/create/recipes.js
@@ -44,8 +44,8 @@ const registerCreateRecipes = (event) => {
        { id: 'create:crafting/kinetics/track_signal' },
        { id: 'create:crafting/kinetics/track_observer' },
        { id: 'create:crafting/kinetics/controls' },
-        { id: 'create:crafting/kinetics/content_observer' },
-        { id: 'create:crafting/kinetics/stockpile_switch' },
+        { id: 'create:crafting/logistics/content_observer' },
+        { id: 'create:crafting/logistics/stockpile_switch' },
        { id: 'create:crafting/logistics/display_link' },
        { id: 'create:crafting/kinetics/nixie_tube' },
        { id: 'create:crafting/logistics/redstone_link' },
@@ -90,6 +90,9 @@ const registerCreateRecipes = (event) => {
        { id: 'create:crafting/kinetics/red_seat' },
        { id: 'create:crafting/kinetics/black_seat' },
        { id: 'create:compat/ae2/mixing/fluix_crystal' },
+        { id: 'create:sequenced_assembly/precision_mechanism' },
+        { id: 'create:crafting/logistics/content_observer' },
+        { id: 'create:milling/bone' },
    ], mod: 'create' })

    // Пушка для постройки схематик
@@ -188,7 +191,7 @@ const registerCreateRecipes = (event) => {
    event.recipes.createMechanicalCrafting('2x create:crushing_wheel', [
        ' AAA ',
        'AABAA',
-        'ABCBC',
+        'ABCBA',
        'AABAA',
        ' AAA '
    ], {
@@ -685,12 +688,12 @@ const registerCreateRecipes = (event) => {
    ], {
        A: '#forge:chests/wooden',
        B: '#forge:sheets/wrought_iron',
-        C: '#forge:screw/wrought_iron',
+        C: '#forge:screw/steel',
        D: '#forge:tools/screwdrivers'
    }).id('tfg:create/shaped/item_vault')

    event.recipes.gtceu.assembler('tfg:create/item_vault')             
-        .itemInputs('3x #forge:chests/wooden', '#forge:sheets/wrought_iron', '2x #forge:screw/wrought_iron')
+        .itemInputs('3x #forge:chests/wooden', '#forge:sheets/wrought_iron', '2x #forge:screw/steel')
        .circuit(3)
        .itemOutputs('create:item_vault')
        .duration(200)
@@ -1068,6 +1071,22 @@ const registerCreateRecipes = (event) => {
        .duration(100)
        .EUt(4)

+    // Ремень
+    event.recipes.tfc.knapping('create:belt_connector', 'tfc:leather', [
+        " XXX ",
+        " XXX ",
+        " XXX ",
+        " XXX ",
+        " XXX ",
+    ]).ingredient('#tfc:leather_knapping').id('tfg:create/shaped/belt_connector')
+
+    event.recipes.gtceu.assembler('tfg:create/belt_connector')             
+        .itemInputs('minecraft:leather')
+        .circuit(2)
+        .itemOutputs('create:belt_connector')
+        .duration(25)
+        .EUt(16)
+        
    //#region Покраска ручек от люка

    event.recipes.gtceu.chemical_bath(`create/valve_handle_decolor`)             
@@ -1120,4 +1139,6 @@ const registerCreateRecipes = (event) => {
                .duration(300)
                .EUt(4)
    })
+
+    //#endregion
 }
--- a/kubejs/server_scripts/create/tags.js
+++ b/kubejs/server_scripts/create/tags.js
@@ -13,3 +13,8 @@ const registerCreateItemTags = (event) => {
        if (dye != 'white') event.add('tfg:colored_seats', `create:${dye}_seat`)
    })
 }
+
+const registerCreateFluidTags = (event) => {
+    event.add('create:bottomless/allow', 'tfc:fresh_water')
+    event.add('create:bottomless/allow', 'tfc:salt_water')
+}
--- a/kubejs/server_scripts/gregtech/loot.js
+++ b/kubejs/server_scripts/gregtech/loot.js
@@ -8,9 +8,9 @@ const registerGTCEULoots = (event) => {
                event.addBlockLootModifier(`gtceu:${stoneType}_${material}_ore`)
                    .removeLoot(Ingredient.all)
                    .addWeightedLoot([
-                        Item.of(`gtceu:rich_raw_${material}`).withChance(20),
-                        Item.of(`gtceu:raw_${material}`).withChance(60),
-                        Item.of(`gtceu:poor_raw_${material}`).withChance(20)
+                        Item.of(`#forge:rich_raw_materials/${material}`).withChance(0.2),
+                        Item.of(`#forge:raw_materials/${material}`).withChance(0.6),
+                        Item.of(`#forge:poor_raw_materials/${material}`).withChance(0.2)
                    ]);
            }
        })
--- a/kubejs/server_scripts/gregtech/recipes.js
+++ b/kubejs/server_scripts/gregtech/recipes.js
@@ -1,6 +1,8 @@
 // priority: 0

 const $MaterialFlags = Java.loadClass('com.gregtechceu.gtceu.api.data.chemical.material.info.MaterialFlags')
+const $TFGMaterialFlags = Java.loadClass('su.terrafirmagreg.core.compat.gtceu.TFGMaterialFlags')
+const $ToolHelper = Java.loadClass('com.gregtechceu.gtceu.api.item.tool.ToolHelper')

 const registerGTCEURecipes = (event) => {
    
@@ -962,6 +964,95 @@ const registerGTCEURecipes = (event) => {

    //#endregion

+    //#region Выход: Стальные машины
+
+    // Экстрактор
+    event.shaped('gtceu:hp_steam_extractor', [
+        'BEB',
+        'CAC',
+        'DBD'
+    ], {
+        A: 'gtceu:steel_brick_casing',
+        B: '#forge:fluid_pipes/small/tin_alloy',
+        C: '#forge:plates/steel',
+        D: '#forge:plates/wrought_iron',
+        E: '#forge:glass_panes'
+    }).id('gtceu:shaped/steam_extractor_steel')
+
+    // Дробитель
+    event.shaped('gtceu:hp_steam_macerator', [
+        'CCC',
+        'BAB',
+        'DDD'
+    ], {
+        A: 'gtceu:steel_brick_casing',
+        B: '#forge:fluid_pipes/small/tin_alloy',
+        C: '#forge:plates/steel',
+        D: '#forge:plates/wrought_iron'
+    }).id('gtceu:shaped/steam_macerator_steel')
+
+    // Компрессор
+    event.shaped('gtceu:hp_steam_compressor', [
+        'BCB',
+        'DAD',
+        'BBB'
+    ], {
+        A: 'gtceu:steel_brick_casing',
+        B: '#forge:fluid_pipes/small/tin_alloy',
+        C: '#forge:plates/steel',
+        D: '#forge:plates/wrought_iron'
+    }).id('gtceu:shaped/steam_compressor_steel')
+
+    // Молот
+    event.shaped('gtceu:hp_steam_forge_hammer', [
+        'DDD',
+        'BAB',
+        'CCC'
+    ], {
+        A: 'gtceu:steel_brick_casing',
+        B: '#forge:fluid_pipes/small/tin_alloy',
+        C: '#forge:plates/steel',
+        D: '#forge:plates/wrought_iron'
+    }).id('gtceu:shaped/steam_hammer_steel')
+
+    // Печь
+    event.shaped('gtceu:hp_steam_furnace', [
+        'BCB',
+        'DAD',
+        'BCB'
+    ], {
+        A: 'gtceu:steel_brick_casing',
+        B: '#forge:fluid_pipes/small/tin_alloy',
+        C: '#forge:plates/steel',
+        D: '#forge:plates/wrought_iron'
+    }).id('gtceu:shaped/steam_furnace_steel')
+
+    // Сплавщик
+    event.shaped('gtceu:hp_steam_alloy_smelter', [
+        'DCD',
+        'DAD',
+        'DBD'
+    ], {
+        A: 'gtceu:steel_brick_casing',
+        B: '#forge:fluid_pipes/small/tin_alloy',
+        C: '#forge:plates/steel',
+        D: '#forge:plates/wrought_iron'
+    }).id('gtceu:shaped/steam_alloy_smelter_steel')
+
+    // Блоко-ломатель
+    event.shaped('gtceu:hp_steam_rock_crusher', [
+        'DCD',
+        'BAB',
+        'DDD'
+    ], {
+        A: 'gtceu:steel_brick_casing',
+        B: '#forge:fluid_pipes/small/tin_alloy',
+        C: '#forge:plates/steel',
+        D: '#forge:plates/wrought_iron'
+    }).id('gtceu:shaped/steam_rock_breaker_steel')
+
+    //#endregion
+
    // Удаление рецептов связанных с Primitive Blast Furnace
    event.remove({id: 'gtceu:arc_furnace/arc_primitive_blast_furnace'})
    event.remove({id: 'gtceu:macerator/macerate_primitive_blast_furnace'})
@@ -1169,6 +1260,26 @@ const registerGTCEURecipes = (event) => {
    //#region Рецепты, которые итерируются по всем материалам

    GTRegistries.MATERIALS.forEach(material => {
+        
+        //#region Рецепты инструментов
+        
+        if (material.hasFlag($TFGMaterialFlags.HAS_TFC_TOOL)) {
+            global.GTCEU_ANVIL_TOOL_TYPES.forEach(toolType => {
+                let toolStack = $ToolHelper.get(toolType, material)
+    
+                event.recipes.tfc.advanced_shaped_crafting(TFC.itemStackProvider.of(toolStack).copyForgingBonus(), [
+                    'A',
+                    'B'
+                ], {
+                    A: `gtceu:${material}_${toolType.name}_head`,
+                    B: '#forge:rods/wooden'
+                }, 0, 0).id(`gtceu:shaped/${toolType.name}_${material}`)
+    
+            })
+        }
+    
+        //#endregion
+
        if (material.hasProperty(PropertyKey.ORE)) 
        {
            // Бедная сырая руда -> Дробленная руда + Дробленная руда (30%)
@@ -1187,8 +1298,16 @@ const registerGTCEURecipes = (event) => {
                .id(`tfg:crushing/${material}_crushed_ore_from_rich_raw_ore`)

            // Грязная пыль -> Пыль (90%)
-            event.recipes.createSplashing(Item.of(`gtceu:${material}_dust`).withChance(0.9), `gtceu:${material}_impure_dust`)
-                .id(`tfg:splashing/${material}_dust`)
+            event.recipes.createSplashing(Item.of(`#forge:dusts/${material}`).withChance(0.9), `gtceu:${material}_impure_dust`)
+                .id(`tfg:splashing/${material}_dust_from_impure`)
+
+            // Очищенная пыль -> Пыль (90%)
+            event.recipes.createSplashing(Item.of(`#forge:dusts/${material}`).withChance(0.9), `gtceu:${material}_pure_dust`)
+                .id(`tfg:splashing/${material}_dust_from_pure`)
+
+            // Дробленная руда -> Очищенная руда (90%)
+            event.recipes.createSplashing(Item.of(`#forge:purified_ores/${material}`).withChance(0.9), `gtceu:${material}_crushed_ore`)
+                .id(`tfg:splashing/${material}_purified_ore`)

            // Грязная пыль -> Пыль
            event.custom({
@@ -1203,7 +1322,37 @@ const registerGTCEURecipes = (event) => {
                    }
                ],
                result: Item.of(`#forge:dusts/${material}`).toJson()
-            }).id(`tfg:ae_transform/${material}_dust`)
+            }).id(`tfg:ae_transform/${material}_dust_from_impure`)
+
+            // Очищенная пыль -> Пыль
+            event.custom({
+                type: "ae2:transform",
+                circumstance: {
+                    type: "fluid",
+                    tag: "minecraft:water"
+                },
+                ingredients: [
+                    {
+                        item: `gtceu:${material}_pure_dust`
+                    }
+                ],
+                result: Item.of(`#forge:dusts/${material}`).toJson()
+            }).id(`tfg:ae_transform/${material}_dust_from_pure`)
+
+            // Дробленная руда -> Очищенная руда
+            event.custom({
+                type: "ae2:transform",
+                circumstance: {
+                    type: "fluid",
+                    tag: "minecraft:water"
+                },
+                ingredients: [
+                    {
+                        item: `gtceu:${material}_crushed_ore`
+                    }
+                ],
+                result: Item.of(`#forge:purified_ores/${material}`).toJson()
+            }).id(`tfg:ae_transform/${material}_purified_ore`)
        }

        if (material.hasFlag($MaterialFlags.GENERATE_PLATE) && material != 'wood') 
--- a/kubejs/server_scripts/main_server_script.js
+++ b/kubejs/server_scripts/main_server_script.js
@@ -36,6 +36,7 @@ ServerEvents.tags('block', event => {
 */
 ServerEvents.tags('fluid', event => {
    registerTFCFluidTags(event)
+    registerCreateFluidTags(event)
 })

 /**
@@ -102,13 +103,6 @@ ServerEvents.recipes(event => {
    registerChiselAndBitsRecipes(event)
 })

-/**
- * Событие регистрации рудных жил.
- */
-GTCEuServerEvents.oreVeins(event => {
-    event.removeAll()
-})
-
 /**
 * Событие регистрации лут-тейблов.
 */
@@ -116,28 +110,9 @@ LootJS.modifiers((event) => {
    registerGTCEULoots(event)
 });

-//#endregion
-
-/*
-
-// 
-event.shaped('', [
-    'AAA',
-    'AAA',
-    'AAA' 
-], {
-    A: '',
-    B: '',
-    C: '',
-    D: '',
-    E: '',
-    F: '',
-    G: '',
-}).id('tfg:create/shaped/')
-
-//
-event.shapeless('', [
-    
-]).id('tfg:create/shapeless/')
-
-*/
+/**
+ * Событие регистрации рудных жил.
+ */
+GTCEuServerEvents.oreVeins(event => {
+    event.removeAll()
+})
--- a/kubejs/server_scripts/minecraft/recipes.js
+++ b/kubejs/server_scripts/minecraft/recipes.js
@@ -2573,6 +2573,16 @@ const registerMinecraftRecipes = (event) => {

    //#endregion

+    //#region Выход: Незер бревна
+
+    event.remove({ id: 'minecraft:stripped_crimson_stem_via_vanilla_stripping' })
+    event.remove({ id: 'minecraft:stripped_crimson_hyphae_via_vanilla_stripping' })
+
+    event.remove({ id: 'minecraft:stripped_warped_stem_via_vanilla_stripping' })
+    event.remove({ id: 'minecraft:stripped_warped_hyphae_via_vanilla_stripping' })
+
+    //#endregion
+
    //#region Исправление дерьма с медью (Однажды разраб GTCEu вспомнит, лучше бы забыл)

    event.smelting('tfc:metal/ingot/copper', 'minecraft:raw_copper')
--- a/kubejs/server_scripts/tfc/recipes.js
+++ b/kubejs/server_scripts/tfc/recipes.js
@@ -206,23 +206,31 @@ const registerTFCRecipes = (event) => {
            // Стержень -> Кольцо
            // Возможно, когда нибудь, когда они пригодятся

+            // Длинный стержень -> Металл
+            event.recipes.tfc.heating(`gtceu:${metal}_long_rod`, metalSpecs.melt_temp)
+                .resultFluid(Fluid.of(metalSpecs.output_fluid, 144))
+                .id(`tfc:heating/metal/${metal}_long_rod`)
+
+            // Стержни -> Длинный стержень
+            event.recipes.tfc.welding(`gtceu:${metal}_long_rod`, `#forge:rods/${metal}`, `#forge:rods/${metal}`)
+                .tier(metalSpecs.tier)
+                .id(`tfc:anvil/${metal}_long_rod`)
+
            // Болт -> Металл
            event.recipes.tfc.heating(`gtceu:${metal}_bolt`, metalSpecs.melt_temp)
                .resultFluid(Fluid.of(metalSpecs.output_fluid, 36))
                .id(`tfc:heating/metal/${metal}_bolt`)

+            // Стержень -> Болт
            event.recipes.tfc.anvil(`2x gtceu:${metal}_bolt`, `#forge:rods/${metal}`, ['punch_last', 'draw_second_last', 'draw_third_last'])
                .tier(metalSpecs.tier)
                .id(`tfc:anvil/${metal}_bolt`)

-            // Стержень -> Болт
-
            // Винт -> Металл
            event.recipes.tfc.heating(`gtceu:${metal}_screw`, metalSpecs.melt_temp)
                .resultFluid(Fluid.of(metalSpecs.output_fluid, 72))
                .id(`tfc:heating/metal/${metal}_screw`)

-
            // Стержень -> Винт
            event.recipes.tfc.anvil(`gtceu:${metal}_screw`, `#forge:rods/${metal}`, ['punch_last', 'punch_second_last', 'shrink_third_last'])
                .tier(metalSpecs.tier)
@@ -618,6 +626,48 @@ const registerTFCRecipes = (event) => {

            //#endregion

+            //#region Молот шахтера
+
+            // Декрафт инструмента в жидкость
+            event.recipes.tfc.heating(`gtceu:${metal}_mining_hammer`, metalSpecs.melt_temp)
+                .resultFluid(Fluid.of(metalSpecs.output_fluid, 288))
+                .useDurability(true)
+                .id(`tfc:heating/metal/${metal}_mining_hammer`)
+
+            // Крафт оголовья
+            event.recipes.tfc.anvil(`gtceu:${metal}_mining_hammer_head`, `#forge:double_ingots/${metal}`, ['punch_last', 'shrink_not_last'])
+                .tier(metalSpecs.tier)
+                .bonus(true)
+                .id(`tfc:anvil/${metal}_mining_hammer_head`)
+
+            // Декрафт оголовья в жидкость
+            event.recipes.tfc.heating(`gtceu:${metal}_mining_hammer_head`, metalSpecs.melt_temp)
+                .resultFluid(Fluid.of(metalSpecs.output_fluid, 288))
+                .id(`tfc:heating/metal/${metal}_mining_hammer_head`)
+
+            //#endregion
+
+            //#region Большая лопата
+            
+            // Декрафт инструмента в жидкость
+            event.recipes.tfc.heating(`gtceu:${metal}_spade`, metalSpecs.melt_temp)
+                .resultFluid(Fluid.of(metalSpecs.output_fluid, 288))
+                .useDurability(true)
+                .id(`tfc:heating/metal/${metal}_spade`)
+
+            // Крафт оголовья
+            event.recipes.tfc.anvil(`gtceu:${metal}_spade_head`, `#forge:double_ingots/${metal}`, ['punch_last', 'hit_not_last'])
+                .tier(metalSpecs.tier)
+                .bonus(true)
+                .id(`tfc:anvil/${metal}_spade_head`)
+
+            // Декрафт оголовья в жидкость
+            event.recipes.tfc.heating(`gtceu:${metal}_spade_head`, metalSpecs.melt_temp)
+                .resultFluid(Fluid.of(metalSpecs.output_fluid, 288))
+                .id(`tfc:heating/metal/${metal}_spade_head`)
+
+            //#endregion
+
            //#region Ножницы 

            // Сварка оголовий
--- a/kubejs/server_scripts/tfc/tags.js
+++ b/kubejs/server_scripts/tfc/tags.js
@@ -317,6 +317,8 @@ const registerTFCPlacedFeatures = (event) => {
    event.add('tfc:in_biome/veins', 'tfg:vein/normal_gold')
    event.add('tfc:in_biome/veins', 'tfg:vein/normal_graphite')
    event.add('tfc:in_biome/veins', 'tfg:vein/normal_hematite')
+    event.add('tfc:in_biome/veins', 'tfg:vein/normal_spodumene')
+    event.add('tfc:in_biome/veins', 'tfg:vein/normal_oil_sands')
    event.add('tfc:in_biome/veins', 'tfg:vein/normal_lapis')
    event.add('tfc:in_biome/veins', 'tfg:vein/normal_limonite')
    event.add('tfc:in_biome/veins', 'tfg:vein/normal_lubricant')
--- a/kubejs/startup_scripts/create/constants.js
+++ b/kubejs/startup_scripts/create/constants.js
@@ -464,5 +464,9 @@ global.CREATE_DISABLED_ITEMS = [
    'create:wooden_bracket', 
    'create:blaze_burner',
    'create:sand_paper',
-    'create:red_sand_paper'
+    'create:red_sand_paper',
+    'create:empty_blaze_burner',
+    'create:minecart_contraption',
+    'create:furnace_minecart_contraption',
+    'create:chest_minecart_contraption'
 ];
--- a/kubejs/startup_scripts/gtceu/constants.js
+++ b/kubejs/startup_scripts/gtceu/constants.js
@@ -42,4 +42,27 @@ global.GTCEU_DISABLED_ITEMS = [
    'gtceu:rubber_log', 
    'gtceu:rubber_leaves', 
    'gtceu:rubber_planks',
+];
+
+global.GTCEU_ANVIL_TOOL_TYPES = [
+    GTToolType.SWORD,
+    GTToolType.PICKAXE,
+    GTToolType.SHOVEL,
+    GTToolType.AXE,
+    GTToolType.HOE,
+    GTToolType.MINING_HAMMER,
+    GTToolType.SPADE,
+    GTToolType.SAW,
+    GTToolType.HARD_HAMMER,
+    // GTToolType.SOFT_MALLET,
+    // GTToolType.WRENCH,
+    GTToolType.FILE,
+    // GTToolType.CROWBAR,
+    // GTToolType.SCREWDRIVER,
+    // GTToolType.MORTAR,
+    // GTToolType.WIRE_CUTTER,
+    GTToolType.SCYTHE,
+    GTToolType.KNIFE,
+    GTToolType.BUTCHERY_KNIFE,
+    // GTToolType.PLUNGER
 ];
--- a/kubejs/startup_scripts/sophisticated_backpacks/constants.js
+++ b/kubejs/startup_scripts/sophisticated_backpacks/constants.js
@@ -20,6 +20,7 @@ global.SOPHISTICATED_BACKPACKS_DISABLED_ITEMS = [
    'sophisticatedbackpacks:advanced_compacting_upgrade',
    'sophisticatedbackpacks:compacting_upgrade',
    'sophisticatedbackpacks:advanced_feeding_upgrade',
-    'sophisticatedbackpacks:feeding_upgrade'
+    'sophisticatedbackpacks:feeding_upgrade',
+    'sophisticatedbackpacks:anvil_upgrade'
 ];

--- a/2
+++ b/2