From ff0240fe55bebd9a46496b31202b76fc21426011 Mon Sep 17 00:00:00 2001
From: Dmitry <52341158+SpeeeDCraft@users.noreply.github.com>
Date: Sat, 6 Jan 2024 10:20:23 +0700
Subject: [PATCH 01/14] Update CHANGELOG.md

Signed-off-by: Dmitry <52341158+SpeeeDCraft@users.noreply.github.com>
---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 95ec33b1c..48add355d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 ### Изменения
 - Исправлен рецепт точного механизма из Create.
 - Исправлен рецепт ремня из Create.
+- Исправлены рецепты стальных машин.
 
 ## [0.4.2] - 05.01.2024
 ### Изменения

From a3ed98df6416e44bce93fcc967c62cb466ff1568 Mon Sep 17 00:00:00 2001
From: Xikaro <0regon.end@gmail.com>
Date: Sat, 6 Jan 2024 10:19:52 +0500
Subject: [PATCH 02/14] Update mods

---
 mods | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mods b/mods
index c0edf71ac..d26c8a300 160000
--- a/mods
+++ b/mods
@@ -1 +1 @@
-Subproject commit c0edf71acbd5a0e9077c233b0bf436a180d0fe57
+Subproject commit d26c8a3006c9a52f92ab00722df5ecf204b09c1b

From efb338a73088cbd1868e849dff459e439e463948 Mon Sep 17 00:00:00 2001
From: Xikaro <0regon.end@gmail.com>
Date: Sat, 6 Jan 2024 11:15:38 +0500
Subject: [PATCH 03/14] Create test.yml

---
 .github/workflows/test.yml | 75 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 .github/workflows/test.yml

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
new file mode 100644
index 000000000..0afb26df0
--- /dev/null
+++ b/.github/workflows/test.yml
@@ -0,0 +1,75 @@
+name: Test
+run-name: "Test #${{ github.run_number }}"
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  modpack-info:
+    name: Modpack Info
+    runs-on: ubuntu-latest
+    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 }}
+      changelog: ${{ steps.changelog.outputs.description }}
+    
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4.1.1
+
+      # - name: Get tag
+      #   id: version
+      #   uses: "WyriHaximus/github-action-get-previous-tag@v1.3.0"
+      #   with:
+      #     fallback: tag_not_found
+
+      # - name: Modpack info
+      #   id: info
+      #   shell: bash
+      #   run: |
+      #     set +e
+
+      #     if [ ! -f ./.github/buildtools/modpack/manifest.json ]; then
+      #       echo "::error::Could not find manifest.json" && exit 1
+      #     fi
+      #     manifestjson=`cat ./.github/buildtools/modpack/manifest.json`
+
+      #     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
+
+      #     if [[ ${{ startsWith(github.ref, 'refs/tags/') }} == true ]]; then
+      #       echo "project_version=${{ steps.version.outputs.tag }}" >> $GITHUB_OUTPUT
+      #     else
+      #       echo "project_version=build.${{ github.run_number }}" >> $GITHUB_OUTPUT
+      #     fi
+
+      - name: Changelog Parser
+        id: changelog
+        uses: coditory/changelog-parser@v1.0.2
+        with:
+          path: CHANGELOG.md
+
+      - name: Send Discord message
+        uses: tsickert/discord-webhook@v5.4.0
+        with:
+          webhook-url: ${{secrets.RELEASES_1_20}}
+          username: "TerraFirmaGreg"
+          avatar-url: "https://raw.githubusercontent.com/TerraFirmaGreg-Team/.github/main/branding/curseforge_logo.png"
+          embed-title: Release 0.4.2
+          embed-url: https://github.com/TerraFirmaGreg-Team/TFG-Modpack-1.20.x/releases/tag/0.4.2
+          embed-thumbnail-url: https://raw.githubusercontent.com/TerraFirmaGreg-Team/.github/main/branding/logo_new_year.png
+          embed-description: |
+            **Release Type**: `BETA`
+            **GameVersion**: `1.20.1`
+            **Website Link**: `[CurseForge](https://www.curseforge.com/minecraft/modpacks/terrafirmagreg/files/5010505)`
+
+            **Changelog**
+            ```${{ steps.changelog.outputs.description }}```
+          embed-color: 15430476

From 704f92a1279567f88f0f5cb95d095f984f7405e0 Mon Sep 17 00:00:00 2001
From: Xikaro <0regon.end@gmail.com>
Date: Sat, 6 Jan 2024 11:16:26 +0500
Subject: [PATCH 04/14] Update test.yml

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0afb26df0..f11c8b510 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -68,7 +68,7 @@ jobs:
           embed-description: |
             **Release Type**: `BETA`
             **GameVersion**: `1.20.1`
-            **Website Link**: `[CurseForge](https://www.curseforge.com/minecraft/modpacks/terrafirmagreg/files/5010505)`
+            **Website Link**: `[CurseForge](<https://www.curseforge.com/minecraft/modpacks/terrafirmagreg/files/5010505>)`
 
             **Changelog**
             ```${{ steps.changelog.outputs.description }}```

From 711da02895ced3ba53f87e2c309167fabeb13a60 Mon Sep 17 00:00:00 2001
From: Xikaro <0regon.end@gmail.com>
Date: Sat, 6 Jan 2024 11:17:54 +0500
Subject: [PATCH 05/14] Update test.yml

---
 .github/workflows/test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f11c8b510..cfc5bd8c2 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -68,7 +68,7 @@ jobs:
           embed-description: |
             **Release Type**: `BETA`
             **GameVersion**: `1.20.1`
-            **Website Link**: `[CurseForge](<https://www.curseforge.com/minecraft/modpacks/terrafirmagreg/files/5010505>)`
+            **Website Link**: [CurseForge](https://www.curseforge.com/minecraft/modpacks/terrafirmagreg/files/5010505)
 
             **Changelog**
             ```${{ steps.changelog.outputs.description }}```

From c1293399b99e6c004b3a80aba584e7854835e0e3 Mon Sep 17 00:00:00 2001
From: Xikaro <0regon.end@gmail.com>
Date: Sat, 6 Jan 2024 11:33:18 +0500
Subject: [PATCH 06/14] workflows final

---
 .github/workflows/build.yml   | 18 ++++-----
 .github/workflows/release.yml | 68 ++++++++++++++++---------------
 .github/workflows/test.yml    | 75 -----------------------------------
 3 files changed, 44 insertions(+), 117 deletions(-)
 delete mode 100644 .github/workflows/test.yml

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 263673a00..48d4ef386 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,9 +18,8 @@ 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 }}
-      changelog: ${{ steps.changelog.outputs.description }}
+      MC_VERSION: ${{ steps.info.outputs.mc_version }}
+      CHANGELOG: ${{ steps.changelog.outputs.description }}
     
     steps:
       - name: Checkout
@@ -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
@@ -177,10 +176,9 @@ jobs:
     if: startsWith(github.ref, 'refs/tags/')
     uses: ./.github/workflows/release.yml
     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 }}
-      changelog: ${{ needs.modpack-info.outputs.changelog }}
+      PROJECT_NAME: ${{ needs.modpack-info.outputs.project_name }}
+      PROJECT_VERSION: ${{ needs.modpack-info.outputs.project_version }}
+      MC_VERSION: ${{ needs.modpack-info.outputs.mc_version }}
+      CHANGELOG: ${{ needs.modpack-info.outputs.changelog }}
     secrets: inherit
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index fcfcc7005..472b0bfb1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -4,19 +4,16 @@ run-name: "Release #${{ github.run_number }}"
 on:
   workflow_call:
     inputs:
-      project_name:
+      PROJECT_NAME:
         required: true
         type: string
-      project_version:
+      PROJECT_VERSION:
         required: true
         type: string
-      mcversion:
+      MC_VERSION:
         required: true
         type: string
-      tag:
-        required: true
-        type: string
-      changelog:
+      CHANGELOG:
         required: true
         type: string
 
@@ -40,12 +37,12 @@ jobs:
       - name: Download cf modpack
         uses: actions/download-artifact@v4.1.0
         with:
-          name: ${{ inputs.project_name }}-${{ inputs.project_version }}-cf
+          name: ${{ inputs.PROJECT_NAME }}-${{ inputs.PROJECT_VERSION }}-cf
 
       - name: Download serverpack
         uses: actions/download-artifact@v4.1.0
         with:
-          name: ${{ inputs.project_name }}-${{ inputs.project_version }}-server
+          name: ${{ inputs.PROJECT_NAME }}-${{ inputs.PROJECT_VERSION }}-server
 
       - name: Upload Curseforge
         id: cf_release
@@ -53,13 +50,13 @@ jobs:
         with:
           api-token: ${{ secrets.CF_API_TOKEN }}
           project-id: ${{ env.CF_PROJECT_ID }}
-          modpack-path: ${{ inputs.project_name }}-${{ inputs.project_version }}-cf.zip
-          modpack-server-path: ${{ inputs.project_name }}-${{ inputs.project_version }}-server.zip
-          changelog: ${{ inputs.changelog }}
+          modpack-path: ${{ inputs.PROJECT_NAME }}-${{ inputs.PROJECT_VERSION }}-cf.zip
+          modpack-server-path: ${{ inputs.PROJECT_NAME }}-${{ inputs.PROJECT_VERSION }}-server.zip
+          changelog: ${{ inputs.CHANGELOG }}
           changelog-format: markdown
-          game-version: ${{ inputs.mcversion }}
-          display-name: ${{ inputs.project_name }}-${{ inputs.project_version }}
-          server-display-name: ${{ inputs.project_name }}-${{ inputs.project_version }}-server
+          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 }}
 
       - name: Send Discord message
@@ -67,11 +64,18 @@ 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"
-          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-color: 5814783
+          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.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: "#57F287"
 
   release-github:
     name: Deploy to GitHub
@@ -87,13 +91,13 @@ jobs:
         with:
           prerelease: false
           generate_release_notes: true
-          name: ${{ inputs.project_version }}
-          body: ${{ inputs.changelog }}
+          name: ${{ inputs.PROJECT_VERSION }}
+          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 }}
+            ${{ 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.PROJECT_VERSION }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -124,13 +128,13 @@ jobs:
   #       with:
   #         api-token: ${{ secrets.MODRINTH_API_TOKEN }}
   #         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 }}"
+  #         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-format: markdown
   #         game-version: ${{ inputs.mcversion }}
-  #         display-name: ${{ inputs.project_name }}-${{ inputs.project_version }}
-  #         server-display-name: ${{ inputs.project_name }}-${{ inputs.project_version }}-server
+  #         display-name: ${{ inputs.PROJECT_NAME }}-${{ inputs.PROJECT_VERSION }}
+  #         server-display-name: ${{ inputs.PROJECT_NAME }}-${{ inputs.PROJECT_VERSION }}-server
   #         release-type: ${{ env.RELEASE_TYPE }}
 
   close-fixed-issues:
@@ -145,7 +149,7 @@ jobs:
         uses: juraj-hrivnak/close-issues-based-on-label@master
         env:
           LABEL: "2. status: fixed in dev"
-          VERSION: ${{ inputs.tag }}
+          VERSION: ${{ inputs.PROJECT_VERSION }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
deleted file mode 100644
index cfc5bd8c2..000000000
--- a/.github/workflows/test.yml
+++ /dev/null
@@ -1,75 +0,0 @@
-name: Test
-run-name: "Test #${{ github.run_number }}"
-
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-  modpack-info:
-    name: Modpack Info
-    runs-on: ubuntu-latest
-    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 }}
-      changelog: ${{ steps.changelog.outputs.description }}
-    
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4.1.1
-
-      # - name: Get tag
-      #   id: version
-      #   uses: "WyriHaximus/github-action-get-previous-tag@v1.3.0"
-      #   with:
-      #     fallback: tag_not_found
-
-      # - name: Modpack info
-      #   id: info
-      #   shell: bash
-      #   run: |
-      #     set +e
-
-      #     if [ ! -f ./.github/buildtools/modpack/manifest.json ]; then
-      #       echo "::error::Could not find manifest.json" && exit 1
-      #     fi
-      #     manifestjson=`cat ./.github/buildtools/modpack/manifest.json`
-
-      #     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
-
-      #     if [[ ${{ startsWith(github.ref, 'refs/tags/') }} == true ]]; then
-      #       echo "project_version=${{ steps.version.outputs.tag }}" >> $GITHUB_OUTPUT
-      #     else
-      #       echo "project_version=build.${{ github.run_number }}" >> $GITHUB_OUTPUT
-      #     fi
-
-      - name: Changelog Parser
-        id: changelog
-        uses: coditory/changelog-parser@v1.0.2
-        with:
-          path: CHANGELOG.md
-
-      - name: Send Discord message
-        uses: tsickert/discord-webhook@v5.4.0
-        with:
-          webhook-url: ${{secrets.RELEASES_1_20}}
-          username: "TerraFirmaGreg"
-          avatar-url: "https://raw.githubusercontent.com/TerraFirmaGreg-Team/.github/main/branding/curseforge_logo.png"
-          embed-title: Release 0.4.2
-          embed-url: https://github.com/TerraFirmaGreg-Team/TFG-Modpack-1.20.x/releases/tag/0.4.2
-          embed-thumbnail-url: https://raw.githubusercontent.com/TerraFirmaGreg-Team/.github/main/branding/logo_new_year.png
-          embed-description: |
-            **Release Type**: `BETA`
-            **GameVersion**: `1.20.1`
-            **Website Link**: [CurseForge](https://www.curseforge.com/minecraft/modpacks/terrafirmagreg/files/5010505)
-
-            **Changelog**
-            ```${{ steps.changelog.outputs.description }}```
-          embed-color: 15430476

From d7df95409cf72d1890bf51f71c6d10992d2cf519 Mon Sep 17 00:00:00 2001
From: Xikaro <0regon.end@gmail.com>
Date: Sat, 6 Jan 2024 11:35:31 +0500
Subject: [PATCH 07/14] Update build.yml

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 48d4ef386..8dd7342b7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,8 +18,8 @@ jobs:
     outputs:
       project_name: ${{ steps.info.outputs.project_name }}
       project_version: ${{ steps.info.outputs.project_version }}
-      MC_VERSION: ${{ steps.info.outputs.mc_version }}
-      CHANGELOG: ${{ steps.changelog.outputs.description }}
+      mc_version: ${{ steps.info.outputs.mc_version }}
+      changelog: ${{ steps.changelog.outputs.description }}
     
     steps:
       - name: Checkout

From 13a0277772b767ba0b9f27cb8236500e6cac7461 Mon Sep 17 00:00:00 2001
From: Xikaro <0regon.end@gmail.com>
Date: Sat, 6 Jan 2024 11:46:03 +0500
Subject: [PATCH 08/14] Update main_menu.txt

---
 config/fancymenu/customization/main_menu.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/fancymenu/customization/main_menu.txt b/config/fancymenu/customization/main_menu.txt
index 954799c42..1e2641ba9 100644
--- a/config/fancymenu/customization/main_menu.txt
+++ b/config/fancymenu/customization/main_menu.txt
@@ -326,7 +326,8 @@ 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/TFG-Modpack-1.20.x/releases/latest","json_path":"$.tag_name"}}§r
+  source = 
   text_border = 0
   case_mode = normal
   source_mode = direct

From fd5582a59aef8957e279aef2125ab21441b99f24 Mon Sep 17 00:00:00 2001
From: Xikaro <0regon.end@gmail.com>
Date: Sat, 6 Jan 2024 12:13:05 +0500
Subject: [PATCH 09/14] =?UTF-8?q?=D1=80=D0=B5=D1=84=D0=B0=D0=BA=D1=82?=
 =?UTF-8?q?=D0=BE=D1=80=20gui?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customization/loading_screen.txt          |   4 +-
 config/fancymenu/customization/main_menu.txt  |  42 +++++++++---------
 .../images/image_1.png                        | Bin
 .../images/image_10.png                       | Bin
 .../images/image_2.png                        | Bin
 .../images/image_3.png                        | Bin
 .../images/image_4.png                        | Bin
 .../images/image_5.png                        | Bin
 .../images/image_6.png                        | Bin
 .../images/image_7.png                        | Bin
 .../images/image_8.png                        | Bin
 .../images/image_9.png                        | Bin
 .../properties.txt                            |   2 +-
 .../quests/chapters/primitive_age.snbt        |   2 +-
 config/ftbquests/quests/data.snbt             |   2 +-
 config/xaerominimap_entities.json             |   2 +-
 .../gui/{button98x20.png => button_98x20.png} | Bin
 ...0_hovered.png => button_98x20_hovered.png} | Bin
 .../{curse_logo.png => curseforge_logo.png}   | Bin
 ...overed.png => curseforge_logo_hovered.png} | Bin
 .../gui/{ds_logo.png => discord_logo.png}     | Bin
 ...o_hovered.png => discord_logo_hovered.png} | Bin
 .../gui/{git_logo.png => github_logo.png}     | Bin
 ...go_hovered.png => github_logo_hovered.png} | Bin
 .../{logo-512x512.png => logo_512x512.png}    | Bin
 .../gui/{mdr_logo.png => modrinth_logo.png}   | Bin
 ..._hovered.png => modrinth_logo_hovered.png} | Bin
 27 files changed, 27 insertions(+), 27 deletions(-)
 rename config/fancymenu/slideshows/{tfgslideshow => main_menu}/images/image_1.png (100%)
 rename config/fancymenu/slideshows/{tfgslideshow => main_menu}/images/image_10.png (100%)
 rename config/fancymenu/slideshows/{tfgslideshow => main_menu}/images/image_2.png (100%)
 rename config/fancymenu/slideshows/{tfgslideshow => main_menu}/images/image_3.png (100%)
 rename config/fancymenu/slideshows/{tfgslideshow => main_menu}/images/image_4.png (100%)
 rename config/fancymenu/slideshows/{tfgslideshow => main_menu}/images/image_5.png (100%)
 rename config/fancymenu/slideshows/{tfgslideshow => main_menu}/images/image_6.png (100%)
 rename config/fancymenu/slideshows/{tfgslideshow => main_menu}/images/image_7.png (100%)
 rename config/fancymenu/slideshows/{tfgslideshow => main_menu}/images/image_8.png (100%)
 rename config/fancymenu/slideshows/{tfgslideshow => main_menu}/images/image_9.png (100%)
 rename config/fancymenu/slideshows/{tfgslideshow => main_menu}/properties.txt (84%)
 rename kubejs/assets/tfg/textures/gui/{button98x20.png => button_98x20.png} (100%)
 rename kubejs/assets/tfg/textures/gui/{button98x20_hovered.png => button_98x20_hovered.png} (100%)
 rename kubejs/assets/tfg/textures/gui/{curse_logo.png => curseforge_logo.png} (100%)
 rename kubejs/assets/tfg/textures/gui/{curse_logo_hovered.png => curseforge_logo_hovered.png} (100%)
 rename kubejs/assets/tfg/textures/gui/{ds_logo.png => discord_logo.png} (100%)
 rename kubejs/assets/tfg/textures/gui/{ds_logo_hovered.png => discord_logo_hovered.png} (100%)
 rename kubejs/assets/tfg/textures/gui/{git_logo.png => github_logo.png} (100%)
 rename kubejs/assets/tfg/textures/gui/{git_logo_hovered.png => github_logo_hovered.png} (100%)
 rename kubejs/assets/tfg/textures/gui/{logo-512x512.png => logo_512x512.png} (100%)
 rename kubejs/assets/tfg/textures/gui/{mdr_logo.png => modrinth_logo.png} (100%)
 rename kubejs/assets/tfg/textures/gui/{mdr_logo_hovered.png => modrinth_logo_hovered.png} (100%)

diff --git a/config/fancymenu/customization/loading_screen.txt b/config/fancymenu/customization/loading_screen.txt
index c1ac6300a..605842f5d 100644
--- 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
diff --git a/config/fancymenu/customization/main_menu.txt b/config/fancymenu/customization/main_menu.txt
index 1e2641ba9..6289cad08 100644
--- 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
 }
 
@@ -38,8 +38,8 @@ customization {
   loopbackgroundanimations = true
   restartbackgroundanimations = true
   action = setbuttontexture
-  backgroundhovered = kubejs/assets/tfg/textures/gui/button98x20_hovered.png
-  backgroundnormal = kubejs/assets/tfg/textures/gui/button98x20.png
+  backgroundhovered = kubejs/assets/tfg/textures/gui/button_98x20_hovered.png
+  backgroundnormal = kubejs/assets/tfg/textures/gui/button_98x20.png
 }
 
 customization {
@@ -65,7 +65,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 {
@@ -81,8 +81,8 @@ customization {
   loopbackgroundanimations = true
   restartbackgroundanimations = true
   action = setbuttontexture
-  backgroundhovered = kubejs/assets/tfg/textures/gui/button98x20_hovered.png
-  backgroundnormal = kubejs/assets/tfg/textures/gui/button98x20.png
+  backgroundhovered = kubejs/assets/tfg/textures/gui/button_98x20_hovered.png
+  backgroundnormal = kubejs/assets/tfg/textures/gui/button_98x20.png
 }
 
 customization {
@@ -98,8 +98,8 @@ customization {
   loopbackgroundanimations = true
   restartbackgroundanimations = true
   action = setbuttontexture
-  backgroundhovered = kubejs/assets/tfg/textures/gui/button98x20_hovered.png
-  backgroundnormal = kubejs/assets/tfg/textures/gui/button98x20.png
+  backgroundhovered = kubejs/assets/tfg/textures/gui/button_98x20_hovered.png
+  backgroundnormal = kubejs/assets/tfg/textures/gui/button_98x20.png
 }
 
 customization {
@@ -145,8 +145,8 @@ customization {
   loopbackgroundanimations = true
   restartbackgroundanimations = true
   action = setbuttontexture
-  backgroundhovered = kubejs/assets/tfg/textures/gui/button98x20_hovered.png
-  backgroundnormal = kubejs/assets/tfg/textures/gui/button98x20.png
+  backgroundhovered = kubejs/assets/tfg/textures/gui/button_98x20_hovered.png
+  backgroundnormal = kubejs/assets/tfg/textures/gui/button_98x20.png
 }
 
 customization {
@@ -234,7 +234,7 @@ customization {
   orientation = mid-centered
   restartbackgroundanimations = true
   buttonaction = joinserver;tfg2.terrafirmagreg.su%btnaction_splitter_fm%
-  backgroundhovered = kubejs/assets/tfg/textures/gui/button98x20_hovered.png
+  backgroundhovered = kubejs/assets/tfg/textures/gui/button_98x20_hovered.png
   label = Offical Server
   loopbackgroundanimations = true
   x = 47
@@ -242,12 +242,12 @@ customization {
   action = addbutton
   actionid = 6514e312-8243-47af-a516-89743d8ca1af1699692677651
   y = -28
-  backgroundnormal = kubejs/assets/tfg/textures/gui/button98x20.png
+  backgroundnormal = kubejs/assets/tfg/textures/gui/button_98x20.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
@@ -261,7 +261,7 @@ 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
+  backgroundhovered = kubejs/assets/tfg/textures/gui/curseforge_logo_hovered.png
   label = 
   loopbackgroundanimations = true
   x = 47
@@ -269,7 +269,7 @@ 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
 }
 
@@ -277,7 +277,7 @@ 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
+  backgroundhovered = kubejs/assets/tfg/textures/gui/discord_logo_hovered.png
   label = 
   loopbackgroundanimations = true
   x = 125
@@ -285,7 +285,7 @@ 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
 }
 
@@ -293,7 +293,7 @@ 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
+  backgroundhovered = kubejs/assets/tfg/textures/gui/github_logo_hovered.png
   label = 
   loopbackgroundanimations = true
   x = 100
@@ -301,7 +301,7 @@ 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
 }
 
@@ -309,7 +309,7 @@ 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
+  backgroundhovered = kubejs/assets/tfg/textures/gui/modrinth_logo_hovered.png
   label = 
   loopbackgroundanimations = true
   x = 72
@@ -317,7 +317,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
 }
 
diff --git a/config/fancymenu/slideshows/tfgslideshow/images/image_1.png b/config/fancymenu/slideshows/main_menu/images/image_1.png
similarity index 100%
rename from config/fancymenu/slideshows/tfgslideshow/images/image_1.png
rename to config/fancymenu/slideshows/main_menu/images/image_1.png
diff --git a/config/fancymenu/slideshows/tfgslideshow/images/image_10.png b/config/fancymenu/slideshows/main_menu/images/image_10.png
similarity index 100%
rename from config/fancymenu/slideshows/tfgslideshow/images/image_10.png
rename to config/fancymenu/slideshows/main_menu/images/image_10.png
diff --git a/config/fancymenu/slideshows/tfgslideshow/images/image_2.png b/config/fancymenu/slideshows/main_menu/images/image_2.png
similarity index 100%
rename from config/fancymenu/slideshows/tfgslideshow/images/image_2.png
rename to config/fancymenu/slideshows/main_menu/images/image_2.png
diff --git a/config/fancymenu/slideshows/tfgslideshow/images/image_3.png b/config/fancymenu/slideshows/main_menu/images/image_3.png
similarity index 100%
rename from config/fancymenu/slideshows/tfgslideshow/images/image_3.png
rename to config/fancymenu/slideshows/main_menu/images/image_3.png
diff --git a/config/fancymenu/slideshows/tfgslideshow/images/image_4.png b/config/fancymenu/slideshows/main_menu/images/image_4.png
similarity index 100%
rename from config/fancymenu/slideshows/tfgslideshow/images/image_4.png
rename to config/fancymenu/slideshows/main_menu/images/image_4.png
diff --git a/config/fancymenu/slideshows/tfgslideshow/images/image_5.png b/config/fancymenu/slideshows/main_menu/images/image_5.png
similarity index 100%
rename from config/fancymenu/slideshows/tfgslideshow/images/image_5.png
rename to config/fancymenu/slideshows/main_menu/images/image_5.png
diff --git a/config/fancymenu/slideshows/tfgslideshow/images/image_6.png b/config/fancymenu/slideshows/main_menu/images/image_6.png
similarity index 100%
rename from config/fancymenu/slideshows/tfgslideshow/images/image_6.png
rename to config/fancymenu/slideshows/main_menu/images/image_6.png
diff --git a/config/fancymenu/slideshows/tfgslideshow/images/image_7.png b/config/fancymenu/slideshows/main_menu/images/image_7.png
similarity index 100%
rename from config/fancymenu/slideshows/tfgslideshow/images/image_7.png
rename to config/fancymenu/slideshows/main_menu/images/image_7.png
diff --git a/config/fancymenu/slideshows/tfgslideshow/images/image_8.png b/config/fancymenu/slideshows/main_menu/images/image_8.png
similarity index 100%
rename from config/fancymenu/slideshows/tfgslideshow/images/image_8.png
rename to config/fancymenu/slideshows/main_menu/images/image_8.png
diff --git a/config/fancymenu/slideshows/tfgslideshow/images/image_9.png b/config/fancymenu/slideshows/main_menu/images/image_9.png
similarity index 100%
rename from config/fancymenu/slideshows/tfgslideshow/images/image_9.png
rename to config/fancymenu/slideshows/main_menu/images/image_9.png
diff --git a/config/fancymenu/slideshows/tfgslideshow/properties.txt b/config/fancymenu/slideshows/main_menu/properties.txt
similarity index 84%
rename from config/fancymenu/slideshows/tfgslideshow/properties.txt
rename to config/fancymenu/slideshows/main_menu/properties.txt
index 451ce3857..62efca3b5 100644
--- a/config/fancymenu/slideshows/tfgslideshow/properties.txt
+++ b/config/fancymenu/slideshows/main_menu/properties.txt
@@ -1,7 +1,7 @@
 type = slideshow
 
 slideshow-meta {
-   name = tfgslideshow
+   name = main_menu
    width = 1920
    height = 1080
    x = 0
diff --git a/config/ftbquests/quests/chapters/primitive_age.snbt b/config/ftbquests/quests/chapters/primitive_age.snbt
index 885a05c3c..5b04ef6c5 100644
--- 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"
diff --git a/config/ftbquests/quests/data.snbt b/config/ftbquests/quests/data.snbt
index 69a600f99..76df671b0 100644
--- 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"
diff --git a/config/xaerominimap_entities.json b/config/xaerominimap_entities.json
index c2360d359..d7187d221 100644
--- 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,
diff --git a/kubejs/assets/tfg/textures/gui/button98x20.png b/kubejs/assets/tfg/textures/gui/button_98x20.png
similarity index 100%
rename from kubejs/assets/tfg/textures/gui/button98x20.png
rename to kubejs/assets/tfg/textures/gui/button_98x20.png
diff --git a/kubejs/assets/tfg/textures/gui/button98x20_hovered.png b/kubejs/assets/tfg/textures/gui/button_98x20_hovered.png
similarity index 100%
rename from kubejs/assets/tfg/textures/gui/button98x20_hovered.png
rename to kubejs/assets/tfg/textures/gui/button_98x20_hovered.png
diff --git a/kubejs/assets/tfg/textures/gui/curse_logo.png b/kubejs/assets/tfg/textures/gui/curseforge_logo.png
similarity index 100%
rename from kubejs/assets/tfg/textures/gui/curse_logo.png
rename to kubejs/assets/tfg/textures/gui/curseforge_logo.png
diff --git a/kubejs/assets/tfg/textures/gui/curse_logo_hovered.png b/kubejs/assets/tfg/textures/gui/curseforge_logo_hovered.png
similarity index 100%
rename from kubejs/assets/tfg/textures/gui/curse_logo_hovered.png
rename to kubejs/assets/tfg/textures/gui/curseforge_logo_hovered.png
diff --git a/kubejs/assets/tfg/textures/gui/ds_logo.png b/kubejs/assets/tfg/textures/gui/discord_logo.png
similarity index 100%
rename from kubejs/assets/tfg/textures/gui/ds_logo.png
rename to kubejs/assets/tfg/textures/gui/discord_logo.png
diff --git a/kubejs/assets/tfg/textures/gui/ds_logo_hovered.png b/kubejs/assets/tfg/textures/gui/discord_logo_hovered.png
similarity index 100%
rename from kubejs/assets/tfg/textures/gui/ds_logo_hovered.png
rename to kubejs/assets/tfg/textures/gui/discord_logo_hovered.png
diff --git a/kubejs/assets/tfg/textures/gui/git_logo.png b/kubejs/assets/tfg/textures/gui/github_logo.png
similarity index 100%
rename from kubejs/assets/tfg/textures/gui/git_logo.png
rename to kubejs/assets/tfg/textures/gui/github_logo.png
diff --git a/kubejs/assets/tfg/textures/gui/git_logo_hovered.png b/kubejs/assets/tfg/textures/gui/github_logo_hovered.png
similarity index 100%
rename from kubejs/assets/tfg/textures/gui/git_logo_hovered.png
rename to kubejs/assets/tfg/textures/gui/github_logo_hovered.png
diff --git a/kubejs/assets/tfg/textures/gui/logo-512x512.png b/kubejs/assets/tfg/textures/gui/logo_512x512.png
similarity index 100%
rename from kubejs/assets/tfg/textures/gui/logo-512x512.png
rename to kubejs/assets/tfg/textures/gui/logo_512x512.png
diff --git a/kubejs/assets/tfg/textures/gui/mdr_logo.png b/kubejs/assets/tfg/textures/gui/modrinth_logo.png
similarity index 100%
rename from kubejs/assets/tfg/textures/gui/mdr_logo.png
rename to kubejs/assets/tfg/textures/gui/modrinth_logo.png
diff --git a/kubejs/assets/tfg/textures/gui/mdr_logo_hovered.png b/kubejs/assets/tfg/textures/gui/modrinth_logo_hovered.png
similarity index 100%
rename from kubejs/assets/tfg/textures/gui/mdr_logo_hovered.png
rename to kubejs/assets/tfg/textures/gui/modrinth_logo_hovered.png

From b0c3cbe9ebabeda7e71b3e829e5a85716b8216d9 Mon Sep 17 00:00:00 2001
From: Xikaro <0regon.end@gmail.com>
Date: Sat, 6 Jan 2024 12:15:10 +0500
Subject: [PATCH 10/14] Update main_menu.txt

---
 config/fancymenu/customization/main_menu.txt | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/fancymenu/customization/main_menu.txt b/config/fancymenu/customization/main_menu.txt
index 6289cad08..02245e27b 100644
--- a/config/fancymenu/customization/main_menu.txt
+++ b/config/fancymenu/customization/main_menu.txt
@@ -260,7 +260,7 @@ customization {
 customization {
   orientation = mid-centered
   restartbackgroundanimations = true
-  buttonaction = openlink;https://www.curseforge.com/minecraft/modpacks/tfg%btnaction_splitter_fm%
+  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
@@ -276,7 +276,7 @@ customization {
 customization {
   orientation = mid-centered
   restartbackgroundanimations = true
-  buttonaction = openlink;https://discord.gg/AEaCzCTUwQ%btnaction_splitter_fm%
+  buttonaction = openlink;https://discord.gg/terrafirmagregQ%btnaction_splitter_fm%
   backgroundhovered = kubejs/assets/tfg/textures/gui/discord_logo_hovered.png
   label = 
   loopbackgroundanimations = true
@@ -292,7 +292,7 @@ customization {
 customization {
   orientation = mid-centered
   restartbackgroundanimations = true
-  buttonaction = openlink;https://github.com/tfg-Team/TFG-Modpack-1.20.x%btnaction_splitter_fm%
+  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
@@ -308,7 +308,7 @@ customization {
 customization {
   orientation = mid-centered
   restartbackgroundanimations = true
-  buttonaction = openlink;https://modrinth.com/modpack/tfg%btnaction_splitter_fm%
+  buttonaction = openlink;https://modrinth.com/modpack/terrafirmagreg%btnaction_splitter_fm%
   backgroundhovered = kubejs/assets/tfg/textures/gui/modrinth_logo_hovered.png
   label = 
   loopbackgroundanimations = true
@@ -326,7 +326,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/TerraFirmaGreg-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
   source = 
   text_border = 0
   case_mode = normal

From 3a544b234039bd526b51b5d1632d15e2ba471809 Mon Sep 17 00:00:00 2001
From: Xikaro <0regon.end@gmail.com>
Date: Sat, 6 Jan 2024 12:31:37 +0500
Subject: [PATCH 11/14] Delete dynamic_lights_reforged.toml

---
 config/dynamic_lights_reforged.toml | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 config/dynamic_lights_reforged.toml

diff --git a/config/dynamic_lights_reforged.toml b/config/dynamic_lights_reforged.toml
deleted file mode 100644
index 0a76984ac..000000000
--- a/config/dynamic_lights_reforged.toml
+++ /dev/null
@@ -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
-

From 1223ce7ec15ccaf39180ca5021b2e57c83d71165 Mon Sep 17 00:00:00 2001
From: Xikaro <0regon.end@gmail.com>
Date: Sat, 6 Jan 2024 12:42:21 +0500
Subject: [PATCH 12/14] Update main_menu.txt

---
 config/fancymenu/customization/main_menu.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/fancymenu/customization/main_menu.txt b/config/fancymenu/customization/main_menu.txt
index 02245e27b..1fe7707ca 100644
--- a/config/fancymenu/customization/main_menu.txt
+++ b/config/fancymenu/customization/main_menu.txt
@@ -276,7 +276,7 @@ customization {
 customization {
   orientation = mid-centered
   restartbackgroundanimations = true
-  buttonaction = openlink;https://discord.gg/terrafirmagregQ%btnaction_splitter_fm%
+  buttonaction = openlink;https://discord.gg/terrafirmagreg%btnaction_splitter_fm%
   backgroundhovered = kubejs/assets/tfg/textures/gui/discord_logo_hovered.png
   label = 
   loopbackgroundanimations = true

From f02a14f019c2f56e3e45ded337b585078badcee4 Mon Sep 17 00:00:00 2001
From: Xikaro <0regon.end@gmail.com>
Date: Sat, 6 Jan 2024 12:57:08 +0500
Subject: [PATCH 13/14] =?UTF-8?q?=D1=81opyright=5Fbutton=20move?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/fancymenu/customizablemenus.txt       |  6 +++---
 config/fancymenu/customization/main_menu.txt | 13 ++++++++++---
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/config/fancymenu/customizablemenus.txt b/config/fancymenu/customizablemenus.txt
index 3dfd5b812..20a4a6322 100644
--- 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 {
+}
+
diff --git a/config/fancymenu/customization/main_menu.txt b/config/fancymenu/customization/main_menu.txt
index 1fe7707ca..3bc24b09f 100644
--- a/config/fancymenu/customization/main_menu.txt
+++ b/config/fancymenu/customization/main_menu.txt
@@ -327,17 +327,24 @@ customization {
   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/TerraFirmaGreg-Team/Modpack-1.20.x/releases/latest","json_path":"$.tag_name"}}§r
-  source = 
   text_border = 0
   case_mode = normal
   source_mode = direct
   line_spacing = 1
-  x = 1
+  x = 0
   width = 163
   action = custom_layout_element:fancymenu_customization_item_text
   actionid = a5845307-9494-47b0-87c0-e398a680e9e01700129661006
-  y = -51
+  y = -61
   alignment = left
   height = 56
 }
 
+customization {
+  identifier = %id=button_compatibility_id:mc_titlescreen_copyright_button%
+  orientation = bottom-left
+  x = 1
+  action = movebutton
+  y = -10
+}
+

From d0991cd35928c3d842bf85ee26a15dd95e27f28b Mon Sep 17 00:00:00 2001
From: Xikaro <0regon.end@gmail.com>
Date: Sat, 6 Jan 2024 13:13:08 +0500
Subject: [PATCH 14/14] Update main_menu.txt

---
 config/fancymenu/customization/main_menu.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/fancymenu/customization/main_menu.txt b/config/fancymenu/customization/main_menu.txt
index 3bc24b09f..27ed96a2d 100644
--- a/config/fancymenu/customization/main_menu.txt
+++ b/config/fancymenu/customization/main_menu.txt
@@ -331,7 +331,7 @@ customization {
   case_mode = normal
   source_mode = direct
   line_spacing = 1
-  x = 0
+  x = 1
   width = 163
   action = custom_layout_element:fancymenu_customization_item_text
   actionid = a5845307-9494-47b0-87c0-e398a680e9e01700129661006
@@ -343,7 +343,7 @@ customization {
 customization {
   identifier = %id=button_compatibility_id:mc_titlescreen_copyright_button%
   orientation = bottom-left
-  x = 1
+  x = 2
   action = movebutton
   y = -10
 }