Skip to content

Commit 1644c91

Browse files
Columnar Blight & Creative Tab Categories Start
1 parent 85ff165 commit 1644c91

File tree

104 files changed

+1288
-1004
lines changed

Some content is hidden

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

104 files changed

+1288
-1004
lines changed

external/aseprite/malum_wood.ase

393 Bytes
Binary file not shown.
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
{
2+
"variants": {
3+
"axis=x,bottom=false,top=false": {
4+
"model": "malum:block/columnar_blight",
5+
"x": 90,
6+
"y": 90
7+
},
8+
"axis=x,bottom=false,top=true": {
9+
"model": "malum:block/columnar_blight_lower",
10+
"x": 90,
11+
"y": 90
12+
},
13+
"axis=x,bottom=true,top=false": {
14+
"model": "malum:block/columnar_blight_upper",
15+
"x": 90,
16+
"y": 90
17+
},
18+
"axis=x,bottom=true,top=true": {
19+
"model": "malum:block/columnar_blight_segment",
20+
"x": 90,
21+
"y": 90
22+
},
23+
"axis=y,bottom=false,top=false": {
24+
"model": "malum:block/columnar_blight",
25+
"y": 180
26+
},
27+
"axis=y,bottom=false,top=true": {
28+
"model": "malum:block/columnar_blight_lower",
29+
"y": 180
30+
},
31+
"axis=y,bottom=true,top=false": {
32+
"model": "malum:block/columnar_blight_upper",
33+
"y": 180
34+
},
35+
"axis=y,bottom=true,top=true": {
36+
"model": "malum:block/columnar_blight_segment",
37+
"y": 180
38+
},
39+
"axis=z,bottom=false,top=false": {
40+
"model": "malum:block/columnar_blight",
41+
"x": 90,
42+
"y": 180
43+
},
44+
"axis=z,bottom=false,top=true": {
45+
"model": "malum:block/columnar_blight_lower",
46+
"x": 90,
47+
"y": 180
48+
},
49+
"axis=z,bottom=true,top=false": {
50+
"model": "malum:block/columnar_blight_upper",
51+
"x": 90,
52+
"y": 180
53+
},
54+
"axis=z,bottom=true,top=true": {
55+
"model": "malum:block/columnar_blight_segment",
56+
"x": 90,
57+
"y": 180
58+
}
59+
}
60+
}

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@
9898
"block.malum.chiseled_tainted_rock": "Chiseled Tainted Rock",
9999
"block.malum.chiseled_twisted_rock": "Chiseled Twisted Rock",
100100
"block.malum.clinging_blight": "Clinging Blight",
101+
"block.malum.columnar_blight": "Columnar Blight",
101102
"block.malum.cthonic_gold_cluster": "Cthonic Gold Cluster",
102103
"block.malum.cthonic_gold_ore": "Cthonic Gold Ore",
103104
"block.malum.cut_dross_stone": "Cut Dross Stone",
@@ -524,7 +525,6 @@
524525
"item.malum.anomalous_design": "Anomalous Design",
525526
"item.malum.aqueous_spirit": "Aqueous Spirit",
526527
"item.malum.arcane_charcoal": "Arcane Charcoal",
527-
"item.malum.arcane_charcoal_fragment": "Arcane Charcoal Fragment",
528528
"item.malum.arcane_spirit": "Arcane Spirit",
529529
"item.malum.aro_prideweave": "Aro Prideweave",
530530
"item.malum.aroace_prideweave": "Aroace Prideweave",
@@ -538,13 +538,10 @@
538538
"item.malum.bi_prideweave": "Bi Prideweave",
539539
"item.malum.blazing_diode": "Blazing Diode",
540540
"item.malum.blazing_quartz": "Blazing Quartz",
541-
"item.malum.blazing_quartz_fragment": "Blazing Quartz Fragment",
542541
"item.malum.blighted_gunk": "Blighted Gunk",
543542
"item.malum.broken_blade": "Broken Blade",
544543
"item.malum.catalyst_lobber": "Catalyst Lobber",
545544
"item.malum.caustic_catalyst": "Caustic Catalyst",
546-
"item.malum.charcoal_fragment": "Charcoal Fragment",
547-
"item.malum.coal_fragment": "Coal Fragment",
548545
"item.malum.cobalt_impetus": "Cobalt Impetus",
549546
"item.malum.cobalt_node": "Cobalt Node",
550547
"item.malum.complete_design": "Complete Design",
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"parent": "minecraft:block/cube_column",
3+
"textures": {
4+
"end": "malum:block/blight/columnar_blight_end",
5+
"side": "malum:block/blight/columnar_blight"
6+
}
7+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"parent": "minecraft:block/cube_column",
3+
"textures": {
4+
"end": "malum:block/blight/columnar_blight_end",
5+
"side": "malum:block/blight/columnar_blight_lower"
6+
}
7+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"parent": "minecraft:block/cube_column",
3+
"textures": {
4+
"end": "malum:block/blight/columnar_blight_end",
5+
"side": "malum:block/blight/columnar_blight_segment"
6+
}
7+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"parent": "minecraft:block/cube_column",
3+
"textures": {
4+
"end": "malum:block/blight/columnar_blight_end",
5+
"side": "malum:block/blight/columnar_blight_upper"
6+
}
7+
}
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
{}
1+
{
2+
"parent": "malum:block/air"
3+
}

src/generated/resources/assets/malum/models/item/arcane_charcoal_fragment.json

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

src/generated/resources/assets/malum/models/item/blazing_quartz_fragment.json

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

0 commit comments

Comments
 (0)