Skip to content

Commit cade336

Browse files
committed
Merge branch 'refs/heads/1.19/dev-secret' into 1.20/secret-dev
2 parents 46f880f + 3d8d965 commit cade336

File tree

1 file changed

+13
-9
lines changed
  • common/src/main/resources/assets/railways/models/block/buffer

1 file changed

+13
-9
lines changed

common/src/main/resources/assets/railways/models/block/buffer/item.json

+13-9
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,7 @@
311311
"faces": {
312312
"north": {"uv": [0, 2, 3, 5], "rotation": 90, "texture": "#4"},
313313
"east": {"uv": [0, 0, 3, 2], "rotation": 90, "texture": "#4"},
314+
"south": {"uv": [12.5, 1, 15.5, 3], "rotation": 180, "texture": "#missing"},
314315
"west": {"uv": [0, 0, 3, 2], "rotation": 270, "texture": "#4"},
315316
"up": {"uv": [0, 0, 3, 2], "texture": "#4"},
316317
"down": {"uv": [0, 0, 3, 2], "rotation": 180, "texture": "#4"}
@@ -360,6 +361,7 @@
360361
"faces": {
361362
"north": {"uv": [0, 5, 3, 2], "rotation": 90, "texture": "#4"},
362363
"east": {"uv": [0, 2, 3, 0], "rotation": 270, "texture": "#4"},
364+
"south": {"uv": [15.5, 1, 12.5, 3], "rotation": 180, "texture": "#missing"},
363365
"west": {"uv": [0, 2, 3, 0], "rotation": 90, "texture": "#4"},
364366
"up": {"uv": [3, 0, 0, 2], "texture": "#4"},
365367
"down": {"uv": [3, 0, 0, 2], "rotation": 180, "texture": "#4"}
@@ -370,25 +372,27 @@
370372
"display": {
371373
"thirdperson_righthand": {
372374
"rotation": [75, 45, 0],
373-
"translation": [0, 2.5, 0],
374-
"scale": [0.12, 0.12, 0.12]
375+
"translation": [0, 3.25, 0],
376+
"scale": [0.25, 0.25, 0.25]
375377
},
376378
"thirdperson_lefthand": {
377379
"rotation": [75, 45, 0],
378-
"translation": [0, 2.5, 0],
379-
"scale": [0.12, 0.12, 0.12]
380+
"translation": [0, 3.25, 0],
381+
"scale": [0.25, 0.25, 0.25]
380382
},
381383
"firstperson_righthand": {
382-
"rotation": [0, 36, 0],
383-
"scale": [0.12, 0.12, 0.12]
384+
"rotation": [0, 45, 0],
385+
"translation": [0.5, 0, 0],
386+
"scale": [0.25, 0.25, 0.25]
384387
},
385388
"firstperson_lefthand": {
386-
"rotation": [0, 36, 0],
387-
"scale": [0.12, 0.12, 0.12]
389+
"rotation": [0, 45, 0],
390+
"translation": [0.5, 0, 0],
391+
"scale": [0.25, 0.25, 0.25]
388392
},
389393
"ground": {
390394
"translation": [0, -1, 0],
391-
"scale": [0.15, 0.15, 0.15]
395+
"scale": [0.25, 0.25, 0.25]
392396
},
393397
"gui": {
394398
"rotation": [30, 225, 0],

0 commit comments

Comments
 (0)