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

This commit is contained in:
DBotThePony 2021-09-08 22:50:31 +07:00
commit fc7bc8ec4a
Signed by: DBot
GPG Key ID: DCC23B5715498507
11 changed files with 187 additions and 0 deletions

View File

@ -0,0 +1,186 @@
{
"textures": {
"charge": "overdrive_that_matters:item/gravitational_disruptor_effect",
"particle": "overdrive_that_matters:item/gravitational_disruptor",
"texture": "overdrive_that_matters:item/gravitational_disruptor"
},
"elements": [
{
"name": "shell",
"from": [5, 0, 5],
"to": [11, 3, 11],
"faces": {
"north": {"uv": [0, 6, 6, 9], "texture": "#texture"},
"east": {"uv": [0, 6, 6, 9], "texture": "#texture"},
"south": {"uv": [0, 6, 6, 9], "texture": "#texture"},
"west": {"uv": [0, 6, 6, 9], "texture": "#texture"},
"up": {"uv": [0, 0, 6, 6], "texture": "#texture"},
"down": {"uv": [0, 9, 6, 15], "texture": "#texture"}
}
},
{
"name": "shell",
"from": [5, 11, 5],
"to": [11, 14, 11],
"faces": {
"north": {"uv": [0, 6, 6, 9], "texture": "#texture"},
"east": {"uv": [0, 6, 6, 9], "texture": "#texture"},
"south": {"uv": [0, 6, 6, 9], "texture": "#texture"},
"west": {"uv": [0, 6, 6, 9], "texture": "#texture"},
"up": {"uv": [0, 0, 6, 6], "texture": "#texture"},
"down": {"uv": [0, 9, 6, 15], "texture": "#texture"}
}
},
{
"name": "coreholder",
"from": [6, 3, 6],
"to": [10, 11, 10],
"faces": {
"north": {"uv": [12, 0, 16, 8], "texture": "#texture"},
"east": {"uv": [12, 0, 16, 8], "texture": "#texture"},
"south": {"uv": [12, 0, 16, 8], "texture": "#texture"},
"west": {"uv": [12, 0, 16, 8], "texture": "#texture"},
"up": {"uv": [8, 6, 12, 10], "texture": "#texture"},
"down": {"uv": [8, 6, 12, 10], "texture": "#texture"}
}
},
{
"name": "charge",
"from": [5.5, 3, 5.5],
"to": [10.5, 11, 10.5],
"faces": {
"north": {"uv": [0, 0, 4, 8], "texture": "#charge"},
"east": {"uv": [12, 0, 16, 8], "texture": "#charge"},
"south": {"uv": [8, 0, 12, 8], "texture": "#charge"},
"west": {"uv": [4, 0, 8, 8], "texture": "#charge"},
"up": {"uv": [8, 6, 12, 10], "texture": "#texture"},
"down": {"uv": [8, 6, 12, 10], "texture": "#texture"}
}
},
{
"name": "handle",
"from": [9, 14, 7],
"to": [10, 15, 9],
"faces": {
"north": {"uv": [8, 13, 9, 14], "texture": "#texture"},
"east": {"uv": [12, 13, 14, 14], "texture": "#texture"},
"south": {"uv": [11, 13, 12, 14], "texture": "#texture"},
"west": {"uv": [12, 13, 14, 14], "texture": "#texture"},
"up": {"uv": [0, 0, 1, 2], "texture": "#texture"},
"down": {"uv": [0, 0, 1, 2], "texture": "#texture"}
}
},
{
"name": "handle",
"from": [6, 14, 7],
"to": [7, 15, 9],
"faces": {
"north": {"uv": [11, 13, 12, 14], "texture": "#texture"},
"east": {"uv": [12, 13, 14, 14], "texture": "#texture"},
"south": {"uv": [8, 13, 9, 14], "texture": "#texture"},
"west": {"uv": [12, 13, 14, 14], "texture": "#texture"},
"up": {"uv": [0, 0, 1, 2], "texture": "#texture"},
"down": {"uv": [0, 0, 1, 2], "texture": "#texture"}
}
},
{
"name": "handle",
"from": [6, 15, 7],
"to": [10, 16, 9],
"faces": {
"north": {"uv": [8, 12, 12, 13], "texture": "#texture"},
"east": {"uv": [12, 12, 14, 13], "texture": "#texture"},
"south": {"uv": [8, 12, 12, 13], "texture": "#texture"},
"west": {"uv": [12, 12, 14, 13], "texture": "#texture"},
"up": {"uv": [8, 10, 12, 12], "texture": "#texture"},
"down": {"uv": [8, 11, 12, 13], "texture": "#texture"}
}
},
{
"name": "frame",
"from": [10, -0.2, 4],
"to": [12, 14.2, 6],
"rotation": {"angle": -45, "axis": "y", "origin": [11, 7, 5]},
"faces": {
"north": {"uv": [6, 2, 8, 16], "texture": "#texture"},
"east": {"uv": [6, 2, 8, 16], "texture": "#texture"},
"south": {"uv": [6, 2, 8, 16], "texture": "#texture"},
"west": {"uv": [6, 2, 8, 16], "texture": "#texture"},
"up": {"uv": [6, 0, 8, 2], "rotation": 180, "texture": "#texture"},
"down": {"uv": [6, 0, 8, 2], "rotation": 180, "texture": "#texture"}
}
},
{
"name": "frame",
"from": [10, -0.2, 10],
"to": [12, 14.2, 12],
"rotation": {"angle": 45, "axis": "y", "origin": [11, 7, 11]},
"faces": {
"north": {"uv": [6, 2, 8, 16], "texture": "#texture"},
"east": {"uv": [6, 2, 8, 16], "texture": "#texture"},
"south": {"uv": [6, 2, 8, 16], "texture": "#texture"},
"west": {"uv": [6, 2, 8, 16], "texture": "#texture"},
"up": {"uv": [6, 0, 8, 2], "rotation": 270, "texture": "#texture"},
"down": {"uv": [6, 0, 8, 2], "rotation": 90, "texture": "#texture"}
}
},
{
"name": "frame",
"from": [4, -0.2, 10],
"to": [6, 14.2, 12],
"rotation": {"angle": -45, "axis": "y", "origin": [5, 7, 11]},
"faces": {
"north": {"uv": [6, 2, 8, 16], "texture": "#texture"},
"east": {"uv": [6, 2, 8, 16], "texture": "#texture"},
"south": {"uv": [6, 2, 8, 16], "texture": "#texture"},
"west": {"uv": [6, 2, 8, 16], "texture": "#texture"},
"up": {"uv": [6, 0, 8, 2], "rotation": 270, "texture": "#texture"},
"down": {"uv": [6, 0, 8, 2], "rotation": 90, "texture": "#texture"}
}
},
{
"name": "frame",
"from": [4, -0.2, 4],
"to": [6, 14.2, 6],
"rotation": {"angle": -45, "axis": "y", "origin": [5, 7, 5]},
"faces": {
"north": {"uv": [6, 2, 8, 16], "texture": "#texture"},
"east": {"uv": [6, 2, 8, 16], "texture": "#texture"},
"south": {"uv": [6, 2, 8, 16], "texture": "#texture"},
"west": {"uv": [6, 2, 8, 16], "texture": "#texture"},
"up": {"uv": [6, 0, 8, 2], "rotation": 270, "texture": "#texture"},
"down": {"uv": [6, 0, 8, 2], "rotation": 90, "texture": "#texture"}
}
}
],
"display": {
"thirdperson_righthand": {
"rotation": [65, 0, 0],
"translation": [0, -4, -4.75],
"scale": [0.7, 0.7, 0.7]
},
"thirdperson_lefthand": {
"rotation": [65, 0, 0],
"translation": [0, -4, -4.75],
"scale": [0.7, 0.7, 0.7]
},
"firstperson_righthand": {
"translation": [0, 0, -1]
},
"firstperson_lefthand": {
"translation": [0, 0, -1]
},
"ground": {
"translation": [0, 3.5, 0],
"scale": [0.8, 0.8, 0.8]
},
"gui": {
"rotation": [45, 45, 0],
"translation": [0, 0.75, 0],
"scale": [0.9, 0.9, 0.9]
},
"head": {
"translation": [0, 14.25, 0]
}
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 283 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 285 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 240 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 260 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 255 B

After

Width:  |  Height:  |  Size: 260 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 273 B

After

Width:  |  Height:  |  Size: 271 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 406 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

@ -0,0 +1 @@
{ "animation": { "frametime": 1 } }

Binary file not shown.

After

Width:  |  Height:  |  Size: 263 B