Skip to content

Commit 262d52f

Browse files
SammySemicolonSammySemicolon
committed
Prerelease
1 parent b649439 commit 262d52f

File tree

187 files changed

+2013
-1202
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

187 files changed

+2013
-1202
lines changed

‎aseprite/malum_textures.ase‎

1.92 KB
Binary file not shown.

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ mod_authors=Sammy Semicolon
2222
mod_description=A dark magic mod focused on soul and spirit magic.
2323

2424
# Mandatory
25-
lodestone_version=1.7.0.294
25+
lodestone_version=1.7.0.298
2626
curios_version=9.3.1+1.21.1
2727

2828
# Iron's Spellbooks

‎src/generated/resources/assets/malum/lang/en_us.json‎

Lines changed: 109 additions & 65 deletions
Large diffs are not rendered by default.

‎src/generated/resources/data/c/tags/item/raw_materials.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"values": [
3+
"malum:raw_soulstone",
4+
"malum:raw_brilliance",
5+
"malum:cthonic_gold",
6+
"malum:cthonic_gold_fragment"
7+
]
8+
}

‎src/generated/resources/data/c/tags/item/tools.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"values": [
3+
"malum:soul_stained_steel_knife",
4+
"malum:sundering_anchor"
5+
]
6+
}

‎src/generated/resources/data/c/tags/item/tools/knife.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"values": [
3+
"malum:soul_stained_steel_knife",
4+
"malum:sundering_anchor"
5+
]
6+
}

‎src/generated/resources/data/c/tags/item/tools/knives.json‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎src/generated/resources/data/farmersdelight/tags/item/tools/knives.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"values": [
3-
"malum:sundering_anchor",
4-
"malum:soul_stained_steel_knife"
3+
"malum:soul_stained_steel_knife",
4+
"malum:sundering_anchor"
55
]
66
}

src/generated/resources/data/malum/advancement/recipes/soul_binding/pact_of_the_sunkissed.json renamed to src/generated/resources/data/malum/advancement/recipes/soul_binding/pact_of_contentedness.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"criteria": {
44
"has_the_recipe": {
55
"conditions": {
6-
"recipe": "malum:pact_of_the_sunkissed"
6+
"recipe": "malum:pact_of_contentedness"
77
},
88
"trigger": "minecraft:recipe_unlocked"
99
}
@@ -15,7 +15,7 @@
1515
],
1616
"rewards": {
1717
"recipes": [
18-
"malum:pact_of_the_sunkissed"
18+
"malum:pact_of_contentedness"
1919
]
2020
}
2121
}

src/generated/resources/data/malum/advancement/recipes/soul_binding/pact_of_the_defiant.json renamed to src/generated/resources/data/malum/advancement/recipes/soul_binding/pact_of_defiance.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"criteria": {
44
"has_the_recipe": {
55
"conditions": {
6-
"recipe": "malum:pact_of_the_defiant"
6+
"recipe": "malum:pact_of_defiance"
77
},
88
"trigger": "minecraft:recipe_unlocked"
99
}
@@ -15,7 +15,7 @@
1515
],
1616
"rewards": {
1717
"recipes": [
18-
"malum:pact_of_the_defiant"
18+
"malum:pact_of_defiance"
1919
]
2020
}
2121
}

0 commit comments

Comments
 (0)