Skip to content

Commit e10def6

Browse files
IThundxrIThundxr
committed
Merge remote-tracking branch 'origin/1.19/dev' into 1.19/dev
2 parents 12b5646 + 3df9abe commit e10def6

File tree

409 files changed

+16203
-6461
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

409 files changed

+16203
-6461
lines changed

‎common/src/generated/resources/.cache/7568cfb1ba927d76bbe88ce5981c1ed7cd0b00e8

+6,039-5,764
Large diffs are not rendered by default.

‎common/src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e

+69-246
Large diffs are not rendered by default.

‎common/src/generated/resources/.cache/c3c688c4efe8f57272b43a9a4840c55a7086f208

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
// 1.19.2 2024-01-31T16:24:04.397277113 Steam 'n' Rails EMI recipe tree defaults
1+
// 1.19.2 2024-02-18T16:28:55.603128257 Steam 'n' Rails EMI recipe tree defaults
22
1dc6aa538b4bff0c8502fe157798936b096e6c6e assets/emi/recipe/defaults/railways.json

‎common/src/generated/resources/.cache/d7e494d5d0e99c7bbf8df1e22c97c22b5c6944c1

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
// 1.19.2 2024-01-31T16:24:04.39179335 Steam 'n' Rails EMI excluded tags
1+
// 1.19.2 2024-02-18T16:28:55.603416135 Steam 'n' Rails EMI excluded tags
22
8ebd080b7100d3961fc94cc411b7bf522b0afcd6 assets/emi/tag/exclusions/railways.json

‎common/src/generated/resources/assets/railways/blockstates/black_brass_wrapped_locometal_boiler.json

+16-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,28 @@
11
{
22
"variants": {
3-
"axis=x,style=gullet": {
3+
"axis=x,raised=false,style=gullet": {
44
"model": "railways:block/black_brass_wrapped_locometal_boiler_gullet_x"
55
},
6-
"axis=x,style=smokebox": {
6+
"axis=x,raised=false,style=smokebox": {
77
"model": "railways:block/black_brass_wrapped_locometal_boiler_smokebox_x"
88
},
9-
"axis=z,style=gullet": {
9+
"axis=x,raised=true,style=gullet": {
10+
"model": "railways:block/black_brass_wrapped_locometal_boiler_gullet_x_raised"
11+
},
12+
"axis=x,raised=true,style=smokebox": {
13+
"model": "railways:block/black_brass_wrapped_locometal_boiler_smokebox_x_raised"
14+
},
15+
"axis=z,raised=false,style=gullet": {
1016
"model": "railways:block/black_brass_wrapped_locometal_boiler_gullet_z"
1117
},
12-
"axis=z,style=smokebox": {
18+
"axis=z,raised=false,style=smokebox": {
1319
"model": "railways:block/black_brass_wrapped_locometal_boiler_smokebox_z"
20+
},
21+
"axis=z,raised=true,style=gullet": {
22+
"model": "railways:block/black_brass_wrapped_locometal_boiler_gullet_z_raised"
23+
},
24+
"axis=z,raised=true,style=smokebox": {
25+
"model": "railways:block/black_brass_wrapped_locometal_boiler_smokebox_z_raised"
1426
}
1527
}
1628
}

‎common/src/generated/resources/assets/railways/blockstates/black_copper_wrapped_locometal_boiler.json

+16-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,28 @@
11
{
22
"variants": {
3-
"axis=x,style=gullet": {
3+
"axis=x,raised=false,style=gullet": {
44
"model": "railways:block/black_copper_wrapped_locometal_boiler_gullet_x"
55
},
6-
"axis=x,style=smokebox": {
6+
"axis=x,raised=false,style=smokebox": {
77
"model": "railways:block/black_copper_wrapped_locometal_boiler_smokebox_x"
88
},
9-
"axis=z,style=gullet": {
9+
"axis=x,raised=true,style=gullet": {
10+
"model": "railways:block/black_copper_wrapped_locometal_boiler_gullet_x_raised"
11+
},
12+
"axis=x,raised=true,style=smokebox": {
13+
"model": "railways:block/black_copper_wrapped_locometal_boiler_smokebox_x_raised"
14+
},
15+
"axis=z,raised=false,style=gullet": {
1016
"model": "railways:block/black_copper_wrapped_locometal_boiler_gullet_z"
1117
},
12-
"axis=z,style=smokebox": {
18+
"axis=z,raised=false,style=smokebox": {
1319
"model": "railways:block/black_copper_wrapped_locometal_boiler_smokebox_z"
20+
},
21+
"axis=z,raised=true,style=gullet": {
22+
"model": "railways:block/black_copper_wrapped_locometal_boiler_gullet_z_raised"
23+
},
24+
"axis=z,raised=true,style=smokebox": {
25+
"model": "railways:block/black_copper_wrapped_locometal_boiler_smokebox_z_raised"
1426
}
1527
}
1628
}

‎common/src/generated/resources/assets/railways/blockstates/black_iron_wrapped_locometal_boiler.json

+16-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,28 @@
11
{
22
"variants": {
3-
"axis=x,style=gullet": {
3+
"axis=x,raised=false,style=gullet": {
44
"model": "railways:block/black_iron_wrapped_locometal_boiler_gullet_x"
55
},
6-
"axis=x,style=smokebox": {
6+
"axis=x,raised=false,style=smokebox": {
77
"model": "railways:block/black_iron_wrapped_locometal_boiler_smokebox_x"
88
},
9-
"axis=z,style=gullet": {
9+
"axis=x,raised=true,style=gullet": {
10+
"model": "railways:block/black_iron_wrapped_locometal_boiler_gullet_x_raised"
11+
},
12+
"axis=x,raised=true,style=smokebox": {
13+
"model": "railways:block/black_iron_wrapped_locometal_boiler_smokebox_x_raised"
14+
},
15+
"axis=z,raised=false,style=gullet": {
1016
"model": "railways:block/black_iron_wrapped_locometal_boiler_gullet_z"
1117
},
12-
"axis=z,style=smokebox": {
18+
"axis=z,raised=false,style=smokebox": {
1319
"model": "railways:block/black_iron_wrapped_locometal_boiler_smokebox_z"
20+
},
21+
"axis=z,raised=true,style=gullet": {
22+
"model": "railways:block/black_iron_wrapped_locometal_boiler_gullet_z_raised"
23+
},
24+
"axis=z,raised=true,style=smokebox": {
25+
"model": "railways:block/black_iron_wrapped_locometal_boiler_smokebox_z_raised"
1426
}
1527
}
1628
}

‎common/src/generated/resources/assets/railways/blockstates/black_locometal_boiler.json

+16-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,28 @@
11
{
22
"variants": {
3-
"axis=x,style=gullet": {
3+
"axis=x,raised=false,style=gullet": {
44
"model": "railways:block/black_locometal_boiler_gullet_x"
55
},
6-
"axis=x,style=smokebox": {
6+
"axis=x,raised=false,style=smokebox": {
77
"model": "railways:block/black_locometal_boiler_smokebox_x"
88
},
9-
"axis=z,style=gullet": {
9+
"axis=x,raised=true,style=gullet": {
10+
"model": "railways:block/black_locometal_boiler_gullet_x_raised"
11+
},
12+
"axis=x,raised=true,style=smokebox": {
13+
"model": "railways:block/black_locometal_boiler_smokebox_x_raised"
14+
},
15+
"axis=z,raised=false,style=gullet": {
1016
"model": "railways:block/black_locometal_boiler_gullet_z"
1117
},
12-
"axis=z,style=smokebox": {
18+
"axis=z,raised=false,style=smokebox": {
1319
"model": "railways:block/black_locometal_boiler_smokebox_z"
20+
},
21+
"axis=z,raised=true,style=gullet": {
22+
"model": "railways:block/black_locometal_boiler_gullet_z_raised"
23+
},
24+
"axis=z,raised=true,style=smokebox": {
25+
"model": "railways:block/black_locometal_boiler_smokebox_z_raised"
1426
}
1527
}
1628
}

‎common/src/generated/resources/assets/railways/blockstates/blue_brass_wrapped_locometal_boiler.json

+16-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,28 @@
11
{
22
"variants": {
3-
"axis=x,style=gullet": {
3+
"axis=x,raised=false,style=gullet": {
44
"model": "railways:block/blue_brass_wrapped_locometal_boiler_gullet_x"
55
},
6-
"axis=x,style=smokebox": {
6+
"axis=x,raised=false,style=smokebox": {
77
"model": "railways:block/blue_brass_wrapped_locometal_boiler_smokebox_x"
88
},
9-
"axis=z,style=gullet": {
9+
"axis=x,raised=true,style=gullet": {
10+
"model": "railways:block/blue_brass_wrapped_locometal_boiler_gullet_x_raised"
11+
},
12+
"axis=x,raised=true,style=smokebox": {
13+
"model": "railways:block/blue_brass_wrapped_locometal_boiler_smokebox_x_raised"
14+
},
15+
"axis=z,raised=false,style=gullet": {
1016
"model": "railways:block/blue_brass_wrapped_locometal_boiler_gullet_z"
1117
},
12-
"axis=z,style=smokebox": {
18+
"axis=z,raised=false,style=smokebox": {
1319
"model": "railways:block/blue_brass_wrapped_locometal_boiler_smokebox_z"
20+
},
21+
"axis=z,raised=true,style=gullet": {
22+
"model": "railways:block/blue_brass_wrapped_locometal_boiler_gullet_z_raised"
23+
},
24+
"axis=z,raised=true,style=smokebox": {
25+
"model": "railways:block/blue_brass_wrapped_locometal_boiler_smokebox_z_raised"
1426
}
1527
}
1628
}

‎common/src/generated/resources/assets/railways/blockstates/blue_copper_wrapped_locometal_boiler.json

+16-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,28 @@
11
{
22
"variants": {
3-
"axis=x,style=gullet": {
3+
"axis=x,raised=false,style=gullet": {
44
"model": "railways:block/blue_copper_wrapped_locometal_boiler_gullet_x"
55
},
6-
"axis=x,style=smokebox": {
6+
"axis=x,raised=false,style=smokebox": {
77
"model": "railways:block/blue_copper_wrapped_locometal_boiler_smokebox_x"
88
},
9-
"axis=z,style=gullet": {
9+
"axis=x,raised=true,style=gullet": {
10+
"model": "railways:block/blue_copper_wrapped_locometal_boiler_gullet_x_raised"
11+
},
12+
"axis=x,raised=true,style=smokebox": {
13+
"model": "railways:block/blue_copper_wrapped_locometal_boiler_smokebox_x_raised"
14+
},
15+
"axis=z,raised=false,style=gullet": {
1016
"model": "railways:block/blue_copper_wrapped_locometal_boiler_gullet_z"
1117
},
12-
"axis=z,style=smokebox": {
18+
"axis=z,raised=false,style=smokebox": {
1319
"model": "railways:block/blue_copper_wrapped_locometal_boiler_smokebox_z"
20+
},
21+
"axis=z,raised=true,style=gullet": {
22+
"model": "railways:block/blue_copper_wrapped_locometal_boiler_gullet_z_raised"
23+
},
24+
"axis=z,raised=true,style=smokebox": {
25+
"model": "railways:block/blue_copper_wrapped_locometal_boiler_smokebox_z_raised"
1426
}
1527
}
1628
}

‎common/src/generated/resources/assets/railways/blockstates/blue_iron_wrapped_locometal_boiler.json

+16-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,28 @@
11
{
22
"variants": {
3-
"axis=x,style=gullet": {
3+
"axis=x,raised=false,style=gullet": {
44
"model": "railways:block/blue_iron_wrapped_locometal_boiler_gullet_x"
55
},
6-
"axis=x,style=smokebox": {
6+
"axis=x,raised=false,style=smokebox": {
77
"model": "railways:block/blue_iron_wrapped_locometal_boiler_smokebox_x"
88
},
9-
"axis=z,style=gullet": {
9+
"axis=x,raised=true,style=gullet": {
10+
"model": "railways:block/blue_iron_wrapped_locometal_boiler_gullet_x_raised"
11+
},
12+
"axis=x,raised=true,style=smokebox": {
13+
"model": "railways:block/blue_iron_wrapped_locometal_boiler_smokebox_x_raised"
14+
},
15+
"axis=z,raised=false,style=gullet": {
1016
"model": "railways:block/blue_iron_wrapped_locometal_boiler_gullet_z"
1117
},
12-
"axis=z,style=smokebox": {
18+
"axis=z,raised=false,style=smokebox": {
1319
"model": "railways:block/blue_iron_wrapped_locometal_boiler_smokebox_z"
20+
},
21+
"axis=z,raised=true,style=gullet": {
22+
"model": "railways:block/blue_iron_wrapped_locometal_boiler_gullet_z_raised"
23+
},
24+
"axis=z,raised=true,style=smokebox": {
25+
"model": "railways:block/blue_iron_wrapped_locometal_boiler_smokebox_z_raised"
1426
}
1527
}
1628
}

‎common/src/generated/resources/assets/railways/blockstates/blue_locometal_boiler.json

+16-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,28 @@
11
{
22
"variants": {
3-
"axis=x,style=gullet": {
3+
"axis=x,raised=false,style=gullet": {
44
"model": "railways:block/blue_locometal_boiler_gullet_x"
55
},
6-
"axis=x,style=smokebox": {
6+
"axis=x,raised=false,style=smokebox": {
77
"model": "railways:block/blue_locometal_boiler_smokebox_x"
88
},
9-
"axis=z,style=gullet": {
9+
"axis=x,raised=true,style=gullet": {
10+
"model": "railways:block/blue_locometal_boiler_gullet_x_raised"
11+
},
12+
"axis=x,raised=true,style=smokebox": {
13+
"model": "railways:block/blue_locometal_boiler_smokebox_x_raised"
14+
},
15+
"axis=z,raised=false,style=gullet": {
1016
"model": "railways:block/blue_locometal_boiler_gullet_z"
1117
},
12-
"axis=z,style=smokebox": {
18+
"axis=z,raised=false,style=smokebox": {
1319
"model": "railways:block/blue_locometal_boiler_smokebox_z"
20+
},
21+
"axis=z,raised=true,style=gullet": {
22+
"model": "railways:block/blue_locometal_boiler_gullet_z_raised"
23+
},
24+
"axis=z,raised=true,style=smokebox": {
25+
"model": "railways:block/blue_locometal_boiler_smokebox_z_raised"
1426
}
1527
}
1628
}

‎common/src/generated/resources/assets/railways/blockstates/brass_wrapped_locometal_boiler.json

+16-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,28 @@
11
{
22
"variants": {
3-
"axis=x,style=gullet": {
3+
"axis=x,raised=false,style=gullet": {
44
"model": "railways:block/brass_wrapped_locometal_boiler_gullet_x"
55
},
6-
"axis=x,style=smokebox": {
6+
"axis=x,raised=false,style=smokebox": {
77
"model": "railways:block/brass_wrapped_locometal_boiler_smokebox_x"
88
},
9-
"axis=z,style=gullet": {
9+
"axis=x,raised=true,style=gullet": {
10+
"model": "railways:block/brass_wrapped_locometal_boiler_gullet_x_raised"
11+
},
12+
"axis=x,raised=true,style=smokebox": {
13+
"model": "railways:block/brass_wrapped_locometal_boiler_smokebox_x_raised"
14+
},
15+
"axis=z,raised=false,style=gullet": {
1016
"model": "railways:block/brass_wrapped_locometal_boiler_gullet_z"
1117
},
12-
"axis=z,style=smokebox": {
18+
"axis=z,raised=false,style=smokebox": {
1319
"model": "railways:block/brass_wrapped_locometal_boiler_smokebox_z"
20+
},
21+
"axis=z,raised=true,style=gullet": {
22+
"model": "railways:block/brass_wrapped_locometal_boiler_gullet_z_raised"
23+
},
24+
"axis=z,raised=true,style=smokebox": {
25+
"model": "railways:block/brass_wrapped_locometal_boiler_smokebox_z_raised"
1426
}
1527
}
1628
}

‎common/src/generated/resources/assets/railways/blockstates/brown_brass_wrapped_locometal_boiler.json

+16-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,28 @@
11
{
22
"variants": {
3-
"axis=x,style=gullet": {
3+
"axis=x,raised=false,style=gullet": {
44
"model": "railways:block/brown_brass_wrapped_locometal_boiler_gullet_x"
55
},
6-
"axis=x,style=smokebox": {
6+
"axis=x,raised=false,style=smokebox": {
77
"model": "railways:block/brown_brass_wrapped_locometal_boiler_smokebox_x"
88
},
9-
"axis=z,style=gullet": {
9+
"axis=x,raised=true,style=gullet": {
10+
"model": "railways:block/brown_brass_wrapped_locometal_boiler_gullet_x_raised"
11+
},
12+
"axis=x,raised=true,style=smokebox": {
13+
"model": "railways:block/brown_brass_wrapped_locometal_boiler_smokebox_x_raised"
14+
},
15+
"axis=z,raised=false,style=gullet": {
1016
"model": "railways:block/brown_brass_wrapped_locometal_boiler_gullet_z"
1117
},
12-
"axis=z,style=smokebox": {
18+
"axis=z,raised=false,style=smokebox": {
1319
"model": "railways:block/brown_brass_wrapped_locometal_boiler_smokebox_z"
20+
},
21+
"axis=z,raised=true,style=gullet": {
22+
"model": "railways:block/brown_brass_wrapped_locometal_boiler_gullet_z_raised"
23+
},
24+
"axis=z,raised=true,style=smokebox": {
25+
"model": "railways:block/brown_brass_wrapped_locometal_boiler_smokebox_z_raised"
1426
}
1527
}
1628
}

‎common/src/generated/resources/assets/railways/blockstates/brown_copper_wrapped_locometal_boiler.json

+16-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,28 @@
11
{
22
"variants": {
3-
"axis=x,style=gullet": {
3+
"axis=x,raised=false,style=gullet": {
44
"model": "railways:block/brown_copper_wrapped_locometal_boiler_gullet_x"
55
},
6-
"axis=x,style=smokebox": {
6+
"axis=x,raised=false,style=smokebox": {
77
"model": "railways:block/brown_copper_wrapped_locometal_boiler_smokebox_x"
88
},
9-
"axis=z,style=gullet": {
9+
"axis=x,raised=true,style=gullet": {
10+
"model": "railways:block/brown_copper_wrapped_locometal_boiler_gullet_x_raised"
11+
},
12+
"axis=x,raised=true,style=smokebox": {
13+
"model": "railways:block/brown_copper_wrapped_locometal_boiler_smokebox_x_raised"
14+
},
15+
"axis=z,raised=false,style=gullet": {
1016
"model": "railways:block/brown_copper_wrapped_locometal_boiler_gullet_z"
1117
},
12-
"axis=z,style=smokebox": {
18+
"axis=z,raised=false,style=smokebox": {
1319
"model": "railways:block/brown_copper_wrapped_locometal_boiler_smokebox_z"
20+
},
21+
"axis=z,raised=true,style=gullet": {
22+
"model": "railways:block/brown_copper_wrapped_locometal_boiler_gullet_z_raised"
23+
},
24+
"axis=z,raised=true,style=smokebox": {
25+
"model": "railways:block/brown_copper_wrapped_locometal_boiler_smokebox_z_raised"
1426
}
1527
}
1628
}

0 commit comments

Comments
 (0)