mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2025-01-27 21:38:05 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'mc1.18/dev' into mc1.19/dev

Browse source
This commit is contained in:
simibubi 2023-11-02 15:35:09 +01:00
commit 26fc820c69
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],
"to": [15, 2, 16],
"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"},
"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"},
"up": {"uv": [0, 0, 8, 7], "rotation": 270, "texture": "#2"},
"down": {"uv": [0, 0, 8, 7], "texture": "#2"}
"up": {"uv": [0, 0, 8, 7], "rotation": 90, "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],
"to": [2, 15, 16],
"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"},
"south": {"uv": [0, 9, 7, 10], "rotation": 90, "texture": "#2"},
"west": {"uv": [0, 0, 8, 7], "rotation": 90, "texture": "#2"},
"south": {"uv": [0.5, 9, 7.5, 10], "rotation": 90, "texture": "#2"},
"west": {"uv": [0, 0, 8, 7], "texture": "#2"},
"up": {"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],
"to": [15, 2, 16],
"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"},
"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"},
"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",
"origin": [8, 8, 8],
"color": 0,
"children": [0, 1, 2, 3, 4, 5, 6]
},
{
"name": "shaft",
"origin": [8, 8, 8],
"color": 0,
"children": [7]
}
]

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

@ -26,12 +26,12 @@
"from": [1, 0, 0],
"to": [15, 2, 16],
"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"},
"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"},
"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