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

This commit is contained in:
DBotThePony 2022-09-29 22:23:47 +07:00
commit 77aed4871f
Signed by: DBot
GPG Key ID: DCC23B5715498507
3 changed files with 176 additions and 0 deletions

View File

@ -0,0 +1,176 @@
{
"textures": {
"0": "overdrive_that_matters:block/phantom_attractor",
"particle": "overdrive_that_matters:block/phantom_attractor"
},
"elements": [
{
"from": [0, 0, 0],
"to": [16, 5, 16],
"faces": {
"north": {"uv": [8, 0, 16, 2.5], "texture": "#0"},
"east": {"uv": [8, 0, 16, 2.5], "texture": "#0"},
"south": {"uv": [8, 0, 16, 2.5], "texture": "#0"},
"west": {"uv": [8, 0, 16, 2.5], "texture": "#0"},
"up": {"uv": [0, 0, 8, 8], "texture": "#0"},
"down": {"uv": [0, 0, 8, 8], "texture": "#0"}
}
},
{
"from": [1, 5, 1],
"to": [15, 6, 15],
"faces": {
"north": {"uv": [8.5, 2.5, 15.5, 3], "texture": "#0"},
"east": {"uv": [8.5, 2.5, 15.5, 3], "texture": "#0"},
"south": {"uv": [8.5, 2.5, 15.5, 3], "texture": "#0"},
"west": {"uv": [8.5, 2.5, 15.5, 3], "texture": "#0"},
"up": {"uv": [0, 0, 7, 7], "texture": "#missing"},
"down": {"uv": [0, 0, 7, 7], "texture": "#missing"}
}
},
{
"from": [0, 6, 0],
"to": [16, 9, 16],
"faces": {
"north": {"uv": [8, 3, 16, 4.5], "texture": "#0"},
"east": {"uv": [8, 3, 16, 4.5], "texture": "#0"},
"south": {"uv": [8, 3, 16, 4.5], "texture": "#0"},
"west": {"uv": [8, 3, 16, 4.5], "texture": "#0"},
"up": {"uv": [0, 0, 8, 8], "texture": "#0"},
"down": {"uv": [0, 0, 8, 8], "texture": "#0"}
}
},
{
"from": [6, 10, 6],
"to": [10, 28, 10],
"faces": {
"north": {"uv": [7, 14, 16, 16], "rotation": 90, "texture": "#0"},
"east": {"uv": [7, 14, 16, 16], "rotation": 90, "texture": "#0"},
"south": {"uv": [7, 14, 16, 16], "rotation": 90, "texture": "#0"},
"west": {"uv": [7, 14, 16, 16], "rotation": 90, "texture": "#0"},
"up": {"uv": [14, 12, 16, 14], "texture": "#0"},
"down": {"uv": [0, 0, 2, 2], "texture": "#missing"}
}
},
{
"from": [10, 21, 7],
"to": [14, 27, 9],
"faces": {
"north": {"uv": [8, 4.5, 10, 7.5], "texture": "#0"},
"east": {"uv": [0, 0, 1, 3], "texture": "#missing"},
"south": {"uv": [8, 4.5, 10, 7.5], "texture": "#0"},
"west": {"uv": [0, 0, 1, 3], "texture": "#missing"},
"up": {"uv": [8, 7.5, 10, 8.5], "texture": "#0"},
"down": {"uv": [8, 7.5, 10, 8.5], "texture": "#0"}
}
},
{
"from": [2, 21, 7],
"to": [6, 27, 9],
"faces": {
"north": {"uv": [8, 4.5, 10, 7.5], "texture": "#0"},
"east": {"uv": [0, 0, 1, 3], "texture": "#missing"},
"south": {"uv": [8, 4.5, 10, 7.5], "texture": "#0"},
"west": {"uv": [0, 0, 1, 3], "texture": "#missing"},
"up": {"uv": [8, 7.5, 10, 8.5], "texture": "#0"},
"down": {"uv": [8, 7.5, 10, 8.5], "texture": "#0"}
}
},
{
"from": [7, 21, 10],
"to": [9, 27, 14],
"faces": {
"north": {"uv": [0, 0, 1, 3], "texture": "#missing"},
"east": {"uv": [8, 4.5, 10, 7.5], "texture": "#0"},
"south": {"uv": [0, 0, 1, 3], "texture": "#missing"},
"west": {"uv": [8, 4.5, 10, 7.5], "texture": "#0"},
"up": {"uv": [8, 7.5, 10, 8.5], "rotation": 90, "texture": "#0"},
"down": {"uv": [8, 7.5, 10, 8.5], "rotation": 90, "texture": "#0"}
}
},
{
"from": [7, 21, 2],
"to": [9, 27, 6],
"faces": {
"north": {"uv": [0, 0, 1, 3], "texture": "#missing"},
"east": {"uv": [8, 4.5, 10, 7.5], "texture": "#0"},
"south": {"uv": [0, 0, 1, 3], "texture": "#missing"},
"west": {"uv": [8, 4.5, 10, 7.5], "texture": "#0"},
"up": {"uv": [8, 7.5, 10, 8.5], "rotation": 90, "texture": "#0"},
"down": {"uv": [8, 7.5, 10, 8.5], "rotation": 90, "texture": "#0"}
}
},
{
"from": [5, 20, 14],
"to": [11, 32, 16],
"faces": {
"north": {"uv": [13, 4.5, 16, 10.5], "texture": "#0"},
"east": {"uv": [12, 4.5, 13, 10.5], "texture": "#0"},
"south": {"uv": [13, 4.5, 16, 10.5], "texture": "#0"},
"west": {"uv": [12, 4.5, 13, 10.5], "texture": "#0"},
"up": {"uv": [13, 10.5, 16, 11.5], "texture": "#0"},
"down": {"uv": [13, 10.5, 16, 11.5], "texture": "#0"}
}
},
{
"from": [5, 20, 0],
"to": [11, 32, 2],
"faces": {
"north": {"uv": [13, 4.5, 16, 10.5], "texture": "#0"},
"east": {"uv": [12, 4.5, 13, 10.5], "texture": "#0"},
"south": {"uv": [13, 4.5, 16, 10.5], "texture": "#0"},
"west": {"uv": [12, 4.5, 13, 10.5], "texture": "#0"},
"up": {"uv": [13, 10.5, 16, 11.5], "texture": "#0"},
"down": {"uv": [13, 10.5, 16, 11.5], "texture": "#0"}
}
},
{
"from": [14, 20, 5],
"to": [16, 32, 11],
"faces": {
"north": {"uv": [12, 4.5, 13, 10.5], "texture": "#0"},
"east": {"uv": [13, 4.5, 16, 10.5], "texture": "#0"},
"south": {"uv": [12, 4.5, 13, 10.5], "texture": "#0"},
"west": {"uv": [13, 4.5, 16, 10.5], "texture": "#0"},
"up": {"uv": [13, 10.5, 16, 11.5], "rotation": 90, "texture": "#0"},
"down": {"uv": [13, 10.5, 16, 11.5], "rotation": 90, "texture": "#0"}
}
},
{
"from": [0, 20, 5],
"to": [2, 32, 11],
"faces": {
"north": {"uv": [12, 4.5, 13, 10.5], "texture": "#0"},
"east": {"uv": [13, 4.5, 16, 10.5], "texture": "#0"},
"south": {"uv": [12, 4.5, 13, 10.5], "texture": "#0"},
"west": {"uv": [13, 4.5, 16, 10.5], "texture": "#0"},
"up": {"uv": [13, 10.5, 16, 11.5], "rotation": 90, "texture": "#0"},
"down": {"uv": [13, 10.5, 16, 11.5], "rotation": 90, "texture": "#0"}
}
},
{
"from": [1, 9, 1],
"to": [15, 11, 15],
"faces": {
"north": {"uv": [0, 15, 7, 16], "texture": "#0"},
"east": {"uv": [0, 15, 7, 16], "texture": "#0"},
"south": {"uv": [0, 15, 7, 16], "texture": "#0"},
"west": {"uv": [0, 15, 7, 16], "texture": "#0"},
"up": {"uv": [0, 8, 7, 15], "texture": "#0"},
"down": {"uv": [0, 0, 7, 7], "texture": "#missing"}
}
},
{
"from": [5, 12, 5],
"to": [11, 15, 11],
"faces": {
"north": {"uv": [7, 9.5, 10, 11], "texture": "#0"},
"east": {"uv": [7, 9.5, 10, 11], "texture": "#0"},
"south": {"uv": [7, 9.5, 10, 11], "texture": "#0"},
"west": {"uv": [7, 9.5, 10, 11], "texture": "#0"},
"up": {"uv": [7, 11, 10, 14], "texture": "#0"},
"down": {"uv": [7, 11, 10, 14], "texture": "#0"}
}
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 369 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB