Merge branch 'feats/1.12' of https://github.com/MrTroble/Open-Signals …

…into feats/1.12
MrTroble · Oct 13, 2024 · 26b5287 · 26b5287
2 parents 0a319c3 + d55eeaf
commit 26b5287
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/resources/assets/opensignals/modeldefinitions/shlight.json b/src/main/resources/assets/opensignals/modeldefinitions/shlight.json
@@ -25,7 +25,7 @@
 				{
 					"blockstate": "with(sh_light_bottom.STATUS_LIGHT) && hasandisnot(sh_high)",
 					"retexture": {
-						"lamp_whitenorth": "lamp_white"
+						"lamp_white2north": "lamp_white"
 					}
 				},
 				{
@@ -50,7 +50,7 @@
 				{
 					"blockstate": "with(sh_light_bottom.STATUS_LIGHT) && hasandis(sh_high)",
 					"retexture": {
-						"lamp_whitenorth": "lamp_white"
+						"lamp_white2north": "lamp_white"
 					},
 					"y": 2
 				}

diff --git a/src/main/resources/assets/opensignals/signalsystems/buesignal.json b/src/main/resources/assets/opensignals/signalsystems/buesignal.json
@@ -6,7 +6,7 @@
 		"signalHeights": {
 			"config(BUETYPE.BUE4) || config(BUETYPE.BUE5) || config(BUETYPE.HET) || config(BUETYPE.AUTO_HET) || config(BUETYPE.ET) || config(BUETYPE.AUTO_ET) || config(BUETYPE.BUE_DISTANT) || config(BUETYPE.BUE_IDENTIFICATION)": 1
 		},
-        "customNameRenderHeight": 1.5,
+        "customNameRenderHeight": 1.55,
         "offsetY": -5,
         "renderHeights": {
             "!(config(BUETYPE.BUE_IDENTIFICATION) || config(BUETYPE.BUE_DISTANT)) ": -1