Merge branch 'TerraFirmaGreg-Team:main' into main

.github/CONTRIBUTING.md

@@ -1,4 +1,4 @@
-# Contributing to Underdog
+# Contributing to TerraFirmaGreg-Modern
 
 ## Required software
 

.github/dependabot.yml

@@ -11,7 +11,7 @@ updates:
     schedule:
       interval: "weekly"
     labels:
-      - "4. PR: Dependencies"
+      - "1. Type: Dependencies"
     groups:
       dependencies:
         applies-to: version-updates

.github/workflows/build.yml

@@ -9,8 +9,11 @@ concurrency:
   group: ${{ github.workflow }}
   cancel-in-progress: true
 
+permissions:
+  pull-requests: none
+
 env:
-  RELEASE_TYPE: "alpha"
+  RELEASE_TYPE: "release"
   MINECRAFT_VERSION: "1.20.1"
 
 jobs:    
@@ -88,7 +91,6 @@ 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
@@ -430,7 +432,7 @@ jobs:
       - name: Format diff
         id: format_diff
         if: ${{ needs.info.outputs.diff != '' }}
-        uses: roamingowl/template-output-with-eta@v1.10.0
+        uses: roamingowl/template-output-with-eta@v1.11.0
         with:
           template: |
             ```markdown
@@ -439,7 +441,7 @@ jobs:
 
       - 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 }}

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 
-## [0.7.15] - 06.01.2025
+## [0.7.16] - ?
+### Changes
+- Removed links for excel spreadsheet ore gen (Pyritie).
+
+## [0.7.15] - 08.01.2025
 ### Changes
 - Fixed oilsands, added missing english strings, added indicators for all ores (Pyritie).
 - Fixed not being able to make cobble in assembler (Pyritie).
@@ -11,27 +15,23 @@
 - Precision mech recipe in assembler (SverhRazum-Nah).
 - Fixed TFG things in field guide, added oregen section (Pyritie). <-- Legend Feature.
 - Various fixes for 0.7.14 (fluffle).
-  1. It changes the costs of AE2 covered, dense and smart cables so the 3:1 ratio for fluix cables is reduced to 1:1.
+  - It changes the costs of AE2 covered, dense and smart cables so the 3:1 ratio for fluix cables is reduced to 1:1.
-  - Covered cables should not be 3x the price for the same functionality.
+    - Covered cables should not be 3x the price for the same functionality.
-  - The 3x cost makes it unnecessarily painful and expensive to run dense cable to where it's needed.
+    - The 3x cost makes it unnecessarily painful and expensive to run dense cable to where it's needed.
-  2. It re-enables AE2 cutting knives and adds recipes for them.
+  - It re-enables AE2 cutting knives and adds recipes for them.
-  - This allows AE parts like interfaces to be renamed easily and cheaply.
+    - This allows AE parts like interfaces to be renamed easily and cheaply.
-  3. It removes the in-world transformation recipe for AE2 fluix crystals.
+  - It removes the in-world transformation recipe for AE2 fluix crystals.
-  - Mixer recipes for fluix crystals are buffed to match in-world transformation recipe costs.
+    - Mixer recipes for fluix crystals are buffed to match in-world transformation recipe costs.
-  - Mixer recipe duration is reduced.
+    - Mixer recipe duration is reduced.
-  - Note that the create mixing recipe for fluix crystals still remains.
+    - Note that the create mixing recipe for fluix crystals still remains.
-  4. It adds self-crafting recipes for all super tanks and chests.
+  - It adds self-crafting recipes for all super tanks and chests.
-  - This means a tank can be crafted to remove NBT data stuck to it, so it can stack with other tanks again.
+    - This means a tank can be crafted to remove NBT data stuck to it, so it can stack with other tanks again.
-  5. It adds a circuit (1) to the GTCEu assembler recipe for minecraft:redstone_lamp.
+  - It adds a circuit (1) to the GTCEu assembler recipe for minecraft:redstone_lamp.
-  - This was conflicting with the AE2 smart cable recipes.
+    - This was conflicting with the AE2 smart cable recipes.
 - Fix LV recycling recipes to produce basic steel (fluffle).
 - Adds early glowstone recipe (Pyritie).
 - Added recipes to stop duping of red alloy + steam machines (Pyritie).
 - Fix stone dust tag (Pyritie).
-### Removed mods
-- ?
-### Updated mods
-- ?
 
 ## [0.7.14] - 01.10.2024
 ### Changes

config/ftbquests/quests/chapters/primitive_age.snbt

@@ -4943,6 +4943,17 @@
 				}
 			}
 			id: "3D7B0F3134C30364"
+			rewards: [{
+				id: "497758E935ED5CBA"
+				item: {
+					Count: 1
+					id: "patchouli:guide_book"
+					tag: {
+						"patchouli:book": "tfc:field_guide"
+					}
+				}
+				type: "item"
+			}]
 			tasks: [{
 				id: "6EB0915B34A4054C"
 				title: "{quests.3D7B0F3134C30364.t1}"

kubejs/assets/emi/recipe/filters/categories.json

@@ -33,6 +33,9 @@
         {
             "category": "emi:fuel"
         },
+        {
+            "category": "gtceu:ore_vein_diagram"
+        },
         {
             "id": "/emi:/crafting/repairing/[^*]+/"
         },

kubejs/assets/tfc/patchouli_books/field_guide/en_us/entries/tfg_ores/ore_basics.json

@@ -1,29 +1,29 @@
-{
+{
-	"name": "Mining in TFG",
+	"name": "Mining in TFG",
-	"icon": "gtceu:pyrite_dust",
+	"icon": "gtceu:pyrite_dust",
-	"category": "tfc:tfg_ores",
+	"category": "tfc:tfg_ores",
-	"priority": true,
+	"priority": true,
-	"sortnum": 0,
+	"sortnum": 0,
-	"pages": [
+	"pages": [
-		{
+		{
-			"type": "patchouli:text",
+			"type": "patchouli:text",
-			"text": "There are two ways of mining ores - with a $(thing)Pickaxe$(), or with a $(thing)Hammer$().$(br)Generally, you should mine anything meltable (such as $(thing)Copper$()) with a hammer, and everything else with a pickaxe, but check JEI if you're unsure."
+			"text": "There are two ways of mining ores - with a $(thing)Pickaxe$(), or with a $(thing)Hammer$().$(br)Generally, you should mine anything meltable (such as $(thing)Copper$()) with a hammer, and everything else with a pickaxe, but check JEI if you're unsure."
-		},
+		},
-		{
+		{
-			"type": "patchouli:spotlight",
+			"type": "patchouli:spotlight",
-			"title": "Pickaxe",
+			"title": "Pickaxe",
-			"text": "Breaking an ore block with a pickaxe will yield $(thing)Raw$() ores (poor, normal, or rich), as well as some stone dust. These are not worth much mB each and you will need multiple to make a single ingot, however some other minerals are only useable in this state, such as $(thing)Coal$().",
+			"text": "Breaking an ore block with a pickaxe will yield $(thing)Raw$() ores (poor, normal, or rich), as well as some stone dust. These are not worth much mB each and you will need multiple to make a single ingot, however some other minerals are only useable in this state, such as $(thing)Coal$().",
-			"item": {
+			"item": {
-				"tag": "minecraft:pickaxes"
+				"tag": "minecraft:pickaxes"
-			}
+			}
-		},
+		},
-		{
+		{
-			"type": "patchouli:spotlight",
+			"type": "patchouli:spotlight",
-			"title": "Hammer",
+			"title": "Hammer",
-			"text": "Breaking an ore block with a hammer will yield 1-2 $(thing)Crushed Ores$(). These already melt into more mB than Raw ores, but with a little $(l:tfg_ores/ore_basics#processing)extra processing$() they can be worth even more!",
+			"text": "Breaking an ore block with a hammer will yield 1-2 $(thing)Crushed Ores$(). These already melt into more mB than Raw ores, but with a little $(l:tfg_ores/ore_basics#processing)extra processing$() they can be worth even more!",
-			"item": {
+			"item": {
-				"tag": "forge:tools/hammers"
+				"tag": "forge:tools/hammers"
-			}
+			}
 		},
 		{
 			"type": "patchouli:spotlight",
@@ -53,7 +53,7 @@
 		},
 		{
 			"type": "patchouli:text",
-			"text": "Later, when you're in LV, check the LV quests to learn about all the different ore processing machines and extra byproducts they can give you. Remember the $(thing)Macerator$() does not give byproducts until $(thing)HV$()!$(br2)Here's a $(l:https://docs.google.com/spreadsheets/d/1P3Baz4y5vgJ3XrCoNs4l3BXGPiFEPlW7i4taPEWpTB4/edit?usp=sharing)Spreadsheet$() if you prefer to see this section's ore generation data that way."
+			"text": "Later, when you're in LV, check the LV quests to learn about all the different ore processing machines and extra byproducts they can give you. Remember the $(thing)Macerator$() does not give byproducts until $(thing)HV$()!"
-		}
+		}
-	]
+	]
-}
+}

mods

@@ -1 +1 @@
-Subproject commit a5fd6b55716faee52f573531340ecf7c1d9956fd
+Subproject commit ab1b9031ee131f4e1e30967bc3eb5bb6fb1cfc77

pakku.json

@@ -1,6 +1,6 @@
 {
     "name": "TerraFirmaGreg-Modern",
-    "version": "0.8.1",
+    "version": "0.7.15",
     "description": "An innovative modpack that contains GregTech and TerraFirmaCraft on 1.20.x.",
     "author": "Exception, Xikaro",
     "overrides": [