Skip to content

Commit

Permalink
It still crashes :(
Browse files Browse the repository at this point in the history
  • Loading branch information
SammySemicolon committed Nov 30, 2024
1 parent 3277118 commit e3c613a
Show file tree
Hide file tree
Showing 60 changed files with 698 additions and 698 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ mod_authors=Sammy Semicolon
mod_description=A dark magic mod focused on soul and spirit magic.

# Mandatory
lodestone_version=1.7.0.90
lodestone_version=1.7.0.92
curios_version=9.0.15+1.21.1

# Iron's Spellbooks
Expand Down
12 changes: 6 additions & 6 deletions src/generated/resources/data/c/tags/block/ores.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"values": [
"malum:blazing_quartz_ore",
"malum:deepslate_quartz_ore",
"malum:cthonic_gold_ore",
"malum:soulstone_ore",
"malum:brilliant_stone",
"malum:natural_quartz_ore",
"malum:deepslate_soulstone_ore",
"malum:deepslate_quartz_ore",
"malum:brilliant_deepslate",
"malum:natural_quartz_ore"
"malum:blazing_quartz_ore",
"malum:soulstone_ore",
"malum:cthonic_gold_ore",
"malum:brilliant_stone"
]
}
30 changes: 15 additions & 15 deletions src/generated/resources/data/c/tags/block/storage_blocks.json
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
{
"values": [
"malum:block_of_malignant_pewter",
"malum:block_of_malignant_lead",
"malum:block_of_astral_weave",
"malum:block_of_mnemonic_fragment",
"malum:block_of_raw_soulstone",
"malum:block_of_cthonic_gold",
"malum:cursed_sap_block",
"malum:block_of_auric_embers",
"malum:block_of_alchemical_calx",
"malum:block_of_hex_ash",
"malum:block_of_arcane_charcoal",
"malum:block_of_living_flesh",
"malum:block_of_soulstone",
"malum:block_of_cthonic_gold",
"malum:block_of_brilliance",
"malum:block_of_void_salts",
"malum:block_of_soul_stained_steel",
"malum:block_of_alchemical_calx",
"malum:mass_of_blighted_gunk",
"malum:block_of_void_salts",
"malum:block_of_blazing_quartz",
"malum:runic_sap_block",
"malum:block_of_rotting_essence",
"malum:block_of_malignant_lead",
"malum:block_of_grim_talc",
"malum:block_of_raw_soulstone",
"malum:block_of_astral_weave",
"malum:block_of_arcane_charcoal",
"malum:block_of_rotting_essence",
"malum:block_of_malignant_pewter",
"malum:block_of_blazing_quartz",
"malum:block_of_auric_embers",
"malum:block_of_hex_ash",
"malum:block_of_soulstone",
"malum:block_of_null_slate",
"malum:block_of_hallowed_gold",
"malum:block_of_null_slate"
"malum:block_of_brilliance"
]
}
12 changes: 6 additions & 6 deletions src/generated/resources/data/c/tags/item/ores.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"values": [
"malum:blazing_quartz_ore",
"malum:deepslate_quartz_ore",
"malum:cthonic_gold_ore",
"malum:soulstone_ore",
"malum:brilliant_stone",
"malum:natural_quartz_ore",
"malum:deepslate_soulstone_ore",
"malum:deepslate_quartz_ore",
"malum:brilliant_deepslate",
"malum:natural_quartz_ore"
"malum:blazing_quartz_ore",
"malum:soulstone_ore",
"malum:cthonic_gold_ore",
"malum:brilliant_stone"
]
}
30 changes: 15 additions & 15 deletions src/generated/resources/data/c/tags/item/storage_blocks.json
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
{
"values": [
"malum:block_of_malignant_pewter",
"malum:block_of_malignant_lead",
"malum:block_of_astral_weave",
"malum:block_of_mnemonic_fragment",
"malum:block_of_raw_soulstone",
"malum:block_of_cthonic_gold",
"malum:cursed_sap_block",
"malum:block_of_auric_embers",
"malum:block_of_alchemical_calx",
"malum:block_of_hex_ash",
"malum:block_of_arcane_charcoal",
"malum:block_of_living_flesh",
"malum:block_of_soulstone",
"malum:block_of_cthonic_gold",
"malum:block_of_brilliance",
"malum:block_of_void_salts",
"malum:block_of_soul_stained_steel",
"malum:block_of_alchemical_calx",
"malum:mass_of_blighted_gunk",
"malum:block_of_void_salts",
"malum:block_of_blazing_quartz",
"malum:runic_sap_block",
"malum:block_of_rotting_essence",
"malum:block_of_malignant_lead",
"malum:block_of_grim_talc",
"malum:block_of_raw_soulstone",
"malum:block_of_astral_weave",
"malum:block_of_arcane_charcoal",
"malum:block_of_rotting_essence",
"malum:block_of_malignant_pewter",
"malum:block_of_blazing_quartz",
"malum:block_of_auric_embers",
"malum:block_of_hex_ash",
"malum:block_of_soulstone",
"malum:block_of_null_slate",
"malum:block_of_hallowed_gold",
"malum:block_of_null_slate"
"malum:block_of_brilliance"
]
}
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"values": [
"malum:tainted_ether_brazier",
"malum:twisted_ether_brazier",
"malum:wall_ether_torch",
"malum:iridescent_wall_ether_torch",
"malum:ether_torch",
"malum:twisted_iridescent_ether_brazier",
"malum:iridescent_ether",
"malum:iridescent_ether_torch",
"malum:iridescent_wall_ether_torch",
"malum:wall_ether_torch",
"malum:tainted_iridescent_ether_brazier",
"malum:ether",
"malum:ether_torch"
"malum:twisted_ether_brazier",
"malum:tainted_ether_brazier",
"malum:iridescent_ether"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"type": "malum:spirit_repair",
"durabilityPercentage": 0.5,
"inputs": [
"minecraft:diamond_sword",
"minecraft:diamond_boots",
"minecraft:diamond_leggings",
"minecraft:diamond_hoe",
"minecraft:diamond_sword",
"minecraft:diamond_shovel",
"minecraft:diamond_axe",
"minecraft:diamond_hoe",
"minecraft:diamond_helmet",
"minecraft:diamond_shovel",
"minecraft:diamond_chestplate",
"minecraft:diamond_pickaxe"
"minecraft:diamond_pickaxe",
"minecraft:diamond_leggings"
],
"itemIdRegex": ".*",
"modIdRegex": ".*",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"type": "malum:spirit_repair",
"durabilityPercentage": 0.5,
"inputs": [
"minecraft:golden_helmet",
"minecraft:golden_sword",
"minecraft:golden_axe",
"minecraft:golden_boots",
"minecraft:golden_shovel",
"minecraft:golden_hoe",
"minecraft:golden_chestplate",
"minecraft:golden_pickaxe",
"minecraft:golden_shovel",
"minecraft:golden_leggings",
"minecraft:golden_axe"
"minecraft:golden_helmet",
"minecraft:golden_sword",
"minecraft:golden_chestplate"
],
"itemIdRegex": ".*",
"modIdRegex": ".*",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
"durabilityPercentage": 0.5,
"inputs": [
"malum:crude_scythe",
"minecraft:iron_helmet",
"minecraft:iron_shovel",
"minecraft:iron_leggings",
"minecraft:iron_sword",
"minecraft:iron_chestplate",
"minecraft:iron_axe",
"minecraft:iron_hoe",
"minecraft:iron_pickaxe",
"minecraft:iron_shovel",
"minecraft:iron_boots",
"minecraft:iron_sword"
"minecraft:iron_axe",
"minecraft:iron_helmet",
"minecraft:iron_hoe",
"minecraft:iron_leggings"
],
"itemIdRegex": ".*",
"modIdRegex": ".*",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"type": "malum:spirit_repair",
"durabilityPercentage": 0.5,
"inputs": [
"minecraft:netherite_boots",
"minecraft:netherite_shovel",
"minecraft:netherite_sword",
"minecraft:netherite_helmet",
"minecraft:netherite_pickaxe",
"minecraft:netherite_hoe",
"minecraft:netherite_leggings",
"minecraft:netherite_chestplate",
"minecraft:netherite_boots",
"minecraft:netherite_axe",
"minecraft:netherite_pickaxe",
"minecraft:netherite_chestplate"
"minecraft:netherite_leggings",
"minecraft:netherite_sword",
"minecraft:netherite_shovel",
"minecraft:netherite_helmet"
],
"itemIdRegex": ".*",
"modIdRegex": ".*",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
"type": "malum:spirit_repair",
"durabilityPercentage": 0.5,
"inputs": [
"minecraft:stone_sword",
"minecraft:stone_axe",
"minecraft:stone_hoe",
"minecraft:stone_shovel",
"minecraft:stone_sword",
"minecraft:stone_pickaxe",
"minecraft:stone_shovel"
"minecraft:stone_axe"
],
"itemIdRegex": ".*",
"modIdRegex": ".*",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
"type": "malum:spirit_repair",
"durabilityPercentage": 0.5,
"inputs": [
"minecraft:wooden_shovel",
"minecraft:wooden_sword",
"minecraft:wooden_axe",
"minecraft:wooden_hoe",
"minecraft:wooden_sword",
"minecraft:wooden_pickaxe",
"minecraft:wooden_shovel"
"minecraft:wooden_pickaxe"
],
"itemIdRegex": ".*",
"modIdRegex": ".*",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"values": [
"malum:blighted_earth",
"malum:mass_of_blighted_gunk",
"malum:blighted_soil",
"malum:mass_of_blighted_gunk"
"malum:blighted_earth"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"values": [
"malum:tall_calcified_blight",
"malum:blighted_growth",
"malum:calcified_blight",
"malum:soulwood_growth",
"malum:clinging_blight",
"malum:soulwood_growth"
"malum:calcified_blight"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
"values": [
"#malum:tainted_rock",
"#malum:twisted_rock",
"malum:runewood_totem_base",
"malum:soulwood_totem_base",
"malum:runewood_totem_pole",
"malum:soulwood_totem_pole"
"malum:soulwood_totem_pole",
"malum:runewood_totem_base",
"malum:soulwood_totem_base"
]
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"values": [
"malum:revealed_runewood_log",
"malum:stripped_runewood",
"malum:stripped_runewood_log",
"malum:exposed_runewood_log",
"malum:runewood",
"malum:runewood_log"
"malum:revealed_runewood_log",
"malum:stripped_runewood_log",
"malum:runewood_log",
"malum:stripped_runewood"
]
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"values": [
"malum:exposed_soulwood_log",
"malum:stripped_soulwood",
"malum:soulwood",
"malum:revealed_soulwood_log",
"malum:stripped_soulwood",
"malum:blighted_soulwood",
"malum:stripped_soulwood_log",
"malum:soulwood_log",
"malum:revealed_soulwood_log"
"malum:stripped_soulwood_log"
]
}
Loading

0 comments on commit e3c613a

Please sign in to comment.