-
-
Notifications
You must be signed in to change notification settings - Fork 37
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #220 from mrsterner/1.5.1-1.20.1
tags silly
- Loading branch information
Showing
84 changed files
with
1,117 additions
and
33 deletions.
There are no files selected for viewing
5 changes: 5 additions & 0 deletions
5
src/generated/resources/data/farmersdelight/tags/blocks/heat_sources.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,5 @@ | ||
| { | ||
| "values": [ | ||
| "malum:block_of_blazing_quartz" | ||
| ] | ||
| } |
16 changes: 16 additions & 0 deletions
16
src/generated/resources/data/farmersdelight/tags/blocks/tray_heat_sources.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,16 @@ | ||
| { | ||
| "values": [ | ||
| "malum:tainted_iridescent_ether_brazier", | ||
| "malum:iridescent_ether", | ||
| "malum:iridescent_ether", | ||
| "malum:twisted_iridescent_ether_brazier", | ||
| "malum:iridescent_wall_ether_torch", | ||
| "malum:wall_ether_torch", | ||
| "malum:iridescent_ether_torch", | ||
| "malum:twisted_ether_brazier", | ||
| "malum:ether", | ||
| "malum:ether", | ||
| "malum:ether_torch", | ||
| "malum:tainted_ether_brazier" | ||
| ] | ||
| } |
5 changes: 5 additions & 0 deletions
5
src/generated/resources/data/farmersdelight/tags/items/tools/knives.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,5 @@ | ||
| { | ||
| "values": [ | ||
| "malum:soul_stained_steel_knife" | ||
| ] | ||
| } |
6 changes: 6 additions & 0 deletions
6
src/generated/resources/data/forge/tags/blocks/fence_gates/wooden.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,6 @@ | ||
| { | ||
| "values": [ | ||
| "malum:soulwood_planks_fence_gate", | ||
| "malum:runewood_planks_fence_gate" | ||
| ] | ||
| } |
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,12 @@ | ||
| { | ||
| "values": [ | ||
| "malum:blazing_quartz_ore", | ||
| "malum:soulstone_ore", | ||
| "malum:block_of_cthonic_gold", | ||
| "malum:brilliant_stone", | ||
| "malum:natural_quartz_ore", | ||
| "malum:brilliant_deepslate", | ||
| "malum:deepslate_quartz_ore", | ||
| "malum:deepslate_soulstone_ore" | ||
| ] | ||
| } |
19 changes: 19 additions & 0 deletions
19
src/generated/resources/data/forge/tags/blocks/storage_blocks.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,19 @@ | ||
| { | ||
| "values": [ | ||
| "malum:block_of_grim_talc", | ||
| "malum:block_of_astral_weave", | ||
| "malum:block_of_cursed_grit", | ||
| "malum:block_of_alchemical_calx", | ||
| "malum:mass_of_blighted_gunk", | ||
| "malum:block_of_blazing_quartz", | ||
| "malum:block_of_void_salts", | ||
| "malum:block_of_soulstone", | ||
| "malum:block_of_arcane_charcoal", | ||
| "malum:block_of_soul_stained_steel", | ||
| "malum:block_of_hallowed_gold", | ||
| "malum:block_of_rotting_essence", | ||
| "malum:block_of_hex_ash", | ||
| "malum:block_of_raw_soulstone", | ||
| "malum:block_of_brilliance" | ||
| ] | ||
| } |
10 changes: 10 additions & 0 deletions
10
src/generated/resources/data/forge/tags/blocks/stripped_logs.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,10 @@ | ||
| { | ||
| "values": [ | ||
| "malum:stripped_soulwood_log", | ||
| "malum:stripped_runewood", | ||
| "malum:stripped_runewood_log", | ||
| "malum:exposed_runewood_log", | ||
| "malum:revealed_soulwood_log", | ||
| "malum:stripped_soulwood" | ||
| ] | ||
| } |
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,9 @@ | ||
| { | ||
| "values": [ | ||
| "malum:processed_soulstone", | ||
| "malum:blazing_quartz", | ||
| "malum:natural_quartz", | ||
| "malum:blazing_quartz", | ||
| "malum:cluster_of_brilliance" | ||
| ] | ||
| } |
5 changes: 5 additions & 0 deletions
5
src/generated/resources/data/forge/tags/items/gems/quartz.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,5 @@ | ||
| { | ||
| "values": [ | ||
| "malum:natural_quartz" | ||
| ] | ||
| } |
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,6 @@ | ||
| { | ||
| "values": [ | ||
| "malum:soul_stained_steel_ingot", | ||
| "malum:hallowed_gold_ingot" | ||
| ] | ||
| } |
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,7 @@ | ||
| { | ||
| "values": [ | ||
| "malum:copper_nugget", | ||
| "malum:hallowed_gold_nugget", | ||
| "malum:soul_stained_steel_nugget" | ||
| ] | ||
| } |
5 changes: 5 additions & 0 deletions
5
src/generated/resources/data/forge/tags/items/nuggets/copper.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,5 @@ | ||
| { | ||
| "values": [ | ||
| "malum:copper_nugget" | ||
| ] | ||
| } |
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,12 @@ | ||
| { | ||
| "values": [ | ||
| "malum:blazing_quartz_ore", | ||
| "malum:soulstone_ore", | ||
| "malum:block_of_cthonic_gold", | ||
| "malum:brilliant_stone", | ||
| "malum:natural_quartz_ore", | ||
| "malum:brilliant_deepslate", | ||
| "malum:deepslate_quartz_ore", | ||
| "malum:deepslate_soulstone_ore" | ||
| ] | ||
| } |
6 changes: 6 additions & 0 deletions
6
src/generated/resources/data/forge/tags/items/ores/quartz.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,6 @@ | ||
| { | ||
| "values": [ | ||
| "malum:natural_quartz_ore", | ||
| "malum:deepslate_quartz_ore" | ||
| ] | ||
| } |
6 changes: 6 additions & 0 deletions
6
src/generated/resources/data/forge/tags/items/slimeballs.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,6 @@ | ||
| { | ||
| "values": [ | ||
| "malum:holy_sapball", | ||
| "malum:unholy_sapball" | ||
| ] | ||
| } |
19 changes: 19 additions & 0 deletions
19
src/generated/resources/data/forge/tags/items/storage_blocks.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,19 @@ | ||
| { | ||
| "values": [ | ||
| "malum:block_of_grim_talc", | ||
| "malum:block_of_astral_weave", | ||
| "malum:block_of_cursed_grit", | ||
| "malum:block_of_alchemical_calx", | ||
| "malum:mass_of_blighted_gunk", | ||
| "malum:block_of_blazing_quartz", | ||
| "malum:block_of_void_salts", | ||
| "malum:block_of_soulstone", | ||
| "malum:block_of_arcane_charcoal", | ||
| "malum:block_of_soul_stained_steel", | ||
| "malum:block_of_hallowed_gold", | ||
| "malum:block_of_rotting_essence", | ||
| "malum:block_of_hex_ash", | ||
| "malum:block_of_raw_soulstone", | ||
| "malum:block_of_brilliance" | ||
| ] | ||
| } |
10 changes: 10 additions & 0 deletions
10
src/generated/resources/data/forge/tags/items/stripped_logs.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,10 @@ | ||
| { | ||
| "values": [ | ||
| "malum:stripped_soulwood_log", | ||
| "malum:stripped_runewood", | ||
| "malum:stripped_runewood_log", | ||
| "malum:exposed_runewood_log", | ||
| "malum:revealed_soulwood_log", | ||
| "malum:stripped_soulwood" | ||
| ] | ||
| } |
5 changes: 5 additions & 0 deletions
5
src/generated/resources/data/forge/tags/items/tools/knives.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,5 @@ | ||
| { | ||
| "values": [ | ||
| "malum:soul_stained_steel_knife" | ||
| ] | ||
| } |
7 changes: 7 additions & 0 deletions
7
src/generated/resources/data/malum/tags/blocks/blighted_blocks.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,7 @@ | ||
| { | ||
| "values": [ | ||
| "malum:mass_of_blighted_gunk", | ||
| "malum:blighted_earth", | ||
| "malum:blighted_soil" | ||
| ] | ||
| } |
7 changes: 7 additions & 0 deletions
7
src/generated/resources/data/malum/tags/blocks/blighted_plants.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,7 @@ | ||
| { | ||
| "values": [ | ||
| "malum:soulwood_growth", | ||
| "malum:blighted_weed", | ||
| "malum:blighted_tumor" | ||
| ] | ||
| } |
3 changes: 3 additions & 0 deletions
3
src/generated/resources/data/malum/tags/blocks/endless_flame.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,3 @@ | ||
| { | ||
| "values": [] | ||
| } |
3 changes: 3 additions & 0 deletions
3
src/generated/resources/data/malum/tags/blocks/greater_aerial_whitelist.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,3 @@ | ||
| { | ||
| "values": [] | ||
| } |
10 changes: 10 additions & 0 deletions
10
src/generated/resources/data/malum/tags/blocks/rite_immune.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,10 @@ | ||
| { | ||
| "values": [ | ||
| "#malum:tainted_rock", | ||
| "#malum:twisted_rock", | ||
| "malum:runewood_totem_base", | ||
| "malum:soulwood_totem_base", | ||
| "malum:runewood_totem_pole", | ||
| "malum:soulwood_totem_pole" | ||
| ] | ||
| } |
10 changes: 10 additions & 0 deletions
10
src/generated/resources/data/malum/tags/blocks/runewood_logs.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,10 @@ | ||
| { | ||
| "values": [ | ||
| "malum:revealed_runewood_log", | ||
| "malum:runewood", | ||
| "malum:stripped_runewood", | ||
| "malum:stripped_runewood_log", | ||
| "malum:exposed_runewood_log", | ||
| "malum:runewood_log" | ||
| ] | ||
| } |
10 changes: 10 additions & 0 deletions
10
src/generated/resources/data/malum/tags/blocks/soulwood_logs.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,10 @@ | ||
| { | ||
| "values": [ | ||
| "malum:soulwood", | ||
| "malum:exposed_soulwood_log", | ||
| "malum:stripped_soulwood_log", | ||
| "malum:soulwood_log", | ||
| "malum:revealed_soulwood_log", | ||
| "malum:stripped_soulwood" | ||
| ] | ||
| } |
54 changes: 54 additions & 0 deletions
54
src/generated/resources/data/malum/tags/blocks/tainted_rock.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,54 @@ | ||
| { | ||
| "values": [ | ||
| "malum:runic_tainted_rock_bricks", | ||
| "malum:runic_tainted_rock_tiles", | ||
| "malum:tainted_rock_tiles_wall", | ||
| "malum:small_tainted_rock_bricks_stairs", | ||
| "malum:spirit_crucible_component", | ||
| "malum:runic_tainted_rock_bricks_slab", | ||
| "malum:tainted_rock_tiles", | ||
| "malum:tainted_rock_stairs", | ||
| "malum:twisted_tablet", | ||
| "malum:tainted_rock_button", | ||
| "malum:tainted_rock_pressure_plate", | ||
| "malum:tainted_iridescent_ether_brazier", | ||
| "malum:tainted_rock_wall", | ||
| "malum:polished_tainted_rock_slab", | ||
| "malum:runic_small_tainted_rock_bricks_wall", | ||
| "malum:tainted_rock_column", | ||
| "malum:small_tainted_rock_bricks_wall", | ||
| "malum:smooth_tainted_rock_stairs", | ||
| "malum:tainted_rock_bricks_wall", | ||
| "malum:small_tainted_rock_bricks_slab", | ||
| "malum:tainted_rock_slab", | ||
| "malum:spirit_crucible", | ||
| "malum:tainted_rock_item_pedestal", | ||
| "malum:runic_small_tainted_rock_bricks_slab", | ||
| "malum:polished_tainted_rock_stairs", | ||
| "malum:tainted_rock_bricks_stairs", | ||
| "malum:runic_small_tainted_rock_bricks", | ||
| "malum:spirit_catalyzer_component", | ||
| "malum:tainted_rock_bricks_slab", | ||
| "malum:spirit_catalyzer", | ||
| "malum:runic_tainted_rock_tiles_wall", | ||
| "malum:smooth_tainted_rock_slab", | ||
| "malum:runic_tainted_rock_bricks_stairs", | ||
| "malum:tainted_rock", | ||
| "malum:runic_small_tainted_rock_bricks_stairs", | ||
| "malum:tainted_rock_bricks", | ||
| "malum:small_tainted_rock_bricks", | ||
| "malum:tainted_rock_item_stand", | ||
| "malum:tainted_rock_tiles_slab", | ||
| "malum:runic_tainted_rock_bricks_wall", | ||
| "malum:the_device", | ||
| "malum:cut_tainted_rock", | ||
| "malum:tainted_rock_column_cap", | ||
| "malum:smooth_tainted_rock", | ||
| "malum:polished_tainted_rock", | ||
| "malum:chiseled_tainted_rock", | ||
| "malum:runic_tainted_rock_tiles_slab", | ||
| "malum:tainted_rock_tiles_stairs", | ||
| "malum:runic_tainted_rock_tiles_stairs", | ||
| "malum:tainted_ether_brazier" | ||
| ] | ||
| } |
49 changes: 49 additions & 0 deletions
49
src/generated/resources/data/malum/tags/blocks/twisted_rock.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,49 @@ | ||
| { | ||
| "values": [ | ||
| "malum:runic_twisted_rock_bricks_stairs", | ||
| "malum:twisted_rock_pressure_plate", | ||
| "malum:twisted_rock_bricks_stairs", | ||
| "malum:polished_twisted_rock", | ||
| "malum:twisted_rock", | ||
| "malum:polished_twisted_rock_slab", | ||
| "malum:twisted_rock_tiles_wall", | ||
| "malum:small_twisted_rock_bricks_slab", | ||
| "malum:twisted_rock_column", | ||
| "malum:twisted_rock_bricks_wall", | ||
| "malum:runic_twisted_rock_bricks", | ||
| "malum:twisted_rock_item_stand", | ||
| "malum:runic_twisted_rock_bricks_wall", | ||
| "malum:twisted_iridescent_ether_brazier", | ||
| "malum:twisted_rock_tiles_slab", | ||
| "malum:twisted_rock_tiles", | ||
| "malum:runic_twisted_rock_bricks_slab", | ||
| "malum:runic_twisted_rock_tiles_stairs", | ||
| "malum:the_vessel", | ||
| "malum:small_twisted_rock_bricks", | ||
| "malum:twisted_rock_tiles_stairs", | ||
| "malum:smooth_twisted_rock_stairs", | ||
| "malum:runic_small_twisted_rock_bricks_stairs", | ||
| "malum:twisted_rock_bricks", | ||
| "malum:runic_small_twisted_rock_bricks_wall", | ||
| "malum:small_twisted_rock_bricks_wall", | ||
| "malum:runic_twisted_rock_tiles_slab", | ||
| "malum:twisted_rock_item_pedestal", | ||
| "malum:twisted_rock_bricks_slab", | ||
| "malum:cut_twisted_rock", | ||
| "malum:smooth_twisted_rock", | ||
| "malum:runic_small_twisted_rock_bricks", | ||
| "malum:twisted_rock_column_cap", | ||
| "malum:twisted_rock_wall", | ||
| "malum:twisted_ether_brazier", | ||
| "malum:runic_small_twisted_rock_bricks_slab", | ||
| "malum:chiseled_twisted_rock", | ||
| "malum:smooth_twisted_rock_slab", | ||
| "malum:runic_twisted_rock_tiles_wall", | ||
| "malum:runic_twisted_rock_tiles", | ||
| "malum:polished_twisted_rock_stairs", | ||
| "malum:twisted_rock_slab", | ||
| "malum:small_twisted_rock_bricks_stairs", | ||
| "malum:twisted_rock_stairs", | ||
| "malum:twisted_rock_button" | ||
| ] | ||
| } |
6 changes: 6 additions & 0 deletions
6
src/generated/resources/data/malum/tags/items/gross_foods.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,6 @@ | ||
| { | ||
| "values": [ | ||
| "minecraft:rotten_flesh", | ||
| "malum:rotting_essence" | ||
| ] | ||
| } |
15 changes: 15 additions & 0 deletions
15
src/generated/resources/data/malum/tags/items/metal_nodes.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,15 @@ | ||
| { | ||
| "values": [ | ||
| "malum:iron_node", | ||
| "malum:copper_node", | ||
| "malum:gold_node", | ||
| "malum:lead_node", | ||
| "malum:silver_node", | ||
| "malum:aluminum_node", | ||
| "malum:nickel_node", | ||
| "malum:uranium_node", | ||
| "malum:osmium_node", | ||
| "malum:zinc_node", | ||
| "malum:tin_node" | ||
| ] | ||
| } |
Oops, something went wrong.