diff --git a/kubejs/data/tfc/loot_tables/panning/cassiterite_gneiss.json b/kubejs/data/tfc/loot_tables/panning/cassiterite_gneiss.json
index faf2dc637..1abb79f2a 100644
--- a/kubejs/data/tfc/loot_tables/panning/cassiterite_gneiss.json
+++ b/kubejs/data/tfc/loot_tables/panning/cassiterite_gneiss.json
@@ -31,7 +31,7 @@
             },
             {
               "type": "minecraft:item",
-              "name": "tfc:ore/gypsum",
+              "name": "gtceu:poor_raw_gypsum",
               "conditions": [
                 {
                   "condition": "minecraft:random_chance",
diff --git a/kubejs/data/tfc/loot_tables/panning/cassiterite_shale.json b/kubejs/data/tfc/loot_tables/panning/cassiterite_shale.json
index b4f7ef569..41cfbbdde 100644
--- a/kubejs/data/tfc/loot_tables/panning/cassiterite_shale.json
+++ b/kubejs/data/tfc/loot_tables/panning/cassiterite_shale.json
@@ -31,7 +31,7 @@
             },
             {
               "type": "minecraft:item",
-              "name": "tfc:ore/borax",
+              "name": "gtceu:poor_raw_borax",
               "conditions": [
                 {
                   "condition": "minecraft:random_chance",
diff --git a/kubejs/data/tfc/loot_tables/panning/native_copper_conglomerate.json b/kubejs/data/tfc/loot_tables/panning/native_copper_conglomerate.json
index d55b7ddf1..5fb9f4dac 100644
--- a/kubejs/data/tfc/loot_tables/panning/native_copper_conglomerate.json
+++ b/kubejs/data/tfc/loot_tables/panning/native_copper_conglomerate.json
@@ -31,7 +31,7 @@
             },
             {
               "type": "minecraft:item",
-              "name": "tfc:ore/lignite",
+              "name": "minecraft:coal",
               "conditions": [
                 {
                   "condition": "minecraft:random_chance",
diff --git a/kubejs/data/tfc/loot_tables/panning/native_copper_gneiss.json b/kubejs/data/tfc/loot_tables/panning/native_copper_gneiss.json
index 5debf27f4..c87232d95 100644
--- a/kubejs/data/tfc/loot_tables/panning/native_copper_gneiss.json
+++ b/kubejs/data/tfc/loot_tables/panning/native_copper_gneiss.json
@@ -31,7 +31,7 @@
             },
             {
               "type": "minecraft:item",
-              "name": "tfc:ore/gypsum",
+              "name": "gtceu:poor_raw_gypsum",
               "conditions": [
                 {
                   "condition": "minecraft:random_chance",
diff --git a/kubejs/data/tfc/loot_tables/panning/native_copper_shale.json b/kubejs/data/tfc/loot_tables/panning/native_copper_shale.json
index 8067a4fa2..b8b91916f 100644
--- a/kubejs/data/tfc/loot_tables/panning/native_copper_shale.json
+++ b/kubejs/data/tfc/loot_tables/panning/native_copper_shale.json
@@ -31,7 +31,7 @@
             },
             {
               "type": "minecraft:item",
-              "name": "tfc:ore/borax",
+              "name": "gtceu:poor_raw_borax",
               "conditions": [
                 {
                   "condition": "minecraft:random_chance",
diff --git a/kubejs/data/tfc/loot_tables/panning/native_gold_conglomerate.json b/kubejs/data/tfc/loot_tables/panning/native_gold_conglomerate.json
index 713789b02..ba66118c5 100644
--- a/kubejs/data/tfc/loot_tables/panning/native_gold_conglomerate.json
+++ b/kubejs/data/tfc/loot_tables/panning/native_gold_conglomerate.json
@@ -31,7 +31,7 @@
             },
             {
               "type": "minecraft:item",
-              "name": "tfc:ore/lignite",
+              "name": "minecraft:coal",
               "conditions": [
                 {
                   "condition": "minecraft:random_chance",
diff --git a/kubejs/data/tfc/loot_tables/panning/native_gold_gneiss.json b/kubejs/data/tfc/loot_tables/panning/native_gold_gneiss.json
index 9b597d63f..8f3700aa0 100644
--- a/kubejs/data/tfc/loot_tables/panning/native_gold_gneiss.json
+++ b/kubejs/data/tfc/loot_tables/panning/native_gold_gneiss.json
@@ -31,7 +31,7 @@
             },
             {
               "type": "minecraft:item",
-              "name": "tfc:ore/gypsum",
+              "name": "gtceu:poor_raw_gypsum",
               "conditions": [
                 {
                   "condition": "minecraft:random_chance",
diff --git a/kubejs/data/tfc/loot_tables/panning/native_gold_shale.json b/kubejs/data/tfc/loot_tables/panning/native_gold_shale.json
index 4bbf5f356..92b47ae4b 100644
--- a/kubejs/data/tfc/loot_tables/panning/native_gold_shale.json
+++ b/kubejs/data/tfc/loot_tables/panning/native_gold_shale.json
@@ -31,7 +31,7 @@
             },
             {
               "type": "minecraft:item",
-              "name": "tfc:ore/borax",
+              "name": "gtceu:poor_raw_borax",
               "conditions": [
                 {
                   "condition": "minecraft:random_chance",
diff --git a/kubejs/data/tfc/loot_tables/panning/native_silver_conglomerate.json b/kubejs/data/tfc/loot_tables/panning/native_silver_conglomerate.json
index 7e990f6f7..55a5c3804 100644
--- a/kubejs/data/tfc/loot_tables/panning/native_silver_conglomerate.json
+++ b/kubejs/data/tfc/loot_tables/panning/native_silver_conglomerate.json
@@ -31,7 +31,7 @@
             },
             {
               "type": "minecraft:item",
-              "name": "tfc:ore/lignite",
+              "name": "minecraft:coal",
               "conditions": [
                 {
                   "condition": "minecraft:random_chance",
diff --git a/kubejs/data/tfc/loot_tables/panning/native_silver_gneiss.json b/kubejs/data/tfc/loot_tables/panning/native_silver_gneiss.json
index 0f986990e..e1fd1df81 100644
--- a/kubejs/data/tfc/loot_tables/panning/native_silver_gneiss.json
+++ b/kubejs/data/tfc/loot_tables/panning/native_silver_gneiss.json
@@ -31,7 +31,7 @@
             },
             {
               "type": "minecraft:item",
-              "name": "tfc:ore/gypsum",
+              "name": "gtceu:poor_raw_gypsum",
               "conditions": [
                 {
                   "condition": "minecraft:random_chance",
diff --git a/kubejs/data/tfc/loot_tables/panning/native_silver_shale.json b/kubejs/data/tfc/loot_tables/panning/native_silver_shale.json
index 83b3dcdf7..7e9064760 100644
--- a/kubejs/data/tfc/loot_tables/panning/native_silver_shale.json
+++ b/kubejs/data/tfc/loot_tables/panning/native_silver_shale.json
@@ -31,7 +31,7 @@
             },
             {
               "type": "minecraft:item",
-              "name": "tfc:ore/borax",
+              "name": "gtceu:poor_raw_borax",
               "conditions": [
                 {
                   "condition": "minecraft:random_chance",
diff --git a/kubejs/data/tfc/loot_tables/sluicing/cassiterite_conglomerate.json b/kubejs/data/tfc/loot_tables/sluicing/cassiterite_conglomerate.json
index 7159d35d6..5f1ae3be2 100644
--- a/kubejs/data/tfc/loot_tables/sluicing/cassiterite_conglomerate.json
+++ b/kubejs/data/tfc/loot_tables/sluicing/cassiterite_conglomerate.json
@@ -31,7 +31,7 @@
             },
             {
               "type": "minecraft:item",
-              "name": "tfc:ore/lignite",
+              "name": "minecraft:coal",
               "conditions": [
                 {
                   "condition": "minecraft:random_chance",
diff --git a/kubejs/data/tfc/loot_tables/sluicing/cassiterite_gneiss.json b/kubejs/data/tfc/loot_tables/sluicing/cassiterite_gneiss.json
index f4b58666d..3065c1aa8 100644
--- a/kubejs/data/tfc/loot_tables/sluicing/cassiterite_gneiss.json
+++ b/kubejs/data/tfc/loot_tables/sluicing/cassiterite_gneiss.json
@@ -31,7 +31,7 @@
             },
             {
               "type": "minecraft:item",
-              "name": "tfc:ore/gypsum",
+              "name": "gtceu:poor_raw_gypsum",
               "conditions": [
                 {
                   "condition": "minecraft:random_chance",
diff --git a/kubejs/data/tfc/loot_tables/sluicing/cassiterite_shale.json b/kubejs/data/tfc/loot_tables/sluicing/cassiterite_shale.json
index 5e3e80044..5ccc438a4 100644
--- a/kubejs/data/tfc/loot_tables/sluicing/cassiterite_shale.json
+++ b/kubejs/data/tfc/loot_tables/sluicing/cassiterite_shale.json
@@ -31,7 +31,7 @@
             },
             {
               "type": "minecraft:item",
-              "name": "tfc:ore/borax",
+              "name": "gtceu:poor_raw_borax",
               "conditions": [
                 {
                   "condition": "minecraft:random_chance",
diff --git a/kubejs/data/tfc/loot_tables/sluicing/native_copper_conglomerate.json b/kubejs/data/tfc/loot_tables/sluicing/native_copper_conglomerate.json
index c358a86ff..6c7c32d65 100644
--- a/kubejs/data/tfc/loot_tables/sluicing/native_copper_conglomerate.json
+++ b/kubejs/data/tfc/loot_tables/sluicing/native_copper_conglomerate.json
@@ -31,7 +31,7 @@
             },
             {
               "type": "minecraft:item",
-              "name": "tfc:ore/lignite",
+              "name": "minecraft:coal",
               "conditions": [
                 {
                   "condition": "minecraft:random_chance",
diff --git a/kubejs/data/tfc/loot_tables/sluicing/native_copper_gneiss.json b/kubejs/data/tfc/loot_tables/sluicing/native_copper_gneiss.json
index 82687e231..1e0a39d39 100644
--- a/kubejs/data/tfc/loot_tables/sluicing/native_copper_gneiss.json
+++ b/kubejs/data/tfc/loot_tables/sluicing/native_copper_gneiss.json
@@ -31,7 +31,7 @@
             },
             {
               "type": "minecraft:item",
-              "name": "tfc:ore/gypsum",
+              "name": "gtceu:poor_raw_gypsum",
               "conditions": [
                 {
                   "condition": "minecraft:random_chance",
diff --git a/kubejs/data/tfc/loot_tables/sluicing/native_copper_shale.json b/kubejs/data/tfc/loot_tables/sluicing/native_copper_shale.json
index d611450a2..5fa23d9b6 100644
--- a/kubejs/data/tfc/loot_tables/sluicing/native_copper_shale.json
+++ b/kubejs/data/tfc/loot_tables/sluicing/native_copper_shale.json
@@ -31,7 +31,7 @@
             },
             {
               "type": "minecraft:item",
-              "name": "tfc:ore/borax",
+              "name": "gtceu:poor_raw_borax",
               "conditions": [
                 {
                   "condition": "minecraft:random_chance",
diff --git a/kubejs/data/tfc/loot_tables/sluicing/native_gold_conglomerate.json b/kubejs/data/tfc/loot_tables/sluicing/native_gold_conglomerate.json
index 743285e22..57fee3624 100644
--- a/kubejs/data/tfc/loot_tables/sluicing/native_gold_conglomerate.json
+++ b/kubejs/data/tfc/loot_tables/sluicing/native_gold_conglomerate.json
@@ -31,7 +31,7 @@
             },
             {
               "type": "minecraft:item",
-              "name": "tfc:ore/lignite",
+              "name": "minecraft:coal",
               "conditions": [
                 {
                   "condition": "minecraft:random_chance",
diff --git a/kubejs/data/tfc/loot_tables/sluicing/native_gold_gneiss.json b/kubejs/data/tfc/loot_tables/sluicing/native_gold_gneiss.json
index cf992d474..92e37a494 100644
--- a/kubejs/data/tfc/loot_tables/sluicing/native_gold_gneiss.json
+++ b/kubejs/data/tfc/loot_tables/sluicing/native_gold_gneiss.json
@@ -31,7 +31,7 @@
             },
             {
               "type": "minecraft:item",
-              "name": "tfc:ore/gypsum",
+              "name": "gtceu:poor_raw_gypsum",
               "conditions": [
                 {
                   "condition": "minecraft:random_chance",
diff --git a/kubejs/data/tfc/loot_tables/sluicing/native_gold_shale.json b/kubejs/data/tfc/loot_tables/sluicing/native_gold_shale.json
index 9f29d9e42..b04036c28 100644
--- a/kubejs/data/tfc/loot_tables/sluicing/native_gold_shale.json
+++ b/kubejs/data/tfc/loot_tables/sluicing/native_gold_shale.json
@@ -31,7 +31,7 @@
             },
             {
               "type": "minecraft:item",
-              "name": "tfc:ore/borax",
+              "name": "gtceu:poor_raw_borax",
               "conditions": [
                 {
                   "condition": "minecraft:random_chance",
diff --git a/kubejs/data/tfc/loot_tables/sluicing/native_silver_conglomerate.json b/kubejs/data/tfc/loot_tables/sluicing/native_silver_conglomerate.json
index 719ac1ec7..e3bf23f12 100644
--- a/kubejs/data/tfc/loot_tables/sluicing/native_silver_conglomerate.json
+++ b/kubejs/data/tfc/loot_tables/sluicing/native_silver_conglomerate.json
@@ -31,7 +31,7 @@
             },
             {
               "type": "minecraft:item",
-              "name": "tfc:ore/lignite",
+              "name": "minecraft:coal",
               "conditions": [
                 {
                   "condition": "minecraft:random_chance",
diff --git a/kubejs/data/tfc/loot_tables/sluicing/native_silver_gneiss.json b/kubejs/data/tfc/loot_tables/sluicing/native_silver_gneiss.json
index d2b6d6847..61a88ba61 100644
--- a/kubejs/data/tfc/loot_tables/sluicing/native_silver_gneiss.json
+++ b/kubejs/data/tfc/loot_tables/sluicing/native_silver_gneiss.json
@@ -31,7 +31,7 @@
             },
             {
               "type": "minecraft:item",
-              "name": "tfc:ore/gypsum",
+              "name": "gtceu:poor_raw_gypsum",
               "conditions": [
                 {
                   "condition": "minecraft:random_chance",
diff --git a/kubejs/data/tfc/loot_tables/sluicing/native_silver_shale.json b/kubejs/data/tfc/loot_tables/sluicing/native_silver_shale.json
index 87addf130..be4b4d22d 100644
--- a/kubejs/data/tfc/loot_tables/sluicing/native_silver_shale.json
+++ b/kubejs/data/tfc/loot_tables/sluicing/native_silver_shale.json
@@ -31,7 +31,7 @@
             },
             {
               "type": "minecraft:item",
-              "name": "tfc:ore/borax",
+              "name": "gtceu:poor_raw_borax",
               "conditions": [
                 {
                   "condition": "minecraft:random_chance",