mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-11-10 12:33:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/mc1.19/dev' into mc1.20.1/dev

Browse Source
This commit is contained in:
simibubi 2023-11-02 15:35:37 +01:00
commit a41053b896
5 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/resources/assets/create/models/block/gauge/base.json
View File

@ -24,12 +24,12 @@
"from": [1, 0, 0], "from": [1, 0, 0],
"to": [15, 2, 16], "to": [15, 2, 16],
"faces": { "faces": {
"north": {"uv": [0, 9, 8, 10], "texture": "#2"}, "north": {"uv": [0.5, 9, 7.5, 10], "texture": "#2"},
"east": {"uv": [0, 9, 8, 10], "texture": "#2"}, "east": {"uv": [0, 9, 8, 10], "texture": "#2"},
"south": {"uv": [0, 9, 7, 10], "texture": "#2"}, "south": {"uv": [0.5, 9, 7.5, 10], "texture": "#2"},
"west": {"uv": [0, 9, 8, 10], "texture": "#2"}, "west": {"uv": [0, 9, 8, 10], "texture": "#2"},
"up": {"uv": [0, 0, 8, 7], "rotation": 270, "texture": "#2"}, "up": {"uv": [0, 0, 8, 7], "rotation": 90, "texture": "#2"},
"down": {"uv": [0, 0, 8, 7], "texture": "#2"} "down": {"uv": [0, 0, 8, 7], "rotation": 90, "texture": "#2"}
} }
} }
] ]

6
src/main/resources/assets/create/models/block/gauge/base_wall.json
View File

@ -24,10 +24,10 @@
"from": [0, 1, 0], "from": [0, 1, 0],
"to": [2, 15, 16], "to": [2, 15, 16],
"faces": { "faces": {
"north": {"uv": [0, 9, 8, 10], "rotation": 270, "texture": "#2"}, "north": {"uv": [0.5, 9, 7.5, 10], "rotation": 270, "texture": "#2"},
"east": {"uv": [0, 0, 8, 7], "texture": "#2"}, "east": {"uv": [0, 0, 8, 7], "texture": "#2"},
"south": {"uv": [0, 9, 7, 10], "rotation": 90, "texture": "#2"}, "south": {"uv": [0.5, 9, 7.5, 10], "rotation": 90, "texture": "#2"},
"west": {"uv": [0, 0, 8, 7], "rotation": 90, "texture": "#2"}, "west": {"uv": [0, 0, 8, 7], "texture": "#2"},
"up": {"uv": [0, 9, 8, 10], "rotation": 90, "texture": "#2"}, "up": {"uv": [0, 9, 8, 10], "rotation": 90, "texture": "#2"},
"down": {"uv": [0, 9, 8, 10], "rotation": 90, "texture": "#2"} "down": {"uv": [0, 9, 8, 10], "rotation": 90, "texture": "#2"}
} }

8
src/main/resources/assets/create/models/block/gauge/speedometer/item.json
View File

@ -26,12 +26,12 @@
"from": [1, 0, 0], "from": [1, 0, 0],
"to": [15, 2, 16], "to": [15, 2, 16],
"faces": { "faces": {
"north": {"uv": [0, 9, 8, 10], "texture": "#2"}, "north": {"uv": [0.5, 9, 7.5, 10], "texture": "#2"},
"east": {"uv": [0, 9, 8, 10], "texture": "#2"}, "east": {"uv": [0, 9, 8, 10], "texture": "#2"},
"south": {"uv": [0, 9, 7, 10], "texture": "#2"}, "south": {"uv": [0.5, 9, 7.5, 10], "texture": "#2"},
"west": {"uv": [0, 9, 8, 10], "texture": "#2"}, "west": {"uv": [0, 9, 8, 10], "texture": "#2"},
"up": {"uv": [0, 0, 8, 7], "rotation": 270, "texture": "#2"}, "up": {"uv": [0, 0, 8, 7], "rotation": 270, "texture": "#2"},
"down": {"uv": [0, 0, 8, 7], "texture": "#2"} "down": {"uv": [0, 0, 8, 7], "rotation": 90, "texture": "#2"}
} }
}, },
{ {
@ -148,11 +148,13 @@
{ {
"name": "Gauge", "name": "Gauge",
"origin": [8, 8, 8], "origin": [8, 8, 8],
"color": 0,
"children": [0, 1, 2, 3, 4, 5, 6] "children": [0, 1, 2, 3, 4, 5, 6]
}, },
{ {
"name": "shaft", "name": "shaft",
"origin": [8, 8, 8], "origin": [8, 8, 8],
"color": 0,
"children": [7] "children": [7]
} }
] ]

6
src/main/resources/assets/create/models/block/gauge/stressometer/item.json
View File

@ -26,12 +26,12 @@
"from": [1, 0, 0], "from": [1, 0, 0],
"to": [15, 2, 16], "to": [15, 2, 16],
"faces": { "faces": {
"north": {"uv": [0, 9, 8, 10], "texture": "#2"}, "north": {"uv": [0.5, 9, 7.5, 10], "texture": "#2"},
"east": {"uv": [0, 9, 8, 10], "texture": "#2"}, "east": {"uv": [0, 9, 8, 10], "texture": "#2"},
"south": {"uv": [0, 9, 7, 10], "texture": "#2"}, "south": {"uv": [0.5, 9, 7.5, 10], "texture": "#2"},
"west": {"uv": [0, 9, 8, 10], "texture": "#2"}, "west": {"uv": [0, 9, 8, 10], "texture": "#2"},
"up": {"uv": [0, 0, 8, 7], "rotation": 270, "texture": "#2"}, "up": {"uv": [0, 0, 8, 7], "rotation": 270, "texture": "#2"},
"down": {"uv": [0, 0, 8, 7], "texture": "#2"} "down": {"uv": [0, 0, 8, 7], "rotation": 90, "texture": "#2"}
} }
}, },
{ {

BIN
src/main/resources/assets/create/textures/gui/widgets.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.2 KiB

After

Width:  |  Height:  |  Size: 9.7 KiB