Merge remote-tracking branch 'origin/master' into master

This commit is contained in:
DBotThePony 2021-08-29 17:02:34 +07:00
commit a5fe020564
Signed by: DBot
GPG Key ID: DCC23B5715498507

View File

@ -2,7 +2,7 @@
"parent": "block/block", "parent": "block/block",
"texture_size": [64, 64], "texture_size": [64, 64],
"textures": { "textures": {
"0": "overdrive_that_matters:block/matter_decomposer", "texture": "overdrive_that_matters:block/matter_decomposer",
"particle": "overdrive_that_matters:block/matter_decomposer" "particle": "overdrive_that_matters:block/matter_decomposer"
}, },
"elements": [ "elements": [
@ -10,72 +10,72 @@
"from": [0, 0, 0], "from": [0, 0, 0],
"to": [16, 3, 16], "to": [16, 3, 16],
"faces": { "faces": {
"north": {"uv": [0, 11.25, 4, 12], "texture": "#0"}, "north": {"uv": [0, 11.25, 4, 12], "texture": "#texture"},
"east": {"uv": [0, 11.25, 4, 12], "texture": "#0"}, "east": {"uv": [0, 11.25, 4, 12], "texture": "#texture"},
"south": {"uv": [0, 11.25, 4, 12], "texture": "#0"}, "south": {"uv": [0, 11.25, 4, 12], "texture": "#texture"},
"west": {"uv": [0, 11.25, 4, 12], "texture": "#0"}, "west": {"uv": [0, 11.25, 4, 12], "texture": "#texture"},
"up": {"uv": [0, 7.25, 4, 11.25], "texture": "#0"}, "up": {"uv": [0, 7.25, 4, 11.25], "texture": "#texture"},
"down": {"uv": [0, 12, 4, 16], "texture": "#0"} "down": {"uv": [0, 12, 4, 16], "texture": "#texture"}
} }
}, },
{ {
"from": [8, 3, 0], "from": [8, 3, 0],
"to": [16, 16, 16], "to": [16, 16, 16],
"faces": { "faces": {
"north": {"uv": [4, 7.25, 6, 10.5], "texture": "#0"}, "north": {"uv": [4, 7.25, 6, 10.5], "texture": "#texture"},
"east": {"uv": [4, 10.5, 8, 13.75], "texture": "#0"}, "east": {"uv": [4, 10.5, 8, 13.75], "texture": "#texture"},
"south": {"uv": [6, 7.25, 8, 10.5], "texture": "#0"}, "south": {"uv": [6, 7.25, 8, 10.5], "texture": "#texture"},
"west": {"uv": [8, 10.5, 12, 13.75], "texture": "#0"}, "west": {"uv": [8, 10.5, 12, 13.75], "texture": "#texture"},
"up": {"uv": [4, 13.75, 8, 15.25], "rotation": 90, "texture": "#0"}, "up": {"uv": [4, 13.75, 8, 15.25], "rotation": 90, "texture": "#texture"},
"down": {"uv": [0, 7.25, 2, 11.25], "texture": "#0"} "down": {"uv": [0, 7.25, 2, 11.25], "texture": "#texture"}
} }
}, },
{ {
"from": [1, 3, 1], "from": [1, 3, 1],
"to": [7, 14, 7], "to": [7, 14, 7],
"faces": { "faces": {
"north": {"uv": [0, 4.5, 1.5, 7.25], "texture": "#0"}, "north": {"uv": [0, 4.5, 1.5, 7.25], "texture": "#texture"},
"east": {"uv": [0, 4.5, 1.5, 7.25], "texture": "#0"}, "east": {"uv": [0, 4.5, 1.5, 7.25], "texture": "#texture"},
"south": {"uv": [0, 4.5, 1.5, 7.25], "texture": "#0"}, "south": {"uv": [0, 4.5, 1.5, 7.25], "texture": "#texture"},
"west": {"uv": [0, 4.5, 1.5, 7.25], "texture": "#0"}, "west": {"uv": [0, 4.5, 1.5, 7.25], "texture": "#texture"},
"up": {"uv": [0, 3, 1.5, 4.5], "texture": "#0"}, "up": {"uv": [0, 3, 1.5, 4.5], "texture": "#texture"},
"down": {"uv": [0, 3, 1.5, 4.5], "texture": "#0"} "down": {"uv": [0, 3, 1.5, 4.5], "texture": "#texture"}
} }
}, },
{ {
"from": [1, 3, 9], "from": [1, 3, 9],
"to": [7, 14, 15], "to": [7, 14, 15],
"faces": { "faces": {
"north": {"uv": [0, 4.5, 1.5, 7.25], "texture": "#0"}, "north": {"uv": [0, 4.5, 1.5, 7.25], "texture": "#texture"},
"east": {"uv": [0, 4.5, 1.5, 7.25], "texture": "#0"}, "east": {"uv": [0, 4.5, 1.5, 7.25], "texture": "#texture"},
"south": {"uv": [0, 4.5, 1.5, 7.25], "texture": "#0"}, "south": {"uv": [0, 4.5, 1.5, 7.25], "texture": "#texture"},
"west": {"uv": [0, 4.5, 1.5, 7.25], "texture": "#0"}, "west": {"uv": [0, 4.5, 1.5, 7.25], "texture": "#texture"},
"up": {"uv": [0, 3, 1.5, 4.5], "texture": "#0"}, "up": {"uv": [0, 3, 1.5, 4.5], "texture": "#texture"},
"down": {"uv": [0, 3, 1.5, 4.5], "texture": "#0"} "down": {"uv": [0, 3, 1.5, 4.5], "texture": "#texture"}
} }
}, },
{ {
"from": [3, 13, 11], "from": [3, 13, 11],
"to": [8, 15, 13], "to": [8, 15, 13],
"faces": { "faces": {
"north": {"uv": [1.75, 6, 2.25, 7.25], "rotation": 270, "texture": "#0"}, "north": {"uv": [1.75, 6, 2.25, 7.25], "rotation": 270, "texture": "#texture"},
"east": {"uv": [0.5, 3.5, 1, 3.75], "texture": "#0"}, "east": {"uv": [0.5, 3.5, 1, 3.75], "texture": "#texture"},
"south": {"uv": [1.75, 6, 2.25, 7.25], "rotation": 90, "texture": "#0"}, "south": {"uv": [1.75, 6, 2.25, 7.25], "rotation": 90, "texture": "#texture"},
"west": {"uv": [1.75, 6.75, 2.25, 7.25], "rotation": 90, "texture": "#0"}, "west": {"uv": [1.75, 6.75, 2.25, 7.25], "rotation": 90, "texture": "#texture"},
"up": {"uv": [2.25, 6, 2.75, 7.25], "rotation": 90, "texture": "#0"}, "up": {"uv": [2.25, 6, 2.75, 7.25], "rotation": 90, "texture": "#texture"},
"down": {"uv": [1.5, 5.25, 1.75, 7.25], "texture": "#0"} "down": {"uv": [1.5, 5.25, 1.75, 7.25], "texture": "#texture"}
} }
}, },
{ {
"from": [3, 13, 3], "from": [3, 13, 3],
"to": [8, 15, 5], "to": [8, 15, 5],
"faces": { "faces": {
"north": {"uv": [1.75, 6, 2.25, 7.25], "rotation": 270, "texture": "#0"}, "north": {"uv": [1.75, 6, 2.25, 7.25], "rotation": 270, "texture": "#texture"},
"east": {"uv": [0.5, 3.5, 1, 3.75], "texture": "#0"}, "east": {"uv": [0.5, 3.5, 1, 3.75], "texture": "#texture"},
"south": {"uv": [1.75, 6, 2.25, 7.25], "rotation": 90, "texture": "#0"}, "south": {"uv": [1.75, 6, 2.25, 7.25], "rotation": 90, "texture": "#texture"},
"west": {"uv": [1.75, 6.75, 2.25, 7.25], "rotation": 90, "texture": "#0"}, "west": {"uv": [1.75, 6.75, 2.25, 7.25], "rotation": 90, "texture": "#texture"},
"up": {"uv": [2.25, 6, 2.75, 7.25], "rotation": 90, "texture": "#0"}, "up": {"uv": [2.25, 6, 2.75, 7.25], "rotation": 90, "texture": "#texture"},
"down": {"uv": [1.5, 5.25, 1.75, 7.25], "texture": "#0"} "down": {"uv": [1.5, 5.25, 1.75, 7.25], "texture": "#texture"}
} }
} }
] ]