Port recent changes

This commit is contained in:
simibubi 2020-12-15 23:22:12 +01:00
parent 67cb69aaea
commit 6f9ee792f4
32 changed files with 82 additions and 47 deletions

View File

@ -89,8 +89,8 @@
},
{
"when": {
"axis": "x",
"sticky_west": "true"
"sticky_west": "true",
"axis": "x"
},
"apply": {
"model": "create:block/radial_chassis_side_x_sticky",
@ -99,8 +99,8 @@
},
{
"when": {
"axis": "y",
"sticky_west": "true"
"sticky_west": "true",
"axis": "y"
},
"apply": {
"model": "create:block/radial_chassis_side_y_sticky",
@ -109,8 +109,8 @@
},
{
"when": {
"axis": "z",
"sticky_west": "true"
"sticky_west": "true",
"axis": "z"
},
"apply": {
"model": "create:block/radial_chassis_side_z_sticky",
@ -119,8 +119,8 @@
},
{
"when": {
"axis": "x",
"sticky_west": "false"
"sticky_west": "false",
"axis": "x"
},
"apply": {
"model": "create:block/radial_chassis_side_x",
@ -129,8 +129,8 @@
},
{
"when": {
"axis": "y",
"sticky_west": "false"
"sticky_west": "false",
"axis": "y"
},
"apply": {
"model": "create:block/radial_chassis_side_y",
@ -139,8 +139,8 @@
},
{
"when": {
"axis": "z",
"sticky_west": "false"
"sticky_west": "false",
"axis": "z"
},
"apply": {
"model": "create:block/radial_chassis_side_z",

View File

@ -17,13 +17,16 @@
},
"criteria": {
"0": {
"trigger": "create:bracket_shaft"
"trigger": "create:bracket_shaft",
"conditions": {}
},
"1": {
"trigger": "create:bracket_cog"
"trigger": "create:bracket_cog",
"conditions": {}
},
"2": {
"trigger": "create:bracket_pipe"
"trigger": "create:bracket_pipe",
"conditions": {}
}
},
"requirements": [

View File

@ -17,7 +17,8 @@
},
"criteria": {
"0": {
"trigger": "create:arm_blaze_burner"
"trigger": "create:arm_blaze_burner",
"conditions": {}
}
},
"requirements": [

View File

@ -17,7 +17,8 @@
},
"criteria": {
"0": {
"trigger": "create:arm_many_targets"
"trigger": "create:arm_many_targets",
"conditions": {}
}
},
"requirements": [

View File

@ -17,7 +17,8 @@
},
"criteria": {
"0": {
"trigger": "create:belt_funnel"
"trigger": "create:belt_funnel",
"conditions": {}
}
},
"requirements": [

View File

@ -17,7 +17,8 @@
},
"criteria": {
"0": {
"trigger": "create:belt_funnel_kiss"
"trigger": "create:belt_funnel_kiss",
"conditions": {}
}
},
"requirements": [

View File

@ -17,7 +17,8 @@
},
"criteria": {
"0": {
"trigger": "create:chained_item_drain"
"trigger": "create:chained_item_drain",
"conditions": {}
}
},
"requirements": [

View File

@ -17,7 +17,8 @@
},
"criteria": {
"0": {
"trigger": "create:chocolate_wheel"
"trigger": "create:chocolate_wheel",
"conditions": {}
}
},
"requirements": [

View File

@ -17,7 +17,8 @@
},
"criteria": {
"0": {
"trigger": "create:clockwork_bearing"
"trigger": "create:clockwork_bearing",
"conditions": {}
}
},
"requirements": [

View File

@ -17,7 +17,8 @@
},
"criteria": {
"0": {
"trigger": "create:cuckoo"
"trigger": "create:cuckoo",
"conditions": {}
}
},
"requirements": [

View File

@ -17,7 +17,8 @@
},
"criteria": {
"0": {
"trigger": "create:fan"
"trigger": "create:fan",
"conditions": {}
}
},
"requirements": [

View File

@ -17,7 +17,8 @@
},
"criteria": {
"0": {
"trigger": "create:fan_lava"
"trigger": "create:fan_lava",
"conditions": {}
}
},
"requirements": [

View File

@ -17,7 +17,8 @@
},
"criteria": {
"0": {
"trigger": "create:fan_smoke"
"trigger": "create:fan_smoke",
"conditions": {}
}
},
"requirements": [

View File

@ -17,7 +17,8 @@
},
"criteria": {
"0": {
"trigger": "create:fan_water"
"trigger": "create:fan_water",
"conditions": {}
}
},
"requirements": [

View File

@ -17,7 +17,8 @@
},
"criteria": {
"0": {
"trigger": "create:flywheel"
"trigger": "create:flywheel",
"conditions": {}
}
},
"requirements": [

View File

@ -17,7 +17,8 @@
},
"criteria": {
"0": {
"trigger": "create:glass_pipe"
"trigger": "create:glass_pipe",
"conditions": {}
}
},
"requirements": [

View File

@ -17,7 +17,8 @@
},
"criteria": {
"0": {
"trigger": "create:hose_pulley"
"trigger": "create:hose_pulley",
"conditions": {}
}
},
"requirements": [

View File

@ -17,7 +17,8 @@
},
"criteria": {
"0": {
"trigger": "create:infinite_chocolate"
"trigger": "create:infinite_chocolate",
"conditions": {}
}
},
"requirements": [

View File

@ -17,7 +17,8 @@
},
"criteria": {
"0": {
"trigger": "create:infinite_lava"
"trigger": "create:infinite_lava",
"conditions": {}
}
},
"requirements": [

View File

@ -17,7 +17,8 @@
},
"criteria": {
"0": {
"trigger": "create:infinite_water"
"trigger": "create:infinite_water",
"conditions": {}
}
},
"requirements": [

View File

@ -17,7 +17,8 @@
},
"criteria": {
"0": {
"trigger": "create:item_drain"
"trigger": "create:item_drain",
"conditions": {}
}
},
"requirements": [

View File

@ -17,7 +17,8 @@
},
"criteria": {
"0": {
"trigger": "create:maxed_windmill"
"trigger": "create:maxed_windmill",
"conditions": {}
}
},
"requirements": [

View File

@ -17,7 +17,8 @@
},
"criteria": {
"0": {
"trigger": "create:overstress_flywheel"
"trigger": "create:overstress_flywheel",
"conditions": {}
}
},
"requirements": [

View File

@ -17,7 +17,8 @@
},
"criteria": {
"0": {
"trigger": "create:pipe_collision"
"trigger": "create:pipe_collision",
"conditions": {}
}
},
"requirements": [

View File

@ -17,7 +17,8 @@
},
"criteria": {
"0": {
"trigger": "create:pipe_spill"
"trigger": "create:pipe_spill",
"conditions": {}
}
},
"requirements": [

View File

@ -17,13 +17,16 @@
},
"criteria": {
"0": {
"trigger": "create:casing_shaft"
"trigger": "create:casing_shaft",
"conditions": {}
},
"1": {
"trigger": "create:casing_belt"
"trigger": "create:casing_belt",
"conditions": {}
},
"2": {
"trigger": "create:casing_pipe"
"trigger": "create:casing_pipe",
"conditions": {}
}
},
"requirements": [

View File

@ -17,7 +17,8 @@
},
"criteria": {
"0": {
"trigger": "create:connect_tunnel"
"trigger": "create:connect_tunnel",
"conditions": {}
}
},
"requirements": [

View File

@ -17,7 +17,8 @@
},
"criteria": {
"0": {
"trigger": "create:spout"
"trigger": "create:spout",
"conditions": {}
}
},
"requirements": [

View File

@ -17,7 +17,8 @@
},
"criteria": {
"0": {
"trigger": "create:spout_potion"
"trigger": "create:spout_potion",
"conditions": {}
}
},
"requirements": [

View File

@ -17,7 +17,8 @@
},
"criteria": {
"0": {
"trigger": "create:place_tunnel"
"trigger": "create:place_tunnel",
"conditions": {}
}
},
"requirements": [

View File

@ -17,7 +17,8 @@
},
"criteria": {
"0": {
"trigger": "create:upward_chute"
"trigger": "create:upward_chute",
"conditions": {}
}
},
"requirements": [

View File

@ -17,7 +17,8 @@
},
"criteria": {
"0": {
"trigger": "create:windmill"
"trigger": "create:windmill",
"conditions": {}
}
},
"requirements": [