Merge remote-tracking branch 'origin/master' into master
@ -0,0 +1,100 @@
|
||||
{
|
||||
"parent": "block/block",
|
||||
"textures": {
|
||||
"texture": "overdrive_that_matters:block/cargo_crate",
|
||||
"particle": "overdrive_that_matters:block/cargo_crate"
|
||||
},
|
||||
"elements": [
|
||||
{
|
||||
"name": "box",
|
||||
"from": [0, 0, 0],
|
||||
"to": [16, 13, 16],
|
||||
"faces": {
|
||||
"north": {"uv": [0, 4.75, 8, 8], "texture": "#texture"},
|
||||
"east": {"uv": [0, 4.75, 8, 8], "texture": "#texture"},
|
||||
"south": {"uv": [0, 4.75, 8, 8], "texture": "#texture"},
|
||||
"west": {"uv": [0, 4.75, 8, 8], "texture": "#texture"},
|
||||
"up": {"uv": [0, 0, 8, 4], "texture": "#texture"},
|
||||
"down": {"uv": [0, 8, 8, 12], "texture": "#texture"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "inside",
|
||||
"from": [2, 13, 2],
|
||||
"to": [14, 15, 14],
|
||||
"faces": {
|
||||
"north": {"uv": [9, 0, 15, 0.5], "texture": "#texture"},
|
||||
"east": {"uv": [9, 0, 15, 0.5], "texture": "#texture"},
|
||||
"south": {"uv": [9, 0, 15, 0.5], "texture": "#texture"},
|
||||
"west": {"uv": [9, 0, 15, 0.5], "texture": "#texture"},
|
||||
"up": {"uv": [0, 0, 6, 3], "texture": "#missing"},
|
||||
"down": {"uv": [0, 0, 6, 3], "texture": "#missing"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "lid",
|
||||
"from": [0, 13, 0],
|
||||
"to": [16, 16, 16],
|
||||
"faces": {
|
||||
"north": {"uv": [0, 4, 8, 4.75], "texture": "#texture"},
|
||||
"east": {"uv": [0, 4, 8, 4.75], "texture": "#texture"},
|
||||
"south": {"uv": [0, 4, 8, 4.75], "texture": "#texture"},
|
||||
"west": {"uv": [0, 4, 8, 4.75], "texture": "#texture"},
|
||||
"up": {"uv": [0, 0, 8, 4], "texture": "#texture"},
|
||||
"down": {"uv": [0, 0, 8, 4], "texture": "#texture"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [0, 13, 7],
|
||||
"to": [0, 15, 9],
|
||||
"rotation": {"angle": 0, "axis": "y", "origin": [0, 14, 8]},
|
||||
"faces": {
|
||||
"north": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
|
||||
"east": {"uv": [3.5, 4.25, 4.5, 4.75], "texture": "#texture"},
|
||||
"south": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
|
||||
"west": {"uv": [3.5, 4.75, 4.5, 5.25], "texture": "#texture"},
|
||||
"up": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
|
||||
"down": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [16, 13, 7],
|
||||
"to": [16, 15, 9],
|
||||
"rotation": {"angle": 0, "axis": "y", "origin": [0, 14, 8]},
|
||||
"faces": {
|
||||
"north": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
|
||||
"east": {"uv": [3.5, 4.25, 4.5, 4.75], "texture": "#texture"},
|
||||
"south": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
|
||||
"west": {"uv": [3.5, 4.75, 4.5, 5.25], "texture": "#texture"},
|
||||
"up": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
|
||||
"down": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [7, 13, 16],
|
||||
"to": [9, 15, 16],
|
||||
"rotation": {"angle": 0, "axis": "y", "origin": [8, 14, 16]},
|
||||
"faces": {
|
||||
"north": {"uv": [3.5, 4.75, 4.5, 5.25], "texture": "#texture"},
|
||||
"east": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
|
||||
"south": {"uv": [3.5, 4.25, 4.5, 4.75], "texture": "#texture"},
|
||||
"west": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
|
||||
"up": {"uv": [0, 0, 0, 0.5], "rotation": 90, "texture": "#missing"},
|
||||
"down": {"uv": [0, 0, 0, 0.5], "rotation": 270, "texture": "#missing"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [7, 13, 0],
|
||||
"to": [9, 15, 0],
|
||||
"rotation": {"angle": 0, "axis": "y", "origin": [8, 14, 16]},
|
||||
"faces": {
|
||||
"north": {"uv": [3.5, 4.75, 4.5, 5.25], "texture": "#texture"},
|
||||
"east": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
|
||||
"south": {"uv": [3.5, 4.25, 4.5, 4.75], "texture": "#texture"},
|
||||
"west": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
|
||||
"up": {"uv": [0, 0, 0, 0.5], "rotation": 90, "texture": "#missing"},
|
||||
"down": {"uv": [0, 0, 0, 0.5], "rotation": 270, "texture": "#missing"}
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
@ -0,0 +1,100 @@
|
||||
{
|
||||
"parent": "block/block",
|
||||
"textures": {
|
||||
"texture": "overdrive_that_matters:block/cargo_crate",
|
||||
"particle": "overdrive_that_matters:block/cargo_crate"
|
||||
},
|
||||
"elements": [
|
||||
{
|
||||
"name": "box",
|
||||
"from": [0, 0, 0],
|
||||
"to": [16, 13, 16],
|
||||
"faces": {
|
||||
"north": {"uv": [0, 4.75, 8, 8], "texture": "#texture"},
|
||||
"east": {"uv": [0, 4.75, 8, 8], "texture": "#texture"},
|
||||
"south": {"uv": [0, 4.75, 8, 8], "texture": "#texture"},
|
||||
"west": {"uv": [0, 4.75, 8, 8], "texture": "#texture"},
|
||||
"up": {"uv": [0, 0, 8, 4], "texture": "#texture"},
|
||||
"down": {"uv": [0, 8, 8, 12], "texture": "#texture"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "inside",
|
||||
"from": [2, 13, 2],
|
||||
"to": [14, 15, 14],
|
||||
"faces": {
|
||||
"north": {"uv": [9, 0, 15, 0.5], "texture": "#texture"},
|
||||
"east": {"uv": [9, 0, 15, 0.5], "texture": "#texture"},
|
||||
"south": {"uv": [9, 0, 15, 0.5], "texture": "#texture"},
|
||||
"west": {"uv": [9, 0, 15, 0.5], "texture": "#texture"},
|
||||
"up": {"uv": [0, 0, 6, 3], "texture": "#missing"},
|
||||
"down": {"uv": [0, 0, 6, 3], "texture": "#missing"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "lid",
|
||||
"from": [0, 15, 0],
|
||||
"to": [16, 18, 16],
|
||||
"faces": {
|
||||
"north": {"uv": [0, 4, 8, 4.75], "texture": "#texture"},
|
||||
"east": {"uv": [0, 4, 8, 4.75], "texture": "#texture"},
|
||||
"south": {"uv": [0, 4, 8, 4.75], "texture": "#texture"},
|
||||
"west": {"uv": [0, 4, 8, 4.75], "texture": "#texture"},
|
||||
"up": {"uv": [0, 0, 8, 4], "texture": "#texture"},
|
||||
"down": {"uv": [0, 0, 8, 4], "texture": "#texture"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [0, 13, 7],
|
||||
"to": [0, 15, 9],
|
||||
"rotation": {"angle": 0, "axis": "y", "origin": [0, 14, 8]},
|
||||
"faces": {
|
||||
"north": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
|
||||
"east": {"uv": [3.5, 4.25, 4.5, 4.75], "texture": "#texture"},
|
||||
"south": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
|
||||
"west": {"uv": [3.5, 4.75, 4.5, 5.25], "texture": "#texture"},
|
||||
"up": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
|
||||
"down": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [16, 13, 7],
|
||||
"to": [16, 15, 9],
|
||||
"rotation": {"angle": 0, "axis": "y", "origin": [0, 14, 8]},
|
||||
"faces": {
|
||||
"north": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
|
||||
"east": {"uv": [3.5, 4.25, 4.5, 4.75], "texture": "#texture"},
|
||||
"south": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
|
||||
"west": {"uv": [3.5, 4.75, 4.5, 5.25], "texture": "#texture"},
|
||||
"up": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
|
||||
"down": {"uv": [0, 0, 0, 0.5], "texture": "#missing"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [7, 13, 16],
|
||||
"to": [9, 15, 16],
|
||||
"rotation": {"angle": 0, "axis": "y", "origin": [8, 14, 16]},
|
||||
"faces": {
|
||||
"north": {"uv": [3.5, 4.75, 4.5, 5.25], "texture": "#texture"},
|
||||
"east": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
|
||||
"south": {"uv": [3.5, 4.25, 4.5, 4.75], "texture": "#texture"},
|
||||
"west": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
|
||||
"up": {"uv": [0, 0, 0, 0.5], "rotation": 90, "texture": "#missing"},
|
||||
"down": {"uv": [0, 0, 0, 0.5], "rotation": 270, "texture": "#missing"}
|
||||
}
|
||||
},
|
||||
{
|
||||
"from": [7, 13, 0],
|
||||
"to": [9, 15, 0],
|
||||
"rotation": {"angle": 0, "axis": "y", "origin": [8, 14, 16]},
|
||||
"faces": {
|
||||
"north": {"uv": [3.5, 4.75, 4.5, 5.25], "texture": "#texture"},
|
||||
"east": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
|
||||
"south": {"uv": [3.5, 4.25, 4.5, 4.75], "texture": "#texture"},
|
||||
"west": {"uv": [0, 0, 0, 0.5], "texture": "#missing"},
|
||||
"up": {"uv": [0, 0, 0, 0.5], "rotation": 90, "texture": "#missing"},
|
||||
"down": {"uv": [0, 0, 0, 0.5], "rotation": 270, "texture": "#missing"}
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
@ -0,0 +1,3 @@
|
||||
{
|
||||
"parent": "overdrive_that_matters:block/cargo_crate_closed"
|
||||
}
|
@ -0,0 +1,6 @@
|
||||
{
|
||||
"parent": "item/generated",
|
||||
"textures": {
|
||||
"layer0": "overdrive_that_matters:item/component/matter_capacitor_parts"
|
||||
}
|
||||
}
|
Before Width: | Height: | Size: 423 B After Width: | Height: | Size: 423 B |
Before Width: | Height: | Size: 178 B After Width: | Height: | Size: 145 B |
Before Width: | Height: | Size: 178 B After Width: | Height: | Size: 145 B |
Before Width: | Height: | Size: 178 B After Width: | Height: | Size: 145 B |
Before Width: | Height: | Size: 178 B After Width: | Height: | Size: 145 B |
Before Width: | Height: | Size: 178 B After Width: | Height: | Size: 145 B |
Before Width: | Height: | Size: 178 B After Width: | Height: | Size: 145 B |
Before Width: | Height: | Size: 178 B After Width: | Height: | Size: 145 B |
After Width: | Height: | Size: 178 B |
After Width: | Height: | Size: 178 B |
After Width: | Height: | Size: 178 B |
After Width: | Height: | Size: 178 B |
After Width: | Height: | Size: 178 B |
After Width: | Height: | Size: 178 B |
Before Width: | Height: | Size: 145 B After Width: | Height: | Size: 145 B |
After Width: | Height: | Size: 178 B |