Merge branch 'main' of https://github.com/TerraFirmaGreg-Team/Modpack-1.20.x

.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
@@ -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
 

.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 }}
 
       

CHANGELOG.md

@@ -4,6 +4,7 @@
 ### Изменения
 - Исправлен рецепт точного механизма из Create.
 - Исправлен рецепт ремня из Create.
+- Исправлены рецепты стальных машин.
 
 ## [0.4.2] - 05.01.2024
 ### Изменения

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
-

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 {
+}
+

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

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
@@ -260,8 +260,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 +269,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 +285,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 +301,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 +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
 }
 
@@ -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/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 +335,16 @@ 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
 }
 
+customization {
+  identifier = %id=button_compatibility_id:mc_titlescreen_copyright_button%
+  orientation = bottom-left
+  x = 2
+  action = movebutton
+  y = -10
+}
+

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

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"

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"

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,