Skip to content

Fix Galosphere crushing accepting slabs for equivalent rewards as full blocks #10548

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
VoidLeech wants to merge 1 commit into
base: mc1.21.1/dev
Choose a base branch
from
Open

Fix Galosphere crushing accepting slabs for equivalent rewards as full blocks #10548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
888 changes: 444 additions & 444 deletions src/generated/resources/.cache/af1b4964b4b67530aeb67585e9573385e8cab38a
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions src/generated/resources/.cache/eaed56ca9d9781c7626be345dd9f2c9a1fad638e
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.21.1 2026-03-06T13:40:00.199931125 Create's Generated Registry Entries
// 1.21.1 2026-06-23T21:20:35.4637129 Create's Generated Registry Entries
abb9dd2c98388abb430343d4ac02d460e5edc086 data/create/create/potato_projectile/type/apple.json
1a20cb4e64dc07918a28fbccc73102bca3560f16 data/create/create/potato_projectile/type/baked_potato.json
8450576952f7723d22250da6f554dd0fda4e9fce data/create/create/potato_projectile/type/beetroot.json
Expand All @@ -7,7 +7,7 @@ abb9dd2c98388abb430343d4ac02d460e5edc086 data/create/create/potato_projectile/ty
6cef3daecf686b417c6dfbe02556fcdff9b1e417 data/create/create/potato_projectile/type/carrot.json
af17d72549ee9421d2643a215ffc2291874fff93 data/create/create/potato_projectile/type/chocolate_berry.json
8cb4811601d46db5fdc0291edce3ec2f3a64e902 data/create/create/potato_projectile/type/chorus_fruit.json
69138506c1b02aa4e2456cc1912ddb70f8a1e42a data/create/create/potato_projectile/type/enchanted_golden_apple.json
3aae8bc72d76a801c36b871eedd121ddc9cab364 data/create/create/potato_projectile/type/enchanted_golden_apple.json
e3ab3c4bd70ad742d37091ae05774aadffb1d1d5 data/create/create/potato_projectile/type/fallback.json
98bf0ce51484c5a9709fc69d046d0c70d987cfdd data/create/create/potato_projectile/type/fish.json
afe4e7cc87110d6f045f6672fb312a09290ca04a data/create/create/potato_projectile/type/glistering_melon.json
Expand All @@ -19,7 +19,7 @@ c6234751ccad5111857b0ae9e297e42f529ad32a data/create/create/potato_projectile/ty
352402ba2fff3f23af178d15d61b0ba0a151097a data/create/create/potato_projectile/type/melon_slice.json
cbfd3028ad878bddbdaeb0eec0cd5a1c50d4c901 data/create/create/potato_projectile/type/poison_potato.json
38116c664c63ca9da0ea043edc16a3ce9264c706 data/create/create/potato_projectile/type/potato.json
347a4a63c1cc99e293876fc2329f8db0f39272ba data/create/create/potato_projectile/type/pufferfish.json
791d9790beb27e1ade44aec77e0a8aa7390ea93f data/create/create/potato_projectile/type/pufferfish.json
63e2df2c83982204bc92479b1df26561922e795d data/create/create/potato_projectile/type/pumpkin_block.json
7d58a0671c55e40cdb728c60152665c89209fb91 data/create/create/potato_projectile/type/pumpkin_pie.json
30bf0b35aeff136251d3bfe2af04fd89ccf953de data/create/create/potato_projectile/type/suspicious_stew.json
Expand Down
16 changes: 8 additions & 8 deletions ...generated/resources/data/create/create/potato_projectile/type/enchanted_golden_apple.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
"duration": 400,
"id": "minecraft:regeneration",
"neoforge:cures": [
"protected_by_totem",
"milk"
"milk",
"protected_by_totem"
],
"show_icon": true
}
Expand All @@ -23,8 +23,8 @@
"duration": 6000,
"id": "minecraft:resistance",
"neoforge:cures": [
"protected_by_totem",
"milk"
"milk",
"protected_by_totem"
],
"show_icon": true
}
Expand All @@ -34,8 +34,8 @@
"duration": 6000,
"id": "minecraft:fire_resistance",
"neoforge:cures": [
"protected_by_totem",
"milk"
"milk",
"protected_by_totem"
],
"show_icon": true
}
Expand All @@ -46,8 +46,8 @@
"duration": 2400,
"id": "minecraft:absorption",
"neoforge:cures": [
"protected_by_totem",
"milk"
"milk",
"protected_by_totem"
],
"show_icon": true
}
Expand Down
12 changes: 6 additions & 6 deletions src/generated/resources/data/create/create/potato_projectile/type/pufferfish.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
"duration": 1200,
"id": "minecraft:poison",
"neoforge:cures": [
"protected_by_totem",
"milk",
"honey",
"milk"
"protected_by_totem"
],
"show_icon": true
}
Expand All @@ -25,8 +25,8 @@
"duration": 300,
"id": "minecraft:hunger",
"neoforge:cures": [
"protected_by_totem",
"milk"
"milk",
"protected_by_totem"
],
"show_icon": true
}
Expand All @@ -36,8 +36,8 @@
"duration": 300,
"id": "minecraft:nausea",
"neoforge:cures": [
"protected_by_totem",
"milk"
"milk",
"protected_by_totem"
],
"show_icon": true
}
Expand Down
12 changes: 0 additions & 12 deletions src/generated/resources/data/create/tags/item/stone_types/galosphere/allurite.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@
"id": "galosphere:allurite_stairs",
"required": false
},
{
"id": "galosphere:allurite_slab",
"required": false
},
{
"id": "galosphere:smooth_allurite",
"required": false
Expand All @@ -20,10 +16,6 @@
"id": "galosphere:smooth_allurite_stairs",
"required": false
},
{
"id": "galosphere:smooth_allurite_slab",
"required": false
},
{
"id": "galosphere:allurite_bricks",
"required": false
Expand All @@ -32,10 +24,6 @@
"id": "galosphere:allurite_brick_stairs",
"required": false
},
{
"id": "galosphere:allurite_brick_slab",
"required": false
},
{
"id": "galosphere:chiseled_allurite",
"required": false
Expand Down
12 changes: 0 additions & 12 deletions src/generated/resources/data/create/tags/item/stone_types/galosphere/amethyst.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@
"id": "galosphere:amethyst_stairs",
"required": false
},
{
"id": "galosphere:amethyst_slab",
"required": false
},
{
"id": "galosphere:smooth_amethyst",
"required": false
Expand All @@ -20,10 +16,6 @@
"id": "galosphere:smooth_amethyst_stairs",
"required": false
},
{
"id": "galosphere:smooth_amethyst_slab",
"required": false
},
{
"id": "galosphere:amethyst_bricks",
"required": false
Expand All @@ -32,10 +24,6 @@
"id": "galosphere:amethyst_brick_stairs",
"required": false
},
{
"id": "galosphere:amethyst_brick_slab",
"required": false
},
{
"id": "galosphere:chiseled_amethyst",
"required": false
Expand Down
12 changes: 0 additions & 12 deletions src/generated/resources/data/create/tags/item/stone_types/galosphere/lumiere.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@
"id": "galosphere:lumiere_stairs",
"required": false
},
{
"id": "galosphere:lumiere_slab",
"required": false
},
{
"id": "galosphere:smooth_lumiere",
"required": false
Expand All @@ -20,10 +16,6 @@
"id": "galosphere:smooth_lumiere_stairs",
"required": false
},
{
"id": "galosphere:smooth_lumiere_slab",
"required": false
},
{
"id": "galosphere:lumiere_bricks",
"required": false
Expand All @@ -32,10 +24,6 @@
"id": "galosphere:lumiere_brick_stairs",
"required": false
},
{
"id": "galosphere:lumiere_brick_slab",
"required": false
},
{
"id": "galosphere:chiseled_lumiere",
"required": false
Expand Down
3 changes: 0 additions & 3 deletions src/main/java/com/simibubi/create/infrastructure/data/CreateRegistrateTags.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,13 +252,10 @@ private static ArrayList<String> gsPalette(String material) {
ArrayList<String> toReturn = new ArrayList<>();
toReturn.add(material + "_block");
toReturn.add(material + "_stairs");
toReturn.add(material + "_slab");
toReturn.add("smooth_" + material);
toReturn.add("smooth_" + material + "_stairs");
toReturn.add("smooth_" + material + "_slab");
toReturn.add(material + "_bricks");
toReturn.add(material + "_brick_stairs");
toReturn.add(material + "_brick_slab");
toReturn.add("chiseled_" + material);
return toReturn;
}
Expand Down
Loading