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

This commit is contained in:
DBotThePony 2023-01-31 00:16:00 +07:00
commit b8b83bde32
Signed by: DBot
GPG Key ID: DCC23B5715498507
2 changed files with 50 additions and 49 deletions

View File

@ -1,6 +1,7 @@
{
"credit": "Made with Blockbench",
"parent": "block/cube_all",
"render_type": "translucent",
"render_type": "translucent",
"textures": {
"0": "overdrive_that_matters:block/holo_sign",
"particle": "overdrive_that_matters:block/holo_sign"
@ -73,80 +74,80 @@
},
{
"name": "light",
"from": [1, 14, 10],
"to": [2, 15, 10],
"from": [14, 14, 9.99],
"to": [15, 15, 9.99],
"faces": {
"north": {"uv": [2, 12.5, 2.5, 13], "texture": "#0", "forge_data": {"block_light": 15}},
"east": {"uv": [0, 0, 0, 0.5], "texture": "#0", "forge_data": {"block_light": 15}},
"south": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"},
"west": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
"up": {"uv": [0, 0, 0.5, 0], "texture": "#missing"},
"down": {"uv": [0, 0, 0.5, 0], "texture": "#missing"}
"north": {"uv": [8.5, 8.5, 9, 9], "texture": "#0", "forge_data": {"block_light": 15}},
"east": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"south": {"uv": [0, 0, 16, 16], "texture": "#missing"},
"west": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"up": {"uv": [0, 0, 16, 0], "texture": "#missing"},
"down": {"uv": [0, 0, 16, 0], "texture": "#missing"}
}
},
{
"name": "light",
"from": [1, 1, 10],
"to": [2, 2, 10],
"from": [1, 14, 9.99],
"to": [2, 15, 9.99],
"faces": {
"north": {"uv": [2, 12.5, 2.5, 13], "texture": "#0", "forge_data": {"block_light": 15}},
"east": {"uv": [0, 0, 0, 0.5], "texture": "#0", "forge_data": {"block_light": 15}},
"south": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"},
"west": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
"up": {"uv": [0, 0, 0.5, 0], "texture": "#missing"},
"down": {"uv": [0, 0, 0.5, 0], "texture": "#missing"}
"north": {"uv": [15, 8.5, 15.5, 9], "texture": "#0", "forge_data": {"block_light": 15}},
"east": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"south": {"uv": [0, 0, 16, 16], "texture": "#missing"},
"west": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"up": {"uv": [0, 0, 16, 0], "texture": "#missing"},
"down": {"uv": [0, 0, 16, 0], "texture": "#missing"}
}
},
{
"name": "light",
"from": [14, 1, 10],
"to": [15, 2, 10],
"from": [1, 1, 9.99],
"to": [2, 2, 9.99],
"faces": {
"north": {"uv": [2, 12.5, 2.5, 13], "texture": "#0", "forge_data": {"block_light": 15}},
"east": {"uv": [0, 0, 0, 0.5], "texture": "#0", "forge_data": {"block_light": 15}},
"south": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"},
"west": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
"up": {"uv": [0, 0, 0.5, 0], "texture": "#missing"},
"down": {"uv": [0, 0, 0.5, 0], "texture": "#missing"}
"north": {"uv": [15, 15, 15.5, 15.5], "texture": "#0", "forge_data": {"block_light": 15}},
"east": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"south": {"uv": [0, 0, 16, 16], "texture": "#missing"},
"west": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"up": {"uv": [0, 0, 16, 0], "texture": "#missing"},
"down": {"uv": [0, 0, 16, 0], "texture": "#missing"}
}
},
{
"name": "light",
"from": [14, 14, 10],
"to": [15, 15, 10],
"from": [14, 1, 9.99],
"to": [15, 2, 9.99],
"faces": {
"north": {"uv": [2, 12.5, 2.5, 13], "texture": "#0", "forge_data": {"block_light": 15}},
"east": {"uv": [0, 0, 0, 0.5], "texture": "#0", "forge_data": {"block_light": 15}},
"south": {"uv": [0, 0, 0.5, 0.5], "texture": "#missing"},
"west": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
"up": {"uv": [0, 0, 0.5, 0], "texture": "#missing"},
"down": {"uv": [0, 0, 0.5, 0], "texture": "#missing"}
"north": {"uv": [8.5, 15, 9, 15.5], "texture": "#0", "forge_data": {"block_light": 15}},
"east": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"south": {"uv": [0, 0, 16, 16], "texture": "#missing"},
"west": {"uv": [0, 0, 0, 16], "texture": "#missing"},
"up": {"uv": [0, 0, 16, 0], "texture": "#missing"},
"down": {"uv": [0, 0, 16, 0], "texture": "#missing"}
}
},
{
"name": "light",
"from": [14, 6, 9],
"to": [14, 10, 10],
"from": [2.01, 6, 9],
"to": [2.01, 10, 10],
"faces": {
"north": {"uv": [0, 0, 0, 2], "texture": "#missing"},
"east": {"uv": [0, 0, 0.5, 2], "texture": "#missing"},
"south": {"uv": [0, 0, 0, 2], "texture": "#missing"},
"west": {"uv": [2, 13, 2.5, 15], "texture": "#0", "forge_data": {"block_light": 15}},
"up": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
"down": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}
"north": {"uv": [0, 0, 0, 4], "texture": "#missing"},
"east": {"uv": [1.5, 13, 2, 15], "texture": "#0", "forge_data": {"block_light": 15}},
"south": {"uv": [0, 0, 0, 4], "texture": "#missing"},
"west": {"uv": [0, 0, 1, 4], "texture": "#missing"},
"up": {"uv": [0, 0, 0, 1], "texture": "#missing"},
"down": {"uv": [0, 0, 0, 1], "texture": "#missing"}
}
},
{
"name": "light",
"from": [2, 6, 9],
"to": [2, 10, 10],
"from": [13.99, 6, 9],
"to": [13.99, 10, 10],
"faces": {
"north": {"uv": [0, 0, 0, 2], "texture": "#missing"},
"east": {"uv": [2, 13, 2.5, 15], "texture": "#0", "forge_data": {"block_light": 15}},
"south": {"uv": [0, 0, 0, 2], "texture": "#missing"},
"west": {"uv": [2, 13, 2.5, 15], "texture": "#0", "forge_data": {"block_light": 15}},
"up": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
"down": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}
"north": {"uv": [0, 0, 0, 4], "texture": "#missing"},
"east": {"uv": [0, 0, 1, 4], "texture": "#missing"},
"south": {"uv": [0, 0, 0, 4], "texture": "#missing"},
"west": {"uv": [1.5, 13, 2, 15], "texture": "#0", "forge_data": {"block_light": 15}},
"up": {"uv": [0, 0, 0, 1], "texture": "#missing"},
"down": {"uv": [0, 0, 0, 1], "texture": "#missing"}
}
}
],

Binary file not shown.

Before

Width:  |  Height:  |  Size: 418 B

After

Width:  |  Height:  |  Size: 424 B