Skip to content

Commit 5912e69

Browse files
hlysinehlysine
committed
Fix merge
1 parent 91837bb commit 5912e69

22 files changed

+434
-433
lines changed

‎src/generated/resources/assets/create_connected/blockstates/inventory_access_port.json

+48-48
Original file line numberDiff line numberDiff line change
@@ -1,94 +1,94 @@
11
{
22
"variants": {
3-
"attached=false,facing=east,target=ceiling": {
4-
"model": "create_connected:block/inventory_access_port/block_ceiling_off",
5-
"y": 90
3+
"attached=false,facing=north,target=floor": {
4+
"model": "create_connected:block/inventory_access_port/block_floor_off"
5+
},
6+
"attached=true,facing=north,target=floor": {
7+
"model": "create_connected:block/inventory_access_port/block_floor_on"
8+
},
9+
"attached=false,facing=south,target=floor": {
10+
"model": "create_connected:block/inventory_access_port/block_floor_off",
11+
"y": 180
12+
},
13+
"attached=true,facing=south,target=floor": {
14+
"model": "create_connected:block/inventory_access_port/block_floor_on",
15+
"y": 180
16+
},
17+
"attached=false,facing=west,target=floor": {
18+
"model": "create_connected:block/inventory_access_port/block_floor_off",
19+
"y": 270
20+
},
21+
"attached=true,facing=west,target=floor": {
22+
"model": "create_connected:block/inventory_access_port/block_floor_on",
23+
"y": 270
624
},
725
"attached=false,facing=east,target=floor": {
826
"model": "create_connected:block/inventory_access_port/block_floor_off",
927
"y": 90
1028
},
11-
"attached=false,facing=east,target=wall": {
12-
"model": "create_connected:block/inventory_access_port/block_wall_off",
29+
"attached=true,facing=east,target=floor": {
30+
"model": "create_connected:block/inventory_access_port/block_floor_on",
1331
"y": 90
1432
},
15-
"attached=false,facing=north,target=ceiling": {
16-
"model": "create_connected:block/inventory_access_port/block_ceiling_off"
17-
},
18-
"attached=false,facing=north,target=floor": {
19-
"model": "create_connected:block/inventory_access_port/block_floor_off"
20-
},
2133
"attached=false,facing=north,target=wall": {
2234
"model": "create_connected:block/inventory_access_port/block_wall_off"
2335
},
24-
"attached=false,facing=south,target=ceiling": {
25-
"model": "create_connected:block/inventory_access_port/block_ceiling_off",
26-
"y": 180
27-
},
28-
"attached=false,facing=south,target=floor": {
29-
"model": "create_connected:block/inventory_access_port/block_floor_off",
30-
"y": 180
36+
"attached=true,facing=north,target=wall": {
37+
"model": "create_connected:block/inventory_access_port/block_wall_on"
3138
},
3239
"attached=false,facing=south,target=wall": {
3340
"model": "create_connected:block/inventory_access_port/block_wall_off",
3441
"y": 180
3542
},
36-
"attached=false,facing=west,target=ceiling": {
37-
"model": "create_connected:block/inventory_access_port/block_ceiling_off",
38-
"y": 270
39-
},
40-
"attached=false,facing=west,target=floor": {
41-
"model": "create_connected:block/inventory_access_port/block_floor_off",
42-
"y": 270
43+
"attached=true,facing=south,target=wall": {
44+
"model": "create_connected:block/inventory_access_port/block_wall_on",
45+
"y": 180
4346
},
4447
"attached=false,facing=west,target=wall": {
4548
"model": "create_connected:block/inventory_access_port/block_wall_off",
4649
"y": 270
4750
},
48-
"attached=true,facing=east,target=ceiling": {
49-
"model": "create_connected:block/inventory_access_port/block_ceiling_on",
50-
"y": 90
51+
"attached=true,facing=west,target=wall": {
52+
"model": "create_connected:block/inventory_access_port/block_wall_on",
53+
"y": 270
5154
},
52-
"attached=true,facing=east,target=floor": {
53-
"model": "create_connected:block/inventory_access_port/block_floor_on",
55+
"attached=false,facing=east,target=wall": {
56+
"model": "create_connected:block/inventory_access_port/block_wall_off",
5457
"y": 90
5558
},
5659
"attached=true,facing=east,target=wall": {
5760
"model": "create_connected:block/inventory_access_port/block_wall_on",
5861
"y": 90
5962
},
63+
"attached=false,facing=north,target=ceiling": {
64+
"model": "create_connected:block/inventory_access_port/block_ceiling_off"
65+
},
6066
"attached=true,facing=north,target=ceiling": {
6167
"model": "create_connected:block/inventory_access_port/block_ceiling_on"
6268
},
63-
"attached=true,facing=north,target=floor": {
64-
"model": "create_connected:block/inventory_access_port/block_floor_on"
65-
},
66-
"attached=true,facing=north,target=wall": {
67-
"model": "create_connected:block/inventory_access_port/block_wall_on"
69+
"attached=false,facing=south,target=ceiling": {
70+
"model": "create_connected:block/inventory_access_port/block_ceiling_off",
71+
"y": 180
6872
},
6973
"attached=true,facing=south,target=ceiling": {
7074
"model": "create_connected:block/inventory_access_port/block_ceiling_on",
7175
"y": 180
7276
},
73-
"attached=true,facing=south,target=floor": {
74-
"model": "create_connected:block/inventory_access_port/block_floor_on",
75-
"y": 180
76-
},
77-
"attached=true,facing=south,target=wall": {
78-
"model": "create_connected:block/inventory_access_port/block_wall_on",
79-
"y": 180
77+
"attached=false,facing=west,target=ceiling": {
78+
"model": "create_connected:block/inventory_access_port/block_ceiling_off",
79+
"y": 270
8080
},
8181
"attached=true,facing=west,target=ceiling": {
8282
"model": "create_connected:block/inventory_access_port/block_ceiling_on",
8383
"y": 270
8484
},
85-
"attached=true,facing=west,target=floor": {
86-
"model": "create_connected:block/inventory_access_port/block_floor_on",
87-
"y": 270
85+
"attached=false,facing=east,target=ceiling": {
86+
"model": "create_connected:block/inventory_access_port/block_ceiling_off",
87+
"y": 90
8888
},
89-
"attached=true,facing=west,target=wall": {
90-
"model": "create_connected:block/inventory_access_port/block_wall_on",
91-
"y": 270
89+
"attached=true,facing=east,target=ceiling": {
90+
"model": "create_connected:block/inventory_access_port/block_ceiling_on",
91+
"y": 90
9292
}
9393
}
9494
}

‎src/generated/resources/assets/create_connected/blockstates/inventory_bridge.json

+22-22
Original file line numberDiff line numberDiff line change
@@ -5,47 +5,47 @@
55
"x": 90,
66
"y": 90
77
},
8-
"attached_negative=false,attached_positive=false,axis=y": {
9-
"model": "create_connected:block/inventory_bridge/block"
10-
},
11-
"attached_negative=false,attached_positive=false,axis=z": {
12-
"model": "create_connected:block/inventory_bridge/block",
8+
"attached_negative=true,attached_positive=false,axis=x": {
9+
"model": "create_connected:block/inventory_bridge/block_negative",
1310
"x": 90,
14-
"y": 180
11+
"y": 90
1512
},
1613
"attached_negative=false,attached_positive=true,axis=x": {
1714
"model": "create_connected:block/inventory_bridge/block_positive",
1815
"x": 90,
1916
"y": 90
2017
},
21-
"attached_negative=false,attached_positive=true,axis=y": {
22-
"model": "create_connected:block/inventory_bridge/block_positive"
23-
},
24-
"attached_negative=false,attached_positive=true,axis=z": {
25-
"model": "create_connected:block/inventory_bridge/block_positive",
26-
"x": 90,
27-
"y": 180
28-
},
29-
"attached_negative=true,attached_positive=false,axis=x": {
30-
"model": "create_connected:block/inventory_bridge/block_negative",
18+
"attached_negative=true,attached_positive=true,axis=x": {
19+
"model": "create_connected:block/inventory_bridge/block_both",
3120
"x": 90,
3221
"y": 90
3322
},
23+
"attached_negative=false,attached_positive=false,axis=y": {
24+
"model": "create_connected:block/inventory_bridge/block"
25+
},
3426
"attached_negative=true,attached_positive=false,axis=y": {
3527
"model": "create_connected:block/inventory_bridge/block_negative"
3628
},
29+
"attached_negative=false,attached_positive=true,axis=y": {
30+
"model": "create_connected:block/inventory_bridge/block_positive"
31+
},
32+
"attached_negative=true,attached_positive=true,axis=y": {
33+
"model": "create_connected:block/inventory_bridge/block_both"
34+
},
35+
"attached_negative=false,attached_positive=false,axis=z": {
36+
"model": "create_connected:block/inventory_bridge/block",
37+
"x": 90,
38+
"y": 180
39+
},
3740
"attached_negative=true,attached_positive=false,axis=z": {
3841
"model": "create_connected:block/inventory_bridge/block_negative",
3942
"x": 90,
4043
"y": 180
4144
},
42-
"attached_negative=true,attached_positive=true,axis=x": {
43-
"model": "create_connected:block/inventory_bridge/block_both",
45+
"attached_negative=false,attached_positive=true,axis=z": {
46+
"model": "create_connected:block/inventory_bridge/block_positive",
4447
"x": 90,
45-
"y": 90
46-
},
47-
"attached_negative=true,attached_positive=true,axis=y": {
48-
"model": "create_connected:block/inventory_bridge/block_both"
48+
"y": 180
4949
},
5050
"attached_negative=true,attached_positive=true,axis=z": {
5151
"model": "create_connected:block/inventory_bridge/block_both",

0 commit comments

Comments
 (0)