Merge remote-tracking branch 'concealed/mc1.20.1/feature-dev' into mc1.20.1/feature-dev

This commit is contained in:
IThundxr 2025-01-01 22:03:54 -05:00
commit 156d0fa837
Failed to generate hash of commit
47 changed files with 41 additions and 40 deletions

View file

@ -15,7 +15,7 @@
"to": [16, 16, 12],
"faces": {
"east": {"uv": [4, 0, 16, 12], "texture": "#1"},
"south": {"uv": [4, 0, 5, 12], "texture": "#1"},
"south": {"uv": [0, 0, 1, 12], "texture": "#1"},
"west": {"uv": [0, 0, 12, 12], "texture": "#1"}
}
},
@ -44,7 +44,7 @@
"faces": {
"north": {"uv": [0, 0, 12, 12], "texture": "#1"},
"south": {"uv": [4, 0, 16, 12], "texture": "#1"},
"west": {"uv": [11, 0, 12, 12], "texture": "#1"}
"west": {"uv": [15, 0, 16, 12], "texture": "#1"}
}
},
{

View file

@ -15,7 +15,7 @@
"to": [12, 16, 1],
"faces": {
"north": {"uv": [4, 0, 16, 12], "texture": "#1"},
"east": {"uv": [4, 0, 5, 12], "texture": "#1"},
"east": {"uv": [15, 0, 16, 12], "texture": "#1"},
"south": {"uv": [0, 0, 12, 12], "texture": "#1"}
}
},
@ -43,7 +43,7 @@
"to": [1, 16, 12],
"faces": {
"east": {"uv": [4, 0, 16, 12], "texture": "#1"},
"south": {"uv": [11, 0, 12, 12], "texture": "#1"},
"south": {"uv": [0, 0, 1, 12], "texture": "#1"},
"west": {"uv": [0, 0, 12, 12], "texture": "#1"}
}
},

View file

@ -16,7 +16,7 @@
"faces": {
"north": {"uv": [0, 0, 12, 12], "texture": "#1"},
"south": {"uv": [4, 0, 16, 12], "texture": "#1"},
"west": {"uv": [4, 0, 5, 12], "texture": "#1"}
"west": {"uv": [15, 0, 16, 12], "texture": "#1"}
}
},
{
@ -42,7 +42,7 @@
"from": [15, 4, 4],
"to": [16, 16, 16],
"faces": {
"north": {"uv": [11, 0, 12, 12], "texture": "#1"},
"north": {"uv": [0, 0, 1, 12], "texture": "#1"},
"east": {"uv": [0, 0, 12, 12], "texture": "#1"},
"west": {"uv": [4, 0, 16, 12], "texture": "#1"}
}

View file

@ -14,7 +14,7 @@
"from": [0, 4, 4],
"to": [1, 16, 16],
"faces": {
"north": {"uv": [4, 0, 5, 12], "texture": "#1"},
"north": {"uv": [15, 0, 16, 12], "texture": "#1"},
"east": {"uv": [0, 0, 12, 12], "texture": "#1"},
"west": {"uv": [4, 0, 16, 12], "texture": "#1"}
}
@ -43,7 +43,7 @@
"to": [12, 16, 16],
"faces": {
"north": {"uv": [4, 0, 16, 12], "texture": "#1"},
"east": {"uv": [11, 0, 12, 12], "texture": "#1"},
"east": {"uv": [0, 0, 1, 12], "texture": "#1"},
"south": {"uv": [0, 0, 12, 12], "texture": "#1"}
}
},

View file

@ -51,6 +51,7 @@
{
"name": "tank",
"origin": [8, 8, -23],
"color": 0,
"children": [0, 1, 2, 3]
}
]

View file

@ -13,7 +13,7 @@
"to": [16, 16, 12],
"faces": {
"east": {"uv": [4, 0, 16, 16], "texture": "#1"},
"south": {"uv": [4, 0, 5, 16], "texture": "#1"},
"south": {"uv": [15, 0, 16, 16], "texture": "#1"},
"west": {"uv": [0, 0, 12, 16], "texture": "#1"}
}
},
@ -42,7 +42,7 @@
"faces": {
"north": {"uv": [0, 0, 12, 16], "texture": "#1"},
"south": {"uv": [4, 0, 16, 16], "texture": "#1"},
"west": {"uv": [11, 0, 12, 16], "texture": "#1"}
"west": {"uv": [0, 0, 1, 16], "texture": "#1"}
}
}
],

View file

@ -13,7 +13,7 @@
"to": [12, 16, 1],
"faces": {
"north": {"uv": [4, 0, 16, 16], "texture": "#1"},
"east": {"uv": [4, 0, 5, 16], "texture": "#1"},
"east": {"uv": [15, 0, 16, 16], "texture": "#1"},
"south": {"uv": [0, 0, 12, 16], "texture": "#1"}
}
},
@ -41,7 +41,7 @@
"to": [1, 16, 12],
"faces": {
"east": {"uv": [4, 0, 16, 16], "texture": "#1"},
"south": {"uv": [11, 0, 12, 16], "texture": "#1"},
"south": {"uv": [0, 0, 1, 16], "texture": "#1"},
"west": {"uv": [0, 0, 12, 16], "texture": "#1"}
}
}

View file

@ -14,7 +14,7 @@
"faces": {
"north": {"uv": [0, 0, 12, 16], "texture": "#1"},
"south": {"uv": [4, 0, 16, 16], "texture": "#1"},
"west": {"uv": [4, 0, 5, 16], "texture": "#1"}
"west": {"uv": [15, 0, 16, 16], "texture": "#1"}
}
},
{
@ -40,7 +40,7 @@
"from": [15, 0, 4],
"to": [16, 16, 16],
"faces": {
"north": {"uv": [11, 0, 12, 16], "texture": "#1"},
"north": {"uv": [0, 0, 1, 16], "texture": "#1"},
"east": {"uv": [0, 0, 12, 16], "texture": "#1"},
"west": {"uv": [4, 0, 16, 16], "texture": "#1"}
}

View file

@ -12,7 +12,7 @@
"from": [0, 0, 4],
"to": [1, 16, 16],
"faces": {
"north": {"uv": [4, 0, 5, 16], "texture": "#1"},
"north": {"uv": [0, 0, 1, 16], "texture": "#1"},
"east": {"uv": [0, 0, 12, 16], "texture": "#1"},
"west": {"uv": [4, 0, 16, 16], "texture": "#1"}
}
@ -41,7 +41,7 @@
"to": [12, 16, 16],
"faces": {
"north": {"uv": [4, 0, 16, 16], "texture": "#1"},
"east": {"uv": [11, 0, 12, 16], "texture": "#1"},
"east": {"uv": [15, 0, 16, 16], "texture": "#1"},
"south": {"uv": [0, 0, 12, 16], "texture": "#1"}
}
}

View file

@ -30,7 +30,7 @@
"rotation": {"angle": 0, "axis": "y", "origin": [8, 8, -23]},
"faces": {
"north": {"uv": [12, 4, 16, 12], "texture": "#1", "cullface": "north"},
"east": {"uv": [8, 4, 9, 12], "texture": "#1", "cullface": "north"},
"east": {"uv": [15, 4, 16, 12], "texture": "#1", "cullface": "north"},
"south": {"uv": [0, 4, 4, 12], "texture": "#1", "cullface": "north"}
}
},
@ -40,7 +40,7 @@
"to": [16, 12, 4],
"faces": {
"east": {"uv": [12, 4, 16, 12], "texture": "#1", "cullface": "east"},
"south": {"uv": [8, 4, 9, 12], "texture": "#1", "cullface": "east"},
"south": {"uv": [15, 4, 16, 12], "texture": "#1", "cullface": "east"},
"west": {"uv": [0, 4, 4, 12], "texture": "#1", "cullface": "east"}
}
},
@ -51,7 +51,7 @@
"faces": {
"north": {"uv": [0, 4, 4, 12], "texture": "#1", "cullface": "south"},
"south": {"uv": [12, 4, 16, 12], "texture": "#1", "cullface": "south"},
"west": {"uv": [8, 4, 9, 12], "texture": "#1", "cullface": "south"}
"west": {"uv": [15, 4, 16, 12], "texture": "#1", "cullface": "south"}
}
},
{
@ -59,7 +59,7 @@
"from": [0, 4, 12],
"to": [1, 12, 16],
"faces": {
"north": {"uv": [8, 4, 9, 12], "texture": "#1", "cullface": "west"},
"north": {"uv": [15, 4, 16, 12], "texture": "#1", "cullface": "west"},
"east": {"uv": [0, 4, 4, 12], "texture": "#1", "cullface": "west"},
"west": {"uv": [12, 4, 16, 12], "texture": "#1", "cullface": "west"}
}
@ -109,7 +109,7 @@
"faces": {
"north": {"uv": [0, 4, 4, 12], "texture": "#1", "cullface": "north"},
"south": {"uv": [12, 4, 16, 12], "texture": "#1", "cullface": "north"},
"west": {"uv": [7, 4, 8, 12], "texture": "#1", "cullface": "north"}
"west": {"uv": [0, 4, 1, 12], "texture": "#1", "cullface": "north"}
}
},
{
@ -117,7 +117,7 @@
"from": [15, 4, 12],
"to": [16, 12, 16],
"faces": {
"north": {"uv": [7, 4, 8, 12], "texture": "#1", "cullface": "east"},
"north": {"uv": [0, 4, 1, 12], "texture": "#1", "cullface": "east"},
"east": {"uv": [0, 4, 4, 12], "texture": "#1", "cullface": "east"},
"west": {"uv": [12, 4, 16, 12], "texture": "#1", "cullface": "east"}
}
@ -128,7 +128,7 @@
"to": [4, 12, 16],
"faces": {
"north": {"uv": [12, 4, 16, 12], "texture": "#1", "cullface": "south"},
"east": {"uv": [7, 4, 8, 12], "texture": "#1", "cullface": "south"},
"east": {"uv": [0, 4, 1, 12], "texture": "#1", "cullface": "south"},
"south": {"uv": [0, 4, 4, 12], "texture": "#1", "cullface": "south"}
}
},
@ -138,7 +138,7 @@
"to": [1, 12, 4],
"faces": {
"east": {"uv": [12, 4, 16, 12], "texture": "#1", "cullface": "west"},
"south": {"uv": [7, 4, 8, 12], "texture": "#1", "cullface": "west"},
"south": {"uv": [0, 4, 1, 12], "texture": "#1", "cullface": "west"},
"west": {"uv": [0, 4, 4, 12], "texture": "#1", "cullface": "west"}
}
},

View file

@ -16,7 +16,7 @@
"rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]},
"faces": {
"east": {"uv": [4, 4, 16, 12], "texture": "#1"},
"south": {"uv": [4, 4, 5, 12], "texture": "#1"},
"south": {"uv": [15, 4, 16, 12], "texture": "#1"},
"west": {"uv": [0, 4, 12, 12], "texture": "#1"}
}
},
@ -48,7 +48,7 @@
"faces": {
"north": {"uv": [0, 4, 12, 12], "texture": "#1"},
"south": {"uv": [4, 4, 16, 12], "texture": "#1"},
"west": {"uv": [11, 4, 12, 12], "texture": "#1"}
"west": {"uv": [0, 4, 1, 12], "texture": "#1"}
}
},
{

View file

@ -16,7 +16,7 @@
"rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]},
"faces": {
"north": {"uv": [4, 4, 16, 12], "texture": "#1"},
"east": {"uv": [4, 4, 5, 12], "texture": "#1"},
"east": {"uv": [0, 4, 1, 12], "texture": "#1"},
"south": {"uv": [0, 4, 12, 12], "texture": "#1"}
}
},
@ -47,7 +47,7 @@
"rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]},
"faces": {
"east": {"uv": [4, 4, 16, 12], "texture": "#1"},
"south": {"uv": [11, 4, 12, 12], "texture": "#1"},
"south": {"uv": [16, 4, 15, 12], "texture": "#1"},
"west": {"uv": [0, 4, 12, 12], "texture": "#1"}
}
},

View file

@ -17,7 +17,7 @@
"faces": {
"north": {"uv": [0, 4, 12, 12], "texture": "#1"},
"south": {"uv": [4, 4, 16, 12], "texture": "#1"},
"west": {"uv": [4, 4, 5, 12], "texture": "#1"}
"west": {"uv": [0, 4, 1, 12], "texture": "#1"}
}
},
{
@ -46,7 +46,7 @@
"to": [16, 12, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]},
"faces": {
"north": {"uv": [11, 4, 12, 12], "texture": "#1"},
"north": {"uv": [15, 4, 16, 12], "texture": "#1"},
"east": {"uv": [0, 4, 12, 12], "texture": "#1"},
"west": {"uv": [4, 4, 16, 12], "texture": "#1"}
}

View file

@ -15,7 +15,7 @@
"to": [1, 12, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]},
"faces": {
"north": {"uv": [4, 4, 5, 12], "texture": "#1"},
"north": {"uv": [0, 4, 1, 12], "texture": "#1"},
"east": {"uv": [0, 4, 12, 12], "texture": "#1"},
"west": {"uv": [4, 4, 16, 12], "texture": "#1"}
}
@ -47,7 +47,7 @@
"rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]},
"faces": {
"north": {"uv": [4, 4, 16, 12], "texture": "#1"},
"east": {"uv": [11, 4, 12, 12], "texture": "#1"},
"east": {"uv": [15, 4, 16, 12], "texture": "#1"},
"south": {"uv": [0, 4, 12, 12], "texture": "#1"}
}
},

View file

@ -16,7 +16,7 @@
"rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]},
"faces": {
"east": {"uv": [4, 4, 16, 16], "texture": "#1"},
"south": {"uv": [4, 4, 5, 16], "texture": "#1"},
"south": {"uv": [15, 4, 16, 16], "texture": "#1"},
"west": {"uv": [0, 4, 12, 16], "texture": "#1"}
}
},
@ -48,7 +48,7 @@
"faces": {
"north": {"uv": [0, 4, 12, 16], "texture": "#1"},
"south": {"uv": [4, 4, 16, 16], "texture": "#1"},
"west": {"uv": [11, 4, 12, 16], "texture": "#1"}
"west": {"uv": [0, 4, 1, 16], "texture": "#1"}
}
},
{

View file

@ -16,7 +16,7 @@
"rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]},
"faces": {
"north": {"uv": [4, 4, 16, 16], "texture": "#1"},
"east": {"uv": [4, 4, 5, 16], "texture": "#1"},
"east": {"uv": [15, 4, 16, 16], "texture": "#1"},
"south": {"uv": [0, 4, 12, 16], "texture": "#1"}
}
},
@ -47,7 +47,7 @@
"rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]},
"faces": {
"east": {"uv": [4, 4, 16, 16], "texture": "#1"},
"south": {"uv": [11, 4, 12, 16], "texture": "#1"},
"south": {"uv": [0, 4, 1, 16], "texture": "#1"},
"west": {"uv": [0, 4, 12, 16], "texture": "#1"}
}
},

View file

@ -17,7 +17,7 @@
"faces": {
"north": {"uv": [0, 4, 12, 16], "texture": "#1"},
"south": {"uv": [4, 4, 16, 16], "texture": "#1"},
"west": {"uv": [4, 4, 5, 16], "texture": "#1"}
"west": {"uv": [15, 4, 16, 16], "texture": "#1"}
}
},
{
@ -46,7 +46,7 @@
"to": [16, 12, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]},
"faces": {
"north": {"uv": [11, 4, 12, 16], "texture": "#1"},
"north": {"uv": [0, 4, 1, 16], "texture": "#1"},
"east": {"uv": [0, 4, 12, 16], "texture": "#1"},
"west": {"uv": [4, 4, 16, 16], "texture": "#1"}
}

View file

@ -15,7 +15,7 @@
"to": [1, 12, 16],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]},
"faces": {
"north": {"uv": [4, 4, 5, 16], "texture": "#1"},
"north": {"uv": [15, 4, 16, 16], "texture": "#1"},
"east": {"uv": [0, 4, 12, 16], "texture": "#1"},
"west": {"uv": [4, 4, 16, 16], "texture": "#1"}
}
@ -47,7 +47,7 @@
"rotation": {"angle": 0, "axis": "y", "origin": [8, 4, 8]},
"faces": {
"north": {"uv": [4, 4, 16, 16], "texture": "#1"},
"east": {"uv": [11, 4, 12, 16], "texture": "#1"},
"east": {"uv": [0, 4, 1, 16], "texture": "#1"},
"south": {"uv": [0, 4, 12, 16], "texture": "#1"}
}
},

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 419 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 516 B

After

Width:  |  Height:  |  Size: 492 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 512 B

After

Width:  |  Height:  |  Size: 577 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 453 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 521 B

After

Width:  |  Height:  |  Size: 533 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 557 B

After

Width:  |  Height:  |  Size: 576 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 455 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 551 B

After

Width:  |  Height:  |  Size: 512 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 589 B

After

Width:  |  Height:  |  Size: 589 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 314 B

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 798 B

After

Width:  |  Height:  |  Size: 8.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 179 B

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 245 B

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 939 B

After

Width:  |  Height:  |  Size: 7.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 225 B

After

Width:  |  Height:  |  Size: 1.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 701 B

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 226 B

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 933 B

After

Width:  |  Height:  |  Size: 8.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 254 B

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 128 B

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.4 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 768 B

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 21 KiB