Anvilcraft/Create
1
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-12-14 13:33:49 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'mc1.18/0.5.1-repolish' of https://github.com/Creators-of-Create/Create-Concealed into mc1.18/0.5.1-repolish

Browse source
This commit is contained in:
simibubi 2023-03-31 00:11:13 +02:00
commit f3814d0668
21 changed files with 17 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/resources/assets/create/models/block/belt_casing/diagonal_end.json
View file

@ -2,7 +2,6 @@
"credit": "Made with Blockbench",
"parent": "block/block",
"textures": {
"5": "create:block/brass_casing_connected",
"7": "create:block/belt/brass_belt_casing",
"8": "create:block/gearbox",
"particle": "create:block/brass_casing"
@ -18,7 +17,7 @@
"east": {"uv": [1, 0, 4, 2.75], "texture": "#7"},
"west": {"uv": [0, 0, 3, 2.75], "texture": "#7"},
"up": {"uv": [0, 4, 4, 7], "texture": "#7"},
"down": {"uv": [2, 0.75, 4, 2], "texture": "#5"}
"down": {"uv": [12, 13.5, 16, 16], "texture": "#7"}
}
},
{
@ -52,7 +51,7 @@
"south": {"uv": [8, 2.25, 12, 4.5], "texture": "#7"},
"west": {"uv": [8, 0, 10, 2.25], "texture": "#7"},
"up": {"uv": [12, 2.25, 16, 4.25], "texture": "#7"},
"down": {"uv": [6, 0, 8, 1], "texture": "#5"}
"down": {"uv": [8, 12, 12, 14], "texture": "#7"}
}
}
]

9
src/main/resources/assets/create/models/block/belt_casing/diagonal_middle.json
View file

@ -3,7 +3,6 @@
"parent": "block/block",
"textures": {
"4": "create:block/belt/brass_belt_casing",
"6": "create:block/brass_casing_connected",
"particle": "create:block/brass_casing"
},
"elements": [
@ -14,10 +13,10 @@
"rotation": {"angle": 45, "axis": "x", "origin": [8, 8, 8]},
"faces": {
"north": {"uv": [8, 2.25, 12, 4.5], "texture": "#4"},
"east": {"uv": [15, 5.75, 12.25, 8], "texture": "#4"},
"west": {"uv": [8.25, 5.75, 11, 8], "texture": "#4"},
"east": {"uv": [14.5, 5.75, 11.75, 8], "texture": "#4"},
"west": {"uv": [11.75, 5.75, 14.5, 8], "texture": "#4"},
"up": {"uv": [12, 2.25, 16, 5], "texture": "#4"},
"down": {"uv": [6, 0, 8, 1.375], "texture": "#6"}
"down": {"uv": [8, 12, 12, 14.75], "texture": "#4"}
}
},
{
@ -30,7 +29,7 @@
"south": {"uv": [8, 2.25, 12, 4.5], "texture": "#4"},
"west": {"uv": [12.25, 5.75, 15, 8], "texture": "#4"},
"up": {"uv": [12, 2.25, 16, 5], "texture": "#4"},
"down": {"uv": [6, 0.25, 8, 1.625], "texture": "#6"}
"down": {"uv": [8, 12.5, 12, 15.25], "texture": "#4"}
}
}
]

9
src/main/resources/assets/create/models/block/belt_casing/diagonal_pulley.json
View file

@ -2,7 +2,6 @@
"credit": "Made with Blockbench",
"parent": "block/block",
"textures": {
"6": "create:block/brass_casing_connected",
"8": "create:block/gearbox",
"10": "create:block/belt/brass_belt_casing",
"particle": "create:block/brass_casing"
@ -18,7 +17,7 @@
"east": {"uv": [12, 0, 14.75, 2.25], "texture": "#10"},
"west": {"uv": [9.25, 0, 12, 2.25], "texture": "#10"},
"up": {"uv": [0, 3.25, 4, 6], "texture": "#10"},
"down": {"uv": [6, 0, 8, 1.375], "texture": "#6"}
"down": {"uv": [8, 12, 12, 14.75], "texture": "#10"}
}
},
{
@ -31,7 +30,7 @@
"south": {"uv": [8, 2.25, 12, 4.5], "texture": "#10"},
"west": {"uv": [12, 0, 14.75, 2.25], "texture": "#10"},
"up": {"uv": [0, 3.25, 4, 6], "rotation": 180, "texture": "#10"},
"down": {"uv": [6, 0.25, 8, 1.625], "texture": "#6"}
"down": {"uv": [8, 12.5, 12, 15.25], "texture": "#10"}
}
},
{
@ -60,10 +59,10 @@
"from": [0, 0, 0],
"to": [16, 8, 8],
"faces": {
"north": {"uv": [6, 0.125, 8, 1.125], "rotation": 180, "texture": "#6"},
"north": {"uv": [8, 12.25, 12, 14.25], "rotation": 180, "texture": "#10"},
"east": {"uv": [2, 8, 4, 10], "texture": "#10"},
"west": {"uv": [0, 8, 2, 10], "texture": "#10"},
"down": {"uv": [6, 0, 8, 1], "texture": "#6"}
"down": {"uv": [8, 12, 12, 14], "texture": "#10"}
}
}
]

7
src/main/resources/assets/create/models/block/belt_casing/diagonal_start.json
View file

@ -2,7 +2,6 @@
"credit": "Made with Blockbench",
"parent": "block/block",
"textures": {
"5": "create:block/brass_casing_connected",
"7": "create:block/belt/brass_belt_casing",
"8": "create:block/gearbox",
"particle": "create:block/brass_casing"
@ -19,7 +18,7 @@
"south": {"uv": [0, 2.75, 4, 5], "rotation": 180, "texture": "#7"},
"west": {"uv": [14, 0, 16, 2.25], "texture": "#7"},
"up": {"uv": [0, 3, 4, 5], "texture": "#7"},
"down": {"uv": [6, 0, 8, 1], "texture": "#5"}
"down": {"uv": [8, 12, 12, 14], "texture": "#7"}
}
},
{
@ -27,12 +26,12 @@
"from": [0, 0, 0],
"to": [16, 11, 16],
"faces": {
"north": {"uv": [6, 0, 8, 1.375], "texture": "#5"},
"north": {"uv": [8, 12, 12, 14.75], "texture": "#7"},
"east": {"uv": [0, 0, 4, 2.75], "texture": "#7"},
"south": {"uv": [4, 5.25, 8, 8], "texture": "#7"},
"west": {"uv": [0, 0, 4, 2.75], "texture": "#7"},
"up": {"uv": [0, 4, 4, 8], "texture": "#7"},
"down": {"uv": [2, 0, 4, 2], "rotation": 180, "texture": "#5"}
"down": {"uv": [12, 12, 16, 16], "rotation": 180, "texture": "#7"}
}
},
{

3
src/main/resources/assets/create/models/block/belt_casing/horizontal_end.json
View file

@ -3,7 +3,6 @@
"parent": "block/block",
"textures": {
"4": "create:block/belt/brass_belt_casing",
"5": "create:block/brass_casing_connected",
"8": "create:block/gearbox",
"particle": "create:block/brass_casing"
},
@ -18,7 +17,7 @@
"south": {"uv": [4, 5.25, 8, 8], "texture": "#4"},
"west": {"uv": [0, 0, 4, 2.75], "texture": "#4"},
"up": {"uv": [0, 4, 4, 8], "texture": "#4"},
"down": {"uv": [2, 0, 4, 2], "rotation": 180, "texture": "#5"}
"down": {"uv": [12, 12, 16, 16], "rotation": 180, "texture": "#4"}
}
},
{

3
src/main/resources/assets/create/models/block/belt_casing/horizontal_middle.json
View file

@ -3,7 +3,6 @@
"parent": "block/block",
"textures": {
"3": "create:block/belt/brass_belt_casing",
"4": "create:block/brass_casing_connected",
"particle": "create:block/brass_casing"
},
"elements": [
@ -17,7 +16,7 @@
"south": {"uv": [4, 5.25, 8, 8], "texture": "#3"},
"west": {"uv": [4, 0, 8, 2.75], "texture": "#3"},
"up": {"uv": [0, 2.75, 4, 4.75], "texture": "#3"},
"down": {"uv": [6, 0, 8, 2], "rotation": 180, "texture": "#4"}
"down": {"uv": [8, 12, 12, 16], "rotation": 180, "texture": "#3"}
}
}
]

3
src/main/resources/assets/create/models/block/belt_casing/horizontal_pulley.json
View file

@ -3,7 +3,6 @@
"parent": "block/block",
"textures": {
"4": "create:block/belt/brass_belt_casing",
"5": "create:block/brass_casing_connected",
"8": "create:block/gearbox",
"particle": "create:block/brass_casing"
},
@ -18,7 +17,7 @@
"south": {"uv": [4, 5.25, 8, 8], "texture": "#4"},
"west": {"uv": [0, 0, 4, 2.75], "texture": "#4"},
"up": {"uv": [0, 4, 4, 8], "texture": "#4"},
"down": {"uv": [6, 0, 8, 2], "rotation": 180, "texture": "#5"}
"down": {"uv": [8, 12, 12, 16], "rotation": 180, "texture": "#4"}
}
},
{

3
src/main/resources/assets/create/models/block/belt_casing/horizontal_start.json
View file

@ -3,7 +3,6 @@
"parent": "block/block",
"textures": {
"4": "create:block/belt/brass_belt_casing",
"5": "create:block/brass_casing_connected",
"8": "create:block/gearbox",
"particle": "create:block/brass_casing"
},
@ -18,7 +17,7 @@
"south": {"uv": [4, 5.25, 8, 8], "texture": "#4"},
"west": {"uv": [0, 0, 4, 2.75], "texture": "#4"},
"up": {"uv": [0, 4, 4, 8], "texture": "#4"},
"down": {"uv": [4, 0, 6, 2], "rotation": 180, "texture": "#5"}
"down": {"uv": [12, 8, 16, 12], "rotation": 180, "texture": "#4"}
}
},
{

BIN
src/main/resources/assets/create/textures/block/belt/andesite_belt_casing.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

BIN
src/main/resources/assets/create/textures/block/belt/brass_belt_casing.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 13 KiB

BIN
src/main/resources/assets/create/textures/block/funnel/andesite_funnel.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

BIN
src/main/resources/assets/create/textures/block/funnel/andesite_funnel_neutral.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
src/main/resources/assets/create/textures/block/funnel/andesite_funnel_powered.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.3 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
src/main/resources/assets/create/textures/block/funnel/andesite_funnel_pull.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.7 KiB

After

Width:  |  Height:  |  Size: 3 KiB

BIN
src/main/resources/assets/create/textures/block/funnel/andesite_funnel_push.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.7 KiB

After

Width:  |  Height:  |  Size: 3 KiB

BIN
src/main/resources/assets/create/textures/block/funnel/andesite_funnel_unpowered.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
src/main/resources/assets/create/textures/block/funnel/brass_funnel.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
src/main/resources/assets/create/textures/block/tunnel/andesite_tunnel.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.3 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
src/main/resources/assets/create/textures/block/tunnel/andesite_tunnel_top.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
src/main/resources/assets/create/textures/block/tunnel/andesite_tunnel_top_connected.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

BIN
src/main/resources/assets/create/textures/block/tunnel/andesite_tunnel_top_window.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB