-
Notifications
You must be signed in to change notification settings - Fork 71
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/1.20.1-aria-for-painters' into 1…
….20.1-aria-for-painters
- Loading branch information
Showing
34 changed files
with
1,310 additions
and
0 deletions.
There are no files selected for viewing
43 changes: 43 additions & 0 deletions
43
...in/resources/data/spectrum/recipes/mod_integration/create/crushing/ores/amethyst_ore.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| { | ||
| "type": "create:crushing", | ||
| "ingredients": [ | ||
| { | ||
| "item": "spectrum:amethyst_ore" | ||
| } | ||
| ], | ||
| "processingTime": 250, | ||
| "results": [ | ||
| { | ||
| "count": 3, | ||
| "item": "minecraft:amethyst_shard" | ||
| }, | ||
| { | ||
| "chance": 0.5, | ||
| "item": "minecraft:amethyst_shard" | ||
| }, | ||
| { | ||
| "count": 2, | ||
| "item": "spectrum:amethyst_powder" | ||
| }, | ||
| { | ||
| "chance": 0.6, | ||
| "item": "spectrum:amethyst_powder" | ||
| }, | ||
| { | ||
| "chance": 0.75, | ||
| "item": "create:experience_nugget" | ||
| }, | ||
| { | ||
| "chance": 0.125, | ||
| "item": "minecraft:cobblestone" | ||
| } | ||
| ], | ||
| "fabric:load_conditions": [ | ||
| { | ||
| "condition": "fabric:all_mods_loaded", | ||
| "values": [ | ||
| "create" | ||
| ] | ||
| } | ||
| ] | ||
| } |
34 changes: 34 additions & 0 deletions
34
...ain/resources/data/spectrum/recipes/mod_integration/create/crushing/ores/azurite_ore.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| { | ||
| "type": "create:crushing", | ||
| "ingredients": [ | ||
| { | ||
| "item": "spectrum:azurite_ore" | ||
| } | ||
| ], | ||
| "processingTime": 350, | ||
| "results": [ | ||
| { | ||
| "item": "spectrum:raw_azurite" | ||
| }, | ||
| { | ||
| "chance": 0.75, | ||
| "item": "spectrum:raw_azurite" | ||
| }, | ||
| { | ||
| "chance": 0.75, | ||
| "item": "create:experience_nugget" | ||
| }, | ||
| { | ||
| "chance": 0.125, | ||
| "item": "minecraft:cobblestone" | ||
| } | ||
| ], | ||
| "fabric:load_conditions": [ | ||
| { | ||
| "condition": "fabric:all_mods_loaded", | ||
| "values": [ | ||
| "create" | ||
| ] | ||
| } | ||
| ] | ||
| } |
43 changes: 43 additions & 0 deletions
43
...es/data/spectrum/recipes/mod_integration/create/crushing/ores/blackslag_amethyst_ore.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| { | ||
| "type": "create:crushing", | ||
| "ingredients": [ | ||
| { | ||
| "item": "spectrum:blackslag_amethyst_ore" | ||
| } | ||
| ], | ||
| "processingTime": 425, | ||
| "results": [ | ||
| { | ||
| "count": 4, | ||
| "item": "minecraft:amethyst_shard" | ||
| }, | ||
| { | ||
| "chance": 0.25, | ||
| "item": "minecraft:amethyst_shard" | ||
| }, | ||
| { | ||
| "count": 4, | ||
| "item": "spectrum:amethyst_powder" | ||
| }, | ||
| { | ||
| "chance": 0.25, | ||
| "item": "spectrum:amethyst_powder" | ||
| }, | ||
| { | ||
| "chance": 0.75, | ||
| "item": "create:experience_nugget" | ||
| }, | ||
| { | ||
| "chance": 0.125, | ||
| "item": "spectrum:cobbled_blackslag" | ||
| } | ||
| ], | ||
| "fabric:load_conditions": [ | ||
| { | ||
| "condition": "fabric:all_mods_loaded", | ||
| "values": [ | ||
| "create" | ||
| ] | ||
| } | ||
| ] | ||
| } |
35 changes: 35 additions & 0 deletions
35
...ces/data/spectrum/recipes/mod_integration/create/crushing/ores/blackslag_azurite_ore.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| { | ||
| "type": "create:crushing", | ||
| "ingredients": [ | ||
| { | ||
| "item": "spectrum:blackslag_azurite_ore" | ||
| } | ||
| ], | ||
| "processingTime": 525, | ||
| "results": [ | ||
| { | ||
| "count": 2, | ||
| "item": "spectrum:raw_azurite" | ||
| }, | ||
| { | ||
| "chance": 0.25, | ||
| "item": "spectrum:raw_azurite" | ||
| }, | ||
| { | ||
| "chance": 0.75, | ||
| "item": "create:experience_nugget" | ||
| }, | ||
| { | ||
| "chance": 0.125, | ||
| "item": "spectrum:cobbled_blackslag" | ||
| } | ||
| ], | ||
| "fabric:load_conditions": [ | ||
| { | ||
| "condition": "fabric:all_mods_loaded", | ||
| "values": [ | ||
| "create" | ||
| ] | ||
| } | ||
| ] | ||
| } |
43 changes: 43 additions & 0 deletions
43
...ces/data/spectrum/recipes/mod_integration/create/crushing/ores/blackslag_citrine_ore.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| { | ||
| "type": "create:crushing", | ||
| "ingredients": [ | ||
| { | ||
| "item": "spectrum:blackslag_citrine_ore" | ||
| } | ||
| ], | ||
| "processingTime": 425, | ||
| "results": [ | ||
| { | ||
| "count": 4, | ||
| "item": "spectrum:citrine_shard" | ||
| }, | ||
| { | ||
| "chance": 0.25, | ||
| "item": "spectrum:citrine_shard" | ||
| }, | ||
| { | ||
| "count": 4, | ||
| "item": "spectrum:citrine_powder" | ||
| }, | ||
| { | ||
| "chance": 0.25, | ||
| "item": "spectrum:citrine_powder" | ||
| }, | ||
| { | ||
| "chance": 0.75, | ||
| "item": "create:experience_nugget" | ||
| }, | ||
| { | ||
| "chance": 0.125, | ||
| "item": "spectrum:cobbled_blackslag" | ||
| } | ||
| ], | ||
| "fabric:load_conditions": [ | ||
| { | ||
| "condition": "fabric:all_mods_loaded", | ||
| "values": [ | ||
| "create" | ||
| ] | ||
| } | ||
| ] | ||
| } |
35 changes: 35 additions & 0 deletions
35
...ources/data/spectrum/recipes/mod_integration/create/crushing/ores/blackslag_coal_ore.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| { | ||
| "type": "create:crushing", | ||
| "ingredients": [ | ||
| { | ||
| "item": "spectrum:blackslag_coal_ore" | ||
| } | ||
| ], | ||
| "processingTime": 375, | ||
| "results": [ | ||
| { | ||
| "count": 2, | ||
| "item": "minecraft:coal" | ||
| }, | ||
| { | ||
| "chance": 0.25, | ||
| "item": "minecraft:coal" | ||
| }, | ||
| { | ||
| "chance": 0.75, | ||
| "item": "create:experience_nugget" | ||
| }, | ||
| { | ||
| "chance": 0.125, | ||
| "item": "spectrum:cobbled_blackslag" | ||
| } | ||
| ], | ||
| "fabric:load_conditions": [ | ||
| { | ||
| "condition": "fabric:all_mods_loaded", | ||
| "values": [ | ||
| "create" | ||
| ] | ||
| } | ||
| ] | ||
| } |
35 changes: 35 additions & 0 deletions
35
...rces/data/spectrum/recipes/mod_integration/create/crushing/ores/blackslag_copper_ore.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| { | ||
| "type": "create:crushing", | ||
| "ingredients": [ | ||
| { | ||
| "item": "spectrum:blackslag_copper_ore" | ||
| } | ||
| ], | ||
| "processingTime": 425, | ||
| "results": [ | ||
| { | ||
| "count": 7, | ||
| "item": "create:crushed_raw_copper" | ||
| }, | ||
| { | ||
| "chance": 0.25, | ||
| "item": "create:crushed_raw_copper" | ||
| }, | ||
| { | ||
| "chance": 0.75, | ||
| "item": "create:experience_nugget" | ||
| }, | ||
| { | ||
| "chance": 0.125, | ||
| "item": "spectrum:cobbled_blackslag" | ||
| } | ||
| ], | ||
| "fabric:load_conditions": [ | ||
| { | ||
| "condition": "fabric:all_mods_loaded", | ||
| "values": [ | ||
| "create" | ||
| ] | ||
| } | ||
| ] | ||
| } |
35 changes: 35 additions & 0 deletions
35
...ces/data/spectrum/recipes/mod_integration/create/crushing/ores/blackslag_diamond_ore.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| { | ||
| "type": "create:crushing", | ||
| "ingredients": [ | ||
| { | ||
| "item": "spectrum:blackslag_diamond_ore" | ||
| } | ||
| ], | ||
| "processingTime": 525, | ||
| "results": [ | ||
| { | ||
| "count": 2, | ||
| "item": "minecraft:diamond" | ||
| }, | ||
| { | ||
| "chance": 0.25, | ||
| "item": "minecraft:diamond" | ||
| }, | ||
| { | ||
| "chance": 0.75, | ||
| "item": "create:experience_nugget" | ||
| }, | ||
| { | ||
| "chance": 0.125, | ||
| "item": "spectrum:cobbled_blackslag" | ||
| } | ||
| ], | ||
| "fabric:load_conditions": [ | ||
| { | ||
| "condition": "fabric:all_mods_loaded", | ||
| "values": [ | ||
| "create" | ||
| ] | ||
| } | ||
| ] | ||
| } |
35 changes: 35 additions & 0 deletions
35
...ces/data/spectrum/recipes/mod_integration/create/crushing/ores/blackslag_emerald_ore.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| { | ||
| "type": "create:crushing", | ||
| "ingredients": [ | ||
| { | ||
| "item": "spectrum:blackslag_emerald_ore" | ||
| } | ||
| ], | ||
| "processingTime": 525, | ||
| "results": [ | ||
| { | ||
| "count": 2, | ||
| "item": "minecraft:emerald" | ||
| }, | ||
| { | ||
| "chance": 0.25, | ||
| "item": "minecraft:emerald" | ||
| }, | ||
| { | ||
| "chance": 0.75, | ||
| "item": "create:experience_nugget" | ||
| }, | ||
| { | ||
| "chance": 0.125, | ||
| "item": "spectrum:cobbled_blackslag" | ||
| } | ||
| ], | ||
| "fabric:load_conditions": [ | ||
| { | ||
| "condition": "fabric:all_mods_loaded", | ||
| "values": [ | ||
| "create" | ||
| ] | ||
| } | ||
| ] | ||
| } |
36 changes: 36 additions & 0 deletions
36
...ources/data/spectrum/recipes/mod_integration/create/crushing/ores/blackslag_gold_ore.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| { | ||
| "type": "create:crushing", | ||
| "ingredients": [ | ||
| { | ||
| "item": "spectrum:blackslag_gold_ore" | ||
| } | ||
| ], | ||
| "processingTime": 425, | ||
| "results": [ | ||
| { | ||
| "count": 2, | ||
| "item": "create:crushed_raw_gold" | ||
| }, | ||
| { | ||
| "chance": 0.25, | ||
| "item": "create:crushed_raw_gold" | ||
| }, | ||
| { | ||
| "chance": 0.75, | ||
| "count": 2, | ||
| "item": "create:experience_nugget" | ||
| }, | ||
| { | ||
| "chance": 0.125, | ||
| "item": "spectrum:cobbled_blackslag" | ||
| } | ||
| ], | ||
| "fabric:load_conditions": [ | ||
| { | ||
| "condition": "fabric:all_mods_loaded", | ||
| "values": [ | ||
| "create" | ||
| ] | ||
| } | ||
| ] | ||
| } |
Oops, something went wrong.