Port recent changes

src/generated/resources/assets/create/blockstates/radial_chassis.json

@@ -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",

src/generated/resources/data/create/advancements/aesthetics.json

@@ -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": [

src/generated/resources/data/create/advancements/arm_blaze_burner.json

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

src/generated/resources/data/create/advancements/arm_many_targets.json

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

src/generated/resources/data/create/advancements/belt_funnel.json

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

src/generated/resources/data/create/advancements/belt_funnel_kiss.json

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

src/generated/resources/data/create/advancements/chained_item_drain.json

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

src/generated/resources/data/create/advancements/chocolate_wheel.json

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

src/generated/resources/data/create/advancements/clockwork_bearing.json

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

src/generated/resources/data/create/advancements/cuckoo.json

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

src/generated/resources/data/create/advancements/fan.json

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

src/generated/resources/data/create/advancements/fan_lava.json

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

src/generated/resources/data/create/advancements/fan_smoke.json

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

src/generated/resources/data/create/advancements/fan_water.json

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

src/generated/resources/data/create/advancements/flywheel.json

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

src/generated/resources/data/create/advancements/glass_pipe.json

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

src/generated/resources/data/create/advancements/hose_pulley.json

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

src/generated/resources/data/create/advancements/infinite_chocolate.json

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

src/generated/resources/data/create/advancements/infinite_lava.json

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

src/generated/resources/data/create/advancements/infinite_water.json

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

src/generated/resources/data/create/advancements/item_drain.json

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

src/generated/resources/data/create/advancements/maxed_windmill.json

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

src/generated/resources/data/create/advancements/overstress_flywheel.json

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

src/generated/resources/data/create/advancements/pipe_collision.json

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

src/generated/resources/data/create/advancements/pipe_spill.json

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

src/generated/resources/data/create/advancements/reinforced.json

@@ -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": [

src/generated/resources/data/create/advancements/splitter_tunnel.json

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

src/generated/resources/data/create/advancements/spout.json

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

src/generated/resources/data/create/advancements/spout_potion.json

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

src/generated/resources/data/create/advancements/tunnel.json

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

src/generated/resources/data/create/advancements/upward_chute.json

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

src/generated/resources/data/create/advancements/windmill.json

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