Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-12-04 20:18:34 +01:00
Code Issues Projects Releases Wiki Activity

Fix recipe confict (Closes #1465)

Browse source
This commit is contained in:
Mrbysco 2024-11-30 16:06:49 +01:00
parent 19a060b372
commit fc63fa00c8
5 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e
View file

@ -1,4 +1,4 @@
// 1.21.1 2024-11-17T13:53:47.3759486 Recipes // 1.21.1 2024-11-30T16:05:55.0827347 Recipes
b44fee42c2b2b3f56256fe76b2d9f529dc87350a data/actuallyadditions/recipe/atomic_reconstructor.json b44fee42c2b2b3f56256fe76b2d9f529dc87350a data/actuallyadditions/recipe/atomic_reconstructor.json
b1c937b75ba7f8e02dfac4db5253271f2de502e5 data/actuallyadditions/recipe/battery_box.json b1c937b75ba7f8e02dfac4db5253271f2de502e5 data/actuallyadditions/recipe/battery_box.json
660b96730a8ef88b4b44e4ce67fde0945c13ae7f data/actuallyadditions/recipe/bio_reactor.json 660b96730a8ef88b4b44e4ce67fde0945c13ae7f data/actuallyadditions/recipe/bio_reactor.json
@ -10,9 +10,9 @@ bc3771d03192825636fb2d1037b902f5c39e97f8 data/actuallyadditions/recipe/black_qua
3d658c921ea08a80509f5e899c310d84af825854 data/actuallyadditions/recipe/black_quartz_pillar_slab.json 3d658c921ea08a80509f5e899c310d84af825854 data/actuallyadditions/recipe/black_quartz_pillar_slab.json
72316aa353fa29f5d0eb5e74849e94ff68ac3ee8 data/actuallyadditions/recipe/black_quartz_pillar_stair.json 72316aa353fa29f5d0eb5e74849e94ff68ac3ee8 data/actuallyadditions/recipe/black_quartz_pillar_stair.json
93052b0c0fdf1aa83a5a0b26037a008aefc3ba80 data/actuallyadditions/recipe/black_quartz_pillar_wall.json 93052b0c0fdf1aa83a5a0b26037a008aefc3ba80 data/actuallyadditions/recipe/black_quartz_pillar_wall.json
e9fad26d1fbcb1acf6f5bd711e890787dae636b1 data/actuallyadditions/recipe/black_quartz_slab.json faee252ef06044ffbef63886eba7bf1f3129cb4a data/actuallyadditions/recipe/black_quartz_slab.json
393c8837e266d33037e02d6704564e2867e89c5b data/actuallyadditions/recipe/black_quartz_stair.json 7cfdb8371ff8e65b594664d9da40124c5e6ee5e3 data/actuallyadditions/recipe/black_quartz_stair.json
24f80731fdcb2f950f28949e9c3dbfcd1ec83278 data/actuallyadditions/recipe/black_quartz_wall.json 18fb02ad6a38943b94bca71e9e5e948a80bd1aa3 data/actuallyadditions/recipe/black_quartz_wall.json
bc5c51e659c0b493098b7919740fc6419efb94d9 data/actuallyadditions/recipe/breaker.json bc5c51e659c0b493098b7919740fc6419efb94d9 data/actuallyadditions/recipe/breaker.json
48a5893a0109e467dca8343ee6d4334095e6d118 data/actuallyadditions/recipe/canola_press.json 48a5893a0109e467dca8343ee6d4334095e6d118 data/actuallyadditions/recipe/canola_press.json
d46bb9d164ab5fcd00acb4f97f77f18245780243 data/actuallyadditions/recipe/chiseled_black_quartz_block.json d46bb9d164ab5fcd00acb4f97f77f18245780243 data/actuallyadditions/recipe/chiseled_black_quartz_block.json

2
src/generated/resources/data/actuallyadditions/recipe/black_quartz_slab.json
View file

@ -3,7 +3,7 @@
"category": "misc", "category": "misc",
"key": { "key": {
"Q": { "Q": {
"item": "actuallyadditions:black_quartz_pillar_block" "item": "actuallyadditions:black_quartz_block"
} }
}, },
"pattern": [ "pattern": [

2
src/generated/resources/data/actuallyadditions/recipe/black_quartz_stair.json
View file

@ -3,7 +3,7 @@
"category": "misc", "category": "misc",
"key": { "key": {
"Q": { "Q": {
"item": "actuallyadditions:black_quartz_pillar_block" "item": "actuallyadditions:black_quartz_block"
} }
}, },
"pattern": [ "pattern": [

2
src/generated/resources/data/actuallyadditions/recipe/black_quartz_wall.json
View file

@ -3,7 +3,7 @@
"category": "misc", "category": "misc",
"key": { "key": {
"Q": { "Q": {
"item": "actuallyadditions:black_quartz_pillar_block" "item": "actuallyadditions:black_quartz_block"
} }
}, },
"pattern": [ "pattern": [

6
src/main/java/de/ellpeck/actuallyadditions/data/BlockRecipeGenerator.java
View file

@ -101,13 +101,13 @@ public class BlockRecipeGenerator extends RecipeProvider {
.save(recipeOutput); .save(recipeOutput);
//Black Quartz Wall //Black Quartz Wall
Recipe.wall(ActuallyBlocks.BLACK_QUARTZ_WALL.getItem(), ActuallyBlocks.BLACK_QUARTZ_PILLAR.get(), recipeOutput); Recipe.wall(ActuallyBlocks.BLACK_QUARTZ_WALL.getItem(), ActuallyBlocks.BLACK_QUARTZ.get(), recipeOutput);
//Black Quartz Slab //Black Quartz Slab
Recipe.slab(ActuallyBlocks.BLACK_QUARTZ_SLAB.getItem(), ActuallyBlocks.BLACK_QUARTZ_PILLAR.get(), recipeOutput); Recipe.slab(ActuallyBlocks.BLACK_QUARTZ_SLAB.getItem(), ActuallyBlocks.BLACK_QUARTZ.get(), recipeOutput);
//Black Quartz Stairs //Black Quartz Stairs
Recipe.stairs(ActuallyBlocks.BLACK_QUARTZ_STAIR.getItem(), ActuallyBlocks.BLACK_QUARTZ_PILLAR.get(), recipeOutput); Recipe.stairs(ActuallyBlocks.BLACK_QUARTZ_STAIR.getItem(), ActuallyBlocks.BLACK_QUARTZ.get(), recipeOutput);
//Smooth Black Quartz Wall //Smooth Black Quartz Wall
Recipe.wall(ActuallyBlocks.SMOOTH_BLACK_QUARTZ_WALL.getItem(), ActuallyBlocks.SMOOTH_BLACK_QUARTZ.get(), recipeOutput); Recipe.wall(ActuallyBlocks.SMOOTH_BLACK_QUARTZ_WALL.getItem(), ActuallyBlocks.SMOOTH_BLACK_QUARTZ.get(), recipeOutput);