Merge remote-tracking branch 'Generations/master'

GenerationsMod · Oct 23, 2024 · 6235e6c · 6235e6c
2 parents a177cad + 26f6a5f
commit 6235e6c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 10 deletions.
diff --git a/...n/src/main/generated/resources/data/generations_core/loot_tables/chests/gigaton_ball.json b/...n/src/main/generated/resources/data/generations_core/loot_tables/chests/gigaton_ball.json
@@ -363,6 +363,10 @@
         {
           "type": "minecraft:item",
           "name": "generations_core:vermilion_city_disc"
+        },
+        {
+          "type": "minecraft:item",
+          "name": "generations_core:mew_fossil"
         }
       ],
       "rolls": 1.0

diff --git a/common/src/main/generated/resources/data/generations_core/loot_tables/chests/heavy_ball.json b/common/src/main/generated/resources/data/generations_core/loot_tables/chests/heavy_ball.json
@@ -308,6 +308,10 @@
           "type": "minecraft:item",
           "name": "generations_core:steel_candy"
         },
+        {
+          "type": "minecraft:item",
+          "name": "generations_core:mew_fossil"
+        },
         {
           "type": "minecraft:item",
           "name": "generations_core:tm_36"

diff --git a/common/src/main/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/common/src/main/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json
@@ -796,22 +796,22 @@
     "generations_core:pink_elevator",
     "generations_core:desk",
     "generations_core:fridge",
+    "generations_core:light_blue_pc",
+    "generations_core:cyan_pc",
+    "generations_core:blue_pc",
+    "generations_core:black_pc",
     "generations_core:brown_pc",
-    "generations_core:pink_pc",
-    "generations_core:green_pc",
+    "generations_core:yellow_pc",
     "generations_core:lime_pc",
     "generations_core:red_pc",
-    "generations_core:black_pc",
-    "generations_core:purple_pc",
-    "generations_core:light_blue_pc",
+    "generations_core:pink_pc",
     "generations_core:light_gray_pc",
-    "generations_core:yellow_pc",
-    "generations_core:cyan_pc",
-    "generations_core:blue_pc",
-    "generations_core:magenta_pc",
+    "generations_core:purple_pc",
+    "generations_core:gray_pc",
     "generations_core:orange_pc",
     "generations_core:white_pc",
-    "generations_core:gray_pc",
+    "generations_core:magenta_pc",
+    "generations_core:green_pc",
     "generations_core:empty_ball_display",
     "generations_core:poke_ball_display",
     "generations_core:great_ball_display",