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

simibubi · simibubi · commit a41053b8966e · 2023-11-02T15:35:37.000+01:00
diff --git a/src/main/resources/assets/create/models/block/gauge/base.json b/src/main/resources/assets/create/models/block/gauge/base.json
@@ -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"}
 			}
 		}
 	]
diff --git a/src/main/resources/assets/create/models/block/gauge/base_wall.json b/src/main/resources/assets/create/models/block/gauge/base_wall.json
@@ -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"}
 			}
diff --git a/src/main/resources/assets/create/models/block/gauge/speedometer/item.json b/src/main/resources/assets/create/models/block/gauge/speedometer/item.json
@@ -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]
 		}
 	]
diff --git a/src/main/resources/assets/create/models/block/gauge/stressometer/item.json b/src/main/resources/assets/create/models/block/gauge/stressometer/item.json
@@ -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"}
 			}
 		},
 		{
diff --git a/src/main/resources/assets/create/textures/gui/widgets.png b/src/main/resources/assets/create/textures/gui/widgets.png

Original file line number	Diff line number	Diff line change
`@@ -24,12 +24,12 @@`
`24`	`24`	`"from": [1, 0, 0],`
`25`	`25`	`"to": [15, 2, 16],`
`26`	`26`	`"faces": {`
`27`		`- "north": {"uv": [0, 9, 8, 10], "texture": "#2"},`
	`27`	`+ "north": {"uv": [0.5, 9, 7.5, 10], "texture": "#2"},`
`28`	`28`	`"east": {"uv": [0, 9, 8, 10], "texture": "#2"},`
`29`		`- "south": {"uv": [0, 9, 7, 10], "texture": "#2"},`
	`29`	`+ "south": {"uv": [0.5, 9, 7.5, 10], "texture": "#2"},`
`30`	`30`	`"west": {"uv": [0, 9, 8, 10], "texture": "#2"},`
`31`		`- "up": {"uv": [0, 0, 8, 7], "rotation": 270, "texture": "#2"},`
`32`		`- "down": {"uv": [0, 0, 8, 7], "texture": "#2"}`
	`31`	`+ "up": {"uv": [0, 0, 8, 7], "rotation": 90, "texture": "#2"},`
	`32`	`+ "down": {"uv": [0, 0, 8, 7], "rotation": 90, "texture": "#2"}`
`33`	`33`	`}`
`34`	`34`	`}`
`35`	`35`	`]`
Original file line number	Diff line number	Diff line change
`@@ -26,12 +26,12 @@`
`26`	`26`	`"from": [1, 0, 0],`
`27`	`27`	`"to": [15, 2, 16],`
`28`	`28`	`"faces": {`
`29`		`- "north": {"uv": [0, 9, 8, 10], "texture": "#2"},`
	`29`	`+ "north": {"uv": [0.5, 9, 7.5, 10], "texture": "#2"},`
`30`	`30`	`"east": {"uv": [0, 9, 8, 10], "texture": "#2"},`
`31`		`- "south": {"uv": [0, 9, 7, 10], "texture": "#2"},`
	`31`	`+ "south": {"uv": [0.5, 9, 7.5, 10], "texture": "#2"},`
`32`	`32`	`"west": {"uv": [0, 9, 8, 10], "texture": "#2"},`
`33`	`33`	`"up": {"uv": [0, 0, 8, 7], "rotation": 270, "texture": "#2"},`
`34`		`- "down": {"uv": [0, 0, 8, 7], "texture": "#2"}`
	`34`	`+ "down": {"uv": [0, 0, 8, 7], "rotation": 90, "texture": "#2"}`
`35`	`35`	`}`
`36`	`36`	`},`
`37`	`37`	`{`
`@@ -148,11 +148,13 @@`
`148`	`148`	`{`
`149`	`149`	`"name": "Gauge",`
`150`	`150`	`"origin": [8, 8, 8],`
	`151`	`+ "color": 0,`
`151`	`152`	`"children": [0, 1, 2, 3, 4, 5, 6]`
`152`	`153`	`},`
`153`	`154`	`{`
`154`	`155`	`"name": "shaft",`
`155`	`156`	`"origin": [8, 8, 8],`
	`157`	`+ "color": 0,`
`156`	`158`	`"children": [7]`
`157`	`159`	`}`
`158`	`160`	`]`