Reverted old ore generation algorithm and applied the latest changes from the main branch

.github/CONTRIBUTING.md

@@ -0,0 +1,47 @@
+# Contributing to Underdog
+
+## Required software
+
+- [Git]
+- [Pakku]
+
+## Recommended software
+
+- [PrismLauncher]
+- [Visual Studio Code]
+
+
+## Set-up
+
+Please follow these steps:
+
+### 1
+
+- Fork the project.
+
+### 2
+
+- In your PrismLauncher, add a new 1.20.1 instance called TerraFirmaGreg-Modern.
+- Install `Forge 47.2.6`.
+
+### 3
+
+- Delete *everything* from the `TerraFirmaGreg-Modern/.minecraft` folder.
+
+### 4
+
+- Clone the project to the empty `TerraFirmaGreg-Modern/.minecraft` folder. \
+You can do that using **terminal**, **cmd** or the **GitHub Desktop** app.
+
+### 5
+
+- Open your _terminal_ and run:
+    ```
+    pakku fetch
+    ```
+
+<!-- Links: -->
+[PrismLauncher]: https://prismlauncher.org/
+[Visual Studio Code]: https://code.visualstudio.com/
+[Git]: https://git-scm.com/
+[Pakku]: https://github.com/juraj-hrivnak/Pakku

.github/ISSUE_TEMPLATE/BUG_REPORT.yml

@@ -50,7 +50,7 @@ body:
     attributes:
       label: "Please provide a link to your latest.log, if relevant."
       description: |
-        "The `latest.log` file is found in `/logs\` within the modpack files."
+        "The `latest.log` file is found in `/logs/` within the modpack files."
         "We recommend always using https://mclo.gs/."
 
         > [!CAUTION]

.github/README.md

@@ -30,19 +30,31 @@
 
 ## Survival Modpack As It Should've Been
 
-**TerraFirmaGreg-Modern** is a Forge modpack that makes the gameplay of Minecraft realistic and challenging, because it contains two of the hard and coolest mods for Minecraft, these are [TerraFirmaCraft](https://www.curseforge.com/minecraft/mc-mods/terrafirmacraft) and [GregTech Modern](https://www.curseforge.com/minecraft/mc-mods/gregtechceu-modern).
+**TerraFirmaGreg-Modern** is a Forge modpack that makes the gameplay of Minecraft realistic and challenging, because it contains two of the hard and coolest mods for Minecraft, these are [TerraFirmaCraft] and [GregTech Modern].
 
-Modpack developers have carefully combined TerraFirmaCraft, which has little compatibility ability, and [GregTech Modern](https://www.curseforge.com/minecraft/mc-mods/gregtechceu-modern), the best of the technical mods.
+Modpack developers have carefully combined TerraFirmaCraft, which has little compatibility ability, and [GregTech Modern], the best of the technical mods.
 
 Also in the modpack there are other interesting mods that will allow you to pass the time with pleasure (or not): 
 
-- [TerraFirmaCraft](https://www.curseforge.com/minecraft/mc-mods/terrafirmacraft)
-- [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)
-- [Gregicality Rocketry](https://www.curseforge.com/minecraft/mc-mods/gcyr)
+- [TerraFirmaCraft]
+- [GregTech Modern]
+- [Applied Energistics]
+- [Create]
+- [Gregicality Rocketry]
 
 
 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.
 
+## Development
+
+For the set-up guide, please feel free to head to the [CONTRIBUTING.md](CONTRIBUTING.md).
+
 ![img](https://github.com/TerraFirmaGreg-Team/.github/blob/main/branding/image_readme.png?raw=true)
+
+
+<!-- Links: -->
+[TerraFirmaCraft]: https://www.curseforge.com/minecraft/mc-mods/terrafirmacraft
+[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
+[Gregicality Rocketry]: https://www.curseforge.com/minecraft/mc-mods/gcyr

.github/workflows/build.yml

@@ -52,7 +52,7 @@ jobs:
           else
             echo "✔️ pakku.json"
           fi
-        
+
       - name: 📈 Get latest tag
         id: latest_tag
         shell: bash
@@ -69,14 +69,17 @@ jobs:
         id: check_pakku_lock_prev
         shell: bash
         run: |
-          if ! git ls-tree -r ${{ steps.latest_tag.outputs.tag }} -- ./pakku-lock.json &> /dev/null; then
-            echo "❌ File pakku-lock.json not found in previous tag" && exit 1
-          else
+          if git cat-file -e ${{ steps.latest_tag.outputs.tag }}:./pakku-lock.json 2>/dev/null; then
             echo "✔️ File pakku-lock.json found in previous tag"
+            echo "file_found=true" >> $GITHUB_OUTPUT
+          else
+            echo "❌ File pakku-lock.json not found in previous tag"
+            echo "file_found=false" >> $GITHUB_OUTPUT
           fi
 
-      - name: 📁 Copy pakku-lock.json from previous tag
-        id: copy_pakku_lock_prev
+      - name: 📁 Check and copy pakku-lock.json from previous tag
+        id: check_copy_lock
+        if: steps.check_pakku_lock_prev.outputs.file_found == 'true'
         shell: bash
         run: |
           git show tags/${{ steps.latest_tag.outputs.tag }}:./pakku-lock.json > ./pakku-lock-prev.json
@@ -85,16 +88,19 @@ jobs:
           else
             echo "❌ Error: File pakku-lock-prev.json is empty or not created" && exit 1
           fi
+          fi
 
       - name: 📦 Download pakku.jar
         id: download_pakku
+        if: steps.check_pakku_lock_prev.outputs.file_found == 'true'
         shell: bash
         run: |
           curl https://github.com/juraj-hrivnak/pakku/releases/latest/download/pakku.jar -o pakku.jar -L -J
           echo "✔️ Downloaded pakku.jar "
 
       - name: 🔄 Run pakku diff
         id: pakku_diff
+        if: steps.check_pakku_lock_prev.outputs.file_found == 'true'
         shell: bash
         run: |
           java -jar pakku.jar diff -v --markdown PROJECTS_DIFF.md ./pakku-lock-prev.json ./pakku-lock.json
@@ -106,6 +112,7 @@ jobs:
 
       - name: 📝 Read PROJECTS_DIFF.md to variable
         id: read_diff
+        if: steps.check_pakku_lock_prev.outputs.file_found == 'true'
         shell: bash
         run: |
           echo "📝 Reading PROJECTS_DIFF.md to variable..."
@@ -145,8 +152,8 @@ jobs:
 
       - name: 📈 Upload Diff
         id: upload_diff
-        if: ${{ steps.read_diff.outputs.diff != '' }}
-        uses: actions/upload-artifact@v4.4.3
+        if: ${{ steps.read_diff.outputs.diff != '' }} && steps.check_pakku_lock_prev.outputs.file_found == 'true'
+        uses: actions/upload-artifact@v4.5.0
         with:
           name: Mods-diff
           path: PROJECTS_DIFF.md
@@ -158,16 +165,16 @@ jobs:
           tag: ${{ steps.project_version.outputs.value }}
 
       - name: 📝 Generate Github Summary
-        run: |
-          echo "📃 **Name**: ${{ steps.project_name.outputs.value }}" >> $GITHUB_STEP_SUMMARY
-          echo "📃 **Release**: ${{ steps.project_version.outputs.value }}" >> $GITHUB_STEP_SUMMARY
-          echo "📃 **Release Type**: ${{ env.RELEASE_TYPE }}" >> $GITHUB_STEP_SUMMARY
-          echo "📃 **Game Version**: ${{ env.MINECRAFT_VERSION }}" >> $GITHUB_STEP_SUMMARY
-
-          echo "${{ steps.changelog.outputs.description }}" >> $GITHUB_STEP_SUMMARY
-          if [ -n "${{ steps.read_diff.outputs.diff != '' }}" ]; then
-            echo "${{ steps.read_diff.outputs.diff }}" >> $GITHUB_STEP_SUMMARY
-          fi
+        uses: WcAServices/[email protected]
+        with:
+          template: |
+            📃 **Name**: ${{ steps.project_name.outputs.value }}
+            📃 **Release**: ${{ steps.project_version.outputs.value }}
+            📃 **Release Type**: ${{ env.RELEASE_TYPE }}
+            📃 **Game Version**: ${{ env.MINECRAFT_VERSION }}
+
+            ${{ steps.changelog.outputs.description }}
+            ${{ steps.read_diff.outputs.diff }}
 
 
   build-modpack:
@@ -206,7 +213,7 @@ jobs:
           mv *.zip $(basename -s .zip *.zip)-curseforge.zip
 
       - name: 🚀 Upload artifact CurseForge
-        uses: actions/upload-artifact@v4.4.3
+        uses: actions/upload-artifact@v4.5.0
         with:
           name: ${{ needs.info.outputs.project_full_name }}-curseforge
           path: ./build/curseforge/${{ needs.info.outputs.project_full_name }}-curseforge.zip
@@ -218,7 +225,7 @@ jobs:
           mv *.mrpack $(basename -s .mrpack *.mrpack)-modrinth.mrpack
 
       - name: 🚀 Upload artifact modrinth
-        uses: actions/upload-artifact@v4.4.3
+        uses: actions/upload-artifact@v4.5.0
         with:
           name: ${{ needs.info.outputs.project_full_name }}-modrinth
           path: ./build/modrinth/${{ needs.info.outputs.project_full_name }}-modrinth.mrpack
@@ -261,7 +268,7 @@ jobs:
           mv *.zip $(basename -s .zip *.zip)-serverpack.zip
 
       - name: 🚀 Upload artifact server
-        uses: actions/upload-artifact@v4.4.3
+        uses: actions/upload-artifact@v4.5.0
         with:
           name: ${{ needs.info.outputs.project_full_name }}-serverpack
           path: ./build/serverpack/${{ needs.info.outputs.project_full_name }}-serverpack.zip
@@ -311,7 +318,7 @@ jobs:
           zip -r ${{ needs.info.outputs.project_full_name }}-multimc.zip icon.png mmc-pack.json instance.cfg .minecraft/ flame/
 
       - name: 🚀 Upload zip multimc
-        uses: actions/upload-artifact@v4.4.3
+        uses: actions/upload-artifact@v4.5.0
         with:
           name: ${{ needs.info.outputs.project_full_name }}-multimc
           path: .pakku/multimc-overrides/${{ needs.info.outputs.project_full_name }}-multimc.zip
@@ -422,25 +429,23 @@ jobs:
 
       - name: Format diff
         id: format_diff
-        run: |
-          if [ -n "${{ needs.info.outputs.diff }}" ]; then
-            value="```markdown
+        if: ${{ needs.info.outputs.diff != '' }}
+        uses: roamingowl/[email protected]
+        with:
+          template: |
+            ```markdown
             ${{ needs.info.outputs.diff }}
-            ```"
-          else
-            value=""
-          fi
-          echo "value=${formatted_diff}" >> $GITHUB_OUTPUT
+            ```
 
       - name: 🚀 Create release
         id: release
-        uses: softprops/action-gh-release@v2.2.0
+        uses: softprops/action-gh-release@v2.1.0
         with:
           name: ${{ needs.info.outputs.project_version }}
           tag_name: ${{ needs.info.outputs.project_version }}
           body: |
             ${{ needs.info.outputs.changelog }}
-            ${{ steps.format_diff.outputs.value }}
+            ${{ steps.format_diff.outputs.text }}
           files: |
             ${{ needs.info.outputs.project_full_name }}-curseforge.zip
             ${{ needs.info.outputs.project_full_name }}-serverpack.zip

kubejs/assets/gtceu/lang/en_us.json

@@ -8,5 +8,45 @@
     "gtceu.alternator": "Alternator",
 
     "material.treated_wood": "Creosote-Treated Wood",
-    "block.gtceu.treated_wood_planks": "Creosote-Treated Wood Planks"
-}
+    "block.gtceu.treated_wood_planks": "Creosote-Treated Wood Planks",
+
+    "block.gtceu.lv_kinetic_mixer": "Basic Kinetic Mixer",
+    "block.gtceu.mv_kinetic_mixer": "Advanced Kinetic Mixer",
+    "block.gtceu.hv_kinetic_mixer": "Advanced Kinetic Mixer II",
+    "block.gtceu.ev_kinetic_mixer": "Advanced Kinetic Mixer III",
+
+    "block.gtceu.lv_electric_gear_box_2a": "Low Voltage 2x Gear Box",
+    "block.gtceu.mv_electric_gear_box_2a": "Medium Voltage 2x Gear Box",
+    "block.gtceu.hv_electric_gear_box_2a": "High Voltage 2x Gear Box",
+    "block.gtceu.ev_electric_gear_box_2a": "Extreme Voltage 2x Gear Box",
+    "block.gtceu.lv_electric_gear_box_8a": "Low Voltage 8x Gear Box",
+    "block.gtceu.mv_electric_gear_box_8a": "Medium Voltage 8x Gear Box",
+    "block.gtceu.hv_electric_gear_box_8a": "High Voltage 8x Gear Box",
+    "block.gtceu.ev_electric_gear_box_8a": "Extreme Voltage 8x Gear Box",
+    "block.gtceu.lv_electric_gear_box_16a": "Low Voltage 16x Gear Box",
+    "block.gtceu.mv_electric_gear_box_16a": "Medium Voltage 16x Gear Box",
+    "block.gtceu.hv_electric_gear_box_16a": "High Voltage 16x Gear Box",
+    "block.gtceu.ev_electric_gear_box_16a": "Extreme Voltage 16x Gear Box",
+    "block.gtceu.lv_electric_gear_box_32a": "Low Voltage 32x Gear Box",
+    "block.gtceu.mv_electric_gear_box_32a": "Medium Voltage 32x Gear Box",
+    "block.gtceu.hv_electric_gear_box_32a": "High Voltage 32x Gear Box",
+    "block.gtceu.ev_electric_gear_box_32a": "Extreme Voltage 32x Gear Box",
+
+    "block.gtceu.lv_kinetic_input_box": "Low Voltage Kinetic Input Box",
+    "block.gtceu.mv_kinetic_input_box": "Medium Voltage Kinetic Input Box",
+    "block.gtceu.hv_kinetic_input_box": "High Voltage Kinetic Input Box",
+    "block.gtceu.ev_kinetic_input_box": "Extreme Voltage Kinetic Input Box",
+    "block.gtceu.iv_kinetic_input_box": "Insane Voltage Kinetic Input Box",
+    "block.gtceu.luv_kinetic_input_box": "Ludicrous Voltage Kinetic Input Box",
+    "block.gtceu.zpm_kinetic_input_box": "ZPM Voltage Kinetic Input Box",
+    "block.gtceu.uv_kinetic_input_box": "Ultimate Voltage Kinetic Input Box",
+
+    "block.gtceu.lv_kinetic_output_box": "Low Voltage Kinetic Output Box",
+    "block.gtceu.mv_kinetic_output_box": "Medium Voltage Kinetic Output Box",
+    "block.gtceu.hv_kinetic_output_box": "High Voltage Kinetic Output Box",
+    "block.gtceu.ev_kinetic_output_box": "Extreme Voltage Kinetic Output Box",
+    "block.gtceu.iv_kinetic_output_box": "Insane Voltage Kinetic Output Box",
+    "block.gtceu.luv_kinetic_output_box": "Ludicrous Voltage Kinetic Output Box",
+    "block.gtceu.zpm_kinetic_output_box": "ZPM Voltage Kinetic Output Box",
+    "block.gtceu.uv_kinetic_output_box": "Ultimate Voltage Kinetic Output Box"
+}

kubejs/assets/tfg/lang/en_us.json

@@ -1,4 +1,8 @@
 {
+    "material.tfg.latex": "Latex",
+    "material.tfg.fluix": "Fluix",
+
+    "item.tfg.spade_head_extruder_mold": "Extruder Mold (Spade Head)",
     "item.tfg.mining_hammer_head_extruder_mold": "Extruder Mold (Mining Hammer)",
     "item.tfg.sword_head_extruder_mold": "Extruder Mold (Sword Head)",
     "item.tfg.pickaxe_head_extruder_mold": "Extruder Mold (Pickaxe Head)",