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

This commit is contained in:
DBotThePony 2022-05-16 16:10:06 +07:00
commit bfb6767d1c
Signed by: DBot
GPG Key ID: DCC23B5715498507
3 changed files with 3 additions and 36 deletions

View File

@ -1,4 +1,5 @@
{
"credit": "Made with Blockbench",
"textures": {
"0": "overdrive_that_matters:block/storage_bus",
"particle": "overdrive_that_matters:block/storage_bus"
@ -28,18 +29,6 @@
"down": {"uv": [6, 8, 10, 11], "texture": "#0"}
}
},
{
"from": [5, 5, 4],
"to": [11, 11, 8],
"faces": {
"north": {"uv": [0, 0, 3, 6], "texture": "#missing"},
"east": {"uv": [10, 6, 13, 10], "rotation": 270, "texture": "#0"},
"south": {"uv": [10, 0, 13, 6], "texture": "#0"},
"west": {"uv": [10, 6, 13, 10], "rotation": 90, "texture": "#0"},
"up": {"uv": [10, 6, 13, 10], "rotation": 180, "texture": "#0"},
"down": {"uv": [10, 6, 13, 10], "texture": "#0"}
}
},
{
"from": [7, 11, 2],
"to": [9, 13, 6],

View File

@ -1,4 +1,5 @@
{
"credit": "Made with Blockbench",
"textures": {
"2": "overdrive_that_matters:block/storage_exporter",
"particle": "overdrive_that_matters:block/storage_exporter"
@ -28,18 +29,6 @@
"down": {"uv": [6, 8, 10, 11], "texture": "#2"}
}
},
{
"from": [5, 5, 4],
"to": [11, 11, 8],
"faces": {
"north": {"uv": [0, 0, 3, 6], "texture": "#2"},
"east": {"uv": [10, 6, 13, 10], "rotation": 270, "texture": "#2"},
"south": {"uv": [10, 0, 13, 6], "texture": "#2"},
"west": {"uv": [10, 6, 13, 10], "rotation": 90, "texture": "#2"},
"up": {"uv": [10, 6, 13, 10], "rotation": 180, "texture": "#2"},
"down": {"uv": [10, 6, 13, 10], "texture": "#2"}
}
},
{
"from": [7, 12, 3],
"to": [9, 14, 7],

View File

@ -1,4 +1,5 @@
{
"credit": "Made with Blockbench",
"textures": {
"1": "overdrive_that_matters:block/storage_importer",
"particle": "overdrive_that_matters:block/storage_importer"
@ -28,18 +29,6 @@
"down": {"uv": [6, 8, 10, 11], "texture": "#1"}
}
},
{
"from": [5, 5, 4],
"to": [11, 11, 8],
"faces": {
"north": {"uv": [0, 0, 3, 6], "texture": "#1"},
"east": {"uv": [10, 6, 13, 10], "rotation": 270, "texture": "#1"},
"south": {"uv": [10, 0, 13, 6], "texture": "#1"},
"west": {"uv": [10, 6, 13, 10], "rotation": 90, "texture": "#1"},
"up": {"uv": [10, 6, 13, 10], "rotation": 180, "texture": "#1"},
"down": {"uv": [10, 6, 13, 10], "texture": "#1"}
}
},
{
"from": [7, 11, 2],
"to": [9, 13, 6],