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

This commit is contained in:
DBotThePony 2021-09-01 16:26:22 +07:00
commit 288336ae18
Signed by: DBot
GPG Key ID: DCC23B5715498507
3 changed files with 207 additions and 1 deletions

View File

@ -0,0 +1,206 @@
{
"parent": "block/block",
"textures": {
"particle": "overdrive_that_matters:block/drive_viewer",
"texture": "overdrive_that_matters:block/drive_viewer"
},
"elements": [
{
"name": "body",
"from": [0, 0, 0],
"to": [16, 8, 16],
"faces": {
"north": {"uv": [0, 12, 4, 16], "texture": "#texture"},
"east": {"uv": [12, 8, 16, 12], "texture": "#texture"},
"south": {"uv": [4, 12, 8, 16], "texture": "#texture"},
"west": {"uv": [12, 8, 16, 12], "texture": "#texture"},
"up": {"uv": [12, 0, 16, 8], "texture": "#texture"},
"down": {"uv": [8, 0, 12, 8], "texture": "#texture"}
}
},
{
"name": "screen",
"from": [6, 12.2, -0.7],
"to": [10, 16.2, 0.3],
"rotation": {"angle": 22.5, "axis": "x", "origin": [3, 14.5, 0.5]},
"faces": {
"north": {"uv": [7, 0, 8, 2], "texture": "#texture"},
"east": {"uv": [7, 2, 8, 2.5], "rotation": 90, "texture": "#texture"},
"south": {"uv": [7, 2.5, 8, 4.5], "texture": "#texture"},
"west": {"uv": [7, 2, 8, 2.5], "rotation": 90, "texture": "#texture"},
"up": {"uv": [7, 2, 8, 2.5], "texture": "#texture"},
"down": {"uv": [7, 2, 8, 2.5], "texture": "#texture"}
}
},
{
"name": "container",
"from": [2, 8, 2],
"to": [14, 14, 14],
"faces": {
"north": {"uv": [0, 6, 3, 9], "texture": "#texture"},
"east": {"uv": [0, 6, 3, 9], "texture": "#texture"},
"south": {"uv": [0, 6, 3, 9], "texture": "#texture"},
"west": {"uv": [0, 6, 3, 9], "texture": "#texture"},
"up": {"uv": [0, 0, 3, 6], "texture": "#texture"},
"down": {"uv": [0, 0, 12, 12], "texture": "#missing"}
}
},
{
"name": "weirdpanel",
"from": [4, 8, 13],
"to": [12, 15, 15],
"faces": {
"north": {"uv": [9, 10, 11, 13.5], "texture": "#texture"},
"east": {"uv": [8.5, 10, 9, 13.5], "texture": "#texture"},
"south": {"uv": [9, 10, 11, 13.5], "texture": "#texture"},
"west": {"uv": [8.5, 10, 9, 13.5], "texture": "#texture"},
"up": {"uv": [9, 9, 11, 10], "texture": "#texture"},
"down": {"uv": [0, 0, 2, 1], "texture": "#missing"}
}
},
{
"name": "pipe",
"from": [14, 8, 6],
"to": [15, 13, 8],
"faces": {
"north": {"uv": [11, 9, 11.25, 11.5], "texture": "#texture"},
"east": {"uv": [11, 9, 11.5, 11.5], "texture": "#texture"},
"south": {"uv": [11, 9, 11.25, 11.5], "texture": "#texture"},
"west": {"uv": [0, 0, 0.5, 2.5], "texture": "#missing"},
"up": {"uv": [11, 9, 11.5, 9.5], "rotation": 90, "texture": "#texture"},
"down": {"uv": [0, 0, 0.25, 1], "texture": "#missing"}
}
},
{
"name": "pipe",
"from": [14, 8, 9],
"to": [15, 13, 11],
"faces": {
"north": {"uv": [11, 9, 11.25, 11.5], "texture": "#texture"},
"east": {"uv": [11, 9, 11.5, 11.5], "texture": "#texture"},
"south": {"uv": [11, 9, 11.25, 11.5], "texture": "#texture"},
"west": {"uv": [0, 0, 0.5, 2.5], "texture": "#missing"},
"up": {"uv": [11, 9, 11.5, 9.5], "rotation": 90, "texture": "#texture"},
"down": {"uv": [0, 0, 0.25, 1], "texture": "#missing"}
}
},
{
"name": "frame",
"from": [0, 8, 0],
"to": [1, 16, 1],
"faces": {
"north": {"uv": [11.75, 8, 12, 12], "texture": "#texture"},
"east": {"uv": [11.75, 8, 12, 12], "texture": "#texture"},
"south": {"uv": [11.75, 8, 12, 12], "texture": "#texture"},
"west": {"uv": [11.75, 8, 12, 12], "texture": "#texture"},
"up": {"uv": [11.5, 8, 11.75, 8.5], "texture": "#texture"},
"down": {"uv": [0, 0, 0.25, 0.5], "texture": "#missing"}
}
},
{
"name": "frame",
"from": [15, 8, 0],
"to": [16, 16, 1],
"faces": {
"north": {"uv": [11.75, 8, 12, 12], "texture": "#texture"},
"east": {"uv": [11.75, 8, 12, 12], "texture": "#texture"},
"south": {"uv": [11.75, 8, 12, 12], "texture": "#texture"},
"west": {"uv": [11.75, 8, 12, 12], "texture": "#texture"},
"up": {"uv": [11.5, 8, 11.75, 8.5], "texture": "#texture"},
"down": {"uv": [0, 0, 0.25, 0.5], "texture": "#missing"}
}
},
{
"name": "screenholder",
"from": [5, 8, 0],
"to": [11, 15, 3],
"rotation": {"angle": 0, "axis": "y", "origin": [-5, 0, 0]},
"faces": {
"north": {"uv": [6.5, 8, 8, 11.5], "texture": "#texture"},
"east": {"uv": [5.75, 8, 6.5, 11], "texture": "#texture"},
"south": {"uv": [6.5, 8, 8, 11.5], "texture": "#texture"},
"west": {"uv": [5.75, 8, 6.5, 11.5], "texture": "#texture"},
"up": {"uv": [6.5, 6.5, 8, 8], "rotation": 180, "texture": "#texture"},
"down": {"uv": [0, 0, 1.5, 1.5], "texture": "#missing"}
}
},
{
"name": "frame",
"from": [15, 8, 15],
"to": [16, 16, 16],
"faces": {
"north": {"uv": [11.75, 8, 12, 12], "texture": "#texture"},
"east": {"uv": [11.75, 8, 12, 12], "texture": "#texture"},
"south": {"uv": [11.75, 8, 12, 12], "texture": "#texture"},
"west": {"uv": [11.75, 8, 12, 12], "texture": "#texture"},
"up": {"uv": [11.5, 8, 11.75, 8.5], "texture": "#texture"},
"down": {"uv": [0, 0, 0.25, 0.5], "texture": "#missing"}
}
},
{
"name": "frame",
"from": [1, 14, 1],
"to": [1, 15, 15],
"faces": {
"north": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
"east": {"uv": [8, 8, 11.5, 8.5], "texture": "#texture"},
"south": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
"west": {"uv": [8, 8, 11.5, 8.5], "texture": "#texture"},
"up": {"uv": [0, 0, 0, 7], "texture": "#missing"},
"down": {"uv": [0, 0, 0, 7], "texture": "#missing"}
}
},
{
"name": "frame",
"from": [1, 9, 1],
"to": [1, 10, 15],
"faces": {
"north": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
"east": {"uv": [8, 8, 11.5, 8.5], "texture": "#texture"},
"south": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
"west": {"uv": [8, 8, 11.5, 8.5], "texture": "#texture"},
"up": {"uv": [0, 0, 0, 7], "texture": "#missing"},
"down": {"uv": [0, 0, 0, 7], "texture": "#missing"}
}
},
{
"name": "frame",
"from": [15, 9, 1],
"to": [15, 10, 15],
"faces": {
"north": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
"east": {"uv": [8, 8, 11.5, 8.5], "texture": "#texture"},
"south": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
"west": {"uv": [8, 8, 11.5, 8.5], "texture": "#texture"},
"up": {"uv": [0, 0, 0, 7], "texture": "#missing"},
"down": {"uv": [0, 0, 0, 7], "texture": "#missing"}
}
},
{
"name": "frame",
"from": [15, 14, 1],
"to": [15, 15, 15],
"faces": {
"north": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
"east": {"uv": [8, 8, 11.5, 8.5], "texture": "#texture"},
"south": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
"west": {"uv": [8, 8, 11.5, 8.5], "texture": "#texture"},
"up": {"uv": [0, 0, 0, 7], "texture": "#missing"},
"down": {"uv": [0, 0, 0, 7], "texture": "#missing"}
}
},
{
"name": "frame",
"from": [0, 8, 15],
"to": [1, 16, 16],
"faces": {
"north": {"uv": [11.75, 8, 12, 12], "texture": "#texture"},
"east": {"uv": [11.75, 8, 12, 12], "texture": "#texture"},
"south": {"uv": [11.75, 8, 12, 12], "texture": "#texture"},
"west": {"uv": [11.75, 8, 12, 12], "texture": "#texture"},
"up": {"uv": [11.5, 8, 11.75, 8.5], "texture": "#texture"},
"down": {"uv": [0, 0, 0.25, 0.5], "texture": "#missing"}
}
}
]
}

View File

@ -1,3 +1,3 @@
{
"parent": "overdrive_that_matters:block/drive_viewer"
"parent": "overdrive_that_matters:block/drive_viewer_idle"
}