Merge branch 'dev' of https://github.com/TerraFirmaGreg-Team/Modpack-Modern into dev

.github/ISSUE_TEMPLATE/BUG_REPORT.yml

@@ -1,4 +1,4 @@
-name: "Bug report"
+name: "[🐛]: Bug report"
 description: "Report a bug where something is not working as expected, which does not crash the game."
 title: "[🐛]: "
 labels: [ "Status: Backlog" ]

.github/ISSUE_TEMPLATE/CRASH_REPORT.yml

@@ -1,4 +1,4 @@
-name: "Crash Report"
+name: "[💥]: Crash Report"
 description: "Report a bug that crashes the game or prevents startup."
 title: "[💥]: "
 labels: [ "Status: Backlog" ]

.github/ISSUE_TEMPLATE/ENHANCEMENT.yml

@@ -1,4 +1,4 @@
-name: "Enhancement"
+name: "[🪡]: Enhancement"
 description: "Provide supporting details for a feature in development"
 title: "[🪡]: "
 labels: [ "Status: Backlog" ]

.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml

@@ -1,4 +1,4 @@
-name: "Feature request"
+name: "[🪶]: Feature request"
 description: "Request a new feature or a change to an existing one."
 title: "[🪶]: "
 labels: [ "Status: Backlog" ]

.github/ISSUE_TEMPLATE/QUESTION.yml

@@ -1,4 +1,4 @@
-name: "Ask a Question"
+name: "[❓]: Ask a Question"
 description: "Ask a question regarding this project."
 title: "[❓]: "
 labels: [ "Status: Backlog" ]

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## [Unreleased]
 ### Changes
+- Complete rework of prospector's picks. (#1594) @Redeix
 ### Bug fixes
 
 ## [0.10.9] - 10-08-2025

kubejs/assets/tfg/lang/en_us.json

@@ -736,6 +736,11 @@
   "tfg.tooltip.moon_rabbit_variant.cyan": "Seafoam Fur",
   "tfg.tooltip.moon_rabbit_variant.purple": "Lavender Fur",
   "tfg.tooltip.moon_rabbit_variant.sofu": "Sundae Fur",
+  "tfg.toast.ore_prospector_none": "No ores found in range.",
+  "tfg.toast.ore_prospector_message": "Ores found within %s §6blocks in this direction: %s",
+  "tooltip.tfg.ore_prospector_stats": "Scan Range: %s, Cross Section: %s x %s.",
+  "tooltip.tfg.ore_prospector_count": "This prospector will display ore counts.",
+  "tooltip.tfg.ore_prospector_xray": "This prospector will display an x-ray view of ore blocks.",
   "item.treetap.tap": "Deprecated Item, Craft to Upgrade",
   "item.gtceu.zinc_ingot": "Deprecated Item, Craft to Upgrade",
   "item.gtceu.brass_ingot": "Deprecated Item, Craft to Upgrade",

kubejs/assets/tfg/particles/ore_prospector.json

@@ -0,0 +1,5 @@
+{
+  "textures": [
+    "tfg:ore_prospector_particle"
+  ]
+}

kubejs/data/tfg/dimension_type/moon.json

@@ -10,7 +10,7 @@
 	"infiniburn": "#minecraft:infiniburn_overworld",
 	"logical_height": 384,
 	"min_y": 0,
-	"monster_spawn_block_light_limit": 15,
+	"monster_spawn_block_light_limit": 0,
 	"monster_spawn_light_level": {
 		"type": "minecraft:uniform",
 		"value": {

kubejs/server_scripts/tfg/tags.js

@@ -48,6 +48,18 @@ const registerTFGItemTags = (event) => {
 
 	event.add('tfg:harvester', 'tfg:harvest_basket')
 	event.add('tfg:harvester', 'tfg:aluminium_harvest_basket')
+
+	event.removeAll('tfc:propicks')
+	event.add('tfg:tools/ore_prospectors/copper', 'tfc:metal/propick/copper')
+	event.add('tfg:tools/ore_prospectors/bronze', 'tfc:metal/propick/bronze')
+	event.add('tfg:tools/ore_prospectors/bronze', 'tfc:metal/propick/bismuth_bronze')
+	event.add('tfg:tools/ore_prospectors/bronze', 'tfc:metal/propick/black_bronze')
+	event.add('tfg:tools/ore_prospectors/wrought_iron', 'tfc:metal/propick/wrought_iron')
+	event.add('tfg:tools/ore_prospectors/steel', 'tfc:metal/propick/steel')
+	event.add('tfg:tools/ore_prospectors/black_steel', 'tfc:metal/propick/black_steel')
+	event.add('tfg:tools/ore_prospectors/blue_steel', 'tfc:metal/propick/blue_steel')
+	event.add('tfg:tools/ore_prospectors/red_steel', 'tfc:metal/propick/red_steel')
+
 	//#endregion
 
 	// #region Paper from wood