Create/Update assets for version 1.8.6

assets/minecraft/blockstates/acacia_fence.json

@@ -1,17 +1,20 @@
 {
-    "multipart": [
+    "variants": {
-        {   "apply": { "model": "acacia_fence_post" }},
+        "east=false,north=false,south=false,west=false": { "model": "acacia_fence_post" },
-        {   "when": { "north": "true" },
+        "east=false,north=true,south=false,west=false": { "model": "acacia_fence_n", "uvlock": true },
-            "apply": { "model": "acacia_fence_side", "uvlock": true }
+        "east=true,north=false,south=false,west=false": { "model": "acacia_fence_n", "y": 90, "uvlock": true },
-        },
+        "east=false,north=false,south=true,west=false": { "model": "acacia_fence_n", "y": 180, "uvlock": true },
-        {   "when": { "east": "true" },
+        "east=false,north=false,south=false,west=true": { "model": "acacia_fence_n", "y": 270, "uvlock": true },
-            "apply": { "model": "acacia_fence_side", "y": 90, "uvlock": true }
+        "east=true,north=true,south=false,west=false": { "model": "acacia_fence_ne", "uvlock": true },
-        },
+        "east=true,north=false,south=true,west=false": { "model": "acacia_fence_ne", "y": 90, "uvlock": true },
-        {   "when": { "south": "true" },
+        "east=false,north=false,south=true,west=true": { "model": "acacia_fence_ne", "y": 180, "uvlock": true },
-            "apply": { "model": "acacia_fence_side", "y": 180, "uvlock": true }
+        "east=false,north=true,south=false,west=true": { "model": "acacia_fence_ne", "y": 270, "uvlock": true },
-        },
+        "east=false,north=true,south=true,west=false": { "model": "acacia_fence_ns", "uvlock": true },
-        {   "when": { "west": "true" },
+        "east=true,north=false,south=false,west=true": { "model": "acacia_fence_ns", "y": 90, "uvlock": true },
-            "apply": { "model": "acacia_fence_side", "y": 270, "uvlock": true }
+        "east=true,north=true,south=true,west=false": { "model": "acacia_fence_nse", "uvlock": true },
-        }
+        "east=true,north=false,south=true,west=true": { "model": "acacia_fence_nse", "y": 90, "uvlock": true },
-    ]
+        "east=false,north=true,south=true,west=true": { "model": "acacia_fence_nse", "y": 180, "uvlock": true },
+        "east=true,north=true,south=false,west=true": { "model": "acacia_fence_nse", "y": 270, "uvlock": true },
+        "east=true,north=true,south=true,west=true": { "model": "acacia_fence_nsew", "uvlock": true }
+    }
 }

assets/minecraft/blockstates/acacia_fence_gate.json

@@ -1,20 +1,20 @@
 {
     "variants": {
-        "facing=south,in_wall=false,open=false": { "model": "acacia_fence_gate_closed", "uvlock": true },
+        "facing=south,in_wall=false,open=false": { "model": "acacia_fence_gate_closed" },
-        "facing=west,in_wall=false,open=false":  { "model": "acacia_fence_gate_closed", "uvlock": true, "y": 90 },
+        "facing=west,in_wall=false,open=false":  { "model": "acacia_fence_gate_closed", "y": 90, "uvlock": true },
-        "facing=north,in_wall=false,open=false": { "model": "acacia_fence_gate_closed", "uvlock": true, "y": 180 },
+        "facing=north,in_wall=false,open=false": { "model": "acacia_fence_gate_closed", "y": 180, "uvlock": true },
-        "facing=east,in_wall=false,open=false":  { "model": "acacia_fence_gate_closed", "uvlock": true, "y": 270 },
+        "facing=east,in_wall=false,open=false":  { "model": "acacia_fence_gate_closed", "y": 270, "uvlock": true },
-        "facing=south,in_wall=false,open=true": { "model": "acacia_fence_gate_open", "uvlock": true },
+        "facing=south,in_wall=false,open=true": { "model": "acacia_fence_gate_open" },
-        "facing=west,in_wall=false,open=true":  { "model": "acacia_fence_gate_open", "uvlock": true, "y": 90 },
+        "facing=west,in_wall=false,open=true":  { "model": "acacia_fence_gate_open", "y": 90, "uvlock": true },
-        "facing=north,in_wall=false,open=true": { "model": "acacia_fence_gate_open", "uvlock": true, "y": 180 },
+        "facing=north,in_wall=false,open=true": { "model": "acacia_fence_gate_open", "y": 180, "uvlock": true },
-        "facing=east,in_wall=false,open=true":  { "model": "acacia_fence_gate_open", "uvlock": true, "y": 270 },
+        "facing=east,in_wall=false,open=true":  { "model": "acacia_fence_gate_open", "y": 270, "uvlock": true },
-        "facing=south,in_wall=true,open=false": { "model": "acacia_wall_gate_closed", "uvlock": true },
+        "facing=south,in_wall=true,open=false": { "model": "acacia_wall_gate_closed" },
-        "facing=west,in_wall=true,open=false":  { "model": "acacia_wall_gate_closed", "uvlock": true, "y": 90 },
+        "facing=west,in_wall=true,open=false":  { "model": "acacia_wall_gate_closed", "y": 90, "uvlock": true },
-        "facing=north,in_wall=true,open=false": { "model": "acacia_wall_gate_closed", "uvlock": true, "y": 180 },
+        "facing=north,in_wall=true,open=false": { "model": "acacia_wall_gate_closed", "y": 180, "uvlock": true },
-        "facing=east,in_wall=true,open=false":  { "model": "acacia_wall_gate_closed", "uvlock": true, "y": 270 },
+        "facing=east,in_wall=true,open=false":  { "model": "acacia_wall_gate_closed", "y": 270, "uvlock": true },
-        "facing=south,in_wall=true,open=true": { "model": "acacia_wall_gate_open", "uvlock": true },
+        "facing=south,in_wall=true,open=true": { "model": "acacia_wall_gate_open" },
-        "facing=west,in_wall=true,open=true":  { "model": "acacia_wall_gate_open", "uvlock": true, "y": 90 },
+        "facing=west,in_wall=true,open=true":  { "model": "acacia_wall_gate_open", "y": 90, "uvlock": true },
-        "facing=north,in_wall=true,open=true": { "model": "acacia_wall_gate_open", "uvlock": true, "y": 180 },
+        "facing=north,in_wall=true,open=true": { "model": "acacia_wall_gate_open", "y": 180, "uvlock": true },
-        "facing=east,in_wall=true,open=true":  { "model": "acacia_wall_gate_open", "uvlock": true, "y": 270 }
+        "facing=east,in_wall=true,open=true":  { "model": "acacia_wall_gate_open", "y": 270, "uvlock": true }
     }
 }

assets/minecraft/blockstates/acacia_log.json

@@ -1,8 +1,8 @@
 {
     "variants": {
         "axis=y":  { "model": "acacia_log" },
-        "axis=z":   { "model": "acacia_log", "x": 90 },
+        "axis=z":   { "model": "acacia_log_side" },
-        "axis=x":   { "model": "acacia_log", "x": 90, "y": 90 },
+        "axis=x":   { "model": "acacia_log_side", "y": 90 },
         "axis=none": { "model": "acacia_bark" }
     }
 }

assets/minecraft/blockstates/acacia_stairs.json

@@ -24,21 +24,21 @@
         "facing=west,half=top,shape=straight":  { "model": "acacia_stairs", "x": 180, "y": 180, "uvlock": true },
         "facing=south,half=top,shape=straight": { "model": "acacia_stairs", "x": 180, "y": 90, "uvlock": true },
         "facing=north,half=top,shape=straight": { "model": "acacia_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_right":  { "model": "acacia_outer_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=east,half=top,shape=outer_right":  { "model": "acacia_outer_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=outer_right":  { "model": "acacia_outer_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=west,half=top,shape=outer_right":  { "model": "acacia_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=outer_right": { "model": "acacia_outer_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=outer_right": { "model": "acacia_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=outer_right": { "model": "acacia_outer_stairs", "x": 180, "uvlock": true },
+        "facing=north,half=top,shape=outer_right": { "model": "acacia_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_left":  { "model": "acacia_outer_stairs", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=outer_left":  { "model": "acacia_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=outer_left":  { "model": "acacia_outer_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=west,half=top,shape=outer_left":  { "model": "acacia_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=outer_left": { "model": "acacia_outer_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=south,half=top,shape=outer_left": { "model": "acacia_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=outer_left": { "model": "acacia_outer_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=north,half=top,shape=outer_left": { "model": "acacia_outer_stairs", "x": 180, "uvlock": true },
-        "facing=east,half=top,shape=inner_right":  { "model": "acacia_inner_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=east,half=top,shape=inner_right":  { "model": "acacia_inner_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=inner_right":  { "model": "acacia_inner_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=west,half=top,shape=inner_right":  { "model": "acacia_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=inner_right": { "model": "acacia_inner_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=inner_right": { "model": "acacia_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=inner_right": { "model": "acacia_inner_stairs", "x": 180, "uvlock": true },
+        "facing=north,half=top,shape=inner_right": { "model": "acacia_inner_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=inner_left":  { "model": "acacia_inner_stairs", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=inner_left":  { "model": "acacia_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=inner_left":  { "model": "acacia_inner_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=west,half=top,shape=inner_left":  { "model": "acacia_inner_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=inner_left": { "model": "acacia_inner_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=south,half=top,shape=inner_left": { "model": "acacia_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=inner_left": { "model": "acacia_inner_stairs", "x": 180, "y": 270, "uvlock": true }
+        "facing=north,half=top,shape=inner_left": { "model": "acacia_inner_stairs", "x": 180, "uvlock": true }
     }
 }

assets/minecraft/blockstates/beetroots.json

@@ -1,8 +0,0 @@
-{
-    "variants": {
-        "age=0": { "model": "beetroots_stage0" },
-        "age=1": { "model": "beetroots_stage1" },
-        "age=2": { "model": "beetroots_stage2" },
-        "age=3": { "model": "beetroots_stage3" }
-    }
-}

assets/minecraft/blockstates/birch_fence.json

@@ -1,17 +1,20 @@
 {
-    "multipart": [
+    "variants": {
-        {   "apply": { "model": "birch_fence_post" }},
+        "east=false,north=false,south=false,west=false": { "model": "birch_fence_post" },
-        {   "when": { "north": "true" },
+        "east=false,north=true,south=false,west=false": { "model": "birch_fence_n", "uvlock": true },
-            "apply": { "model": "birch_fence_side", "uvlock": true }
+        "east=true,north=false,south=false,west=false": { "model": "birch_fence_n", "y": 90, "uvlock": true },
-        },
+        "east=false,north=false,south=true,west=false": { "model": "birch_fence_n", "y": 180, "uvlock": true },
-        {   "when": { "east": "true" },
+        "east=false,north=false,south=false,west=true": { "model": "birch_fence_n", "y": 270, "uvlock": true },
-            "apply": { "model": "birch_fence_side", "y": 90, "uvlock": true }
+        "east=true,north=true,south=false,west=false": { "model": "birch_fence_ne", "uvlock": true },
-        },
+        "east=true,north=false,south=true,west=false": { "model": "birch_fence_ne", "y": 90, "uvlock": true },
-        {   "when": { "south": "true" },
+        "east=false,north=false,south=true,west=true": { "model": "birch_fence_ne", "y": 180, "uvlock": true },
-            "apply": { "model": "birch_fence_side", "y": 180, "uvlock": true }
+        "east=false,north=true,south=false,west=true": { "model": "birch_fence_ne", "y": 270, "uvlock": true },
-        },
+        "east=false,north=true,south=true,west=false": { "model": "birch_fence_ns", "uvlock": true },
-        {   "when": { "west": "true" },
+        "east=true,north=false,south=false,west=true": { "model": "birch_fence_ns", "y": 90, "uvlock": true },
-            "apply": { "model": "birch_fence_side", "y": 270, "uvlock": true }
+        "east=true,north=true,south=true,west=false": { "model": "birch_fence_nse", "uvlock": true },
-        }
+        "east=true,north=false,south=true,west=true": { "model": "birch_fence_nse", "y": 90, "uvlock": true },
-    ]
+        "east=false,north=true,south=true,west=true": { "model": "birch_fence_nse", "y": 180, "uvlock": true },
+        "east=true,north=true,south=false,west=true": { "model": "birch_fence_nse", "y": 270, "uvlock": true },
+        "east=true,north=true,south=true,west=true": { "model": "birch_fence_nsew", "uvlock": true }
+    }
 }

assets/minecraft/blockstates/birch_fence_gate.json

@@ -1,20 +1,20 @@
 {
     "variants": {
-        "facing=south,in_wall=false,open=false": { "model": "birch_fence_gate_closed", "uvlock": true },
+        "facing=south,in_wall=false,open=false": { "model": "birch_fence_gate_closed" },
-        "facing=west,in_wall=false,open=false":  { "model": "birch_fence_gate_closed", "uvlock": true, "y": 90 },
+        "facing=west,in_wall=false,open=false":  { "model": "birch_fence_gate_closed", "y": 90, "uvlock": true },
-        "facing=north,in_wall=false,open=false": { "model": "birch_fence_gate_closed", "uvlock": true, "y": 180 },
+        "facing=north,in_wall=false,open=false": { "model": "birch_fence_gate_closed", "y": 180, "uvlock": true },
-        "facing=east,in_wall=false,open=false":  { "model": "birch_fence_gate_closed", "uvlock": true, "y": 270 },
+        "facing=east,in_wall=false,open=false":  { "model": "birch_fence_gate_closed", "y": 270, "uvlock": true },
-        "facing=south,in_wall=false,open=true": { "model": "birch_fence_gate_open", "uvlock": true },
+        "facing=south,in_wall=false,open=true": { "model": "birch_fence_gate_open" },
-        "facing=west,in_wall=false,open=true":  { "model": "birch_fence_gate_open", "uvlock": true, "y": 90 },
+        "facing=west,in_wall=false,open=true":  { "model": "birch_fence_gate_open", "y": 90, "uvlock": true },
-        "facing=north,in_wall=false,open=true": { "model": "birch_fence_gate_open", "uvlock": true, "y": 180 },
+        "facing=north,in_wall=false,open=true": { "model": "birch_fence_gate_open", "y": 180, "uvlock": true },
-        "facing=east,in_wall=false,open=true":  { "model": "birch_fence_gate_open", "uvlock": true, "y": 270 },
+        "facing=east,in_wall=false,open=true":  { "model": "birch_fence_gate_open", "y": 270, "uvlock": true },
-        "facing=south,in_wall=true,open=false": { "model": "birch_wall_gate_closed", "uvlock": true },
+        "facing=south,in_wall=true,open=false": { "model": "birch_wall_gate_closed" },
-        "facing=west,in_wall=true,open=false":  { "model": "birch_wall_gate_closed", "uvlock": true, "y": 90 },
+        "facing=west,in_wall=true,open=false":  { "model": "birch_wall_gate_closed", "y": 90, "uvlock": true },
-        "facing=north,in_wall=true,open=false": { "model": "birch_wall_gate_closed", "uvlock": true, "y": 180 },
+        "facing=north,in_wall=true,open=false": { "model": "birch_wall_gate_closed", "y": 180, "uvlock": true },
-        "facing=east,in_wall=true,open=false":  { "model": "birch_wall_gate_closed", "uvlock": true, "y": 270 },
+        "facing=east,in_wall=true,open=false":  { "model": "birch_wall_gate_closed", "y": 270, "uvlock": true },
-        "facing=south,in_wall=true,open=true": { "model": "birch_wall_gate_open", "uvlock": true },
+        "facing=south,in_wall=true,open=true": { "model": "birch_wall_gate_open" },
-        "facing=west,in_wall=true,open=true":  { "model": "birch_wall_gate_open", "uvlock": true, "y": 90 },
+        "facing=west,in_wall=true,open=true":  { "model": "birch_wall_gate_open", "y": 90, "uvlock": true },
-        "facing=north,in_wall=true,open=true": { "model": "birch_wall_gate_open", "uvlock": true, "y": 180 },
+        "facing=north,in_wall=true,open=true": { "model": "birch_wall_gate_open", "y": 180, "uvlock": true },
-        "facing=east,in_wall=true,open=true":  { "model": "birch_wall_gate_open", "uvlock": true, "y": 270 }
+        "facing=east,in_wall=true,open=true":  { "model": "birch_wall_gate_open", "y": 270, "uvlock": true }
     }
 }

assets/minecraft/blockstates/birch_log.json

@@ -1,8 +1,8 @@
 {
     "variants": {
         "axis=y":  { "model": "birch_log" },
-        "axis=z":   { "model": "birch_log", "x": 90 },
+        "axis=z":   { "model": "birch_log_side" },
-        "axis=x":   { "model": "birch_log", "x": 90, "y": 90 },
+        "axis=x":   { "model": "birch_log_side", "y": 90 },
         "axis=none": { "model": "birch_bark" }
     }
 }

assets/minecraft/blockstates/birch_stairs.json

@@ -24,21 +24,21 @@
         "facing=west,half=top,shape=straight":  { "model": "birch_stairs", "x": 180, "y": 180, "uvlock": true },
         "facing=south,half=top,shape=straight": { "model": "birch_stairs", "x": 180, "y": 90, "uvlock": true },
         "facing=north,half=top,shape=straight": { "model": "birch_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_right":  { "model": "birch_outer_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=east,half=top,shape=outer_right":  { "model": "birch_outer_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=outer_right":  { "model": "birch_outer_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=west,half=top,shape=outer_right":  { "model": "birch_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=outer_right": { "model": "birch_outer_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=outer_right": { "model": "birch_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=outer_right": { "model": "birch_outer_stairs", "x": 180, "uvlock": true },
+        "facing=north,half=top,shape=outer_right": { "model": "birch_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_left":  { "model": "birch_outer_stairs", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=outer_left":  { "model": "birch_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=outer_left":  { "model": "birch_outer_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=west,half=top,shape=outer_left":  { "model": "birch_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=outer_left": { "model": "birch_outer_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=south,half=top,shape=outer_left": { "model": "birch_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=outer_left": { "model": "birch_outer_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=north,half=top,shape=outer_left": { "model": "birch_outer_stairs", "x": 180, "uvlock": true },
-        "facing=east,half=top,shape=inner_right":  { "model": "birch_inner_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=east,half=top,shape=inner_right":  { "model": "birch_inner_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=inner_right":  { "model": "birch_inner_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=west,half=top,shape=inner_right":  { "model": "birch_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=inner_right": { "model": "birch_inner_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=inner_right": { "model": "birch_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=inner_right": { "model": "birch_inner_stairs", "x": 180, "uvlock": true },
+        "facing=north,half=top,shape=inner_right": { "model": "birch_inner_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=inner_left":  { "model": "birch_inner_stairs", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=inner_left":  { "model": "birch_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=inner_left":  { "model": "birch_inner_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=west,half=top,shape=inner_left":  { "model": "birch_inner_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=inner_left": { "model": "birch_inner_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=south,half=top,shape=inner_left": { "model": "birch_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=inner_left": { "model": "birch_inner_stairs", "x": 180, "y": 270, "uvlock": true }
+        "facing=north,half=top,shape=inner_left": { "model": "birch_inner_stairs", "x": 180, "uvlock": true }
     }
 }

assets/minecraft/blockstates/black_stained_glass_pane.json

@@ -1,29 +1,20 @@
 {
-    "multipart": [
+    "variants": {
-        {   "apply": { "model": "black_stained_glass_pane_post" }},
+        "east=false,north=false,south=false,west=false": { "model": "black_pane_nsew" },
-        {   "when": { "north": true },
+        "east=false,north=true,south=false,west=false": { "model": "black_pane_n" },
-            "apply": { "model": "black_stained_glass_pane_side" }
+        "east=true,north=false,south=false,west=false": { "model": "black_pane_n", "y": 90 },
-        },
+        "east=false,north=false,south=true,west=false": { "model": "black_pane_s" },
-        {   "when": { "east": true },
+        "east=false,north=false,south=false,west=true": { "model": "black_pane_s", "y": 90 },
-            "apply": { "model": "black_stained_glass_pane_side", "y": 90 }
+        "east=true,north=true,south=false,west=false": { "model": "black_pane_ne" },
-        },
+        "east=true,north=false,south=true,west=false": { "model": "black_pane_se" },
-        {   "when": { "south": true },
+        "east=false,north=false,south=true,west=true": { "model": "black_pane_sw" },
-            "apply": { "model": "black_stained_glass_pane_side_alt" }
+        "east=false,north=true,south=false,west=true": { "model": "black_pane_nw" },
-        },
+        "east=false,north=true,south=true,west=false": { "model": "black_pane_ns" },
-        {   "when": { "west": true },
+        "east=true,north=false,south=false,west=true": { "model": "black_pane_ns", "y": 90 },
-            "apply": { "model": "black_stained_glass_pane_side_alt", "y": 90 }
+        "east=true,north=true,south=true,west=false": { "model": "black_pane_nse" },
-        },
+        "east=true,north=false,south=true,west=true": { "model": "black_pane_sew" },
-        {   "when": { "north": false },
+        "east=false,north=true,south=true,west=true": { "model": "black_pane_nsw" },
-            "apply": { "model": "black_stained_glass_pane_noside" }
+        "east=true,north=true,south=false,west=true": { "model": "black_pane_new" },
-        },
+        "east=true,north=true,south=true,west=true": { "model": "black_pane_nsew" }
-        {   "when": { "east": false },
+    }
-            "apply": { "model": "black_stained_glass_pane_noside_alt" }
-        },
-        {   "when": { "south": false },
-            "apply": { "model": "black_stained_glass_pane_noside_alt", "y": 90 }
-        },
-        {   "when": { "west": false },
-            "apply": { "model": "black_stained_glass_pane_noside", "y": 270 }
-        }
-    ]
 }

assets/minecraft/blockstates/blue_stained_glass_pane.json

@@ -1,29 +1,20 @@
 {
-    "multipart": [
+    "variants": {
-        {   "apply": { "model": "blue_stained_glass_pane_post" }},
+        "east=false,north=false,south=false,west=false": { "model": "blue_pane_nsew" },
-        {   "when": { "north": true },
+        "east=false,north=true,south=false,west=false": { "model": "blue_pane_n" },
-            "apply": { "model": "blue_stained_glass_pane_side" }
+        "east=true,north=false,south=false,west=false": { "model": "blue_pane_n", "y": 90 },
-        },
+        "east=false,north=false,south=true,west=false": { "model": "blue_pane_s" },
-        {   "when": { "east": true },
+        "east=false,north=false,south=false,west=true": { "model": "blue_pane_s", "y": 90 },
-            "apply": { "model": "blue_stained_glass_pane_side", "y": 90 }
+        "east=true,north=true,south=false,west=false": { "model": "blue_pane_ne" },
-        },
+        "east=true,north=false,south=true,west=false": { "model": "blue_pane_se" },
-        {   "when": { "south": true },
+        "east=false,north=false,south=true,west=true": { "model": "blue_pane_sw" },
-            "apply": { "model": "blue_stained_glass_pane_side_alt" }
+        "east=false,north=true,south=false,west=true": { "model": "blue_pane_nw" },
-        },
+        "east=false,north=true,south=true,west=false": { "model": "blue_pane_ns" },
-        {   "when": { "west": true },
+        "east=true,north=false,south=false,west=true": { "model": "blue_pane_ns", "y": 90 },
-            "apply": { "model": "blue_stained_glass_pane_side_alt", "y": 90 }
+        "east=true,north=true,south=true,west=false": { "model": "blue_pane_nse" },
-        },
+        "east=true,north=false,south=true,west=true": { "model": "blue_pane_sew" },
-        {   "when": { "north": false },
+        "east=false,north=true,south=true,west=true": { "model": "blue_pane_nsw" },
-            "apply": { "model": "blue_stained_glass_pane_noside" }
+        "east=true,north=true,south=false,west=true": { "model": "blue_pane_new" },
-        },
+        "east=true,north=true,south=true,west=true": { "model": "blue_pane_nsew" }
-        {   "when": { "east": false },
+    }
-            "apply": { "model": "blue_stained_glass_pane_noside_alt" }
-        },
-        {   "when": { "south": false },
-            "apply": { "model": "blue_stained_glass_pane_noside_alt", "y": 90 }
-        },
-        {   "when": { "west": false },
-            "apply": { "model": "blue_stained_glass_pane_noside", "y": 270 }
-        }
-    ]
 }

assets/minecraft/blockstates/brewing_stand.json

@@ -1,23 +1,12 @@
 {
-    "multipart": [
+    "variants": {
-        {   "apply": { "model": "brewing_stand" }},
+        "has_bottle_0=false,has_bottle_1=false,has_bottle_2=false": { "model": "brewing_stand_empty" },
-        {   "when": { "has_bottle_0": "true" },
+        "has_bottle_0=true,has_bottle_1=false,has_bottle_2=false": { "model": "brewing_stand_bottles_1" },
-            "apply": { "model": "brewing_stand_bottle0" }
+        "has_bottle_0=false,has_bottle_1=true,has_bottle_2=false": { "model": "brewing_stand_bottles_2" },
-        },
+        "has_bottle_0=false,has_bottle_1=false,has_bottle_2=true": { "model": "brewing_stand_bottles_3" },
-        {   "when": { "has_bottle_1": "true" },
+        "has_bottle_0=true,has_bottle_1=true,has_bottle_2=false": { "model": "brewing_stand_bottles_12" },
-            "apply": { "model": "brewing_stand_bottle1" }
+        "has_bottle_0=true,has_bottle_1=false,has_bottle_2=true": { "model": "brewing_stand_bottles_13" },
-        },
+        "has_bottle_0=false,has_bottle_1=true,has_bottle_2=true": { "model": "brewing_stand_bottles_23" },
-        {   "when": { "has_bottle_2": "true" },
+        "has_bottle_0=true,has_bottle_1=true,has_bottle_2=true": { "model": "brewing_stand_bottles_123" }
-            "apply": { "model": "brewing_stand_bottle2" }
+    }
-        },
-        {   "when": { "has_bottle_0": "false" },
-            "apply": { "model": "brewing_stand_empty0" }
-        },
-        {   "when": { "has_bottle_1": "false" },
-            "apply": { "model": "brewing_stand_empty1" }
-        },
-        {   "when": { "has_bottle_2": "false" },
-            "apply": { "model": "brewing_stand_empty2" }
-        }
-    ]
 }

assets/minecraft/blockstates/brick_stairs.json

@@ -24,21 +24,21 @@
         "facing=west,half=top,shape=straight":  { "model": "brick_stairs", "x": 180, "y": 180, "uvlock": true },
         "facing=south,half=top,shape=straight": { "model": "brick_stairs", "x": 180, "y": 90, "uvlock": true },
         "facing=north,half=top,shape=straight": { "model": "brick_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_right":  { "model": "brick_outer_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=east,half=top,shape=outer_right":  { "model": "brick_outer_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=outer_right":  { "model": "brick_outer_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=west,half=top,shape=outer_right":  { "model": "brick_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=outer_right": { "model": "brick_outer_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=outer_right": { "model": "brick_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=outer_right": { "model": "brick_outer_stairs", "x": 180, "uvlock": true },
+        "facing=north,half=top,shape=outer_right": { "model": "brick_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_left":  { "model": "brick_outer_stairs", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=outer_left":  { "model": "brick_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=outer_left":  { "model": "brick_outer_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=west,half=top,shape=outer_left":  { "model": "brick_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=outer_left": { "model": "brick_outer_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=south,half=top,shape=outer_left": { "model": "brick_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=outer_left": { "model": "brick_outer_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=north,half=top,shape=outer_left": { "model": "brick_outer_stairs", "x": 180, "uvlock": true },
-        "facing=east,half=top,shape=inner_right":  { "model": "brick_inner_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=east,half=top,shape=inner_right":  { "model": "brick_inner_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=inner_right":  { "model": "brick_inner_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=west,half=top,shape=inner_right":  { "model": "brick_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=inner_right": { "model": "brick_inner_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=inner_right": { "model": "brick_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=inner_right": { "model": "brick_inner_stairs", "x": 180, "uvlock": true },
+        "facing=north,half=top,shape=inner_right": { "model": "brick_inner_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=inner_left":  { "model": "brick_inner_stairs", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=inner_left":  { "model": "brick_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=inner_left":  { "model": "brick_inner_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=west,half=top,shape=inner_left":  { "model": "brick_inner_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=inner_left": { "model": "brick_inner_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=south,half=top,shape=inner_left": { "model": "brick_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=inner_left": { "model": "brick_inner_stairs", "x": 180, "y": 270, "uvlock": true }
+        "facing=north,half=top,shape=inner_left": { "model": "brick_inner_stairs", "x": 180, "uvlock": true }
     }
 }

assets/minecraft/blockstates/brown_stained_glass_pane.json

@@ -1,29 +1,20 @@
 {
-    "multipart": [
+    "variants": {
-        {   "apply": { "model": "brown_stained_glass_pane_post" }},
+        "east=false,north=false,south=false,west=false": { "model": "brown_pane_nsew" },
-        {   "when": { "north": true },
+        "east=false,north=true,south=false,west=false": { "model": "brown_pane_n" },
-            "apply": { "model": "brown_stained_glass_pane_side" }
+        "east=true,north=false,south=false,west=false": { "model": "brown_pane_n", "y": 90 },
-        },
+        "east=false,north=false,south=true,west=false": { "model": "brown_pane_s" },
-        {   "when": { "east": true },
+        "east=false,north=false,south=false,west=true": { "model": "brown_pane_s", "y": 90 },
-            "apply": { "model": "brown_stained_glass_pane_side", "y": 90 }
+        "east=true,north=true,south=false,west=false": { "model": "brown_pane_ne" },
-        },
+        "east=true,north=false,south=true,west=false": { "model": "brown_pane_se" },
-        {   "when": { "south": true },
+        "east=false,north=false,south=true,west=true": { "model": "brown_pane_sw" },
-            "apply": { "model": "brown_stained_glass_pane_side_alt" }
+        "east=false,north=true,south=false,west=true": { "model": "brown_pane_nw" },
-        },
+        "east=false,north=true,south=true,west=false": { "model": "brown_pane_ns" },
-        {   "when": { "west": true },
+        "east=true,north=false,south=false,west=true": { "model": "brown_pane_ns", "y": 90 },
-            "apply": { "model": "brown_stained_glass_pane_side_alt", "y": 90 }
+        "east=true,north=true,south=true,west=false": { "model": "brown_pane_nse" },
-        },
+        "east=true,north=false,south=true,west=true": { "model": "brown_pane_sew" },
-        {   "when": { "north": false },
+        "east=false,north=true,south=true,west=true": { "model": "brown_pane_nsw" },
-            "apply": { "model": "brown_stained_glass_pane_noside" }
+        "east=true,north=true,south=false,west=true": { "model": "brown_pane_new" },
-        },
+        "east=true,north=true,south=true,west=true": { "model": "brown_pane_nsew" }
-        {   "when": { "east": false },
+    }
-            "apply": { "model": "brown_stained_glass_pane_noside_alt" }
-        },
-        {   "when": { "south": false },
-            "apply": { "model": "brown_stained_glass_pane_noside_alt", "y": 90 }
-        },
-        {   "when": { "west": false },
-            "apply": { "model": "brown_stained_glass_pane_noside", "y": 270 }
-        }
-    ]
 }

assets/minecraft/blockstates/chain_command_block.json

@@ -1,16 +0,0 @@
-{
-    "variants": {
-        "conditional=false,facing=down":  { "model": "chain_command_block", "x": 90 },
-        "conditional=false,facing=up":    { "model": "chain_command_block", "x": 270 },
-        "conditional=false,facing=north": { "model": "chain_command_block" },
-        "conditional=false,facing=south": { "model": "chain_command_block", "y": 180 },
-        "conditional=false,facing=west":  { "model": "chain_command_block", "y": 270 },
-        "conditional=false,facing=east":  { "model": "chain_command_block", "y": 90 },
-        "conditional=true,facing=down":  { "model": "chain_command_block_conditional", "x": 90 },
-        "conditional=true,facing=up":    { "model": "chain_command_block_conditional", "x": 270 },
-        "conditional=true,facing=north": { "model": "chain_command_block_conditional" },
-        "conditional=true,facing=south": { "model": "chain_command_block_conditional", "y": 180 },
-        "conditional=true,facing=west":  { "model": "chain_command_block_conditional", "y": 270 },
-        "conditional=true,facing=east":  { "model": "chain_command_block_conditional", "y": 90 }
-    }
-}

assets/minecraft/blockstates/chorus_flower.json

@@ -1,10 +0,0 @@
-{
-    "variants": {
-        "age=0": { "model": "chorus_flower" },
-        "age=1": { "model": "chorus_flower" },
-        "age=2": { "model": "chorus_flower" },
-        "age=3": { "model": "chorus_flower" },
-        "age=4": { "model": "chorus_flower" },
-        "age=5": { "model": "chorus_flower_dead" }
-    }
-}

assets/minecraft/blockstates/chorus_plant.json

@@ -1,70 +0,0 @@
-{
-    "multipart": [
-        {   "when": { "north": true },
-            "apply": { "model": "chorus_plant_side" }
-        },
-        {   "when": { "east": true },
-            "apply": { "model": "chorus_plant_side", "y": 90, "uvlock": true }
-        },
-        {   "when": { "south": true },
-            "apply": { "model": "chorus_plant_side", "y": 180, "uvlock": true }
-        },
-        {   "when": { "west": true },
-            "apply": { "model": "chorus_plant_side", "y": 270, "uvlock": true }
-        },
-        {   "when": { "up": true },
-            "apply": { "model": "chorus_plant_side", "x": 270, "uvlock": true }
-        },
-        {   "when": { "down": true },
-            "apply": { "model": "chorus_plant_side", "x": 90, "uvlock": true }
-        },
-        {   "when": { "north": false },
-            "apply": [
-                { "model": "chorus_plant_noside", "weight": 2 },
-                { "model": "chorus_plant_noside1" },
-                { "model": "chorus_plant_noside2" },
-                { "model": "chorus_plant_noside3" }
-            ]
-        },
-        {   "when": { "east": false },
-            "apply": [
-                { "model": "chorus_plant_noside1", "y": 90, "uvlock": true },
-                { "model": "chorus_plant_noside2", "y": 90, "uvlock": true },
-                { "model": "chorus_plant_noside3", "y": 90, "uvlock": true },
-                { "model": "chorus_plant_noside", "weight": 2, "y": 90, "uvlock": true }
-            ]
-        },
-        {   "when": { "south": false },
-            "apply": [
-                { "model": "chorus_plant_noside2", "y": 180, "uvlock": true },
-                { "model": "chorus_plant_noside3", "y": 180, "uvlock": true },
-                { "model": "chorus_plant_noside", "weight": 2, "y": 180, "uvlock": true },
-                { "model": "chorus_plant_noside1", "y": 180, "uvlock": true }
-            ]
-        },
-        {   "when": { "west": false },
-            "apply": [
-                { "model": "chorus_plant_noside3", "y": 270, "uvlock": true },
-                { "model": "chorus_plant_noside", "weight": 2, "y": 270, "uvlock": true },
-                { "model": "chorus_plant_noside1", "y": 270, "uvlock": true },
-                { "model": "chorus_plant_noside2", "y": 270, "uvlock": true }
-            ]
-        },
-        {   "when": { "up": false },
-            "apply": [
-                { "model": "chorus_plant_noside", "weight": 2, "x": 270, "uvlock": true },
-                { "model": "chorus_plant_noside3", "x": 270, "uvlock": true },
-                { "model": "chorus_plant_noside1", "x": 270, "uvlock": true },
-                { "model": "chorus_plant_noside2", "x": 270, "uvlock": true }
-            ]
-        },
-        {   "when": { "down": false },
-            "apply": [
-                { "model": "chorus_plant_noside3", "x": 90, "uvlock": true },
-                { "model": "chorus_plant_noside2", "x": 90, "uvlock": true },
-                { "model": "chorus_plant_noside1", "x": 90, "uvlock": true },
-                { "model": "chorus_plant_noside", "weight": 2, "x": 90, "uvlock": true }
-            ]
-        }
-    ]
-}

assets/minecraft/blockstates/cobblestone_wall.json

@@ -1,19 +1,36 @@
 {
-    "multipart": [
+    "variants": {
-        {   "when": { "up": "true" },
+        "east=false,north=false,south=false,up=false,west=false": { "model": "cobblestone_wall_post" },
-            "apply": { "model": "cobblestone_wall_post" }
+        "east=false,north=true,south=false,up=false,west=false":  { "model": "cobblestone_wall_n" },
-        },
+        "east=true,north=false,south=false,up=false,west=false":  { "model": "cobblestone_wall_n", "y": 90, "uvlock": true },
-        {   "when": { "north": "true" },
+        "east=false,north=false,south=true,up=false,west=false":  { "model": "cobblestone_wall_n", "y": 180, "uvlock": true },
-            "apply": { "model": "cobblestone_wall_side", "uvlock": true }
+        "east=false,north=false,south=false,up=false,west=true":  { "model": "cobblestone_wall_n", "y": 270, "uvlock": true },
-        },
+        "east=true,north=true,south=false,up=false,west=false":   { "model": "cobblestone_wall_ne" },
-        {   "when": { "east": "true" },
+        "east=true,north=false,south=true,up=false,west=false":   { "model": "cobblestone_wall_ne", "y": 90, "uvlock": true },
-            "apply": { "model": "cobblestone_wall_side", "y": 90, "uvlock": true }
+        "east=false,north=false,south=true,up=false,west=true":   { "model": "cobblestone_wall_ne", "y": 180, "uvlock": true },
-        },
+        "east=false,north=true,south=false,up=false,west=true":   { "model": "cobblestone_wall_ne", "y": 270, "uvlock": true },
-        {   "when": { "south": "true" },
+        "east=false,north=true,south=true,up=false,west=false":   { "model": "cobblestone_wall_ns" },
-            "apply": { "model": "cobblestone_wall_side", "y": 180, "uvlock": true }
+        "east=true,north=false,south=false,up=false,west=true":   { "model": "cobblestone_wall_ns", "y": 90, "uvlock": true },
-        },
+        "east=true,north=true,south=true,up=false,west=false":    { "model": "cobblestone_wall_nse" },
-        {   "when": { "west": "true" },
+        "east=true,north=false,south=true,up=false,west=true":    { "model": "cobblestone_wall_nse", "y": 90, "uvlock": true },
-            "apply": { "model": "cobblestone_wall_side", "y": 270, "uvlock": true }
+        "east=false,north=true,south=true,up=false,west=true":    { "model": "cobblestone_wall_nse", "y": 180, "uvlock": true },
-        }
+        "east=true,north=true,south=false,up=false,west=true":    { "model": "cobblestone_wall_nse", "y": 270, "uvlock": true },
-    ]
+        "east=true,north=true,south=true,up=false,west=true":     { "model": "cobblestone_wall_nsew" },
+        "east=false,north=false,south=false,up=true,west=false":  { "model": "cobblestone_wall_post" },
+        "east=false,north=true,south=false,up=true,west=false":   { "model": "cobblestone_wall_n" },
+        "east=true,north=false,south=false,up=true,west=false":   { "model": "cobblestone_wall_n", "y": 90, "uvlock": true },
+        "east=false,north=false,south=true,up=true,west=false":   { "model": "cobblestone_wall_n", "y": 180, "uvlock": true },
+        "east=false,north=false,south=false,up=true,west=true":   { "model": "cobblestone_wall_n", "y": 270, "uvlock": true },
+        "east=true,north=true,south=false,up=true,west=false":    { "model": "cobblestone_wall_ne" },
+        "east=true,north=false,south=true,up=true,west=false":    { "model": "cobblestone_wall_ne", "y": 90, "uvlock": true },
+        "east=false,north=false,south=true,up=true,west=true":    { "model": "cobblestone_wall_ne", "y": 180, "uvlock": true },
+        "east=false,north=true,south=false,up=true,west=true":    { "model": "cobblestone_wall_ne", "y": 270, "uvlock": true },
+        "east=false,north=true,south=true,up=true,west=false":    { "model": "cobblestone_wall_ns_above" },
+        "east=true,north=false,south=false,up=true,west=true":    { "model": "cobblestone_wall_ns_above", "y": 90, "uvlock": true },
+        "east=true,north=true,south=true,up=true,west=false":     { "model": "cobblestone_wall_nse" },
+        "east=true,north=false,south=true,up=true,west=true":     { "model": "cobblestone_wall_nse", "y": 90, "uvlock": true },
+        "east=false,north=true,south=true,up=true,west=true":     { "model": "cobblestone_wall_nse", "y": 180, "uvlock": true },
+        "east=true,north=true,south=false,up=true,west=true":     { "model": "cobblestone_wall_nse", "y": 270, "uvlock": true },
+        "east=true,north=true,south=true,up=true,west=true":      { "model": "cobblestone_wall_nsew" }
+    }
 }

assets/minecraft/blockstates/command_block.json

@@ -1,16 +1,5 @@
 {
     "variants": {
-        "conditional=false,facing=down":  { "model": "command_block", "x": 90 },
+        "normal": { "model": "command_block" }
-        "conditional=false,facing=up":    { "model": "command_block", "x": 270 },
-        "conditional=false,facing=north": { "model": "command_block" },
-        "conditional=false,facing=south": { "model": "command_block", "y": 180 },
-        "conditional=false,facing=west":  { "model": "command_block", "y": 270 },
-        "conditional=false,facing=east":  { "model": "command_block", "y": 90 },
-        "conditional=true,facing=down":  { "model": "command_block_conditional", "x": 90 },
-        "conditional=true,facing=up":    { "model": "command_block_conditional", "x": 270 },
-        "conditional=true,facing=north": { "model": "command_block_conditional" },
-        "conditional=true,facing=south": { "model": "command_block_conditional", "y": 180 },
-        "conditional=true,facing=west":  { "model": "command_block_conditional", "y": 270 },
-        "conditional=true,facing=east":  { "model": "command_block_conditional", "y": 90 }
     }
 }

assets/minecraft/blockstates/cyan_stained_glass_pane.json

@@ -1,29 +1,20 @@
 {
-    "multipart": [
+    "variants": {
-        {   "apply": { "model": "cyan_stained_glass_pane_post" }},
+        "east=false,north=false,south=false,west=false": { "model": "cyan_pane_nsew" },
-        {   "when": { "north": true },
+        "east=false,north=true,south=false,west=false": { "model": "cyan_pane_n" },
-            "apply": { "model": "cyan_stained_glass_pane_side" }
+        "east=true,north=false,south=false,west=false": { "model": "cyan_pane_n", "y": 90 },
-        },
+        "east=false,north=false,south=true,west=false": { "model": "cyan_pane_s" },
-        {   "when": { "east": true },
+        "east=false,north=false,south=false,west=true": { "model": "cyan_pane_s", "y": 90 },
-            "apply": { "model": "cyan_stained_glass_pane_side", "y": 90 }
+        "east=true,north=true,south=false,west=false": { "model": "cyan_pane_ne" },
-        },
+        "east=true,north=false,south=true,west=false": { "model": "cyan_pane_se" },
-        {   "when": { "south": true },
+        "east=false,north=false,south=true,west=true": { "model": "cyan_pane_sw" },
-            "apply": { "model": "cyan_stained_glass_pane_side_alt" }
+        "east=false,north=true,south=false,west=true": { "model": "cyan_pane_nw" },
-        },
+        "east=false,north=true,south=true,west=false": { "model": "cyan_pane_ns" },
-        {   "when": { "west": true },
+        "east=true,north=false,south=false,west=true": { "model": "cyan_pane_ns", "y": 90 },
-            "apply": { "model": "cyan_stained_glass_pane_side_alt", "y": 90 }
+        "east=true,north=true,south=true,west=false": { "model": "cyan_pane_nse" },
-        },
+        "east=true,north=false,south=true,west=true": { "model": "cyan_pane_sew" },
-        {   "when": { "north": false },
+        "east=false,north=true,south=true,west=true": { "model": "cyan_pane_nsw" },
-            "apply": { "model": "cyan_stained_glass_pane_noside" }
+        "east=true,north=true,south=false,west=true": { "model": "cyan_pane_new" },
-        },
+        "east=true,north=true,south=true,west=true": { "model": "cyan_pane_nsew" }
-        {   "when": { "east": false },
+    }
-            "apply": { "model": "cyan_stained_glass_pane_noside_alt" }
-        },
-        {   "when": { "south": false },
-            "apply": { "model": "cyan_stained_glass_pane_noside_alt", "y": 90 }
-        },
-        {   "when": { "west": false },
-            "apply": { "model": "cyan_stained_glass_pane_noside", "y": 270 }
-        }
-    ]
 }

assets/minecraft/blockstates/dark_oak_fence.json

@@ -1,17 +1,20 @@
 {
-    "multipart": [
+    "variants": {
-        {   "apply": { "model": "dark_oak_fence_post" }},
+        "east=false,north=false,south=false,west=false": { "model": "dark_oak_fence_post" },
-        {   "when": { "north": "true" },
+        "east=false,north=true,south=false,west=false": { "model": "dark_oak_fence_n", "uvlock": true },
-            "apply": { "model": "dark_oak_fence_side", "uvlock": true }
+        "east=true,north=false,south=false,west=false": { "model": "dark_oak_fence_n", "y": 90, "uvlock": true },
-        },
+        "east=false,north=false,south=true,west=false": { "model": "dark_oak_fence_n", "y": 180, "uvlock": true },
-        {   "when": { "east": "true" },
+        "east=false,north=false,south=false,west=true": { "model": "dark_oak_fence_n", "y": 270, "uvlock": true },
-            "apply": { "model": "dark_oak_fence_side", "y": 90, "uvlock": true }
+        "east=true,north=true,south=false,west=false": { "model": "dark_oak_fence_ne", "uvlock": true },
-        },
+        "east=true,north=false,south=true,west=false": { "model": "dark_oak_fence_ne", "y": 90, "uvlock": true },
-        {   "when": { "south": "true" },
+        "east=false,north=false,south=true,west=true": { "model": "dark_oak_fence_ne", "y": 180, "uvlock": true },
-            "apply": { "model": "dark_oak_fence_side", "y": 180, "uvlock": true }
+        "east=false,north=true,south=false,west=true": { "model": "dark_oak_fence_ne", "y": 270, "uvlock": true },
-        },
+        "east=false,north=true,south=true,west=false": { "model": "dark_oak_fence_ns", "uvlock": true },
-        {   "when": { "west": "true" },
+        "east=true,north=false,south=false,west=true": { "model": "dark_oak_fence_ns", "y": 90, "uvlock": true },
-            "apply": { "model": "dark_oak_fence_side", "y": 270, "uvlock": true }
+        "east=true,north=true,south=true,west=false": { "model": "dark_oak_fence_nse", "uvlock": true },
-        }
+        "east=true,north=false,south=true,west=true": { "model": "dark_oak_fence_nse", "y": 90, "uvlock": true },
-    ]
+        "east=false,north=true,south=true,west=true": { "model": "dark_oak_fence_nse", "y": 180, "uvlock": true },
+        "east=true,north=true,south=false,west=true": { "model": "dark_oak_fence_nse", "y": 270, "uvlock": true },
+        "east=true,north=true,south=true,west=true": { "model": "dark_oak_fence_nsew", "uvlock": true }
+    }
 }

assets/minecraft/blockstates/dark_oak_fence_gate.json

@@ -1,20 +1,20 @@
 {
     "variants": {
-        "facing=south,in_wall=false,open=false": { "model": "dark_oak_fence_gate_closed", "uvlock": true },
+        "facing=south,in_wall=false,open=false": { "model": "dark_oak_fence_gate_closed" },
-        "facing=west,in_wall=false,open=false":  { "model": "dark_oak_fence_gate_closed", "uvlock": true, "y": 90 },
+        "facing=west,in_wall=false,open=false":  { "model": "dark_oak_fence_gate_closed", "y": 90, "uvlock": true },
-        "facing=north,in_wall=false,open=false": { "model": "dark_oak_fence_gate_closed", "uvlock": true, "y": 180 },
+        "facing=north,in_wall=false,open=false": { "model": "dark_oak_fence_gate_closed", "y": 180, "uvlock": true },
-        "facing=east,in_wall=false,open=false":  { "model": "dark_oak_fence_gate_closed", "uvlock": true, "y": 270 },
+        "facing=east,in_wall=false,open=false":  { "model": "dark_oak_fence_gate_closed", "y": 270, "uvlock": true },
-        "facing=south,in_wall=false,open=true": { "model": "dark_oak_fence_gate_open", "uvlock": true },
+        "facing=south,in_wall=false,open=true": { "model": "dark_oak_fence_gate_open" },
-        "facing=west,in_wall=false,open=true":  { "model": "dark_oak_fence_gate_open", "uvlock": true, "y": 90 },
+        "facing=west,in_wall=false,open=true":  { "model": "dark_oak_fence_gate_open", "y": 90, "uvlock": true },
-        "facing=north,in_wall=false,open=true": { "model": "dark_oak_fence_gate_open", "uvlock": true, "y": 180 },
+        "facing=north,in_wall=false,open=true": { "model": "dark_oak_fence_gate_open", "y": 180, "uvlock": true },
-        "facing=east,in_wall=false,open=true":  { "model": "dark_oak_fence_gate_open", "uvlock": true, "y": 270 },
+        "facing=east,in_wall=false,open=true":  { "model": "dark_oak_fence_gate_open", "y": 270, "uvlock": true },
-        "facing=south,in_wall=true,open=false": { "model": "dark_oak_wall_gate_closed", "uvlock": true },
+        "facing=south,in_wall=true,open=false": { "model": "dark_oak_wall_gate_closed" },
-        "facing=west,in_wall=true,open=false":  { "model": "dark_oak_wall_gate_closed", "uvlock": true, "y": 90 },
+        "facing=west,in_wall=true,open=false":  { "model": "dark_oak_wall_gate_closed", "y": 90, "uvlock": true },
-        "facing=north,in_wall=true,open=false": { "model": "dark_oak_wall_gate_closed", "uvlock": true, "y": 180 },
+        "facing=north,in_wall=true,open=false": { "model": "dark_oak_wall_gate_closed", "y": 180, "uvlock": true },
-        "facing=east,in_wall=true,open=false":  { "model": "dark_oak_wall_gate_closed", "uvlock": true, "y": 270 },
+        "facing=east,in_wall=true,open=false":  { "model": "dark_oak_wall_gate_closed", "y": 270, "uvlock": true },
-        "facing=south,in_wall=true,open=true": { "model": "dark_oak_wall_gate_open", "uvlock": true },
+        "facing=south,in_wall=true,open=true": { "model": "dark_oak_wall_gate_open" },
-        "facing=west,in_wall=true,open=true":  { "model": "dark_oak_wall_gate_open", "uvlock": true, "y": 90 },
+        "facing=west,in_wall=true,open=true":  { "model": "dark_oak_wall_gate_open", "y": 90, "uvlock": true },
-        "facing=north,in_wall=true,open=true": { "model": "dark_oak_wall_gate_open", "uvlock": true, "y": 180 },
+        "facing=north,in_wall=true,open=true": { "model": "dark_oak_wall_gate_open", "y": 180, "uvlock": true },
-        "facing=east,in_wall=true,open=true":  { "model": "dark_oak_wall_gate_open", "uvlock": true, "y": 270 }
+        "facing=east,in_wall=true,open=true":  { "model": "dark_oak_wall_gate_open", "y": 270, "uvlock": true }
     }
 }

assets/minecraft/blockstates/dark_oak_log.json

@@ -1,8 +1,8 @@
 {
     "variants": {
         "axis=y":  { "model": "dark_oak_log" },
-        "axis=z":   { "model": "dark_oak_log", "x": 90 },
+        "axis=z":   { "model": "dark_oak_log_side" },
-        "axis=x":   { "model": "dark_oak_log", "x": 90, "y": 90 },
+        "axis=x":   { "model": "dark_oak_log_side", "y": 90 },
         "axis=none": { "model": "dark_oak_bark" }
     }
 }

assets/minecraft/blockstates/dark_oak_stairs.json

@@ -24,21 +24,21 @@
         "facing=west,half=top,shape=straight":  { "model": "dark_oak_stairs", "x": 180, "y": 180, "uvlock": true },
         "facing=south,half=top,shape=straight": { "model": "dark_oak_stairs", "x": 180, "y": 90, "uvlock": true },
         "facing=north,half=top,shape=straight": { "model": "dark_oak_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_right":  { "model": "dark_oak_outer_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=east,half=top,shape=outer_right":  { "model": "dark_oak_outer_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=outer_right":  { "model": "dark_oak_outer_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=west,half=top,shape=outer_right":  { "model": "dark_oak_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=outer_right": { "model": "dark_oak_outer_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=outer_right": { "model": "dark_oak_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=outer_right": { "model": "dark_oak_outer_stairs", "x": 180, "uvlock": true },
+        "facing=north,half=top,shape=outer_right": { "model": "dark_oak_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_left":  { "model": "dark_oak_outer_stairs", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=outer_left":  { "model": "dark_oak_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=outer_left":  { "model": "dark_oak_outer_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=west,half=top,shape=outer_left":  { "model": "dark_oak_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=outer_left": { "model": "dark_oak_outer_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=south,half=top,shape=outer_left": { "model": "dark_oak_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=outer_left": { "model": "dark_oak_outer_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=north,half=top,shape=outer_left": { "model": "dark_oak_outer_stairs", "x": 180, "uvlock": true },
-        "facing=east,half=top,shape=inner_right":  { "model": "dark_oak_inner_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=east,half=top,shape=inner_right":  { "model": "dark_oak_inner_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=inner_right":  { "model": "dark_oak_inner_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=west,half=top,shape=inner_right":  { "model": "dark_oak_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=inner_right": { "model": "dark_oak_inner_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=inner_right": { "model": "dark_oak_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=inner_right": { "model": "dark_oak_inner_stairs", "x": 180, "uvlock": true },
+        "facing=north,half=top,shape=inner_right": { "model": "dark_oak_inner_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=inner_left":  { "model": "dark_oak_inner_stairs", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=inner_left":  { "model": "dark_oak_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=inner_left":  { "model": "dark_oak_inner_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=west,half=top,shape=inner_left":  { "model": "dark_oak_inner_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=inner_left": { "model": "dark_oak_inner_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=south,half=top,shape=inner_left": { "model": "dark_oak_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=inner_left": { "model": "dark_oak_inner_stairs", "x": 180, "y": 270, "uvlock": true }
+        "facing=north,half=top,shape=inner_left": { "model": "dark_oak_inner_stairs", "x": 180, "uvlock": true }
     }
 }

assets/minecraft/blockstates/end_bricks.json

@@ -1,5 +0,0 @@
-{
-    "variants": {
-        "normal": { "model": "end_bricks" }
-    }
-}

assets/minecraft/blockstates/end_rod.json

@@ -1,10 +0,0 @@
-{
-    "variants": {
-        "facing=up": { "model": "end_rod" },
-        "facing=down": { "model": "end_rod", "x": 180 },
-        "facing=east": { "model": "end_rod", "y": 90, "x": 90 },
-        "facing=south": { "model": "end_rod", "y": 180, "x": 90 },
-        "facing=west": { "model": "end_rod", "y": 270, "x": 90 },
-        "facing=north": { "model": "end_rod", "y": 0, "x": 90 }
-    }
-}

assets/minecraft/blockstates/fence.json

@@ -1,17 +1,20 @@
 {
-    "multipart": [
+    "variants": {
-        {   "apply": { "model": "oak_fence_post" }},
+        "east=false,north=false,south=false,west=false": { "model": "oak_fence_post" },
-        {   "when": { "north": "true" },
+        "east=false,north=true,south=false,west=false": { "model": "oak_fence_n", "uvlock": true },
-            "apply": { "model": "oak_fence_side", "uvlock": true }
+        "east=true,north=false,south=false,west=false": { "model": "oak_fence_n", "y": 90, "uvlock": true },
-        },
+        "east=false,north=false,south=true,west=false": { "model": "oak_fence_n", "y": 180, "uvlock": true },
-        {   "when": { "east": "true" },
+        "east=false,north=false,south=false,west=true": { "model": "oak_fence_n", "y": 270, "uvlock": true },
-            "apply": { "model": "oak_fence_side", "y": 90, "uvlock": true }
+        "east=true,north=true,south=false,west=false": { "model": "oak_fence_ne", "uvlock": true },
-        },
+        "east=true,north=false,south=true,west=false": { "model": "oak_fence_ne", "y": 90, "uvlock": true },
-        {   "when": { "south": "true" },
+        "east=false,north=false,south=true,west=true": { "model": "oak_fence_ne", "y": 180, "uvlock": true },
-            "apply": { "model": "oak_fence_side", "y": 180, "uvlock": true }
+        "east=false,north=true,south=false,west=true": { "model": "oak_fence_ne", "y": 270, "uvlock": true },
-        },
+        "east=false,north=true,south=true,west=false": { "model": "oak_fence_ns", "uvlock": true },
-        {   "when": { "west": "true" },
+        "east=true,north=false,south=false,west=true": { "model": "oak_fence_ns", "y": 90, "uvlock": true },
-            "apply": { "model": "oak_fence_side", "y": 270, "uvlock": true }
+        "east=true,north=true,south=true,west=false": { "model": "oak_fence_nse", "uvlock": true },
-        }
+        "east=true,north=false,south=true,west=true": { "model": "oak_fence_nse", "y": 90, "uvlock": true },
-    ]
+        "east=false,north=true,south=true,west=true": { "model": "oak_fence_nse", "y": 180, "uvlock": true },
+        "east=true,north=true,south=false,west=true": { "model": "oak_fence_nse", "y": 270, "uvlock": true },
+        "east=true,north=true,south=true,west=true": { "model": "oak_fence_nsew", "uvlock": true }
+    }
 }

assets/minecraft/blockstates/fence_gate.json

@@ -1,20 +1,20 @@
 {
     "variants": {
-        "facing=south,in_wall=false,open=false": { "model": "oak_fence_gate_closed", "uvlock": true },
+        "facing=south,in_wall=false,open=false": { "model": "oak_fence_gate_closed" },
-        "facing=west,in_wall=false,open=false":  { "model": "oak_fence_gate_closed", "uvlock": true, "y": 90 },
+        "facing=west,in_wall=false,open=false":  { "model": "oak_fence_gate_closed", "y": 90, "uvlock": true },
-        "facing=north,in_wall=false,open=false": { "model": "oak_fence_gate_closed", "uvlock": true, "y": 180 },
+        "facing=north,in_wall=false,open=false": { "model": "oak_fence_gate_closed", "y": 180, "uvlock": true },
-        "facing=east,in_wall=false,open=false":  { "model": "oak_fence_gate_closed", "uvlock": true, "y": 270 },
+        "facing=east,in_wall=false,open=false":  { "model": "oak_fence_gate_closed", "y": 270, "uvlock": true },
-        "facing=south,in_wall=false,open=true": { "model": "oak_fence_gate_open", "uvlock": true },
+        "facing=south,in_wall=false,open=true": { "model": "oak_fence_gate_open" },
-        "facing=west,in_wall=false,open=true":  { "model": "oak_fence_gate_open", "uvlock": true, "y": 90 },
+        "facing=west,in_wall=false,open=true":  { "model": "oak_fence_gate_open", "y": 90, "uvlock": true },
-        "facing=north,in_wall=false,open=true": { "model": "oak_fence_gate_open", "uvlock": true, "y": 180 },
+        "facing=north,in_wall=false,open=true": { "model": "oak_fence_gate_open", "y": 180, "uvlock": true },
-        "facing=east,in_wall=false,open=true":  { "model": "oak_fence_gate_open", "uvlock": true, "y": 270 },
+        "facing=east,in_wall=false,open=true":  { "model": "oak_fence_gate_open", "y": 270, "uvlock": true },
-        "facing=south,in_wall=true,open=false": { "model": "oak_wall_gate_closed", "uvlock": true },
+        "facing=south,in_wall=true,open=false": { "model": "oak_wall_gate_closed" },
-        "facing=west,in_wall=true,open=false":  { "model": "oak_wall_gate_closed", "uvlock": true, "y": 90 },
+        "facing=west,in_wall=true,open=false":  { "model": "oak_wall_gate_closed", "y": 90, "uvlock": true },
-        "facing=north,in_wall=true,open=false": { "model": "oak_wall_gate_closed", "uvlock": true, "y": 180 },
+        "facing=north,in_wall=true,open=false": { "model": "oak_wall_gate_closed", "y": 180, "uvlock": true },
-        "facing=east,in_wall=true,open=false":  { "model": "oak_wall_gate_closed", "uvlock": true, "y": 270 },
+        "facing=east,in_wall=true,open=false":  { "model": "oak_wall_gate_closed", "y": 270, "uvlock": true },
-        "facing=south,in_wall=true,open=true": { "model": "oak_wall_gate_open", "uvlock": true },
+        "facing=south,in_wall=true,open=true": { "model": "oak_wall_gate_open" },
-        "facing=west,in_wall=true,open=true":  { "model": "oak_wall_gate_open", "uvlock": true, "y": 90 },
+        "facing=west,in_wall=true,open=true":  { "model": "oak_wall_gate_open", "y": 90, "uvlock": true },
-        "facing=north,in_wall=true,open=true": { "model": "oak_wall_gate_open", "uvlock": true, "y": 180 },
+        "facing=north,in_wall=true,open=true": { "model": "oak_wall_gate_open", "y": 180, "uvlock": true },
-        "facing=east,in_wall=true,open=true":  { "model": "oak_wall_gate_open", "uvlock": true, "y": 270 }
+        "facing=east,in_wall=true,open=true":  { "model": "oak_wall_gate_open", "y": 270, "uvlock": true }
     }
 }

assets/minecraft/blockstates/fire.json

@@ -1,50 +1,196 @@
 {
-    "multipart": [
+    "variants": {
-        {   "when": {"north": false, "east": false, "south": false, "west": false, "up": false},
+        "alt=false,east=false,flip=false,north=false,south=false,upper=0,west=false": { "model": "fire_floor_main" },
-            "apply": [
+        "alt=false,east=false,flip=false,north=false,south=true,upper=0,west=false": { "model": "fire_n_main", "y": 180 },
-                { "model": "fire_floor0" },
+        "alt=false,east=false,flip=false,north=false,south=false,upper=0,west=true": { "model": "fire_n_main", "y": 270 },
-                { "model": "fire_floor1" }
+        "alt=false,east=false,flip=false,north=true,south=false,upper=0,west=false": { "model": "fire_n_main" },
-            ]
+        "alt=false,east=true,flip=false,north=false,south=false,upper=0,west=false": { "model": "fire_n_main", "y": 90 },
-        },
+        "alt=false,east=true,flip=false,north=true,south=false,upper=0,west=false": { "model": "fire_ne_main" },
-        {   "when": {"OR": [{"north": true}, {"north": false, "east": false, "south": false, "west": false, "up": false}]},
+        "alt=false,east=true,flip=false,north=false,south=true,upper=0,west=false": { "model": "fire_ne_main", "y": 90 },
-            "apply": [
+        "alt=false,east=false,flip=false,north=false,south=true,upper=0,west=true": { "model": "fire_ne_main", "y": 180 },
-                { "model": "fire_side0" },
+        "alt=false,east=false,flip=false,north=true,south=false,upper=0,west=true": { "model": "fire_ne_main", "y": 270 },
-                { "model": "fire_side1" },
+        "alt=false,east=false,flip=false,north=true,south=true,upper=0,west=false": { "model": "fire_ns_main" },
-                { "model": "fire_side_alt0" },
+        "alt=false,east=true,flip=false,north=false,south=false,upper=0,west=true": { "model": "fire_ns_main", "y": 90 },
-                { "model": "fire_side_alt1" }
+        "alt=false,east=true,flip=false,north=true,south=true,upper=0,west=false": { "model": "fire_nse_main" },
-            ]
+        "alt=false,east=true,flip=false,north=false,south=true,upper=0,west=true": { "model": "fire_nse_main", "y": 90 },
-        },
+        "alt=false,east=false,flip=false,north=true,south=true,upper=0,west=true": { "model": "fire_nse_main", "y": 180 },
-        {   "when": {"OR": [{"east": true}, {"north": false, "east": false, "south": false, "west": false, "up": false}]},
+        "alt=false,east=true,flip=false,north=true,south=false,upper=0,west=true": { "model": "fire_nse_main", "y": 270 },
-            "apply": [
+        "alt=false,east=true,flip=false,north=true,south=true,upper=0,west=true": { "model": "fire_nsew_main" },
-                { "model": "fire_side0", "y": 90 },
+        "alt=false,east=false,flip=false,north=false,south=false,upper=1,west=false": { "model": "fire_u1_main" },
-                { "model": "fire_side1", "y": 90 },
+        "alt=false,east=false,flip=false,north=false,south=true,upper=1,west=false": { "model": "fire_nu1_main", "y": 180 },
-                { "model": "fire_side_alt0", "y": 90 },
+        "alt=false,east=false,flip=false,north=false,south=false,upper=1,west=true": { "model": "fire_nu1_main", "y": 270 },
-                { "model": "fire_side_alt1", "y": 90 }
+        "alt=false,east=false,flip=false,north=true,south=false,upper=1,west=false": { "model": "fire_nu1_main" },
-            ]
+        "alt=false,east=true,flip=false,north=false,south=false,upper=1,west=false": { "model": "fire_nu1_main", "y": 90 },
-        },
+        "alt=false,east=true,flip=false,north=true,south=false,upper=1,west=false": { "model": "fire_neu1_main" },
-        {   "when": {"OR": [{"south": true}, {"north": false, "east": false, "south": false, "west": false, "up": false}]},
+        "alt=false,east=true,flip=false,north=false,south=true,upper=1,west=false": { "model": "fire_neu1_main", "y": 90 },
-            "apply": [
+        "alt=false,east=false,flip=false,north=false,south=true,upper=1,west=true": { "model": "fire_neu1_main", "y": 180 },
-                { "model": "fire_side0", "y": 180 },
+        "alt=false,east=false,flip=false,north=true,south=false,upper=1,west=true": { "model": "fire_neu1_main", "y": 270 },
-                { "model": "fire_side1", "y": 180 },
+        "alt=false,east=false,flip=false,north=true,south=true,upper=1,west=false": { "model": "fire_nsu1_main" },
-                { "model": "fire_side_alt0", "y": 180 },
+        "alt=false,east=true,flip=false,north=false,south=false,upper=1,west=true": { "model": "fire_nsu1_main", "y": 90 },
-                { "model": "fire_side_alt1", "y": 180 }
+        "alt=false,east=true,flip=false,north=true,south=true,upper=1,west=false": { "model": "fire_nseu1_main" },
-            ]
+        "alt=false,east=true,flip=false,north=false,south=true,upper=1,west=true": { "model": "fire_nseu1_main", "y": 90 },
-        },
+        "alt=false,east=false,flip=false,north=true,south=true,upper=1,west=true": { "model": "fire_nseu1_main", "y": 180 },
-        {   "when": {"OR": [{"west": true}, {"north": false, "east": false, "south": false, "west": false, "up": false}]},
+        "alt=false,east=true,flip=false,north=true,south=false,upper=1,west=true": { "model": "fire_nseu1_main", "y": 270 },
-            "apply": [
+        "alt=false,east=true,flip=false,north=true,south=true,upper=1,west=true": { "model": "fire_nsewu1_main" },
-                { "model": "fire_side0", "y": 270 },
+        "alt=false,east=false,flip=false,north=false,south=false,upper=2,west=false": { "model": "fire_u2_main" },
-                { "model": "fire_side1", "y": 270 },
+        "alt=false,east=false,flip=false,north=false,south=true,upper=2,west=false": { "model": "fire_nu2_main", "y": 180 },
-                { "model": "fire_side_alt0", "y": 270 },
+        "alt=false,east=false,flip=false,north=false,south=false,upper=2,west=true": { "model": "fire_nu2_main", "y": 270 },
-                { "model": "fire_side_alt1", "y": 270 }
+        "alt=false,east=false,flip=false,north=true,south=false,upper=2,west=false": { "model": "fire_nu2_main" },
-            ]
+        "alt=false,east=true,flip=false,north=false,south=false,upper=2,west=false": { "model": "fire_nu2_main", "y": 90 },
-        },
+        "alt=false,east=true,flip=false,north=true,south=false,upper=2,west=false": { "model": "fire_neu2_main" },
-        {   "when": {"up": true},
+        "alt=false,east=true,flip=false,north=false,south=true,upper=2,west=false": { "model": "fire_neu2_main", "y": 90 },
-            "apply": [
+        "alt=false,east=false,flip=false,north=false,south=true,upper=2,west=true": { "model": "fire_neu2_main", "y": 180 },
-                { "model": "fire_up0" },
+        "alt=false,east=false,flip=false,north=true,south=false,upper=2,west=true": { "model": "fire_neu2_main", "y": 270 },
-                { "model": "fire_up1" },
+        "alt=false,east=false,flip=false,north=true,south=true,upper=2,west=false": { "model": "fire_nsu2_main" },
-                { "model": "fire_up_alt0" },
+        "alt=false,east=true,flip=false,north=false,south=false,upper=2,west=true": { "model": "fire_nsu2_main", "y": 90 },
-                { "model": "fire_up_alt1" }
+        "alt=false,east=true,flip=false,north=true,south=true,upper=2,west=false": { "model": "fire_nseu2_main" },
-            ]
+        "alt=false,east=true,flip=false,north=false,south=true,upper=2,west=true": { "model": "fire_nseu2_main", "y": 90 },
-        }
+        "alt=false,east=false,flip=false,north=true,south=true,upper=2,west=true": { "model": "fire_nseu2_main", "y": 180 },
-    ]
+        "alt=false,east=true,flip=false,north=true,south=false,upper=2,west=true": { "model": "fire_nseu2_main", "y": 270 },
+        "alt=false,east=true,flip=false,north=true,south=true,upper=2,west=true": { "model": "fire_nsewu2_main" },
+        "alt=true,east=false,flip=false,north=false,south=false,upper=0,west=false": { "model": "fire_floor_main" },
+        "alt=true,east=false,flip=false,north=false,south=true,upper=0,west=false": { "model": "fire_n_alt", "y": 180 },
+        "alt=true,east=false,flip=false,north=false,south=false,upper=0,west=true": { "model": "fire_n_alt", "y": 270 },
+        "alt=true,east=false,flip=false,north=true,south=false,upper=0,west=false": { "model": "fire_n_alt" },
+        "alt=true,east=true,flip=false,north=false,south=false,upper=0,west=false": { "model": "fire_n_alt", "y": 90 },
+        "alt=true,east=true,flip=false,north=true,south=false,upper=0,west=false": { "model": "fire_ne_alt" },
+        "alt=true,east=true,flip=false,north=false,south=true,upper=0,west=false": { "model": "fire_ne_alt", "y": 90 },
+        "alt=true,east=false,flip=false,north=false,south=true,upper=0,west=true": { "model": "fire_ne_alt", "y": 180 },
+        "alt=true,east=false,flip=false,north=true,south=false,upper=0,west=true": { "model": "fire_ne_alt", "y": 270 },
+        "alt=true,east=false,flip=false,north=true,south=true,upper=0,west=false": { "model": "fire_ns_alt" },
+        "alt=true,east=true,flip=false,north=false,south=false,upper=0,west=true": { "model": "fire_ns_alt", "y": 90 },
+        "alt=true,east=true,flip=false,north=true,south=true,upper=0,west=false": { "model": "fire_nse_alt" },
+        "alt=true,east=true,flip=false,north=false,south=true,upper=0,west=true": { "model": "fire_nse_alt", "y": 90 },
+        "alt=true,east=false,flip=false,north=true,south=true,upper=0,west=true": { "model": "fire_nse_alt", "y": 180 },
+        "alt=true,east=true,flip=false,north=true,south=false,upper=0,west=true": { "model": "fire_nse_alt", "y": 270 },
+        "alt=true,east=true,flip=false,north=true,south=true,upper=0,west=true": { "model": "fire_nsew_alt" },
+        "alt=true,east=false,flip=false,north=false,south=false,upper=1,west=false": { "model": "fire_u1_main" },
+        "alt=true,east=false,flip=false,north=false,south=true,upper=1,west=false": { "model": "fire_nu1_alt", "y": 180 },
+        "alt=true,east=false,flip=false,north=false,south=false,upper=1,west=true": { "model": "fire_nu1_alt", "y": 270 },
+        "alt=true,east=false,flip=false,north=true,south=false,upper=1,west=false": { "model": "fire_nu1_alt" },
+        "alt=true,east=true,flip=false,north=false,south=false,upper=1,west=false": { "model": "fire_nu1_alt", "y": 90 },
+        "alt=true,east=true,flip=false,north=true,south=false,upper=1,west=false": { "model": "fire_neu1_alt" },
+        "alt=true,east=true,flip=false,north=false,south=true,upper=1,west=false": { "model": "fire_neu1_alt", "y": 90 },
+        "alt=true,east=false,flip=false,north=false,south=true,upper=1,west=true": { "model": "fire_neu1_alt", "y": 180 },
+        "alt=true,east=false,flip=false,north=true,south=false,upper=1,west=true": { "model": "fire_neu1_alt", "y": 270 },
+        "alt=true,east=false,flip=false,north=true,south=true,upper=1,west=false": { "model": "fire_nsu1_alt" },
+        "alt=true,east=true,flip=false,north=false,south=false,upper=1,west=true": { "model": "fire_nsu1_alt", "y": 90 },
+        "alt=true,east=true,flip=false,north=true,south=true,upper=1,west=false": { "model": "fire_nseu1_alt" },
+        "alt=true,east=true,flip=false,north=false,south=true,upper=1,west=true": { "model": "fire_nseu1_alt", "y": 90 },
+        "alt=true,east=false,flip=false,north=true,south=true,upper=1,west=true": { "model": "fire_nseu1_alt", "y": 180 },
+        "alt=true,east=true,flip=false,north=true,south=false,upper=1,west=true": { "model": "fire_nseu1_alt", "y": 270 },
+        "alt=true,east=true,flip=false,north=true,south=true,upper=1,west=true": { "model": "fire_nsewu1_alt" },
+        "alt=true,east=false,flip=false,north=false,south=false,upper=2,west=false": { "model": "fire_u2_main" },
+        "alt=true,east=false,flip=false,north=false,south=true,upper=2,west=false": { "model": "fire_nu2_alt", "y": 180 },
+        "alt=true,east=false,flip=false,north=false,south=false,upper=2,west=true": { "model": "fire_nu2_alt", "y": 270 },
+        "alt=true,east=false,flip=false,north=true,south=false,upper=2,west=false": { "model": "fire_nu2_alt" },
+        "alt=true,east=true,flip=false,north=false,south=false,upper=2,west=false": { "model": "fire_nu2_alt", "y": 90 },
+        "alt=true,east=true,flip=false,north=true,south=false,upper=2,west=false": { "model": "fire_neu2_alt" },
+        "alt=true,east=true,flip=false,north=false,south=true,upper=2,west=false": { "model": "fire_neu2_alt", "y": 90 },
+        "alt=true,east=false,flip=false,north=false,south=true,upper=2,west=true": { "model": "fire_neu2_alt", "y": 180 },
+        "alt=true,east=false,flip=false,north=true,south=false,upper=2,west=true": { "model": "fire_neu2_alt", "y": 270 },
+        "alt=true,east=false,flip=false,north=true,south=true,upper=2,west=false": { "model": "fire_nsu2_alt" },
+        "alt=true,east=true,flip=false,north=false,south=false,upper=2,west=true": { "model": "fire_nsu2_alt", "y": 90 },
+        "alt=true,east=true,flip=false,north=true,south=true,upper=2,west=false": { "model": "fire_nseu2_alt" },
+        "alt=true,east=true,flip=false,north=false,south=true,upper=2,west=true": { "model": "fire_nseu2_alt", "y": 90 },
+        "alt=true,east=false,flip=false,north=true,south=true,upper=2,west=true": { "model": "fire_nseu2_alt", "y": 180 },
+        "alt=true,east=true,flip=false,north=true,south=false,upper=2,west=true": { "model": "fire_nseu2_alt", "y": 270 },
+        "alt=true,east=true,flip=false,north=true,south=true,upper=2,west=true": { "model": "fire_nsewu2_alt" },
+        "alt=false,east=false,flip=true,north=false,south=false,upper=0,west=false": { "model": "fire_floor_main" },
+        "alt=false,east=false,flip=true,north=false,south=true,upper=0,west=false": { "model": "fire_n_flip_main", "y": 180 },
+        "alt=false,east=false,flip=true,north=false,south=false,upper=0,west=true": { "model": "fire_n_flip_main", "y": 270 },
+        "alt=false,east=false,flip=true,north=true,south=false,upper=0,west=false": { "model": "fire_n_flip_main" },
+        "alt=false,east=true,flip=true,north=false,south=false,upper=0,west=false": { "model": "fire_n_flip_main", "y": 90 },
+        "alt=false,east=true,flip=true,north=true,south=false,upper=0,west=false": { "model": "fire_ne_flip_main" },
+        "alt=false,east=true,flip=true,north=false,south=true,upper=0,west=false": { "model": "fire_ne_flip_main", "y": 90 },
+        "alt=false,east=false,flip=true,north=false,south=true,upper=0,west=true": { "model": "fire_ne_flip_main", "y": 180 },
+        "alt=false,east=false,flip=true,north=true,south=false,upper=0,west=true": { "model": "fire_ne_flip_main", "y": 270 },
+        "alt=false,east=false,flip=true,north=true,south=true,upper=0,west=false": { "model": "fire_ns_flip_main" },
+        "alt=false,east=true,flip=true,north=false,south=false,upper=0,west=true": { "model": "fire_ns_flip_main", "y": 90 },
+        "alt=false,east=true,flip=true,north=true,south=true,upper=0,west=false": { "model": "fire_nse_flip_main" },
+        "alt=false,east=true,flip=true,north=false,south=true,upper=0,west=true": { "model": "fire_nse_flip_main", "y": 90 },
+        "alt=false,east=false,flip=true,north=true,south=true,upper=0,west=true": { "model": "fire_nse_flip_main", "y": 180 },
+        "alt=false,east=true,flip=true,north=true,south=false,upper=0,west=true": { "model": "fire_nse_flip_main", "y": 270 },
+        "alt=false,east=true,flip=true,north=true,south=true,upper=0,west=true": { "model": "fire_nsew_flip_main" },
+        "alt=false,east=false,flip=true,north=false,south=false,upper=1,west=false": { "model": "fire_u1_main" },
+        "alt=false,east=false,flip=true,north=false,south=true,upper=1,west=false": { "model": "fire_nu1_flip_main", "y": 180 },
+        "alt=false,east=false,flip=true,north=false,south=false,upper=1,west=true": { "model": "fire_nu1_flip_main", "y": 270 },
+        "alt=false,east=false,flip=true,north=true,south=false,upper=1,west=false": { "model": "fire_nu1_flip_main" },
+        "alt=false,east=true,flip=true,north=false,south=false,upper=1,west=false": { "model": "fire_nu1_flip_main", "y": 90 },
+        "alt=false,east=true,flip=true,north=true,south=false,upper=1,west=false": { "model": "fire_neu1_flip_main" },
+        "alt=false,east=true,flip=true,north=false,south=true,upper=1,west=false": { "model": "fire_neu1_flip_main", "y": 90 },
+        "alt=false,east=false,flip=true,north=false,south=true,upper=1,west=true": { "model": "fire_neu1_flip_main", "y": 180 },
+        "alt=false,east=false,flip=true,north=true,south=false,upper=1,west=true": { "model": "fire_neu1_flip_main", "y": 270 },
+        "alt=false,east=false,flip=true,north=true,south=true,upper=1,west=false": { "model": "fire_nsu1_flip_main" },
+        "alt=false,east=true,flip=true,north=false,south=false,upper=1,west=true": { "model": "fire_nsu1_flip_main", "y": 90 },
+        "alt=false,east=true,flip=true,north=true,south=true,upper=1,west=false": { "model": "fire_nseu1_flip_main" },
+        "alt=false,east=true,flip=true,north=false,south=true,upper=1,west=true": { "model": "fire_nseu1_flip_main", "y": 90 },
+        "alt=false,east=false,flip=true,north=true,south=true,upper=1,west=true": { "model": "fire_nseu1_flip_main", "y": 180 },
+        "alt=false,east=true,flip=true,north=true,south=false,upper=1,west=true": { "model": "fire_nseu1_flip_main", "y": 270 },
+        "alt=false,east=true,flip=true,north=true,south=true,upper=1,west=true": { "model": "fire_nsewu1_flip_main" },
+        "alt=false,east=false,flip=true,north=false,south=false,upper=2,west=false": { "model": "fire_u2_main" },
+        "alt=false,east=false,flip=true,north=false,south=true,upper=2,west=false": { "model": "fire_nu2_flip_main", "y": 180 },
+        "alt=false,east=false,flip=true,north=false,south=false,upper=2,west=true": { "model": "fire_nu2_flip_main", "y": 270 },
+        "alt=false,east=false,flip=true,north=true,south=false,upper=2,west=false": { "model": "fire_nu2_flip_main" },
+        "alt=false,east=true,flip=true,north=false,south=false,upper=2,west=false": { "model": "fire_nu2_flip_main", "y": 90 },
+        "alt=false,east=true,flip=true,north=true,south=false,upper=2,west=false": { "model": "fire_neu2_flip_main" },
+        "alt=false,east=true,flip=true,north=false,south=true,upper=2,west=false": { "model": "fire_neu2_flip_main", "y": 90 },
+        "alt=false,east=false,flip=true,north=false,south=true,upper=2,west=true": { "model": "fire_neu2_flip_main", "y": 180 },
+        "alt=false,east=false,flip=true,north=true,south=false,upper=2,west=true": { "model": "fire_neu2_flip_main", "y": 270 },
+        "alt=false,east=false,flip=true,north=true,south=true,upper=2,west=false": { "model": "fire_nsu2_flip_main" },
+        "alt=false,east=true,flip=true,north=false,south=false,upper=2,west=true": { "model": "fire_nsu2_flip_main", "y": 90 },
+        "alt=false,east=true,flip=true,north=true,south=true,upper=2,west=false": { "model": "fire_nseu2_flip_main" },
+        "alt=false,east=true,flip=true,north=false,south=true,upper=2,west=true": { "model": "fire_nseu2_flip_main", "y": 90 },
+        "alt=false,east=false,flip=true,north=true,south=true,upper=2,west=true": { "model": "fire_nseu2_flip_main", "y": 180 },
+        "alt=false,east=true,flip=true,north=true,south=false,upper=2,west=true": { "model": "fire_nseu2_flip_main", "y": 270 },
+        "alt=false,east=true,flip=true,north=true,south=true,upper=2,west=true": { "model": "fire_nsewu2_flip_main" },
+        "alt=true,east=false,flip=true,north=false,south=false,upper=0,west=false": { "model": "fire_floor_main" },
+        "alt=true,east=false,flip=true,north=false,south=true,upper=0,west=false": { "model": "fire_n_alt_flip", "y": 180 },
+        "alt=true,east=false,flip=true,north=false,south=false,upper=0,west=true": { "model": "fire_n_alt_flip", "y": 270 },
+        "alt=true,east=false,flip=true,north=true,south=false,upper=0,west=false": { "model": "fire_n_alt_flip" },
+        "alt=true,east=true,flip=true,north=false,south=false,upper=0,west=false": { "model": "fire_n_alt_flip", "y": 90 },
+        "alt=true,east=true,flip=true,north=true,south=false,upper=0,west=false": { "model": "fire_ne_alt_flip" },
+        "alt=true,east=true,flip=true,north=false,south=true,upper=0,west=false": { "model": "fire_ne_alt_flip", "y": 90 },
+        "alt=true,east=false,flip=true,north=false,south=true,upper=0,west=true": { "model": "fire_ne_alt_flip", "y": 180 },
+        "alt=true,east=false,flip=true,north=true,south=false,upper=0,west=true": { "model": "fire_ne_alt_flip", "y": 270 },
+        "alt=true,east=false,flip=true,north=true,south=true,upper=0,west=false": { "model": "fire_ns_alt_flip" },
+        "alt=true,east=true,flip=true,north=false,south=false,upper=0,west=true": { "model": "fire_ns_alt_flip", "y": 90 },
+        "alt=true,east=true,flip=true,north=true,south=true,upper=0,west=false": { "model": "fire_nse_alt_flip" },
+        "alt=true,east=true,flip=true,north=false,south=true,upper=0,west=true": { "model": "fire_nse_alt_flip", "y": 90 },
+        "alt=true,east=false,flip=true,north=true,south=true,upper=0,west=true": { "model": "fire_nse_alt_flip", "y": 180 },
+        "alt=true,east=true,flip=true,north=true,south=false,upper=0,west=true": { "model": "fire_nse_alt_flip", "y": 270 },
+        "alt=true,east=true,flip=true,north=true,south=true,upper=0,west=true": { "model": "fire_nsew_alt_flip" },
+        "alt=true,east=false,flip=true,north=false,south=false,upper=1,west=false": { "model": "fire_u1_main" },
+        "alt=true,east=false,flip=true,north=false,south=true,upper=1,west=false": { "model": "fire_nu1_alt_flip", "y": 180 },
+        "alt=true,east=false,flip=true,north=false,south=false,upper=1,west=true": { "model": "fire_nu1_alt_flip", "y": 270 },
+        "alt=true,east=false,flip=true,north=true,south=false,upper=1,west=false": { "model": "fire_nu1_alt_flip" },
+        "alt=true,east=true,flip=true,north=false,south=false,upper=1,west=false": { "model": "fire_nu1_alt_flip", "y": 90 },
+        "alt=true,east=true,flip=true,north=true,south=false,upper=1,west=false": { "model": "fire_neu1_alt_flip" },
+        "alt=true,east=true,flip=true,north=false,south=true,upper=1,west=false": { "model": "fire_neu1_alt_flip", "y": 90 },
+        "alt=true,east=false,flip=true,north=false,south=true,upper=1,west=true": { "model": "fire_neu1_alt_flip", "y": 180 },
+        "alt=true,east=false,flip=true,north=true,south=false,upper=1,west=true": { "model": "fire_neu1_alt_flip", "y": 270 },
+        "alt=true,east=false,flip=true,north=true,south=true,upper=1,west=false": { "model": "fire_nsu1_alt_flip" },
+        "alt=true,east=true,flip=true,north=false,south=false,upper=1,west=true": { "model": "fire_nsu1_alt_flip", "y": 90 },
+        "alt=true,east=true,flip=true,north=true,south=true,upper=1,west=false": { "model": "fire_nseu1_alt_flip" },
+        "alt=true,east=true,flip=true,north=false,south=true,upper=1,west=true": { "model": "fire_nseu1_alt_flip", "y": 90 },
+        "alt=true,east=false,flip=true,north=true,south=true,upper=1,west=true": { "model": "fire_nseu1_alt_flip", "y": 180 },
+        "alt=true,east=true,flip=true,north=true,south=false,upper=1,west=true": { "model": "fire_nseu1_alt_flip", "y": 270 },
+        "alt=true,east=true,flip=true,north=true,south=true,upper=1,west=true": { "model": "fire_nsewu1_alt_flip" },
+        "alt=true,east=false,flip=true,north=false,south=false,upper=2,west=false": { "model": "fire_u2_main" },
+        "alt=true,east=false,flip=true,north=false,south=true,upper=2,west=false": { "model": "fire_nu2_alt_flip", "y": 180 },
+        "alt=true,east=false,flip=true,north=false,south=false,upper=2,west=true": { "model": "fire_nu2_alt_flip", "y": 270 },
+        "alt=true,east=false,flip=true,north=true,south=false,upper=2,west=false": { "model": "fire_nu2_alt_flip" },
+        "alt=true,east=true,flip=true,north=false,south=false,upper=2,west=false": { "model": "fire_nu2_alt_flip", "y": 90 },
+        "alt=true,east=true,flip=true,north=true,south=false,upper=2,west=false": { "model": "fire_neu2_alt_flip" },
+        "alt=true,east=true,flip=true,north=false,south=true,upper=2,west=false": { "model": "fire_neu2_alt_flip", "y": 90 },
+        "alt=true,east=false,flip=true,north=false,south=true,upper=2,west=true": { "model": "fire_neu2_alt_flip", "y": 180 },
+        "alt=true,east=false,flip=true,north=true,south=false,upper=2,west=true": { "model": "fire_neu2_alt_flip", "y": 270 },
+        "alt=true,east=false,flip=true,north=true,south=true,upper=2,west=false": { "model": "fire_nsu2_alt_flip" },
+        "alt=true,east=true,flip=true,north=false,south=false,upper=2,west=true": { "model": "fire_nsu2_alt_flip", "y": 90 },
+        "alt=true,east=true,flip=true,north=true,south=true,upper=2,west=false": { "model": "fire_nseu2_alt_flip" },
+        "alt=true,east=true,flip=true,north=false,south=true,upper=2,west=true": { "model": "fire_nseu2_alt_flip", "y": 90 },
+        "alt=true,east=false,flip=true,north=true,south=true,upper=2,west=true": { "model": "fire_nseu2_alt_flip", "y": 180 },
+        "alt=true,east=true,flip=true,north=true,south=false,upper=2,west=true": { "model": "fire_nseu2_alt_flip", "y": 270 },
+        "alt=true,east=true,flip=true,north=true,south=true,upper=2,west=true": { "model": "fire_nsewu2_alt_flip" }
+    }
 }

assets/minecraft/blockstates/frosted_ice.json

@@ -1,8 +0,0 @@
-{
-    "variants": {
-        "age=0": { "model": "frosted_ice_0" },
-        "age=1": { "model": "frosted_ice_1" },
-        "age=2": { "model": "frosted_ice_2" },
-        "age=3": { "model": "frosted_ice_3" }
-    }
-}

assets/minecraft/blockstates/glass_pane.json

@@ -1,29 +1,20 @@
 {
-    "multipart": [
+    "variants": {
-        {   "apply": { "model": "glass_pane_post" }},
+        "east=false,north=false,south=false,west=false": { "model": "glass_pane_nsew" },
-        {   "when": { "north": true },
+        "east=false,north=true,south=false,west=false": { "model": "glass_pane_n" },
-            "apply": { "model": "glass_pane_side" }
+        "east=true,north=false,south=false,west=false": { "model": "glass_pane_n", "y": 90 },
-        },
+        "east=false,north=false,south=true,west=false": { "model": "glass_pane_n", "y": 180 },
-        {   "when": { "east": true },
+        "east=false,north=false,south=false,west=true": { "model": "glass_pane_n", "y": 270 },
-            "apply": { "model": "glass_pane_side", "y": 90 }
+        "east=true,north=true,south=false,west=false": { "model": "glass_pane_ne" },
-        },
+        "east=true,north=false,south=true,west=false": { "model": "glass_pane_ne", "y": 90 },
-        {   "when": { "south": true },
+        "east=false,north=false,south=true,west=true": { "model": "glass_pane_ne", "y": 180 },
-            "apply": { "model": "glass_pane_side_alt" }
+        "east=false,north=true,south=false,west=true": { "model": "glass_pane_ne", "y": 270 },
-        },
+        "east=false,north=true,south=true,west=false": { "model": "glass_pane_ns" },
-        {   "when": { "west": true },
+        "east=true,north=false,south=false,west=true": { "model": "glass_pane_ns", "y": 90 },
-            "apply": { "model": "glass_pane_side_alt", "y": 90 }
+        "east=true,north=true,south=true,west=false": { "model": "glass_pane_nse" },
-        },
+        "east=true,north=false,south=true,west=true": { "model": "glass_pane_nse", "y": 90 },
-        {   "when": { "north": false },
+        "east=false,north=true,south=true,west=true": { "model": "glass_pane_nse", "y": 180 },
-            "apply": { "model": "glass_pane_noside" }
+        "east=true,north=true,south=false,west=true": { "model": "glass_pane_nse", "y": 270 },
-        },
+        "east=true,north=true,south=true,west=true": { "model": "glass_pane_nsew" }
-        {   "when": { "east": false },
+    }
-            "apply": { "model": "glass_pane_noside_alt" }
-        },
-        {   "when": { "south": false },
-            "apply": { "model": "glass_pane_noside_alt", "y": 90 }
-        },
-        {   "when": { "west": false },
-            "apply": { "model": "glass_pane_noside", "y": 270 }
-        }
-    ]
 }

assets/minecraft/blockstates/grass_path.json

@@ -1,5 +0,0 @@
-{
-    "variants": {
-        "normal": { "model": "grass_path" }
-    }
-}

assets/minecraft/blockstates/gray_stained_glass_pane.json

@@ -1,29 +1,20 @@
 {
-    "multipart": [
+    "variants": {
-        {   "apply": { "model": "gray_stained_glass_pane_post" }},
+        "east=false,north=false,south=false,west=false": { "model": "gray_pane_nsew" },
-        {   "when": { "north": true },
+        "east=false,north=true,south=false,west=false": { "model": "gray_pane_n" },
-            "apply": { "model": "gray_stained_glass_pane_side" }
+        "east=true,north=false,south=false,west=false": { "model": "gray_pane_n", "y": 90 },
-        },
+        "east=false,north=false,south=true,west=false": { "model": "gray_pane_s" },
-        {   "when": { "east": true },
+        "east=false,north=false,south=false,west=true": { "model": "gray_pane_s", "y": 90 },
-            "apply": { "model": "gray_stained_glass_pane_side", "y": 90 }
+        "east=true,north=true,south=false,west=false": { "model": "gray_pane_ne" },
-        },
+        "east=true,north=false,south=true,west=false": { "model": "gray_pane_se" },
-        {   "when": { "south": true },
+        "east=false,north=false,south=true,west=true": { "model": "gray_pane_sw" },
-            "apply": { "model": "gray_stained_glass_pane_side_alt" }
+        "east=false,north=true,south=false,west=true": { "model": "gray_pane_nw" },
-        },
+        "east=false,north=true,south=true,west=false": { "model": "gray_pane_ns" },
-        {   "when": { "west": true },
+        "east=true,north=false,south=false,west=true": { "model": "gray_pane_ns", "y": 90 },
-            "apply": { "model": "gray_stained_glass_pane_side_alt", "y": 90 }
+        "east=true,north=true,south=true,west=false": { "model": "gray_pane_nse" },
-        },
+        "east=true,north=false,south=true,west=true": { "model": "gray_pane_sew" },
-        {   "when": { "north": false },
+        "east=false,north=true,south=true,west=true": { "model": "gray_pane_nsw" },
-            "apply": { "model": "gray_stained_glass_pane_noside" }
+        "east=true,north=true,south=false,west=true": { "model": "gray_pane_new" },
-        },
+        "east=true,north=true,south=true,west=true": { "model": "gray_pane_nsew" }
-        {   "when": { "east": false },
+    }
-            "apply": { "model": "gray_stained_glass_pane_noside_alt" }
-        },
-        {   "when": { "south": false },
-            "apply": { "model": "gray_stained_glass_pane_noside_alt", "y": 90 }
-        },
-        {   "when": { "west": false },
-            "apply": { "model": "gray_stained_glass_pane_noside", "y": 270 }
-        }
-    ]
 }

assets/minecraft/blockstates/green_stained_glass_pane.json

@@ -1,29 +1,20 @@
 {
-    "multipart": [
+    "variants": {
-        {   "apply": { "model": "green_stained_glass_pane_post" }},
+        "east=false,north=false,south=false,west=false": { "model": "green_pane_nsew" },
-        {   "when": { "north": true },
+        "east=false,north=true,south=false,west=false": { "model": "green_pane_n" },
-            "apply": { "model": "green_stained_glass_pane_side" }
+        "east=true,north=false,south=false,west=false": { "model": "green_pane_n", "y": 90 },
-        },
+        "east=false,north=false,south=true,west=false": { "model": "green_pane_s" },
-        {   "when": { "east": true },
+        "east=false,north=false,south=false,west=true": { "model": "green_pane_s", "y": 90 },
-            "apply": { "model": "green_stained_glass_pane_side", "y": 90 }
+        "east=true,north=true,south=false,west=false": { "model": "green_pane_ne" },
-        },
+        "east=true,north=false,south=true,west=false": { "model": "green_pane_se" },
-        {   "when": { "south": true },
+        "east=false,north=false,south=true,west=true": { "model": "green_pane_sw" },
-            "apply": { "model": "green_stained_glass_pane_side_alt" }
+        "east=false,north=true,south=false,west=true": { "model": "green_pane_nw" },
-        },
+        "east=false,north=true,south=true,west=false": { "model": "green_pane_ns" },
-        {   "when": { "west": true },
+        "east=true,north=false,south=false,west=true": { "model": "green_pane_ns", "y": 90 },
-            "apply": { "model": "green_stained_glass_pane_side_alt", "y": 90 }
+        "east=true,north=true,south=true,west=false": { "model": "green_pane_nse" },
-        },
+        "east=true,north=false,south=true,west=true": { "model": "green_pane_sew" },
-        {   "when": { "north": false },
+        "east=false,north=true,south=true,west=true": { "model": "green_pane_nsw" },
-            "apply": { "model": "green_stained_glass_pane_noside" }
+        "east=true,north=true,south=false,west=true": { "model": "green_pane_new" },
-        },
+        "east=true,north=true,south=true,west=true": { "model": "green_pane_nsew" }
-        {   "when": { "east": false },
+    }
-            "apply": { "model": "green_stained_glass_pane_noside_alt" }
-        },
-        {   "when": { "south": false },
-            "apply": { "model": "green_stained_glass_pane_noside_alt", "y": 90 }
-        },
-        {   "when": { "west": false },
-            "apply": { "model": "green_stained_glass_pane_noside", "y": 270 }
-        }
-    ]
 }

assets/minecraft/blockstates/hay_block.json

@@ -1,7 +1,7 @@
 {
     "variants": {
         "axis=y": { "model": "hay" },
-        "axis=z": { "model": "hay", "x": 90 },
+        "axis=z": { "model": "hay_side" },
-        "axis=x": { "model": "hay", "x": 90, "y": 90 }
+        "axis=x": { "model": "hay_side", "y": 90 }
     }
 }

assets/minecraft/blockstates/iron_bars.json

@@ -1,32 +1,20 @@
 {
-    "multipart": [
+    "variants": {
-        {   "apply": { "model": "iron_bars_post_ends" }},
+        "east=false,north=false,south=false,west=false": { "model": "bars_nsew" },
-        {   "when": { "north": false, "east": false, "south": false, "west": false },
+        "east=false,north=true,south=false,west=false": { "model": "bars_n" },
-            "apply": { "model": "iron_bars_post" }
+        "east=true,north=false,south=false,west=false": { "model": "bars_n", "y": 90 },
-        },
+        "east=false,north=false,south=true,west=false": { "model": "bars_n", "y": 180 },
-        {   "when": { "north": true, "east": false, "south": false, "west": false },
+        "east=false,north=false,south=false,west=true": { "model": "bars_n", "y": 270 },
-            "apply": { "model": "iron_bars_cap" }
+        "east=true,north=true,south=false,west=false": { "model": "bars_ne" },
-        },
+        "east=true,north=false,south=true,west=false": { "model": "bars_ne", "y": 90 },
-        {   "when": { "north": false, "east": true, "south": false, "west": false },
+        "east=false,north=false,south=true,west=true": { "model": "bars_ne", "y": 180 },
-            "apply": { "model": "iron_bars_cap", "y": 90 }
+        "east=false,north=true,south=false,west=true": { "model": "bars_ne", "y": 270 },
-        },
+        "east=false,north=true,south=true,west=false": { "model": "bars_ns" },
-        {   "when": { "north": false, "east": false, "south": true, "west": false },
+        "east=true,north=false,south=false,west=true": { "model": "bars_ns", "y": 90 },
-            "apply": { "model": "iron_bars_cap_alt" }
+        "east=true,north=true,south=true,west=false": { "model": "bars_nse" },
-        },
+        "east=true,north=false,south=true,west=true": { "model": "bars_nse", "y": 90 },
-        {   "when": { "north": false, "east": false, "south": false, "west": true },
+        "east=false,north=true,south=true,west=true": { "model": "bars_nse", "y": 180 },
-            "apply": { "model": "iron_bars_cap_alt", "y": 90 }
+        "east=true,north=true,south=false,west=true": { "model": "bars_nse", "y": 270 },
-        },
+        "east=true,north=true,south=true,west=true": { "model": "bars_nsew" }
-        {   "when": { "north": true },
+    }
-            "apply": { "model": "iron_bars_side" }
-        },
-        {   "when": { "east": true },
-            "apply": { "model": "iron_bars_side", "y": 90 }
-        },
-        {   "when": { "south": true },
-            "apply": { "model": "iron_bars_side_alt" }
-        },
-        {   "when": { "west": true },
-            "apply": { "model": "iron_bars_side_alt", "y": 90 }
-        }
-    ]
 }

assets/minecraft/blockstates/jungle_fence.json

@@ -1,17 +1,20 @@
 {
-    "multipart": [
+    "variants": {
-        {   "apply": { "model": "jungle_fence_post" }},
+        "east=false,north=false,south=false,west=false": { "model": "jungle_fence_post" },
-        {   "when": { "north": "true" },
+        "east=false,north=true,south=false,west=false": { "model": "jungle_fence_n", "uvlock": true },
-            "apply": { "model": "jungle_fence_side", "uvlock": true }
+        "east=true,north=false,south=false,west=false": { "model": "jungle_fence_n", "y": 90, "uvlock": true },
-        },
+        "east=false,north=false,south=true,west=false": { "model": "jungle_fence_n", "y": 180, "uvlock": true },
-        {   "when": { "east": "true" },
+        "east=false,north=false,south=false,west=true": { "model": "jungle_fence_n", "y": 270, "uvlock": true },
-            "apply": { "model": "jungle_fence_side", "y": 90, "uvlock": true }
+        "east=true,north=true,south=false,west=false": { "model": "jungle_fence_ne", "uvlock": true },
-        },
+        "east=true,north=false,south=true,west=false": { "model": "jungle_fence_ne", "y": 90, "uvlock": true },
-        {   "when": { "south": "true" },
+        "east=false,north=false,south=true,west=true": { "model": "jungle_fence_ne", "y": 180, "uvlock": true },
-            "apply": { "model": "jungle_fence_side", "y": 180, "uvlock": true }
+        "east=false,north=true,south=false,west=true": { "model": "jungle_fence_ne", "y": 270, "uvlock": true },
-        },
+        "east=false,north=true,south=true,west=false": { "model": "jungle_fence_ns", "uvlock": true },
-        {   "when": { "west": "true" },
+        "east=true,north=false,south=false,west=true": { "model": "jungle_fence_ns", "y": 90, "uvlock": true },
-            "apply": { "model": "jungle_fence_side", "y": 270, "uvlock": true }
+        "east=true,north=true,south=true,west=false": { "model": "jungle_fence_nse", "uvlock": true },
-        }
+        "east=true,north=false,south=true,west=true": { "model": "jungle_fence_nse", "y": 90, "uvlock": true },
-    ]
+        "east=false,north=true,south=true,west=true": { "model": "jungle_fence_nse", "y": 180, "uvlock": true },
+        "east=true,north=true,south=false,west=true": { "model": "jungle_fence_nse", "y": 270, "uvlock": true },
+        "east=true,north=true,south=true,west=true": { "model": "jungle_fence_nsew", "uvlock": true }
+    }
 }

assets/minecraft/blockstates/jungle_fence_gate.json

@@ -1,20 +1,20 @@
 {
     "variants": {
-        "facing=south,in_wall=false,open=false": { "model": "jungle_fence_gate_closed", "uvlock": true },
+        "facing=south,in_wall=false,open=false": { "model": "jungle_fence_gate_closed" },
-        "facing=west,in_wall=false,open=false":  { "model": "jungle_fence_gate_closed", "uvlock": true, "y": 90 },
+        "facing=west,in_wall=false,open=false":  { "model": "jungle_fence_gate_closed", "y": 90, "uvlock": true },
-        "facing=north,in_wall=false,open=false": { "model": "jungle_fence_gate_closed", "uvlock": true, "y": 180 },
+        "facing=north,in_wall=false,open=false": { "model": "jungle_fence_gate_closed", "y": 180, "uvlock": true },
-        "facing=east,in_wall=false,open=false":  { "model": "jungle_fence_gate_closed", "uvlock": true, "y": 270 },
+        "facing=east,in_wall=false,open=false":  { "model": "jungle_fence_gate_closed", "y": 270, "uvlock": true },
-        "facing=south,in_wall=false,open=true": { "model": "jungle_fence_gate_open", "uvlock": true },
+        "facing=south,in_wall=false,open=true": { "model": "jungle_fence_gate_open" },
-        "facing=west,in_wall=false,open=true":  { "model": "jungle_fence_gate_open", "uvlock": true, "y": 90 },
+        "facing=west,in_wall=false,open=true":  { "model": "jungle_fence_gate_open", "y": 90, "uvlock": true },
-        "facing=north,in_wall=false,open=true": { "model": "jungle_fence_gate_open", "uvlock": true, "y": 180 },
+        "facing=north,in_wall=false,open=true": { "model": "jungle_fence_gate_open", "y": 180, "uvlock": true },
-        "facing=east,in_wall=false,open=true":  { "model": "jungle_fence_gate_open", "uvlock": true, "y": 270 },
+        "facing=east,in_wall=false,open=true":  { "model": "jungle_fence_gate_open", "y": 270, "uvlock": true },
-        "facing=south,in_wall=true,open=false": { "model": "jungle_wall_gate_closed", "uvlock": true },
+        "facing=south,in_wall=true,open=false": { "model": "jungle_wall_gate_closed" },
-        "facing=west,in_wall=true,open=false":  { "model": "jungle_wall_gate_closed", "uvlock": true, "y": 90 },
+        "facing=west,in_wall=true,open=false":  { "model": "jungle_wall_gate_closed", "y": 90, "uvlock": true },
-        "facing=north,in_wall=true,open=false": { "model": "jungle_wall_gate_closed", "uvlock": true, "y": 180 },
+        "facing=north,in_wall=true,open=false": { "model": "jungle_wall_gate_closed", "y": 180, "uvlock": true },
-        "facing=east,in_wall=true,open=false":  { "model": "jungle_wall_gate_closed", "uvlock": true, "y": 270 },
+        "facing=east,in_wall=true,open=false":  { "model": "jungle_wall_gate_closed", "y": 270, "uvlock": true },
-        "facing=south,in_wall=true,open=true": { "model": "jungle_wall_gate_open", "uvlock": true },
+        "facing=south,in_wall=true,open=true": { "model": "jungle_wall_gate_open" },
-        "facing=west,in_wall=true,open=true":  { "model": "jungle_wall_gate_open", "uvlock": true, "y": 90 },
+        "facing=west,in_wall=true,open=true":  { "model": "jungle_wall_gate_open", "y": 90, "uvlock": true },
-        "facing=north,in_wall=true,open=true": { "model": "jungle_wall_gate_open", "uvlock": true, "y": 180 },
+        "facing=north,in_wall=true,open=true": { "model": "jungle_wall_gate_open", "y": 180, "uvlock": true },
-        "facing=east,in_wall=true,open=true":  { "model": "jungle_wall_gate_open", "uvlock": true, "y": 270 }
+        "facing=east,in_wall=true,open=true":  { "model": "jungle_wall_gate_open", "y": 270, "uvlock": true }
     }
 }

assets/minecraft/blockstates/jungle_log.json

@@ -1,8 +1,8 @@
 {
     "variants": {
         "axis=y":  { "model": "jungle_log" },
-        "axis=z":   { "model": "jungle_log", "x": 90 },
+        "axis=z":   { "model": "jungle_log_side" },
-        "axis=x":   { "model": "jungle_log", "x": 90, "y": 90 },
+        "axis=x":   { "model": "jungle_log_side", "y": 90 },
         "axis=none": { "model": "jungle_bark" }
     }
 }

assets/minecraft/blockstates/jungle_stairs.json

@@ -24,21 +24,21 @@
         "facing=west,half=top,shape=straight":  { "model": "jungle_stairs", "x": 180, "y": 180, "uvlock": true },
         "facing=south,half=top,shape=straight": { "model": "jungle_stairs", "x": 180, "y": 90, "uvlock": true },
         "facing=north,half=top,shape=straight": { "model": "jungle_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_right":  { "model": "jungle_outer_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=east,half=top,shape=outer_right":  { "model": "jungle_outer_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=outer_right":  { "model": "jungle_outer_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=west,half=top,shape=outer_right":  { "model": "jungle_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=outer_right": { "model": "jungle_outer_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=outer_right": { "model": "jungle_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=outer_right": { "model": "jungle_outer_stairs", "x": 180, "uvlock": true },
+        "facing=north,half=top,shape=outer_right": { "model": "jungle_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_left":  { "model": "jungle_outer_stairs", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=outer_left":  { "model": "jungle_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=outer_left":  { "model": "jungle_outer_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=west,half=top,shape=outer_left":  { "model": "jungle_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=outer_left": { "model": "jungle_outer_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=south,half=top,shape=outer_left": { "model": "jungle_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=outer_left": { "model": "jungle_outer_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=north,half=top,shape=outer_left": { "model": "jungle_outer_stairs", "x": 180, "uvlock": true },
-        "facing=east,half=top,shape=inner_right":  { "model": "jungle_inner_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=east,half=top,shape=inner_right":  { "model": "jungle_inner_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=inner_right":  { "model": "jungle_inner_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=west,half=top,shape=inner_right":  { "model": "jungle_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=inner_right": { "model": "jungle_inner_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=inner_right": { "model": "jungle_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=inner_right": { "model": "jungle_inner_stairs", "x": 180, "uvlock": true },
+        "facing=north,half=top,shape=inner_right": { "model": "jungle_inner_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=inner_left":  { "model": "jungle_inner_stairs", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=inner_left":  { "model": "jungle_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=inner_left":  { "model": "jungle_inner_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=west,half=top,shape=inner_left":  { "model": "jungle_inner_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=inner_left": { "model": "jungle_inner_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=south,half=top,shape=inner_left": { "model": "jungle_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=inner_left": { "model": "jungle_inner_stairs", "x": 180, "y": 270, "uvlock": true }
+        "facing=north,half=top,shape=inner_left": { "model": "jungle_inner_stairs", "x": 180, "uvlock": true }
     }
 }

assets/minecraft/blockstates/light_blue_stained_glass_pane.json

@@ -1,29 +1,20 @@
 {
-    "multipart": [
+    "variants": {
-        {   "apply": { "model": "light_blue_stained_glass_pane_post" }},
+        "east=false,north=false,south=false,west=false": { "model": "light_blue_pane_nsew" },
-        {   "when": { "north": true },
+        "east=false,north=true,south=false,west=false": { "model": "light_blue_pane_n" },
-            "apply": { "model": "light_blue_stained_glass_pane_side" }
+        "east=true,north=false,south=false,west=false": { "model": "light_blue_pane_n", "y": 90 },
-        },
+        "east=false,north=false,south=true,west=false": { "model": "light_blue_pane_s" },
-        {   "when": { "east": true },
+        "east=false,north=false,south=false,west=true": { "model": "light_blue_pane_s", "y": 90 },
-            "apply": { "model": "light_blue_stained_glass_pane_side", "y": 90 }
+        "east=true,north=true,south=false,west=false": { "model": "light_blue_pane_ne" },
-        },
+        "east=true,north=false,south=true,west=false": { "model": "light_blue_pane_se" },
-        {   "when": { "south": true },
+        "east=false,north=false,south=true,west=true": { "model": "light_blue_pane_sw" },
-            "apply": { "model": "light_blue_stained_glass_pane_side_alt" }
+        "east=false,north=true,south=false,west=true": { "model": "light_blue_pane_nw" },
-        },
+        "east=false,north=true,south=true,west=false": { "model": "light_blue_pane_ns" },
-        {   "when": { "west": true },
+        "east=true,north=false,south=false,west=true": { "model": "light_blue_pane_ns", "y": 90 },
-            "apply": { "model": "light_blue_stained_glass_pane_side_alt", "y": 90 }
+        "east=true,north=true,south=true,west=false": { "model": "light_blue_pane_nse" },
-        },
+        "east=true,north=false,south=true,west=true": { "model": "light_blue_pane_sew" },
-        {   "when": { "north": false },
+        "east=false,north=true,south=true,west=true": { "model": "light_blue_pane_nsw" },
-            "apply": { "model": "light_blue_stained_glass_pane_noside" }
+        "east=true,north=true,south=false,west=true": { "model": "light_blue_pane_new" },
-        },
+        "east=true,north=true,south=true,west=true": { "model": "light_blue_pane_nsew" }
-        {   "when": { "east": false },
+    }
-            "apply": { "model": "light_blue_stained_glass_pane_noside_alt" }
-        },
-        {   "when": { "south": false },
-            "apply": { "model": "light_blue_stained_glass_pane_noside_alt", "y": 90 }
-        },
-        {   "when": { "west": false },
-            "apply": { "model": "light_blue_stained_glass_pane_noside", "y": 270 }
-        }
-    ]
 }

assets/minecraft/blockstates/lime_stained_glass_pane.json

@@ -1,29 +1,20 @@
 {
-    "multipart": [
+    "variants": {
-        {   "apply": { "model": "lime_stained_glass_pane_post" }},
+        "east=false,north=false,south=false,west=false": { "model": "lime_pane_nsew" },
-        {   "when": { "north": true },
+        "east=false,north=true,south=false,west=false": { "model": "lime_pane_n" },
-            "apply": { "model": "lime_stained_glass_pane_side" }
+        "east=true,north=false,south=false,west=false": { "model": "lime_pane_n", "y": 90 },
-        },
+        "east=false,north=false,south=true,west=false": { "model": "lime_pane_s" },
-        {   "when": { "east": true },
+        "east=false,north=false,south=false,west=true": { "model": "lime_pane_s", "y": 90 },
-            "apply": { "model": "lime_stained_glass_pane_side", "y": 90 }
+        "east=true,north=true,south=false,west=false": { "model": "lime_pane_ne" },
-        },
+        "east=true,north=false,south=true,west=false": { "model": "lime_pane_se" },
-        {   "when": { "south": true },
+        "east=false,north=false,south=true,west=true": { "model": "lime_pane_sw" },
-            "apply": { "model": "lime_stained_glass_pane_side_alt" }
+        "east=false,north=true,south=false,west=true": { "model": "lime_pane_nw" },
-        },
+        "east=false,north=true,south=true,west=false": { "model": "lime_pane_ns" },
-        {   "when": { "west": true },
+        "east=true,north=false,south=false,west=true": { "model": "lime_pane_ns", "y": 90 },
-            "apply": { "model": "lime_stained_glass_pane_side_alt", "y": 90 }
+        "east=true,north=true,south=true,west=false": { "model": "lime_pane_nse" },
-        },
+        "east=true,north=false,south=true,west=true": { "model": "lime_pane_sew" },
-        {   "when": { "north": false },
+        "east=false,north=true,south=true,west=true": { "model": "lime_pane_nsw" },
-            "apply": { "model": "lime_stained_glass_pane_noside" }
+        "east=true,north=true,south=false,west=true": { "model": "lime_pane_new" },
-        },
+        "east=true,north=true,south=true,west=true": { "model": "lime_pane_nsew" }
-        {   "when": { "east": false },
+    }
-            "apply": { "model": "lime_stained_glass_pane_noside_alt" }
-        },
-        {   "when": { "south": false },
-            "apply": { "model": "lime_stained_glass_pane_noside_alt", "y": 90 }
-        },
-        {   "when": { "west": false },
-            "apply": { "model": "lime_stained_glass_pane_noside", "y": 270 }
-        }
-    ]
 }

assets/minecraft/blockstates/magenta_stained_glass_pane.json

@@ -1,29 +1,20 @@
 {
-    "multipart": [
+    "variants": {
-        {   "apply": { "model": "magenta_stained_glass_pane_post" }},
+        "east=false,north=false,south=false,west=false": { "model": "magenta_pane_nsew" },
-        {   "when": { "north": true },
+        "east=false,north=true,south=false,west=false": { "model": "magenta_pane_n" },
-            "apply": { "model": "magenta_stained_glass_pane_side" }
+        "east=true,north=false,south=false,west=false": { "model": "magenta_pane_n", "y": 90 },
-        },
+        "east=false,north=false,south=true,west=false": { "model": "magenta_pane_s" },
-        {   "when": { "east": true },
+        "east=false,north=false,south=false,west=true": { "model": "magenta_pane_s", "y": 90 },
-            "apply": { "model": "magenta_stained_glass_pane_side", "y": 90 }
+        "east=true,north=true,south=false,west=false": { "model": "magenta_pane_ne" },
-        },
+        "east=true,north=false,south=true,west=false": { "model": "magenta_pane_se" },
-        {   "when": { "south": true },
+        "east=false,north=false,south=true,west=true": { "model": "magenta_pane_sw" },
-            "apply": { "model": "magenta_stained_glass_pane_side_alt" }
+        "east=false,north=true,south=false,west=true": { "model": "magenta_pane_nw" },
-        },
+        "east=false,north=true,south=true,west=false": { "model": "magenta_pane_ns" },
-        {   "when": { "west": true },
+        "east=true,north=false,south=false,west=true": { "model": "magenta_pane_ns", "y": 90 },
-            "apply": { "model": "magenta_stained_glass_pane_side_alt", "y": 90 }
+        "east=true,north=true,south=true,west=false": { "model": "magenta_pane_nse" },
-        },
+        "east=true,north=false,south=true,west=true": { "model": "magenta_pane_sew" },
-        {   "when": { "north": false },
+        "east=false,north=true,south=true,west=true": { "model": "magenta_pane_nsw" },
-            "apply": { "model": "magenta_stained_glass_pane_noside" }
+        "east=true,north=true,south=false,west=true": { "model": "magenta_pane_new" },
-        },
+        "east=true,north=true,south=true,west=true": { "model": "magenta_pane_nsew" }
-        {   "when": { "east": false },
+    }
-            "apply": { "model": "magenta_stained_glass_pane_noside_alt" }
-        },
-        {   "when": { "south": false },
-            "apply": { "model": "magenta_stained_glass_pane_noside_alt", "y": 90 }
-        },
-        {   "when": { "west": false },
-            "apply": { "model": "magenta_stained_glass_pane_noside", "y": 270 }
-        }
-    ]
 }

assets/minecraft/blockstates/mossy_cobblestone_wall.json

@@ -1,19 +1,36 @@
 {
-    "multipart": [
+    "variants": {
-        {   "when": { "up": true },
+        "east=false,north=false,south=false,up=false,west=false": { "model": "mossy_wall_post" },
-            "apply": { "model": "mossy_cobblestone_wall_post" }
+        "east=false,north=true,south=false,up=false,west=false":  { "model": "mossy_wall_n" },
-        },
+        "east=true,north=false,south=false,up=false,west=false":  { "model": "mossy_wall_n", "y": 90, "uvlock": true },
-        {   "when": { "north": true },
+        "east=false,north=false,south=true,up=false,west=false":  { "model": "mossy_wall_n", "y": 180, "uvlock": true },
-            "apply": { "model": "mossy_cobblestone_wall_side", "uvlock": true }
+        "east=false,north=false,south=false,up=false,west=true":  { "model": "mossy_wall_n", "y": 270, "uvlock": true },
-        },
+        "east=true,north=true,south=false,up=false,west=false":   { "model": "mossy_wall_ne" },
-        {   "when": { "east": true },
+        "east=true,north=false,south=true,up=false,west=false":   { "model": "mossy_wall_ne", "y": 90, "uvlock": true },
-            "apply": { "model": "mossy_cobblestone_wall_side", "y": 90, "uvlock": true }
+        "east=false,north=false,south=true,up=false,west=true":   { "model": "mossy_wall_ne", "y": 180, "uvlock": true },
-        },
+        "east=false,north=true,south=false,up=false,west=true":   { "model": "mossy_wall_ne", "y": 270, "uvlock": true },
-        {   "when": { "south": true },
+        "east=false,north=true,south=true,up=false,west=false":   { "model": "mossy_wall_ns" },
-            "apply": { "model": "mossy_cobblestone_wall_side", "y": 180, "uvlock": true }
+        "east=true,north=false,south=false,up=false,west=true":   { "model": "mossy_wall_ns", "y": 90, "uvlock": true },
-        },
+        "east=true,north=true,south=true,up=false,west=false":    { "model": "mossy_wall_nse" },
-        {   "when": { "west": true },
+        "east=true,north=false,south=true,up=false,west=true":    { "model": "mossy_wall_nse", "y": 90, "uvlock": true },
-            "apply": { "model": "mossy_cobblestone_wall_side", "y": 270, "uvlock": true }
+        "east=false,north=true,south=true,up=false,west=true":    { "model": "mossy_wall_nse", "y": 180, "uvlock": true },
-        }
+        "east=true,north=true,south=false,up=false,west=true":    { "model": "mossy_wall_nse", "y": 270, "uvlock": true },
-    ]
+        "east=true,north=true,south=true,up=false,west=true":     { "model": "mossy_wall_nsew" },
+        "east=false,north=false,south=false,up=true,west=false":  { "model": "mossy_wall_post" },
+        "east=false,north=true,south=false,up=true,west=false":   { "model": "mossy_wall_n" },
+        "east=true,north=false,south=false,up=true,west=false":   { "model": "mossy_wall_n", "y": 90, "uvlock": true },
+        "east=false,north=false,south=true,up=true,west=false":   { "model": "mossy_wall_n", "y": 180, "uvlock": true },
+        "east=false,north=false,south=false,up=true,west=true":   { "model": "mossy_wall_n", "y": 270, "uvlock": true },
+        "east=true,north=true,south=false,up=true,west=false":    { "model": "mossy_wall_ne" },
+        "east=true,north=false,south=true,up=true,west=false":    { "model": "mossy_wall_ne", "y": 90, "uvlock": true },
+        "east=false,north=false,south=true,up=true,west=true":    { "model": "mossy_wall_ne", "y": 180, "uvlock": true },
+        "east=false,north=true,south=false,up=true,west=true":    { "model": "mossy_wall_ne", "y": 270, "uvlock": true },
+        "east=false,north=true,south=true,up=true,west=false":    { "model": "mossy_wall_ns_above" },
+        "east=true,north=false,south=false,up=true,west=true":    { "model": "mossy_wall_ns_above", "y": 90, "uvlock": true },
+        "east=true,north=true,south=true,up=true,west=false":     { "model": "mossy_wall_nse" },
+        "east=true,north=false,south=true,up=true,west=true":     { "model": "mossy_wall_nse", "y": 90, "uvlock": true },
+        "east=false,north=true,south=true,up=true,west=true":     { "model": "mossy_wall_nse", "y": 180, "uvlock": true },
+        "east=true,north=true,south=false,up=true,west=true":     { "model": "mossy_wall_nse", "y": 270, "uvlock": true },
+        "east=true,north=true,south=true,up=true,west=true":      { "model": "mossy_wall_nsew" }
+    }
 }

assets/minecraft/blockstates/nether_brick_fence.json

@@ -1,17 +1,20 @@
 {
-    "multipart": [
+    "variants": {
-        {   "apply": { "model": "nether_brick_fence_post" }},
+        "east=false,north=false,south=false,west=false": { "model": "nether_brick_fence_post" },
-        {   "when": { "north": true },
+        "east=false,north=true,south=false,west=false": { "model": "nether_brick_fence_n" },
-            "apply": { "model": "nether_brick_fence_side", "uvlock": true }
+        "east=true,north=false,south=false,west=false": { "model": "nether_brick_fence_n", "y": 90, "uvlock": true },
-        },
+        "east=false,north=false,south=true,west=false": { "model": "nether_brick_fence_n", "y": 180, "uvlock": true },
-        {   "when": { "east": true },
+        "east=false,north=false,south=false,west=true": { "model": "nether_brick_fence_n", "y": 270, "uvlock": true },
-            "apply": { "model": "nether_brick_fence_side", "y": 90, "uvlock": true }
+        "east=true,north=true,south=false,west=false": { "model": "nether_brick_fence_ne" },
-        },
+        "east=true,north=false,south=true,west=false": { "model": "nether_brick_fence_ne", "y": 90, "uvlock": true },
-        {   "when": { "south": true },
+        "east=false,north=false,south=true,west=true": { "model": "nether_brick_fence_ne", "y": 180, "uvlock": true },
-            "apply": { "model": "nether_brick_fence_side", "y": 180, "uvlock": true }
+        "east=false,north=true,south=false,west=true": { "model": "nether_brick_fence_ne", "y": 270, "uvlock": true },
-        },
+        "east=false,north=true,south=true,west=false": { "model": "nether_brick_fence_ns" },
-        {   "when": { "west": true },
+        "east=true,north=false,south=false,west=true": { "model": "nether_brick_fence_ns", "y": 90, "uvlock": true },
-            "apply": { "model": "nether_brick_fence_side", "y": 270, "uvlock": true }
+        "east=true,north=true,south=true,west=false": { "model": "nether_brick_fence_nse" },
-        }
+        "east=true,north=false,south=true,west=true": { "model": "nether_brick_fence_nse", "y": 90, "uvlock": true },
-    ]
+        "east=false,north=true,south=true,west=true": { "model": "nether_brick_fence_nse", "y": 180, "uvlock": true },
+        "east=true,north=true,south=false,west=true": { "model": "nether_brick_fence_nse", "y": 270, "uvlock": true },
+        "east=true,north=true,south=true,west=true": { "model": "nether_brick_fence_nsew" }
+    }
 }

assets/minecraft/blockstates/nether_brick_stairs.json

@@ -24,21 +24,21 @@
         "facing=west,half=top,shape=straight":  { "model": "nether_brick_stairs", "x": 180, "y": 180, "uvlock": true },
         "facing=south,half=top,shape=straight": { "model": "nether_brick_stairs", "x": 180, "y": 90, "uvlock": true },
         "facing=north,half=top,shape=straight": { "model": "nether_brick_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_right":  { "model": "nether_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=east,half=top,shape=outer_right":  { "model": "nether_brick_outer_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=outer_right":  { "model": "nether_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=west,half=top,shape=outer_right":  { "model": "nether_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=outer_right": { "model": "nether_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=outer_right": { "model": "nether_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=outer_right": { "model": "nether_brick_outer_stairs", "x": 180, "uvlock": true },
+        "facing=north,half=top,shape=outer_right": { "model": "nether_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_left":  { "model": "nether_brick_outer_stairs", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=outer_left":  { "model": "nether_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=outer_left":  { "model": "nether_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=west,half=top,shape=outer_left":  { "model": "nether_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=outer_left": { "model": "nether_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=south,half=top,shape=outer_left": { "model": "nether_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=outer_left": { "model": "nether_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=north,half=top,shape=outer_left": { "model": "nether_brick_outer_stairs", "x": 180, "uvlock": true },
-        "facing=east,half=top,shape=inner_right":  { "model": "nether_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=east,half=top,shape=inner_right":  { "model": "nether_brick_inner_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=inner_right":  { "model": "nether_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=west,half=top,shape=inner_right":  { "model": "nether_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=inner_right": { "model": "nether_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=inner_right": { "model": "nether_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=inner_right": { "model": "nether_brick_inner_stairs", "x": 180, "uvlock": true },
+        "facing=north,half=top,shape=inner_right": { "model": "nether_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=inner_left":  { "model": "nether_brick_inner_stairs", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=inner_left":  { "model": "nether_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=inner_left":  { "model": "nether_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=west,half=top,shape=inner_left":  { "model": "nether_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=inner_left": { "model": "nether_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=south,half=top,shape=inner_left": { "model": "nether_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=inner_left": { "model": "nether_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true }
+        "facing=north,half=top,shape=inner_left": { "model": "nether_brick_inner_stairs", "x": 180, "uvlock": true }
     }
 }

assets/minecraft/blockstates/oak_log.json

@@ -1,8 +1,8 @@
 {
     "variants": {
         "axis=y":    { "model": "oak_log" },
-        "axis=z":     { "model": "oak_log", "x": 90 },
+        "axis=z":     { "model": "oak_log_side" },
-        "axis=x":     { "model": "oak_log", "x": 90, "y": 90 },
+        "axis=x":     { "model": "oak_log_side", "y": 90 },
         "axis=none":   { "model": "oak_bark" }
     }
 }

assets/minecraft/blockstates/oak_stairs.json

@@ -24,21 +24,21 @@
         "facing=west,half=top,shape=straight":  { "model": "oak_stairs", "x": 180, "y": 180, "uvlock": true },
         "facing=south,half=top,shape=straight": { "model": "oak_stairs", "x": 180, "y": 90, "uvlock": true },
         "facing=north,half=top,shape=straight": { "model": "oak_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_right":  { "model": "oak_outer_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=east,half=top,shape=outer_right":  { "model": "oak_outer_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=outer_right":  { "model": "oak_outer_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=west,half=top,shape=outer_right":  { "model": "oak_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=outer_right": { "model": "oak_outer_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=outer_right": { "model": "oak_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=outer_right": { "model": "oak_outer_stairs", "x": 180, "uvlock": true },
+        "facing=north,half=top,shape=outer_right": { "model": "oak_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_left":  { "model": "oak_outer_stairs", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=outer_left":  { "model": "oak_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=outer_left":  { "model": "oak_outer_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=west,half=top,shape=outer_left":  { "model": "oak_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=outer_left": { "model": "oak_outer_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=south,half=top,shape=outer_left": { "model": "oak_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=outer_left": { "model": "oak_outer_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=north,half=top,shape=outer_left": { "model": "oak_outer_stairs", "x": 180, "uvlock": true },
-        "facing=east,half=top,shape=inner_right":  { "model": "oak_inner_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=east,half=top,shape=inner_right":  { "model": "oak_inner_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=inner_right":  { "model": "oak_inner_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=west,half=top,shape=inner_right":  { "model": "oak_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=inner_right": { "model": "oak_inner_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=inner_right": { "model": "oak_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=inner_right": { "model": "oak_inner_stairs", "x": 180, "uvlock": true },
+        "facing=north,half=top,shape=inner_right": { "model": "oak_inner_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=inner_left":  { "model": "oak_inner_stairs", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=inner_left":  { "model": "oak_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=inner_left":  { "model": "oak_inner_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=west,half=top,shape=inner_left":  { "model": "oak_inner_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=inner_left": { "model": "oak_inner_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=south,half=top,shape=inner_left": { "model": "oak_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=inner_left": { "model": "oak_inner_stairs", "x": 180, "y": 270, "uvlock": true }
+        "facing=north,half=top,shape=inner_left": { "model": "oak_inner_stairs", "x": 180, "uvlock": true }
     }
 }

assets/minecraft/blockstates/orange_stained_glass_pane.json

@@ -1,29 +1,20 @@
 {
-    "multipart": [
+    "variants": {
-        {   "apply": { "model": "orange_stained_glass_pane_post" }},
+        "east=false,north=false,south=false,west=false": { "model": "orange_pane_nsew" },
-        {   "when": { "north": true },
+        "east=false,north=true,south=false,west=false": { "model": "orange_pane_n" },
-            "apply": { "model": "orange_stained_glass_pane_side" }
+        "east=true,north=false,south=false,west=false": { "model": "orange_pane_n", "y": 90 },
-        },
+        "east=false,north=false,south=true,west=false": { "model": "orange_pane_s" },
-        {   "when": { "east": true },
+        "east=false,north=false,south=false,west=true": { "model": "orange_pane_s", "y": 90 },
-            "apply": { "model": "orange_stained_glass_pane_side", "y": 90 }
+        "east=true,north=true,south=false,west=false": { "model": "orange_pane_ne" },
-        },
+        "east=true,north=false,south=true,west=false": { "model": "orange_pane_se" },
-        {   "when": { "south": true },
+        "east=false,north=false,south=true,west=true": { "model": "orange_pane_sw" },
-            "apply": { "model": "orange_stained_glass_pane_side_alt" }
+        "east=false,north=true,south=false,west=true": { "model": "orange_pane_nw" },
-        },
+        "east=false,north=true,south=true,west=false": { "model": "orange_pane_ns" },
-        {   "when": { "west": true },
+        "east=true,north=false,south=false,west=true": { "model": "orange_pane_ns", "y": 90 },
-            "apply": { "model": "orange_stained_glass_pane_side_alt", "y": 90 }
+        "east=true,north=true,south=true,west=false": { "model": "orange_pane_nse" },
-        },
+        "east=true,north=false,south=true,west=true": { "model": "orange_pane_sew" },
-        {   "when": { "north": false },
+        "east=false,north=true,south=true,west=true": { "model": "orange_pane_nsw" },
-            "apply": { "model": "orange_stained_glass_pane_noside" }
+        "east=true,north=true,south=false,west=true": { "model": "orange_pane_new" },
-        },
+        "east=true,north=true,south=true,west=true": { "model": "orange_pane_nsew" }
-        {   "when": { "east": false },
+    }
-            "apply": { "model": "orange_stained_glass_pane_noside_alt" }
-        },
-        {   "when": { "south": false },
-            "apply": { "model": "orange_stained_glass_pane_noside_alt", "y": 90 }
-        },
-        {   "when": { "west": false },
-            "apply": { "model": "orange_stained_glass_pane_noside", "y": 270 }
-        }
-    ]
 }

assets/minecraft/blockstates/pink_stained_glass_pane.json

@@ -1,29 +1,20 @@
 {
-    "multipart": [
+    "variants": {
-        {   "apply": { "model": "pink_stained_glass_pane_post" }},
+        "east=false,north=false,south=false,west=false": { "model": "pink_pane_nsew" },
-        {   "when": { "north": true },
+        "east=false,north=true,south=false,west=false": { "model": "pink_pane_n" },
-            "apply": { "model": "pink_stained_glass_pane_side" }
+        "east=true,north=false,south=false,west=false": { "model": "pink_pane_n", "y": 90 },
-        },
+        "east=false,north=false,south=true,west=false": { "model": "pink_pane_s" },
-        {   "when": { "east": true },
+        "east=false,north=false,south=false,west=true": { "model": "pink_pane_s", "y": 90 },
-            "apply": { "model": "pink_stained_glass_pane_side", "y": 90 }
+        "east=true,north=true,south=false,west=false": { "model": "pink_pane_ne" },
-        },
+        "east=true,north=false,south=true,west=false": { "model": "pink_pane_se" },
-        {   "when": { "south": true },
+        "east=false,north=false,south=true,west=true": { "model": "pink_pane_sw" },
-            "apply": { "model": "pink_stained_glass_pane_side_alt" }
+        "east=false,north=true,south=false,west=true": { "model": "pink_pane_nw" },
-        },
+        "east=false,north=true,south=true,west=false": { "model": "pink_pane_ns" },
-        {   "when": { "west": true },
+        "east=true,north=false,south=false,west=true": { "model": "pink_pane_ns", "y": 90 },
-            "apply": { "model": "pink_stained_glass_pane_side_alt", "y": 90 }
+        "east=true,north=true,south=true,west=false": { "model": "pink_pane_nse" },
-        },
+        "east=true,north=false,south=true,west=true": { "model": "pink_pane_sew" },
-        {   "when": { "north": false },
+        "east=false,north=true,south=true,west=true": { "model": "pink_pane_nsw" },
-            "apply": { "model": "pink_stained_glass_pane_noside" }
+        "east=true,north=true,south=false,west=true": { "model": "pink_pane_new" },
-        },
+        "east=true,north=true,south=true,west=true": { "model": "pink_pane_nsew" }
-        {   "when": { "east": false },
+    }
-            "apply": { "model": "pink_stained_glass_pane_noside_alt" }
-        },
-        {   "when": { "south": false },
-            "apply": { "model": "pink_stained_glass_pane_noside_alt", "y": 90 }
-        },
-        {   "when": { "west": false },
-            "apply": { "model": "pink_stained_glass_pane_noside", "y": 270 }
-        }
-    ]
 }

assets/minecraft/blockstates/purple_stained_glass_pane.json

@@ -1,29 +1,20 @@
 {
-    "multipart": [
+    "variants": {
-        {   "apply": { "model": "purple_stained_glass_pane_post" }},
+        "east=false,north=false,south=false,west=false": { "model": "purple_pane_nsew" },
-        {   "when": { "north": true },
+        "east=false,north=true,south=false,west=false": { "model": "purple_pane_n" },
-            "apply": { "model": "purple_stained_glass_pane_side" }
+        "east=true,north=false,south=false,west=false": { "model": "purple_pane_n", "y": 90 },
-        },
+        "east=false,north=false,south=true,west=false": { "model": "purple_pane_s" },
-        {   "when": { "east": true },
+        "east=false,north=false,south=false,west=true": { "model": "purple_pane_s", "y": 90 },
-            "apply": { "model": "purple_stained_glass_pane_side", "y": 90 }
+        "east=true,north=true,south=false,west=false": { "model": "purple_pane_ne" },
-        },
+        "east=true,north=false,south=true,west=false": { "model": "purple_pane_se" },
-        {   "when": { "south": true },
+        "east=false,north=false,south=true,west=true": { "model": "purple_pane_sw" },
-            "apply": { "model": "purple_stained_glass_pane_side_alt" }
+        "east=false,north=true,south=false,west=true": { "model": "purple_pane_nw" },
-        },
+        "east=false,north=true,south=true,west=false": { "model": "purple_pane_ns" },
-        {   "when": { "west": true },
+        "east=true,north=false,south=false,west=true": { "model": "purple_pane_ns", "y": 90 },
-            "apply": { "model": "purple_stained_glass_pane_side_alt", "y": 90 }
+        "east=true,north=true,south=true,west=false": { "model": "purple_pane_nse" },
-        },
+        "east=true,north=false,south=true,west=true": { "model": "purple_pane_sew" },
-        {   "when": { "north": false },
+        "east=false,north=true,south=true,west=true": { "model": "purple_pane_nsw" },
-            "apply": { "model": "purple_stained_glass_pane_noside" }
+        "east=true,north=true,south=false,west=true": { "model": "purple_pane_new" },
-        },
+        "east=true,north=true,south=true,west=true": { "model": "purple_pane_nsew" }
-        {   "when": { "east": false },
+    }
-            "apply": { "model": "purple_stained_glass_pane_noside_alt" }
-        },
-        {   "when": { "south": false },
-            "apply": { "model": "purple_stained_glass_pane_noside_alt", "y": 90 }
-        },
-        {   "when": { "west": false },
-            "apply": { "model": "purple_stained_glass_pane_noside", "y": 270 }
-        }
-    ]
 }

assets/minecraft/blockstates/purpur_block.json

@@ -1,5 +0,0 @@
-{
-    "variants": {
-        "normal": { "model": "purpur_block" }
-    }
-}

assets/minecraft/blockstates/purpur_double_slab.json

@@ -1,5 +0,0 @@
-{
-    "variants": {
-        "variant=default": { "model": "purpur_block" }
-    }
-}

assets/minecraft/blockstates/purpur_pillar.json

@@ -1,7 +0,0 @@
-{
-    "variants": {
-        "axis=y": { "model": "purpur_pillar_top" },
-        "axis=z": { "model": "purpur_pillar_top", "x": 90 },
-        "axis=x": { "model": "purpur_pillar_top", "x": 90, "y": 90 }
-    }
-}

assets/minecraft/blockstates/purpur_slab.json

@@ -1,6 +0,0 @@
-{
-    "variants": {
-        "half=bottom,variant=default": { "model": "half_slab_purpur" },
-        "half=top,variant=default": { "model": "upper_slab_purpur" }
-    }
-}

assets/minecraft/blockstates/purpur_stairs.json

@@ -1,44 +0,0 @@
-{
-    "variants": {
-        "facing=east,half=bottom,shape=straight":  { "model": "purpur_stairs" },
-        "facing=west,half=bottom,shape=straight":  { "model": "purpur_stairs", "y": 180, "uvlock": true },
-        "facing=south,half=bottom,shape=straight": { "model": "purpur_stairs", "y": 90, "uvlock": true },
-        "facing=north,half=bottom,shape=straight": { "model": "purpur_stairs", "y": 270, "uvlock": true },
-        "facing=east,half=bottom,shape=outer_right":  { "model": "purpur_outer_stairs" },
-        "facing=west,half=bottom,shape=outer_right":  { "model": "purpur_outer_stairs", "y": 180, "uvlock": true },
-        "facing=south,half=bottom,shape=outer_right": { "model": "purpur_outer_stairs", "y": 90, "uvlock": true },
-        "facing=north,half=bottom,shape=outer_right": { "model": "purpur_outer_stairs", "y": 270, "uvlock": true },
-        "facing=east,half=bottom,shape=outer_left":  { "model": "purpur_outer_stairs", "y": 270, "uvlock": true },
-        "facing=west,half=bottom,shape=outer_left":  { "model": "purpur_outer_stairs", "y": 90, "uvlock": true },
-        "facing=south,half=bottom,shape=outer_left": { "model": "purpur_outer_stairs" },
-        "facing=north,half=bottom,shape=outer_left": { "model": "purpur_outer_stairs", "y": 180, "uvlock": true },
-        "facing=east,half=bottom,shape=inner_right":  { "model": "purpur_inner_stairs" },
-        "facing=west,half=bottom,shape=inner_right":  { "model": "purpur_inner_stairs", "y": 180, "uvlock": true },
-        "facing=south,half=bottom,shape=inner_right": { "model": "purpur_inner_stairs", "y": 90, "uvlock": true },
-        "facing=north,half=bottom,shape=inner_right": { "model": "purpur_inner_stairs", "y": 270, "uvlock": true },
-        "facing=east,half=bottom,shape=inner_left":  { "model": "purpur_inner_stairs", "y": 270, "uvlock": true },
-        "facing=west,half=bottom,shape=inner_left":  { "model": "purpur_inner_stairs", "y": 90, "uvlock": true },
-        "facing=south,half=bottom,shape=inner_left": { "model": "purpur_inner_stairs" },
-        "facing=north,half=bottom,shape=inner_left": { "model": "purpur_inner_stairs", "y": 180, "uvlock": true },
-        "facing=east,half=top,shape=straight":  { "model": "purpur_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=straight":  { "model": "purpur_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=straight": { "model": "purpur_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=straight": { "model": "purpur_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_right":  { "model": "purpur_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=outer_right":  { "model": "purpur_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=outer_right": { "model": "purpur_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=outer_right": { "model": "purpur_outer_stairs", "x": 180, "uvlock": true },
-        "facing=east,half=top,shape=outer_left":  { "model": "purpur_outer_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=outer_left":  { "model": "purpur_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=outer_left": { "model": "purpur_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=outer_left": { "model": "purpur_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=inner_right":  { "model": "purpur_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=inner_right":  { "model": "purpur_inner_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=inner_right": { "model": "purpur_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=inner_right": { "model": "purpur_inner_stairs", "x": 180, "uvlock": true },
-        "facing=east,half=top,shape=inner_left":  { "model": "purpur_inner_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=inner_left":  { "model": "purpur_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=inner_left": { "model": "purpur_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=inner_left": { "model": "purpur_inner_stairs", "x": 180, "y": 270, "uvlock": true }
-    }
-}

assets/minecraft/blockstates/quartz_stairs.json

@@ -24,21 +24,21 @@
         "facing=west,half=top,shape=straight":  { "model": "quartz_stairs", "x": 180, "y": 180, "uvlock": true },
         "facing=south,half=top,shape=straight": { "model": "quartz_stairs", "x": 180, "y": 90, "uvlock": true },
         "facing=north,half=top,shape=straight": { "model": "quartz_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_right":  { "model": "quartz_outer_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=east,half=top,shape=outer_right":  { "model": "quartz_outer_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=outer_right":  { "model": "quartz_outer_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=west,half=top,shape=outer_right":  { "model": "quartz_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=outer_right": { "model": "quartz_outer_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=outer_right": { "model": "quartz_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=outer_right": { "model": "quartz_outer_stairs", "x": 180, "uvlock": true },
+        "facing=north,half=top,shape=outer_right": { "model": "quartz_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_left":  { "model": "quartz_outer_stairs", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=outer_left":  { "model": "quartz_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=outer_left":  { "model": "quartz_outer_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=west,half=top,shape=outer_left":  { "model": "quartz_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=outer_left": { "model": "quartz_outer_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=south,half=top,shape=outer_left": { "model": "quartz_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=outer_left": { "model": "quartz_outer_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=north,half=top,shape=outer_left": { "model": "quartz_outer_stairs", "x": 180, "uvlock": true },
-        "facing=east,half=top,shape=inner_right":  { "model": "quartz_inner_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=east,half=top,shape=inner_right":  { "model": "quartz_inner_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=inner_right":  { "model": "quartz_inner_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=west,half=top,shape=inner_right":  { "model": "quartz_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=inner_right": { "model": "quartz_inner_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=inner_right": { "model": "quartz_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=inner_right": { "model": "quartz_inner_stairs", "x": 180, "uvlock": true },
+        "facing=north,half=top,shape=inner_right": { "model": "quartz_inner_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=inner_left":  { "model": "quartz_inner_stairs", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=inner_left":  { "model": "quartz_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=inner_left":  { "model": "quartz_inner_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=west,half=top,shape=inner_left":  { "model": "quartz_inner_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=inner_left": { "model": "quartz_inner_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=south,half=top,shape=inner_left": { "model": "quartz_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=inner_left": { "model": "quartz_inner_stairs", "x": 180, "y": 270, "uvlock": true }
+        "facing=north,half=top,shape=inner_left": { "model": "quartz_inner_stairs", "x": 180, "uvlock": true }
     }
 }

assets/minecraft/blockstates/red_sandstone_stairs.json

@@ -24,21 +24,21 @@
         "facing=west,half=top,shape=straight":  { "model": "red_sandstone_stairs", "x": 180, "y": 180, "uvlock": true },
         "facing=south,half=top,shape=straight": { "model": "red_sandstone_stairs", "x": 180, "y": 90, "uvlock": true },
         "facing=north,half=top,shape=straight": { "model": "red_sandstone_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_right":  { "model": "red_sandstone_outer_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=east,half=top,shape=outer_right":  { "model": "red_sandstone_outer_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=outer_right":  { "model": "red_sandstone_outer_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=west,half=top,shape=outer_right":  { "model": "red_sandstone_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=outer_right": { "model": "red_sandstone_outer_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=outer_right": { "model": "red_sandstone_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=outer_right": { "model": "red_sandstone_outer_stairs", "x": 180, "uvlock": true },
+        "facing=north,half=top,shape=outer_right": { "model": "red_sandstone_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_left":  { "model": "red_sandstone_outer_stairs", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=outer_left":  { "model": "red_sandstone_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=outer_left":  { "model": "red_sandstone_outer_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=west,half=top,shape=outer_left":  { "model": "red_sandstone_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=outer_left": { "model": "red_sandstone_outer_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=south,half=top,shape=outer_left": { "model": "red_sandstone_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=outer_left": { "model": "red_sandstone_outer_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=north,half=top,shape=outer_left": { "model": "red_sandstone_outer_stairs", "x": 180, "uvlock": true },
-        "facing=east,half=top,shape=inner_right":  { "model": "red_sandstone_inner_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=east,half=top,shape=inner_right":  { "model": "red_sandstone_inner_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=inner_right":  { "model": "red_sandstone_inner_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=west,half=top,shape=inner_right":  { "model": "red_sandstone_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=inner_right": { "model": "red_sandstone_inner_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=inner_right": { "model": "red_sandstone_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=inner_right": { "model": "red_sandstone_inner_stairs", "x": 180, "uvlock": true },
+        "facing=north,half=top,shape=inner_right": { "model": "red_sandstone_inner_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=inner_left":  { "model": "red_sandstone_inner_stairs", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=inner_left":  { "model": "red_sandstone_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=inner_left":  { "model": "red_sandstone_inner_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=west,half=top,shape=inner_left":  { "model": "red_sandstone_inner_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=inner_left": { "model": "red_sandstone_inner_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=south,half=top,shape=inner_left": { "model": "red_sandstone_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=inner_left": { "model": "red_sandstone_inner_stairs", "x": 180, "y": 270, "uvlock": true }
+        "facing=north,half=top,shape=inner_left": { "model": "red_sandstone_inner_stairs", "x": 180, "uvlock": true }
     }
 }

assets/minecraft/blockstates/red_stained_glass_pane.json

@@ -1,29 +1,20 @@
 {
-    "multipart": [
+    "variants": {
-        {   "apply": { "model": "red_stained_glass_pane_post" }},
+        "east=false,north=false,south=false,west=false": { "model": "red_pane_nsew" },
-        {   "when": { "north": true },
+        "east=false,north=true,south=false,west=false": { "model": "red_pane_n" },
-            "apply": { "model": "red_stained_glass_pane_side" }
+        "east=true,north=false,south=false,west=false": { "model": "red_pane_n", "y": 90 },
-        },
+        "east=false,north=false,south=true,west=false": { "model": "red_pane_s" },
-        {   "when": { "east": true },
+        "east=false,north=false,south=false,west=true": { "model": "red_pane_s", "y": 90 },
-            "apply": { "model": "red_stained_glass_pane_side", "y": 90 }
+        "east=true,north=true,south=false,west=false": { "model": "red_pane_ne" },
-        },
+        "east=true,north=false,south=true,west=false": { "model": "red_pane_se" },
-        {   "when": { "south": true },
+        "east=false,north=false,south=true,west=true": { "model": "red_pane_sw" },
-            "apply": { "model": "red_stained_glass_pane_side_alt" }
+        "east=false,north=true,south=false,west=true": { "model": "red_pane_nw" },
-        },
+        "east=false,north=true,south=true,west=false": { "model": "red_pane_ns" },
-        {   "when": { "west": true },
+        "east=true,north=false,south=false,west=true": { "model": "red_pane_ns", "y": 90 },
-            "apply": { "model": "red_stained_glass_pane_side_alt", "y": 90 }
+        "east=true,north=true,south=true,west=false": { "model": "red_pane_nse" },
-        },
+        "east=true,north=false,south=true,west=true": { "model": "red_pane_sew" },
-        {   "when": { "north": false },
+        "east=false,north=true,south=true,west=true": { "model": "red_pane_nsw" },
-            "apply": { "model": "red_stained_glass_pane_noside" }
+        "east=true,north=true,south=false,west=true": { "model": "red_pane_new" },
-        },
+        "east=true,north=true,south=true,west=true": { "model": "red_pane_nsew" }
-        {   "when": { "east": false },
+    }
-            "apply": { "model": "red_stained_glass_pane_noside_alt" }
-        },
-        {   "when": { "south": false },
-            "apply": { "model": "red_stained_glass_pane_noside_alt", "y": 90 }
-        },
-        {   "when": { "west": false },
-            "apply": { "model": "red_stained_glass_pane_noside", "y": 270 }
-        }
-    ]
 }

assets/minecraft/blockstates/redstone_wire.json

@@ -1,49 +1,103 @@
 {
-    "multipart": [
+    "variants": {
-        {   "when": { "OR": [
+        "east=none,north=none,south=none,west=none": { "model": "redstone_none" },
-                {"north": "none", "east": "none", "south": "none", "west": "none"},
+
-                {"north": "side|up", "east": "side|up" },
+        "east=none,north=side,south=none,west=none": { "model": "redstone_n" },
-                {"east": "side|up", "south": "side|up" },
+        "east=none,north=none,south=side,west=none": { "model": "redstone_n" },
-                {"south": "side|up", "west": "side|up"},
+        "east=side,north=none,south=none,west=none": { "model": "redstone_n", "y": 90 },
-                {"west": "side|up", "north": "side|up"}
+        "east=none,north=none,south=none,west=side": { "model": "redstone_n", "y": 90 },
-            ]},
+
-            "apply": { "model": "redstone_dot" }
+        "east=none,north=up,south=none,west=none": { "model": "redstone_uns" },
-        },
+        "east=none,north=none,south=up,west=none": { "model": "redstone_uns", "y": 180, "uvlock": true },
-        {   "when": { "OR": [
+        "east=up,north=none,south=none,west=none": { "model": "redstone_uew" },
-                { "north": "side|up" },
+        "east=none,north=none,south=none,west=up": { "model": "redstone_uew", "y": 180, "uvlock": true },
-                { "north": "none", "east": "none", "south": "side|up", "west": "none" }
+
-            ]},
+        "east=side,north=side,south=none,west=none":   { "model": "redstone_ne", "uvlock": true },
-            "apply": { "model": "redstone_side0" }
+        "east=side,north=up,south=none,west=none":  { "model": "redstone_une", "uvlock": true },
-        },
+        "east=up,north=side,south=none,west=none":  { "model": "redstone_nue", "uvlock": true },
-        {   "when": { "OR": [
+        "east=up,north=up,south=none,west=none": { "model": "redstone_unue", "uvlock": true },
-                { "south": "side|up" },
+
-                { "north": "side|up", "east": "none", "south": "none", "west": "none" }
+        "east=side,north=none,south=side,west=none":   { "model": "redstone_ne", "y": 90, "uvlock": true },
-            ]},
+        "east=up,north=none,south=side,west=none":  { "model": "redstone_une", "y": 90, "uvlock": true },
-            "apply": { "model": "redstone_side_alt0" }
+        "east=side,north=none,south=up,west=none":  { "model": "redstone_nue", "y": 90, "uvlock": true },
-        },
+        "east=up,north=none,south=up,west=none": { "model": "redstone_unue", "y": 90, "uvlock": true },
-        {   "when": { "OR": [
+
-                { "east": "side|up" },
+        "east=none,north=none,south=side,west=side":   { "model": "redstone_ne", "y": 180, "uvlock": true },
-                { "north": "none", "east": "none", "south": "none", "west": "side|up" }
+        "east=none,north=none,south=up,west=side":  { "model": "redstone_une", "y": 180, "uvlock": true },
-            ]},
+        "east=none,north=none,south=side,west=up":  { "model": "redstone_nue", "y": 180, "uvlock": true },
-            "apply": { "model": "redstone_side_alt1", "y": 270 }
+        "east=none,north=none,south=up,west=up": { "model": "redstone_unue", "y": 180, "uvlock": true },
-        },
+
-        {   "when": { "OR": [
+        "east=none,north=side,south=none,west=side":   { "model": "redstone_ne", "y": 270, "uvlock": true },
-                { "west": "side|up" },
+        "east=none,north=side,south=none,west=up":  { "model": "redstone_une", "y": 270, "uvlock": true },
-                { "north": "none", "east": "side|up", "south": "none", "west": "none" }
+        "east=none,north=up,south=none,west=side":  { "model": "redstone_nue", "y": 270, "uvlock": true },
-            ]},
+        "east=none,north=up,south=none,west=up": { "model": "redstone_unue", "y": 270, "uvlock": true },
-            "apply": { "model": "redstone_side1", "y": 270 }
+
-        },
+        "east=none,north=side,south=side,west=none":  { "model": "redstone_n" },
-        {   "when": { "north": "up" },
+        "east=none,north=up,south=side,west=none": { "model": "redstone_uns" },
-            "apply": { "model": "redstone_up" }
+        "east=none,north=side,south=up,west=none": { "model": "redstone_uns", "y": 180 },
-        },
+        "east=none,north=up,south=up,west=none": { "model": "redstone_unus" },
-        {   "when": { "east": "up" },
+
-            "apply": { "model": "redstone_up", "y": 90 }
+        "east=side,north=none,south=none,west=side":  { "model": "redstone_n", "y": 90 },
-        },
+        "east=up,north=none,south=none,west=side": { "model": "redstone_uns", "y": 90 },
-        {   "when": { "south": "up" },
+        "east=side,north=none,south=none,west=up": { "model": "redstone_uns", "y": 270 },
-            "apply": { "model": "redstone_up", "y": 180 }
+        "east=up,north=none,south=none,west=up": { "model": "redstone_ueuw" },
-        },
+
-        {   "when": { "west": "up" },
+        "east=side,north=side,south=side,west=none":    { "model": "redstone_nse", "uvlock": true },
-            "apply": { "model": "redstone_up", "y": 270 }
+        "east=side,north=up,south=side,west=none":   { "model": "redstone_unse", "uvlock": true },
-        }
+        "east=side,north=side,south=up,west=none":   { "model": "redstone_nuse", "uvlock": true },
-    ]
+        "east=up,north=side,south=side,west=none":   { "model": "redstone_nsue", "uvlock": true },
+        "east=up,north=side,south=up,west=none":  { "model": "redstone_nusue", "uvlock": true },
+        "east=side,north=up,south=up,west=none":  { "model": "redstone_unuse", "uvlock": true },
+        "east=up,north=up,south=side,west=none":  { "model": "redstone_unsue", "uvlock": true },
+        "east=up,north=up,south=up,west=none": { "model": "redstone_unusue", "uvlock": true },
+
+        "east=side,north=none,south=side,west=side":    { "model": "redstone_nse", "y": 90, "uvlock": true },
+        "east=up,north=none,south=side,west=side":   { "model": "redstone_unse", "y": 90, "uvlock": true },
+        "east=side,north=none,south=side,west=up":   { "model": "redstone_nuse", "y": 90, "uvlock": true },
+        "east=side,north=none,south=up,west=side":   { "model": "redstone_nsue", "y": 90, "uvlock": true },
+        "east=side,north=none,south=up,west=up":  { "model": "redstone_nusue", "y": 90, "uvlock": true },
+        "east=up,north=none,south=side,west=up":  { "model": "redstone_unuse", "y": 90, "uvlock": true },
+        "east=up,north=none,south=up,west=side":  { "model": "redstone_unsue", "y": 90, "uvlock": true },
+        "east=up,north=none,south=up,west=up": { "model": "redstone_unusue", "y": 90, "uvlock": true },
+
+        "east=none,north=side,south=side,west=side":    { "model": "redstone_nse", "y": 180, "uvlock": true },
+        "east=none,north=side,south=up,west=side":   { "model": "redstone_unse", "y": 180, "uvlock": true },
+        "east=none,north=up,south=side,west=side":   { "model": "redstone_nuse", "y": 180, "uvlock": true },
+        "east=none,north=side,south=side,west=up":   { "model": "redstone_nsue", "y": 180, "uvlock": true },
+        "east=none,north=up,south=side,west=up":  { "model": "redstone_nusue", "y": 180, "uvlock": true },
+        "east=none,north=up,south=up,west=side":  { "model": "redstone_unuse", "y": 180, "uvlock": true },
+        "east=none,north=side,south=up,west=up":  { "model": "redstone_unsue", "y": 180, "uvlock": true },
+        "east=none,north=up,south=up,west=up": { "model": "redstone_unusue", "y": 180, "uvlock": true },
+
+        "east=side,north=side,south=none,west=side":    { "model": "redstone_nse", "y": 270, "uvlock": true },
+        "east=side,north=side,south=none,west=up":   { "model": "redstone_unse", "y": 270, "uvlock": true },
+        "east=up,north=side,south=none,west=side":   { "model": "redstone_nuse", "y": 270, "uvlock": true },
+        "east=side,north=up,south=none,west=side":   { "model": "redstone_nsue", "y": 270, "uvlock": true },
+        "east=up,north=up,south=none,west=side":  { "model": "redstone_nusue", "y": 270, "uvlock": true },
+        "east=up,north=side,south=none,west=up":  { "model": "redstone_unuse", "y": 270, "uvlock": true },
+        "east=side,north=up,south=none,west=up":  { "model": "redstone_unsue", "y": 270, "uvlock": true },
+        "east=up,north=up,south=none,west=up": { "model": "redstone_unusue", "y": 270, "uvlock": true },
+
+        "east=side,north=side,south=side,west=side": { "model": "redstone_nsew", "uvlock": true },
+
+        "east=side,north=up,south=side,west=side": { "model": "redstone_unsew", "uvlock": true },
+        "east=side,north=side,south=up,west=side": { "model": "redstone_unsew", "y": 180, "uvlock": true },
+        "east=up,north=side,south=side,west=side": { "model": "redstone_unsew", "y": 90, "uvlock": true },
+        "east=side,north=side,south=side,west=up": { "model": "redstone_unsew", "y": 270, "uvlock": true },
+
+        "east=side,north=up,south=up,west=side": { "model": "redstone_unusew", "uvlock": true },
+        "east=up,north=side,south=side,west=up": { "model": "redstone_unusew", "y": 90, "uvlock": true },
+
+        "east=up,north=up,south=side,west=side": { "model": "redstone_unsuew", "uvlock": true },
+        "east=up,north=side,south=up,west=side": { "model": "redstone_unsuew", "y": 90, "uvlock": true },
+        "east=side,north=side,south=up,west=up": { "model": "redstone_unsuew", "y": 180, "uvlock": true },
+        "east=side,north=up,south=side,west=up": { "model": "redstone_unsuew", "y": 270, "uvlock": true },
+
+        "east=up,north=up,south=up,west=side": { "model": "redstone_unusuew", "uvlock": true },
+        "east=up,north=side,south=up,west=up": { "model": "redstone_unusuew", "y": 90, "uvlock": true },
+        "east=side,north=up,south=up,west=up": { "model": "redstone_unusuew", "y": 180, "uvlock": true },
+        "east=up,north=up,south=side,west=up": { "model": "redstone_unusuew", "y": 270, "uvlock": true },
+
+        "east=up,north=up,south=up,west=up": { "model": "redstone_unusueuw", "uvlock": true }
+    }
 }

assets/minecraft/blockstates/repeating_command_block.json

@@ -1,16 +0,0 @@
-{
-    "variants": {
-        "conditional=false,facing=down":  { "model": "repeating_command_block", "x": 90 },
-        "conditional=false,facing=up":    { "model": "repeating_command_block", "x": 270 },
-        "conditional=false,facing=north": { "model": "repeating_command_block" },
-        "conditional=false,facing=south": { "model": "repeating_command_block", "y": 180 },
-        "conditional=false,facing=west":  { "model": "repeating_command_block", "y": 270 },
-        "conditional=false,facing=east":  { "model": "repeating_command_block", "y": 90 },
-        "conditional=true,facing=down":  { "model": "repeating_command_block_conditional", "x": 90 },
-        "conditional=true,facing=up":    { "model": "repeating_command_block_conditional", "x": 270 },
-        "conditional=true,facing=north": { "model": "repeating_command_block_conditional" },
-        "conditional=true,facing=south": { "model": "repeating_command_block_conditional", "y": 180 },
-        "conditional=true,facing=west":  { "model": "repeating_command_block_conditional", "y": 270 },
-        "conditional=true,facing=east":  { "model": "repeating_command_block_conditional", "y": 90 }
-    }
-}

assets/minecraft/blockstates/sandstone_stairs.json

@@ -24,21 +24,21 @@
         "facing=west,half=top,shape=straight":  { "model": "sandstone_stairs", "x": 180, "y": 180, "uvlock": true },
         "facing=south,half=top,shape=straight": { "model": "sandstone_stairs", "x": 180, "y": 90, "uvlock": true },
         "facing=north,half=top,shape=straight": { "model": "sandstone_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_right":  { "model": "sandstone_outer_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=east,half=top,shape=outer_right":  { "model": "sandstone_outer_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=outer_right":  { "model": "sandstone_outer_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=west,half=top,shape=outer_right":  { "model": "sandstone_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=outer_right": { "model": "sandstone_outer_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=outer_right": { "model": "sandstone_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=outer_right": { "model": "sandstone_outer_stairs", "x": 180, "uvlock": true },
+        "facing=north,half=top,shape=outer_right": { "model": "sandstone_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_left":  { "model": "sandstone_outer_stairs", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=outer_left":  { "model": "sandstone_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=outer_left":  { "model": "sandstone_outer_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=west,half=top,shape=outer_left":  { "model": "sandstone_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=outer_left": { "model": "sandstone_outer_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=south,half=top,shape=outer_left": { "model": "sandstone_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=outer_left": { "model": "sandstone_outer_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=north,half=top,shape=outer_left": { "model": "sandstone_outer_stairs", "x": 180, "uvlock": true },
-        "facing=east,half=top,shape=inner_right":  { "model": "sandstone_inner_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=east,half=top,shape=inner_right":  { "model": "sandstone_inner_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=inner_right":  { "model": "sandstone_inner_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=west,half=top,shape=inner_right":  { "model": "sandstone_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=inner_right": { "model": "sandstone_inner_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=inner_right": { "model": "sandstone_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=inner_right": { "model": "sandstone_inner_stairs", "x": 180, "uvlock": true },
+        "facing=north,half=top,shape=inner_right": { "model": "sandstone_inner_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=inner_left":  { "model": "sandstone_inner_stairs", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=inner_left":  { "model": "sandstone_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=inner_left":  { "model": "sandstone_inner_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=west,half=top,shape=inner_left":  { "model": "sandstone_inner_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=inner_left": { "model": "sandstone_inner_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=south,half=top,shape=inner_left": { "model": "sandstone_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=inner_left": { "model": "sandstone_inner_stairs", "x": 180, "y": 270, "uvlock": true }
+        "facing=north,half=top,shape=inner_left": { "model": "sandstone_inner_stairs", "x": 180, "uvlock": true }
     }
 }

assets/minecraft/blockstates/silver_stained_glass_pane.json

@@ -1,29 +1,20 @@
 {
-    "multipart": [
+    "variants": {
-        {   "apply": { "model": "silver_stained_glass_pane_post" }},
+        "east=false,north=false,south=false,west=false": { "model": "silver_pane_nsew" },
-        {   "when": { "north": true },
+        "east=false,north=true,south=false,west=false": { "model": "silver_pane_n" },
-            "apply": { "model": "silver_stained_glass_pane_side" }
+        "east=true,north=false,south=false,west=false": { "model": "silver_pane_n", "y": 90 },
-        },
+        "east=false,north=false,south=true,west=false": { "model": "silver_pane_s" },
-        {   "when": { "east": true },
+        "east=false,north=false,south=false,west=true": { "model": "silver_pane_s", "y": 90 },
-            "apply": { "model": "silver_stained_glass_pane_side", "y": 90 }
+        "east=true,north=true,south=false,west=false": { "model": "silver_pane_ne" },
-        },
+        "east=true,north=false,south=true,west=false": { "model": "silver_pane_se" },
-        {   "when": { "south": true },
+        "east=false,north=false,south=true,west=true": { "model": "silver_pane_sw" },
-            "apply": { "model": "silver_stained_glass_pane_side_alt" }
+        "east=false,north=true,south=false,west=true": { "model": "silver_pane_nw" },
-        },
+        "east=false,north=true,south=true,west=false": { "model": "silver_pane_ns" },
-        {   "when": { "west": true },
+        "east=true,north=false,south=false,west=true": { "model": "silver_pane_ns", "y": 90 },
-            "apply": { "model": "silver_stained_glass_pane_side_alt", "y": 90 }
+        "east=true,north=true,south=true,west=false": { "model": "silver_pane_nse" },
-        },
+        "east=true,north=false,south=true,west=true": { "model": "silver_pane_sew" },
-        {   "when": { "north": false },
+        "east=false,north=true,south=true,west=true": { "model": "silver_pane_nsw" },
-            "apply": { "model": "silver_stained_glass_pane_noside" }
+        "east=true,north=true,south=false,west=true": { "model": "silver_pane_new" },
-        },
+        "east=true,north=true,south=true,west=true": { "model": "silver_pane_nsew" }
-        {   "when": { "east": false },
+    }
-            "apply": { "model": "silver_stained_glass_pane_noside_alt" }
-        },
-        {   "when": { "south": false },
-            "apply": { "model": "silver_stained_glass_pane_noside_alt", "y": 90 }
-        },
-        {   "when": { "west": false },
-            "apply": { "model": "silver_stained_glass_pane_noside", "y": 270 }
-        }
-    ]
 }

assets/minecraft/blockstates/spruce_fence.json

@@ -1,17 +1,20 @@
 {
-    "multipart": [
+    "variants": {
-        {   "apply": { "model": "spruce_fence_post" }},
+        "east=false,north=false,south=false,west=false": { "model": "spruce_fence_post" },
-        {   "when": { "north": "true" },
+        "east=false,north=true,south=false,west=false": { "model": "spruce_fence_n", "uvlock": true },
-            "apply": { "model": "spruce_fence_side", "uvlock": true }
+        "east=true,north=false,south=false,west=false": { "model": "spruce_fence_n", "y": 90, "uvlock": true },
-        },
+        "east=false,north=false,south=true,west=false": { "model": "spruce_fence_n", "y": 180, "uvlock": true },
-        {   "when": { "east": "true" },
+        "east=false,north=false,south=false,west=true": { "model": "spruce_fence_n", "y": 270, "uvlock": true },
-            "apply": { "model": "spruce_fence_side", "y": 90, "uvlock": true }
+        "east=true,north=true,south=false,west=false": { "model": "spruce_fence_ne", "uvlock": true },
-        },
+        "east=true,north=false,south=true,west=false": { "model": "spruce_fence_ne", "y": 90, "uvlock": true },
-        {   "when": { "south": "true" },
+        "east=false,north=false,south=true,west=true": { "model": "spruce_fence_ne", "y": 180, "uvlock": true },
-            "apply": { "model": "spruce_fence_side", "y": 180, "uvlock": true }
+        "east=false,north=true,south=false,west=true": { "model": "spruce_fence_ne", "y": 270, "uvlock": true },
-        },
+        "east=false,north=true,south=true,west=false": { "model": "spruce_fence_ns", "uvlock": true },
-        {   "when": { "west": "true" },
+        "east=true,north=false,south=false,west=true": { "model": "spruce_fence_ns", "y": 90, "uvlock": true },
-            "apply": { "model": "spruce_fence_side", "y": 270, "uvlock": true }
+        "east=true,north=true,south=true,west=false": { "model": "spruce_fence_nse", "uvlock": true },
-        }
+        "east=true,north=false,south=true,west=true": { "model": "spruce_fence_nse", "y": 90, "uvlock": true },
-    ]
+        "east=false,north=true,south=true,west=true": { "model": "spruce_fence_nse", "y": 180, "uvlock": true },
+        "east=true,north=true,south=false,west=true": { "model": "spruce_fence_nse", "y": 270, "uvlock": true },
+        "east=true,north=true,south=true,west=true": { "model": "spruce_fence_nsew", "uvlock": true }
+    }
 }

assets/minecraft/blockstates/spruce_fence_gate.json

@@ -1,20 +1,20 @@
 {
     "variants": {
-        "facing=south,in_wall=false,open=false": { "model": "spruce_fence_gate_closed", "uvlock": true },
+        "facing=south,in_wall=false,open=false": { "model": "spruce_fence_gate_closed" },
-        "facing=west,in_wall=false,open=false":  { "model": "spruce_fence_gate_closed", "uvlock": true, "y": 90 },
+        "facing=west,in_wall=false,open=false":  { "model": "spruce_fence_gate_closed", "y": 90, "uvlock": true },
-        "facing=north,in_wall=false,open=false": { "model": "spruce_fence_gate_closed", "uvlock": true, "y": 180 },
+        "facing=north,in_wall=false,open=false": { "model": "spruce_fence_gate_closed", "y": 180, "uvlock": true },
-        "facing=east,in_wall=false,open=false":  { "model": "spruce_fence_gate_closed", "uvlock": true, "y": 270 },
+        "facing=east,in_wall=false,open=false":  { "model": "spruce_fence_gate_closed", "y": 270, "uvlock": true },
-        "facing=south,in_wall=false,open=true": { "model": "spruce_fence_gate_open", "uvlock": true },
+        "facing=south,in_wall=false,open=true": { "model": "spruce_fence_gate_open" },
-        "facing=west,in_wall=false,open=true":  { "model": "spruce_fence_gate_open", "uvlock": true, "y": 90 },
+        "facing=west,in_wall=false,open=true":  { "model": "spruce_fence_gate_open", "y": 90, "uvlock": true },
-        "facing=north,in_wall=false,open=true": { "model": "spruce_fence_gate_open", "uvlock": true, "y": 180 },
+        "facing=north,in_wall=false,open=true": { "model": "spruce_fence_gate_open", "y": 180, "uvlock": true },
-        "facing=east,in_wall=false,open=true":  { "model": "spruce_fence_gate_open", "uvlock": true, "y": 270 },
+        "facing=east,in_wall=false,open=true":  { "model": "spruce_fence_gate_open", "y": 270, "uvlock": true },
-        "facing=south,in_wall=true,open=false": { "model": "spruce_wall_gate_closed", "uvlock": true },
+        "facing=south,in_wall=true,open=false": { "model": "spruce_wall_gate_closed" },
-        "facing=west,in_wall=true,open=false":  { "model": "spruce_wall_gate_closed", "uvlock": true, "y": 90 },
+        "facing=west,in_wall=true,open=false":  { "model": "spruce_wall_gate_closed", "y": 90, "uvlock": true },
-        "facing=north,in_wall=true,open=false": { "model": "spruce_wall_gate_closed", "uvlock": true, "y": 180 },
+        "facing=north,in_wall=true,open=false": { "model": "spruce_wall_gate_closed", "y": 180, "uvlock": true },
-        "facing=east,in_wall=true,open=false":  { "model": "spruce_wall_gate_closed", "uvlock": true, "y": 270 },
+        "facing=east,in_wall=true,open=false":  { "model": "spruce_wall_gate_closed", "y": 270, "uvlock": true },
-        "facing=south,in_wall=true,open=true": { "model": "spruce_wall_gate_open", "uvlock": true },
+        "facing=south,in_wall=true,open=true": { "model": "spruce_wall_gate_open" },
-        "facing=west,in_wall=true,open=true":  { "model": "spruce_wall_gate_open", "uvlock": true, "y": 90 },
+        "facing=west,in_wall=true,open=true":  { "model": "spruce_wall_gate_open", "y": 90, "uvlock": true },
-        "facing=north,in_wall=true,open=true": { "model": "spruce_wall_gate_open", "uvlock": true, "y": 180 },
+        "facing=north,in_wall=true,open=true": { "model": "spruce_wall_gate_open", "y": 180, "uvlock": true },
-        "facing=east,in_wall=true,open=true":  { "model": "spruce_wall_gate_open", "uvlock": true, "y": 270 }
+        "facing=east,in_wall=true,open=true":  { "model": "spruce_wall_gate_open", "y": 270, "uvlock": true }
     }
 }

assets/minecraft/blockstates/spruce_log.json

@@ -1,8 +1,8 @@
 {
     "variants": {
         "axis=y":  { "model": "spruce_log" },
-        "axis=z":   { "model": "spruce_log", "x": 90 },
+        "axis=z":   { "model": "spruce_log_side" },
-        "axis=x":   { "model": "spruce_log", "x": 90, "y": 90 },
+        "axis=x":   { "model": "spruce_log_side", "y": 90 },
         "axis=none": { "model": "spruce_bark" }
     }
 }

assets/minecraft/blockstates/spruce_stairs.json

@@ -24,21 +24,21 @@
         "facing=west,half=top,shape=straight":  { "model": "spruce_stairs", "x": 180, "y": 180, "uvlock": true },
         "facing=south,half=top,shape=straight": { "model": "spruce_stairs", "x": 180, "y": 90, "uvlock": true },
         "facing=north,half=top,shape=straight": { "model": "spruce_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_right":  { "model": "spruce_outer_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=east,half=top,shape=outer_right":  { "model": "spruce_outer_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=outer_right":  { "model": "spruce_outer_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=west,half=top,shape=outer_right":  { "model": "spruce_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=outer_right": { "model": "spruce_outer_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=outer_right": { "model": "spruce_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=outer_right": { "model": "spruce_outer_stairs", "x": 180, "uvlock": true },
+        "facing=north,half=top,shape=outer_right": { "model": "spruce_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_left":  { "model": "spruce_outer_stairs", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=outer_left":  { "model": "spruce_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=outer_left":  { "model": "spruce_outer_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=west,half=top,shape=outer_left":  { "model": "spruce_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=outer_left": { "model": "spruce_outer_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=south,half=top,shape=outer_left": { "model": "spruce_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=outer_left": { "model": "spruce_outer_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=north,half=top,shape=outer_left": { "model": "spruce_outer_stairs", "x": 180, "uvlock": true },
-        "facing=east,half=top,shape=inner_right":  { "model": "spruce_inner_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=east,half=top,shape=inner_right":  { "model": "spruce_inner_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=inner_right":  { "model": "spruce_inner_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=west,half=top,shape=inner_right":  { "model": "spruce_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=inner_right": { "model": "spruce_inner_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=inner_right": { "model": "spruce_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=inner_right": { "model": "spruce_inner_stairs", "x": 180, "uvlock": true },
+        "facing=north,half=top,shape=inner_right": { "model": "spruce_inner_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=inner_left":  { "model": "spruce_inner_stairs", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=inner_left":  { "model": "spruce_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=inner_left":  { "model": "spruce_inner_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=west,half=top,shape=inner_left":  { "model": "spruce_inner_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=inner_left": { "model": "spruce_inner_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=south,half=top,shape=inner_left": { "model": "spruce_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=inner_left": { "model": "spruce_inner_stairs", "x": 180, "y": 270, "uvlock": true }
+        "facing=north,half=top,shape=inner_left": { "model": "spruce_inner_stairs", "x": 180, "uvlock": true }
     }
 }

assets/minecraft/blockstates/stone_brick_stairs.json

@@ -24,21 +24,21 @@
         "facing=west,half=top,shape=straight":  { "model": "stone_brick_stairs", "x": 180, "y": 180, "uvlock": true },
         "facing=south,half=top,shape=straight": { "model": "stone_brick_stairs", "x": 180, "y": 90, "uvlock": true },
         "facing=north,half=top,shape=straight": { "model": "stone_brick_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_right":  { "model": "stone_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=east,half=top,shape=outer_right":  { "model": "stone_brick_outer_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=outer_right":  { "model": "stone_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=west,half=top,shape=outer_right":  { "model": "stone_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=outer_right": { "model": "stone_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=outer_right": { "model": "stone_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=outer_right": { "model": "stone_brick_outer_stairs", "x": 180, "uvlock": true },
+        "facing=north,half=top,shape=outer_right": { "model": "stone_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_left":  { "model": "stone_brick_outer_stairs", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=outer_left":  { "model": "stone_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=outer_left":  { "model": "stone_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=west,half=top,shape=outer_left":  { "model": "stone_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=outer_left": { "model": "stone_brick_outer_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=south,half=top,shape=outer_left": { "model": "stone_brick_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=outer_left": { "model": "stone_brick_outer_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=north,half=top,shape=outer_left": { "model": "stone_brick_outer_stairs", "x": 180, "uvlock": true },
-        "facing=east,half=top,shape=inner_right":  { "model": "stone_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=east,half=top,shape=inner_right":  { "model": "stone_brick_inner_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=inner_right":  { "model": "stone_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=west,half=top,shape=inner_right":  { "model": "stone_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=inner_right": { "model": "stone_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=inner_right": { "model": "stone_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=inner_right": { "model": "stone_brick_inner_stairs", "x": 180, "uvlock": true },
+        "facing=north,half=top,shape=inner_right": { "model": "stone_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=inner_left":  { "model": "stone_brick_inner_stairs", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=inner_left":  { "model": "stone_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=inner_left":  { "model": "stone_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=west,half=top,shape=inner_left":  { "model": "stone_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=inner_left": { "model": "stone_brick_inner_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=south,half=top,shape=inner_left": { "model": "stone_brick_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=inner_left": { "model": "stone_brick_inner_stairs", "x": 180, "y": 270, "uvlock": true }
+        "facing=north,half=top,shape=inner_left": { "model": "stone_brick_inner_stairs", "x": 180, "uvlock": true }
     }
 }

assets/minecraft/blockstates/stone_button.json

@@ -1,16 +1,16 @@
 {
     "variants": {
-        "facing=up,powered=false":    { "model": "stone_button", "uvlock": true },
+        "facing=up,powered=false":    { "model": "stone_button" },
-        "facing=down,powered=false":  { "model": "stone_button", "uvlock": true, "x": 180 },
+        "facing=down,powered=false":  { "model": "stone_button", "x": 180 },
-        "facing=east,powered=false":  { "model": "stone_button", "uvlock": true, "x": 90, "y": 90 },
+        "facing=east,powered=false":  { "model": "stone_button", "x": 90, "y": 90 },
-        "facing=west,powered=false":  { "model": "stone_button", "uvlock": true, "x": 90, "y": 270 },
+        "facing=west,powered=false":  { "model": "stone_button", "x": 90, "y": 270 },
-        "facing=south,powered=false": { "model": "stone_button", "uvlock": true, "x": 90, "y": 180 },
+        "facing=south,powered=false": { "model": "stone_button", "x": 90, "y": 180 },
-        "facing=north,powered=false": { "model": "stone_button", "uvlock": true, "x": 90 },
+        "facing=north,powered=false": { "model": "stone_button", "x": 90 },
-        "facing=up,powered=true":     { "model": "stone_button_pressed", "uvlock": true },
+        "facing=up,powered=true":     { "model": "stone_button_pressed" },
-        "facing=down,powered=true":   { "model": "stone_button_pressed", "uvlock": true, "x": 180 },
+        "facing=down,powered=true":   { "model": "stone_button_pressed", "x": 180 },
-        "facing=east,powered=true":   { "model": "stone_button_pressed", "uvlock": true, "x": 90, "y": 90 },
+        "facing=east,powered=true":   { "model": "stone_button_pressed", "x": 90, "y": 90 },
-        "facing=west,powered=true":   { "model": "stone_button_pressed", "uvlock": true, "x": 90, "y": 270 },
+        "facing=west,powered=true":   { "model": "stone_button_pressed", "x": 90, "y": 270 },
-        "facing=south,powered=true":  { "model": "stone_button_pressed", "uvlock": true, "x": 90, "y": 180 },
+        "facing=south,powered=true":  { "model": "stone_button_pressed", "x": 90, "y": 180 },
-        "facing=north,powered=true":  { "model": "stone_button_pressed", "uvlock": true, "x": 90 }
+        "facing=north,powered=true":  { "model": "stone_button_pressed", "x": 90 }
     }
 }

assets/minecraft/blockstates/stone_stairs.json

@@ -24,21 +24,21 @@
         "facing=west,half=top,shape=straight":  { "model": "stone_stairs", "x": 180, "y": 180, "uvlock": true },
         "facing=south,half=top,shape=straight": { "model": "stone_stairs", "x": 180, "y": 90, "uvlock": true },
         "facing=north,half=top,shape=straight": { "model": "stone_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_right":  { "model": "stone_outer_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=east,half=top,shape=outer_right":  { "model": "stone_outer_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=outer_right":  { "model": "stone_outer_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=west,half=top,shape=outer_right":  { "model": "stone_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=outer_right": { "model": "stone_outer_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=outer_right": { "model": "stone_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=outer_right": { "model": "stone_outer_stairs", "x": 180, "uvlock": true },
+        "facing=north,half=top,shape=outer_right": { "model": "stone_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=outer_left":  { "model": "stone_outer_stairs", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=outer_left":  { "model": "stone_outer_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=outer_left":  { "model": "stone_outer_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=west,half=top,shape=outer_left":  { "model": "stone_outer_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=outer_left": { "model": "stone_outer_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=south,half=top,shape=outer_left": { "model": "stone_outer_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=outer_left": { "model": "stone_outer_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=north,half=top,shape=outer_left": { "model": "stone_outer_stairs", "x": 180, "uvlock": true },
-        "facing=east,half=top,shape=inner_right":  { "model": "stone_inner_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=east,half=top,shape=inner_right":  { "model": "stone_inner_stairs", "x": 180, "uvlock": true },
-        "facing=west,half=top,shape=inner_right":  { "model": "stone_inner_stairs", "x": 180, "y": 270, "uvlock": true },
+        "facing=west,half=top,shape=inner_right":  { "model": "stone_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=south,half=top,shape=inner_right": { "model": "stone_inner_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=south,half=top,shape=inner_right": { "model": "stone_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=north,half=top,shape=inner_right": { "model": "stone_inner_stairs", "x": 180, "uvlock": true },
+        "facing=north,half=top,shape=inner_right": { "model": "stone_inner_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=east,half=top,shape=inner_left":  { "model": "stone_inner_stairs", "x": 180, "uvlock": true },
+        "facing=east,half=top,shape=inner_left":  { "model": "stone_inner_stairs", "x": 180, "y": 90, "uvlock": true },
-        "facing=west,half=top,shape=inner_left":  { "model": "stone_inner_stairs", "x": 180, "y": 180, "uvlock": true },
+        "facing=west,half=top,shape=inner_left":  { "model": "stone_inner_stairs", "x": 180, "y": 270, "uvlock": true },
-        "facing=south,half=top,shape=inner_left": { "model": "stone_inner_stairs", "x": 180, "y": 90, "uvlock": true },
+        "facing=south,half=top,shape=inner_left": { "model": "stone_inner_stairs", "x": 180, "y": 180, "uvlock": true },
-        "facing=north,half=top,shape=inner_left": { "model": "stone_inner_stairs", "x": 180, "y": 270, "uvlock": true }
+        "facing=north,half=top,shape=inner_left": { "model": "stone_inner_stairs", "x": 180, "uvlock": true }
     }
 }

assets/minecraft/blockstates/structure_block.json

@@ -1,8 +0,0 @@
-{
-    "variants": {
-        "mode=save": { "model": "structure_block_save" },
-        "mode=load": { "model": "structure_block_load" },
-        "mode=corner": { "model": "structure_block_corner" },
-        "mode=data": { "model": "structure_block_data" }
-    }
-}

assets/minecraft/blockstates/tnt.json

@@ -1,5 +1,10 @@
 {
     "variants": {
-        "normal": { "model": "tnt" }
+        "normal": [
+            { "model": "tnt" },
+            { "model": "tnt", "y": 90 },
+            { "model": "tnt", "y": 180 },
+            { "model": "tnt", "y": 270 }
+        ]
     }
 }

assets/minecraft/blockstates/tripwire.json

@@ -1,36 +1,68 @@
 {
     "variants": {
-        "attached=false,east=false,north=false,south=false,west=false": { "model": "tripwire_ns" },
+        "attached=false,east=false,north=false,south=false,suspended=false,west=false": { "model": "tripwire_ns" },
-        "attached=false,east=false,north=true,south=false,west=false": { "model": "tripwire_n" },
+        "attached=false,east=false,north=true,south=false,suspended=false,west=false": { "model": "tripwire_n" },
-        "attached=false,east=false,north=false,south=true,west=false": { "model": "tripwire_n", "y": 180 },
+        "attached=false,east=false,north=false,south=true,suspended=false,west=false": { "model": "tripwire_n", "y": 180 },
-        "attached=false,east=true,north=false,south=false,west=false": { "model": "tripwire_n", "y": 90 },
+        "attached=false,east=true,north=false,south=false,suspended=false,west=false": { "model": "tripwire_n", "y": 90 },
-        "attached=false,east=false,north=false,south=false,west=true": { "model": "tripwire_n", "y": 270 },
+        "attached=false,east=false,north=false,south=false,suspended=false,west=true": { "model": "tripwire_n", "y": 270 },
-        "attached=false,east=true,north=true,south=false,west=false": { "model": "tripwire_ne" },
+        "attached=false,east=true,north=true,south=false,suspended=false,west=false": { "model": "tripwire_ne" },
-        "attached=false,east=true,north=false,south=true,west=false": { "model": "tripwire_ne", "y": 90 },
+        "attached=false,east=true,north=false,south=true,suspended=false,west=false": { "model": "tripwire_ne", "y": 90 },
-        "attached=false,east=false,north=false,south=true,west=true": { "model": "tripwire_ne", "y": 180 },
+        "attached=false,east=false,north=false,south=true,suspended=false,west=true": { "model": "tripwire_ne", "y": 180 },
-        "attached=false,east=false,north=true,south=false,west=true": { "model": "tripwire_ne", "y": 270 },
+        "attached=false,east=false,north=true,south=false,suspended=false,west=true": { "model": "tripwire_ne", "y": 270 },
-        "attached=false,east=false,north=true,south=true,west=false": { "model": "tripwire_ns" },
+        "attached=false,east=false,north=true,south=true,suspended=false,west=false": { "model": "tripwire_ns" },
-        "attached=false,east=true,north=false,south=false,west=true": { "model": "tripwire_ns", "y": 90 },
+        "attached=false,east=true,north=false,south=false,suspended=false,west=true": { "model": "tripwire_ns", "y": 90 },
-        "attached=false,east=true,north=true,south=true,west=false": { "model": "tripwire_nse" },
+        "attached=false,east=true,north=true,south=true,suspended=false,west=false": { "model": "tripwire_nse" },
-        "attached=false,east=true,north=false,south=true,west=true": { "model": "tripwire_nse", "y": 90 },
+        "attached=false,east=true,north=false,south=true,suspended=false,west=true": { "model": "tripwire_nse", "y": 90 },
-        "attached=false,east=false,north=true,south=true,west=true": { "model": "tripwire_nse", "y": 180 },
+        "attached=false,east=false,north=true,south=true,suspended=false,west=true": { "model": "tripwire_nse", "y": 180 },
-        "attached=false,east=true,north=true,south=false,west=true": { "model": "tripwire_nse", "y": 270 },
+        "attached=false,east=true,north=true,south=false,suspended=false,west=true": { "model": "tripwire_nse", "y": 270 },
-        "attached=false,east=true,north=true,south=true,west=true": { "model": "tripwire_nsew" },
+        "attached=false,east=true,north=true,south=true,suspended=false,west=true": { "model": "tripwire_nsew" },
-        "attached=true,east=false,north=false,south=false,west=false": { "model": "tripwire_attached_ns" },
+        "attached=false,east=false,north=false,south=false,suspended=true,west=false": { "model": "tripwire_suspended_ns" },
-        "attached=true,east=false,north=true,south=false,west=false": { "model": "tripwire_attached_n" },
+        "attached=false,east=false,north=true,south=false,suspended=true,west=false": { "model": "tripwire_suspended_n" },
-        "attached=true,east=false,north=false,south=true,west=false": { "model": "tripwire_attached_n", "y": 180 },
+        "attached=false,east=false,north=false,south=true,suspended=true,west=false": { "model": "tripwire_suspended_n", "y": 180 },
-        "attached=true,east=true,north=false,south=false,west=false": { "model": "tripwire_attached_n", "y": 90 },
+        "attached=false,east=true,north=false,south=false,suspended=true,west=false": { "model": "tripwire_suspended_n", "y": 90 },
-        "attached=true,east=false,north=false,south=false,west=true": { "model": "tripwire_attached_n", "y": 270 },
+        "attached=false,east=false,north=false,south=false,suspended=true,west=true": { "model": "tripwire_suspended_n", "y": 270 },
-        "attached=true,east=true,north=true,south=false,west=false": { "model": "tripwire_attached_ne" },
+        "attached=false,east=true,north=true,south=false,suspended=true,west=false": { "model": "tripwire_suspended_ne" },
-        "attached=true,east=true,north=false,south=true,west=false": { "model": "tripwire_attached_ne", "y": 90 },
+        "attached=false,east=true,north=false,south=true,suspended=true,west=false": { "model": "tripwire_suspended_ne", "y": 90 },
-        "attached=true,east=false,north=false,south=true,west=true": { "model": "tripwire_attached_ne", "y": 180 },
+        "attached=false,east=false,north=false,south=true,suspended=true,west=true": { "model": "tripwire_suspended_ne", "y": 180 },
-        "attached=true,east=false,north=true,south=false,west=true": { "model": "tripwire_attached_ne", "y": 270 },
+        "attached=false,east=false,north=true,south=false,suspended=true,west=true": { "model": "tripwire_suspended_ne", "y": 270 },
-        "attached=true,east=false,north=true,south=true,west=false": { "model": "tripwire_attached_ns" },
+        "attached=false,east=false,north=true,south=true,suspended=true,west=false": { "model": "tripwire_suspended_ns" },
-        "attached=true,east=true,north=false,south=false,west=true": { "model": "tripwire_attached_ns", "y": 90 },
+        "attached=false,east=true,north=false,south=false,suspended=true,west=true": { "model": "tripwire_suspended_ns", "y": 90 },
-        "attached=true,east=true,north=true,south=true,west=false": { "model": "tripwire_attached_nse" },
+        "attached=false,east=true,north=true,south=true,suspended=true,west=false": { "model": "tripwire_suspended_nse" },
-        "attached=true,east=true,north=false,south=true,west=true": { "model": "tripwire_attached_nse", "y": 90 },
+        "attached=false,east=true,north=false,south=true,suspended=true,west=true": { "model": "tripwire_suspended_nse", "y": 90 },
-        "attached=true,east=false,north=true,south=true,west=true": { "model": "tripwire_attached_nse", "y": 180 },
+        "attached=false,east=false,north=true,south=true,suspended=true,west=true": { "model": "tripwire_suspended_nse", "y": 180 },
-        "attached=true,east=true,north=true,south=false,west=true": { "model": "tripwire_attached_nse", "y": 270 },
+        "attached=false,east=true,north=true,south=false,suspended=true,west=true": { "model": "tripwire_suspended_nse", "y": 270 },
-        "attached=true,east=true,north=true,south=true,west=true": { "model": "tripwire_attached_nsew" }
+        "attached=false,east=true,north=true,south=true,suspended=true,west=true": { "model": "tripwire_suspended_nsew" },
+        "attached=true,east=false,north=false,south=false,suspended=false,west=false": { "model": "tripwire_attached_ns" },
+        "attached=true,east=false,north=true,south=false,suspended=false,west=false": { "model": "tripwire_attached_n" },
+        "attached=true,east=false,north=false,south=true,suspended=false,west=false": { "model": "tripwire_attached_n", "y": 180 },
+        "attached=true,east=true,north=false,south=false,suspended=false,west=false": { "model": "tripwire_attached_n", "y": 90 },
+        "attached=true,east=false,north=false,south=false,suspended=false,west=true": { "model": "tripwire_attached_n", "y": 270 },
+        "attached=true,east=true,north=true,south=false,suspended=false,west=false": { "model": "tripwire_attached_ne" },
+        "attached=true,east=true,north=false,south=true,suspended=false,west=false": { "model": "tripwire_attached_ne", "y": 90 },
+        "attached=true,east=false,north=false,south=true,suspended=false,west=true": { "model": "tripwire_attached_ne", "y": 180 },
+        "attached=true,east=false,north=true,south=false,suspended=false,west=true": { "model": "tripwire_attached_ne", "y": 270 },
+        "attached=true,east=false,north=true,south=true,suspended=false,west=false": { "model": "tripwire_attached_ns" },
+        "attached=true,east=true,north=false,south=false,suspended=false,west=true": { "model": "tripwire_attached_ns", "y": 90 },
+        "attached=true,east=true,north=true,south=true,suspended=false,west=false": { "model": "tripwire_attached_nse" },
+        "attached=true,east=true,north=false,south=true,suspended=false,west=true": { "model": "tripwire_attached_nse", "y": 90 },
+        "attached=true,east=false,north=true,south=true,suspended=false,west=true": { "model": "tripwire_attached_nse", "y": 180 },
+        "attached=true,east=true,north=true,south=false,suspended=false,west=true": { "model": "tripwire_attached_nse", "y": 270 },
+        "attached=true,east=true,north=true,south=true,suspended=false,west=true": { "model": "tripwire_attached_nsew" },
+        "attached=true,east=false,north=false,south=false,suspended=true,west=false": { "model": "tripwire_attached_suspended_ns" },
+        "attached=true,east=false,north=true,south=false,suspended=true,west=false": { "model": "tripwire_attached_suspended_n" },
+        "attached=true,east=false,north=false,south=true,suspended=true,west=false": { "model": "tripwire_attached_suspended_n", "y": 180 },
+        "attached=true,east=true,north=false,south=false,suspended=true,west=false": { "model": "tripwire_attached_suspended_n", "y": 90 },
+        "attached=true,east=false,north=false,south=false,suspended=true,west=true": { "model": "tripwire_attached_suspended_n", "y": 270 },
+        "attached=true,east=true,north=true,south=false,suspended=true,west=false": { "model": "tripwire_attached_suspended_ne" },
+        "attached=true,east=true,north=false,south=true,suspended=true,west=false": { "model": "tripwire_attached_suspended_ne", "y": 90 },
+        "attached=true,east=false,north=false,south=true,suspended=true,west=true": { "model": "tripwire_attached_suspended_ne", "y": 180 },
+        "attached=true,east=false,north=true,south=false,suspended=true,west=true": { "model": "tripwire_attached_suspended_ne", "y": 270 },
+        "attached=true,east=false,north=true,south=true,suspended=true,west=false": { "model": "tripwire_attached_suspended_ns" },
+        "attached=true,east=true,north=false,south=false,suspended=true,west=true": { "model": "tripwire_attached_suspended_ns", "y": 90 },
+        "attached=true,east=true,north=true,south=true,suspended=true,west=false": { "model": "tripwire_attached_suspended_nse" },
+        "attached=true,east=true,north=false,south=true,suspended=true,west=true": { "model": "tripwire_attached_suspended_nse", "y": 90 },
+        "attached=true,east=false,north=true,south=true,suspended=true,west=true": { "model": "tripwire_attached_suspended_nse", "y": 180 },
+        "attached=true,east=true,north=true,south=false,suspended=true,west=true": { "model": "tripwire_attached_suspended_nse", "y": 270 },
+        "attached=true,east=true,north=true,south=true,suspended=true,west=true": { "model": "tripwire_attached_suspended_nsew" }
     }
 }

assets/minecraft/blockstates/tripwire_hook.json

@@ -1,20 +1,36 @@
 {
     "variants": {
-        "attached=false,facing=north,powered=false": { "model": "tripwire_hook" },
+        "attached=false,facing=north,powered=false,suspended=false": { "model": "tripwire_hook" },
-        "attached=false,facing=south,powered=false": { "model": "tripwire_hook", "y": 180 },
+        "attached=false,facing=south,powered=false,suspended=false": { "model": "tripwire_hook", "y": 180 },
-        "attached=false,facing=west,powered=false": { "model": "tripwire_hook", "y": 270 },
+        "attached=false,facing=west,powered=false,suspended=false": { "model": "tripwire_hook", "y": 270 },
-        "attached=false,facing=east,powered=false": { "model": "tripwire_hook", "y": 90 },
+        "attached=false,facing=east,powered=false,suspended=false": { "model": "tripwire_hook", "y": 90 },
-        "attached=true,facing=north,powered=false": { "model": "tripwire_hook_attached" },
+        "attached=false,facing=north,powered=false,suspended=true": { "model": "tripwire_hook" },
-        "attached=true,facing=south,powered=false": { "model": "tripwire_hook_attached", "y": 180 },
+        "attached=false,facing=south,powered=false,suspended=true": { "model": "tripwire_hook", "y": 180 },
-        "attached=true,facing=west,powered=false": { "model": "tripwire_hook_attached", "y": 270 },
+        "attached=false,facing=west,powered=false,suspended=true": { "model": "tripwire_hook", "y": 270 },
-        "attached=true,facing=east,powered=false": { "model": "tripwire_hook_attached", "y": 90 },
+        "attached=false,facing=east,powered=false,suspended=true": { "model": "tripwire_hook", "y": 90 },
-        "attached=false,facing=north,powered=true": { "model": "tripwire_hook_powered" },
+        "attached=true,facing=north,powered=false,suspended=false": { "model": "tripwire_hook_attached" },
-        "attached=false,facing=south,powered=true": { "model": "tripwire_hook_powered", "y": 180 },
+        "attached=true,facing=south,powered=false,suspended=false": { "model": "tripwire_hook_attached", "y": 180 },
-        "attached=false,facing=west,powered=true": { "model": "tripwire_hook_powered", "y": 270 },
+        "attached=true,facing=west,powered=false,suspended=false": { "model": "tripwire_hook_attached", "y": 270 },
-        "attached=false,facing=east,powered=true": { "model": "tripwire_hook_powered", "y": 90 },
+        "attached=true,facing=east,powered=false,suspended=false": { "model": "tripwire_hook_attached", "y": 90 },
-        "attached=true,facing=north,powered=true": { "model": "tripwire_hook_attached_powered" },
+        "attached=true,facing=north,powered=false,suspended=true": { "model": "tripwire_hook_attached_suspended" },
-        "attached=true,facing=south,powered=true": { "model": "tripwire_hook_attached_powered", "y": 180 },
+        "attached=true,facing=south,powered=false,suspended=true": { "model": "tripwire_hook_attached_suspended", "y": 180 },
-        "attached=true,facing=west,powered=true": { "model": "tripwire_hook_attached_powered", "y": 270 },
+        "attached=true,facing=west,powered=false,suspended=true": { "model": "tripwire_hook_attached_suspended", "y": 270 },
-        "attached=true,facing=east,powered=true": { "model": "tripwire_hook_attached_powered", "y": 90 }
+        "attached=true,facing=east,powered=false,suspended=true": { "model": "tripwire_hook_attached_suspended", "y": 90 },
+        "attached=false,facing=north,powered=true,suspended=false": { "model": "tripwire_hook_powered" },
+        "attached=false,facing=south,powered=true,suspended=false": { "model": "tripwire_hook_powered", "y": 180 },
+        "attached=false,facing=west,powered=true,suspended=false": { "model": "tripwire_hook_powered", "y": 270 },
+        "attached=false,facing=east,powered=true,suspended=false": { "model": "tripwire_hook_powered", "y": 90 },
+        "attached=false,facing=north,powered=true,suspended=true": { "model": "tripwire_hook_powered" },
+        "attached=false,facing=south,powered=true,suspended=true": { "model": "tripwire_hook_powered", "y": 180 },
+        "attached=false,facing=west,powered=true,suspended=true": { "model": "tripwire_hook_powered", "y": 270 },
+        "attached=false,facing=east,powered=true,suspended=true": { "model": "tripwire_hook_powered", "y": 90 },
+        "attached=true,facing=north,powered=true,suspended=false": { "model": "tripwire_hook_attached_powered" },
+        "attached=true,facing=south,powered=true,suspended=false": { "model": "tripwire_hook_attached_powered", "y": 180 },
+        "attached=true,facing=west,powered=true,suspended=false": { "model": "tripwire_hook_attached_powered", "y": 270 },
+        "attached=true,facing=east,powered=true,suspended=false": { "model": "tripwire_hook_attached_powered", "y": 90 },
+        "attached=true,facing=north,powered=true,suspended=true": { "model": "tripwire_hook_attached_suspended_powered" },
+        "attached=true,facing=south,powered=true,suspended=true": { "model": "tripwire_hook_attached_suspended_powered", "y": 180 },
+        "attached=true,facing=west,powered=true,suspended=true": { "model": "tripwire_hook_attached_suspended_powered", "y": 270 },
+        "attached=true,facing=east,powered=true,suspended=true": { "model": "tripwire_hook_attached_suspended_powered", "y": 90 }
     }
 }

assets/minecraft/blockstates/white_stained_glass_pane.json

@@ -1,29 +1,20 @@
 {
-    "multipart": [
+    "variants": {
-        {   "apply": { "model": "white_stained_glass_pane_post" }},
+        "east=false,north=false,south=false,west=false": { "model": "white_pane_nsew" },
-        {   "when": { "north": true },
+        "east=false,north=true,south=false,west=false": { "model": "white_pane_n" },
-            "apply": { "model": "white_stained_glass_pane_side" }
+        "east=true,north=false,south=false,west=false": { "model": "white_pane_n", "y": 90 },
-        },
+        "east=false,north=false,south=true,west=false": { "model": "white_pane_s" },
-        {   "when": { "east": true },
+        "east=false,north=false,south=false,west=true": { "model": "white_pane_s", "y": 90 },
-            "apply": { "model": "white_stained_glass_pane_side", "y": 90 }
+        "east=true,north=true,south=false,west=false": { "model": "white_pane_ne" },
-        },
+        "east=true,north=false,south=true,west=false": { "model": "white_pane_se" },
-        {   "when": { "south": true },
+        "east=false,north=false,south=true,west=true": { "model": "white_pane_sw" },
-            "apply": { "model": "white_stained_glass_pane_side_alt" }
+        "east=false,north=true,south=false,west=true": { "model": "white_pane_nw" },
-        },
+        "east=false,north=true,south=true,west=false": { "model": "white_pane_ns" },
-        {   "when": { "west": true },
+        "east=true,north=false,south=false,west=true": { "model": "white_pane_ns", "y": 90 },
-            "apply": { "model": "white_stained_glass_pane_side_alt", "y": 90 }
+        "east=true,north=true,south=true,west=false": { "model": "white_pane_nse" },
-        },
+        "east=true,north=false,south=true,west=true": { "model": "white_pane_sew" },
-        {   "when": { "north": false },
+        "east=false,north=true,south=true,west=true": { "model": "white_pane_nsw" },
-            "apply": { "model": "white_stained_glass_pane_noside" }
+        "east=true,north=true,south=false,west=true": { "model": "white_pane_new" },
-        },
+        "east=true,north=true,south=true,west=true": { "model": "white_pane_nsew" }
-        {   "when": { "east": false },
+    }
-            "apply": { "model": "white_stained_glass_pane_noside_alt" }
-        },
-        {   "when": { "south": false },
-            "apply": { "model": "white_stained_glass_pane_noside_alt", "y": 90 }
-        },
-        {   "when": { "west": false },
-            "apply": { "model": "white_stained_glass_pane_noside", "y": 270 }
-        }
-    ]
 }

assets/minecraft/blockstates/wooden_button.json

@@ -1,16 +1,16 @@
 {
     "variants": {
-        "facing=up,powered=false":    { "model": "wooden_button", "uvlock": true },
+        "facing=up,powered=false":    { "model": "wooden_button" },
-        "facing=down,powered=false":  { "model": "wooden_button", "uvlock": true, "x": 180 },
+        "facing=down,powered=false":  { "model": "wooden_button", "x": 180 },
-        "facing=east,powered=false":  { "model": "wooden_button", "uvlock": true, "x": 90, "y": 90 },
+        "facing=east,powered=false":  { "model": "wooden_button", "x": 90, "y": 90 },
-        "facing=west,powered=false":  { "model": "wooden_button", "uvlock": true, "x": 90, "y": 270 },
+        "facing=west,powered=false":  { "model": "wooden_button", "x": 90, "y": 270 },
-        "facing=south,powered=false": { "model": "wooden_button", "uvlock": true, "x": 90, "y": 180 },
+        "facing=south,powered=false": { "model": "wooden_button", "x": 90, "y": 180 },
-        "facing=north,powered=false": { "model": "wooden_button", "uvlock": true, "x": 90 },
+        "facing=north,powered=false": { "model": "wooden_button", "x": 90 },
-        "facing=up,powered=true":     { "model": "wooden_button_pressed", "uvlock": true },
+        "facing=up,powered=true":     { "model": "wooden_button_pressed" },
-        "facing=down,powered=true":   { "model": "wooden_button_pressed", "uvlock": true, "x": 180 },
+        "facing=down,powered=true":   { "model": "wooden_button_pressed", "x": 180 },
-        "facing=east,powered=true":   { "model": "wooden_button_pressed", "uvlock": true, "x": 90, "y": 90 },
+        "facing=east,powered=true":   { "model": "wooden_button_pressed", "x": 90, "y": 90 },
-        "facing=west,powered=true":   { "model": "wooden_button_pressed", "uvlock": true, "x": 90, "y": 270 },
+        "facing=west,powered=true":   { "model": "wooden_button_pressed", "x": 90, "y": 270 },
-        "facing=south,powered=true":  { "model": "wooden_button_pressed", "uvlock": true, "x": 90, "y": 180 },
+        "facing=south,powered=true":  { "model": "wooden_button_pressed", "x": 90, "y": 180 },
-        "facing=north,powered=true":  { "model": "wooden_button_pressed", "uvlock": true, "x": 90 }
+        "facing=north,powered=true":  { "model": "wooden_button_pressed", "x": 90 }
     }
 }

assets/minecraft/blockstates/yellow_stained_glass_pane.json

@@ -1,29 +1,20 @@
 {
-    "multipart": [
+    "variants": {
-        {   "apply": { "model": "yellow_stained_glass_pane_post" }},
+        "east=false,north=false,south=false,west=false": { "model": "yellow_pane_nsew" },
-        {   "when": { "north": true },
+        "east=false,north=true,south=false,west=false": { "model": "yellow_pane_n" },
-            "apply": { "model": "yellow_stained_glass_pane_side" }
+        "east=true,north=false,south=false,west=false": { "model": "yellow_pane_n", "y": 90 },
-        },
+        "east=false,north=false,south=true,west=false": { "model": "yellow_pane_s" },
-        {   "when": { "east": true },
+        "east=false,north=false,south=false,west=true": { "model": "yellow_pane_s", "y": 90 },
-            "apply": { "model": "yellow_stained_glass_pane_side", "y": 90 }
+        "east=true,north=true,south=false,west=false": { "model": "yellow_pane_ne" },
-        },
+        "east=true,north=false,south=true,west=false": { "model": "yellow_pane_se" },
-        {   "when": { "south": true },
+        "east=false,north=false,south=true,west=true": { "model": "yellow_pane_sw" },
-            "apply": { "model": "yellow_stained_glass_pane_side_alt" }
+        "east=false,north=true,south=false,west=true": { "model": "yellow_pane_nw" },
-        },
+        "east=false,north=true,south=true,west=false": { "model": "yellow_pane_ns" },
-        {   "when": { "west": true },
+        "east=true,north=false,south=false,west=true": { "model": "yellow_pane_ns", "y": 90 },
-            "apply": { "model": "yellow_stained_glass_pane_side_alt", "y": 90 }
+        "east=true,north=true,south=true,west=false": { "model": "yellow_pane_nse" },
-        },
+        "east=true,north=false,south=true,west=true": { "model": "yellow_pane_sew" },
-        {   "when": { "north": false },
+        "east=false,north=true,south=true,west=true": { "model": "yellow_pane_nsw" },
-            "apply": { "model": "yellow_stained_glass_pane_noside" }
+        "east=true,north=true,south=false,west=true": { "model": "yellow_pane_new" },
-        },
+        "east=true,north=true,south=true,west=true": { "model": "yellow_pane_nsew" }
-        {   "when": { "east": false },
+    }
-            "apply": { "model": "yellow_stained_glass_pane_noside_alt" }
-        },
-        {   "when": { "south": false },
-            "apply": { "model": "yellow_stained_glass_pane_noside_alt", "y": 90 }
-        },
-        {   "when": { "west": false },
-            "apply": { "model": "yellow_stained_glass_pane_noside", "y": 270 }
-        }
-    ]
 }

assets/minecraft/lang/en_US.lang

@@ -49,14 +49,12 @@ selectWorld.create=Create New World
 selectWorld.recreate=Re-Create
 selectWorld.createDemo=Play New Demo World
 selectWorld.delete=Delete
-selectWorld.edit=Edit
+selectWorld.rename=Rename
-selectWorld.edit.title=Edit World
-selectWorld.edit.resetIcon=Reset Icon
-selectWorld.edit.openFolder=Open Folder
-selectWorld.edit.save=Save World
 selectWorld.deleteQuestion=Are you sure you want to delete this world?
 selectWorld.deleteWarning=will be lost forever! (A long time!)
 selectWorld.deleteButton=Delete
+selectWorld.renameButton=Rename
+selectWorld.renameTitle=Rename World
 selectWorld.conversion=Must be converted!
 selectWorld.newWorld=New World
 selectWorld.newWorld.copyOf=Copy of %s
@@ -66,15 +64,6 @@ selectWorld.enterSeed=Seed for the World Generator
 selectWorld.seedInfo=Leave blank for a random seed
 selectWorld.cheats=Cheats
 selectWorld.customizeType=Customize
-selectWorld.version=Version:
-selectWorld.versionUnknown=unknown
-selectWorld.versionQuestion=Do you really want to load this world?
-selectWorld.versionWarning=This world was saved in version '%s' and loading it in this version could cause corruption!
-selectWorld.versionJoinButton=Use anyway
-selectWorld.tooltip.fromNewerVersion1=World was saved in a newer version,
-selectWorld.tooltip.fromNewerVersion2=loading this world could cause problems!
-selectWorld.tooltip.snapshot1=Don't forget to backup this world
-selectWorld.tooltip.snapshot2=before you load it in this snapshot.
 
 createWorld.customize.presets=Presets
 createWorld.customize.presets.title=Select a Preset
@@ -90,7 +79,6 @@ createWorld.customize.flat.removeLayer=Remove Layer
 createWorld.customize.flat.layer.top=Top - %d
 createWorld.customize.flat.layer=%d
 createWorld.customize.flat.layer.bottom=Bottom - %d
-createWorld.customize.flat.air=Air
 
 createWorld.customize.custom.page0=Basic Settings
 createWorld.customize.custom.page1=Ore Settings
@@ -160,7 +148,7 @@ gameMode.creative=Creative Mode
 gameMode.adventure=Adventure Mode
 gameMode.spectator=Spectator Mode
 gameMode.hardcore=Hardcore Mode!
-gameMode.changed=Your game mode has been updated to %s
+gameMode.changed=Your game mode has been updated
 
 selectWorld.gameMode=Game Mode
 selectWorld.gameMode.survival=Survival
@@ -253,6 +241,9 @@ chat.copy=Copy to Clipboard
 chat.link.confirmTrusted=Do you want to open this link or copy it to your clipboard?
 chat.link.open=Open in browser
 
+chat.stream.text=(%s) <%s> %s
+chat.stream.emote=(%s) * %s %s
+
 menu.playdemo=Play Demo World
 menu.resetdemo=Reset Demo World
 
@@ -304,7 +295,6 @@ soundCategory.neutral=Friendly Creatures
 soundCategory.player=Players
 soundCategory.block=Blocks
 soundCategory.ambient=Ambient/Environment
-soundCategory.voice=Voice/Speech
 
 record.nowPlaying=Now playing: %s
 
@@ -316,6 +306,7 @@ options.title=Options
 options.controls=Controls...
 options.video=Video Settings...
 options.language=Language...
+options.stream=Broadcast Settings...
 options.sounds=Music & Sounds...
 options.sounds.title=Music & Sound Options
 options.languageWarning=Language translations may not be 100%% accurate
@@ -411,20 +402,42 @@ options.fullscreen=Fullscreen
 options.vsync=Use VSync
 options.vbo=Use VBOs
 options.touchscreen=Touchscreen Mode
+options.blockAlternatives=Alternate Blocks
 options.reducedDebugInfo=Reduced Debug Info
 options.entityShadows=Entity Shadows
-options.mainHand=Main Hand
-options.mainHand.left=Left
-options.mainHand.right=Right
-options.attackIndicator=Attack Indicator
-options.attack.crosshair=Crosshair
-options.attack.hotbar=Hotbar
-options.showSubtitles=Show Subtitles
-options.realmsNotifications=Realms Notifications
 
 options.mipmapLevels=Mipmap Levels
 options.forceUnicodeFont=Force Unicode Font
 
+options.stream.title=Twitch Broadcast Settings
+options.stream.bytesPerPixel=Quality
+options.stream.micVolumne=Mic Volume
+options.stream.micToggleBehavior=Push To
+options.stream.mic_toggle.mute=Mute
+options.stream.mic_toggle.talk=Talk
+options.stream.systemVolume=System Volume
+options.stream.kbps=Bandwidth
+options.stream.fps=Framerate
+options.stream.sendMetadata=Send Metadata
+options.stream.compression=Compression
+options.stream.compression.low=Low
+options.stream.compression.medium=Medium
+options.stream.compression.high=High
+options.stream.estimation=Estimated resolution: %dx%d
+options.stream.changes=You may need to restart your stream for these changes to take place.
+options.stream.ingestSelection=Broadcast Server List
+options.stream.ingest.title=Twitch Broadcast Servers
+options.stream.ingest.reset=Reset Preference
+options.stream.chat.title=Twitch Chat Settings
+options.stream.chat.enabled=Enable
+options.stream.chat.enabled.streaming=Whilst Streaming
+options.stream.chat.enabled.always=Always
+options.stream.chat.enabled.never=Never
+options.stream.chat.userFilter=User Filter
+options.stream.chat.userFilter.all=All Viewers
+options.stream.chat.userFilter.subs=Subscribers
+options.stream.chat.userFilter.mods=Moderators
+
 difficulty.lock.title=Lock World Difficulty
 difficulty.lock.question=Are you sure you want to lock the difficulty of this world? This will set this world to always be %1$s, and you will never be able to change that again.
 
@@ -441,9 +454,8 @@ key.left=Strafe Left
 key.back=Walk Backwards
 key.right=Strafe Right
 key.jump=Jump
-key.inventory=Open/Close Inventory
+key.inventory=Inventory
-key.drop=Drop Selected Item
+key.drop=Drop Item
-key.swapHands=Swap Item In Hands
 key.chat=Open Chat
 key.sneak=Sneak
 key.playerlist=List Players
@@ -466,6 +478,10 @@ key.hotbar.6=Hotbar Slot 6
 key.hotbar.7=Hotbar Slot 7
 key.hotbar.8=Hotbar Slot 8
 key.hotbar.9=Hotbar Slot 9
+key.streamStartStop=Start/Stop Stream
+key.streamPauseUnpause=Pause/Unpause Stream
+key.streamCommercial=Show Stream Commercials
+key.streamToggleMic=Push To Talk/Mute
 
 key.categories.movement=Movement
 key.categories.misc=Miscellaneous
@@ -473,18 +489,13 @@ key.categories.multiplayer=Multiplayer
 key.categories.gameplay=Gameplay
 key.categories.ui=Game Interface
 key.categories.inventory=Inventory
+key.categories.stream=Streaming
 
 resourcePack.openFolder=Open resource pack folder
 resourcePack.title=Select Resource Packs
 resourcePack.available.title=Available Resource Packs
 resourcePack.selected.title=Selected Resource Packs
 resourcePack.folderInfo=(Place resource pack files here)
-resourcePack.incompatible=Incompatible
-resourcePack.incompatible.old=(Made for an older version of Minecraft)
-resourcePack.incompatible.new=(Made for a newer version of Minecraft)
-resourcePack.incompatible.confirm.title=Are you sure you want to load this resource pack?
-resourcePack.incompatible.confirm.old=This resource pack was made for an older version of Minecraft and may no longer work correctly.
-resourcePack.incompatible.confirm.new=This resource pack was made for a newer version of Minecraft and may no longer work correctly.
 
 sign.edit=Edit sign message
 
@@ -706,7 +717,6 @@ tile.woolCarpet.magenta.name=Magenta Carpet
 tile.woolCarpet.orange.name=Orange Carpet
 tile.woolCarpet.white.name=Carpet
 tile.ice.name=Ice
-tile.frostedIce.name=Frosted Ice
 tile.icePacked.name=Packed Ice
 tile.cactus.name=Cactus
 tile.clay.name=Clay
@@ -824,8 +834,6 @@ tile.blockRedstone.name=Block of Redstone
 tile.tripWire.name=Tripwire
 tile.tripWireSource.name=Tripwire Hook
 tile.commandBlock.name=Command Block
-tile.repeatingCommandBlock.name=Repeating Command Block
-tile.chainCommandBlock.name=Chain Command Block
 tile.beacon.name=Beacon
 tile.beacon.primary=Primary Power
 tile.beacon.secondary=Secondary Power
@@ -846,18 +854,6 @@ tile.prismarine.rough.name=Prismarine
 tile.prismarine.bricks.name=Prismarine Bricks
 tile.prismarine.dark.name=Dark Prismarine
 tile.seaLantern.name=Sea Lantern
-tile.endRod.name=End Rod
-tile.chorusPlant.name=Chorus Plant
-tile.chorusFlower.name=Chorus Flower
-tile.purpurBlock.name=Purpur Block
-tile.purpurPillar.name=Purpur Pillar
-tile.stairsPurpur.name=Purpur Stairs
-tile.purpurSlab.name=Purpur Slab
-tile.endBricks.name=End Stone Bricks
-tile.beetroots.name=Beetroots
-tile.grassPath.name=Grass Path
-
-tile.structureBlock.name=Structure Block
 
 item.nameTag.name=Name Tag
 item.leash.name=Lead
@@ -869,8 +865,6 @@ item.apple.name=Apple
 item.cookie.name=Cookie
 item.bow.name=Bow
 item.arrow.name=Arrow
-item.spectral_arrow.name=Spectral Arrow
-item.tipped_arrow.name=Tipped Arrow
 item.coal.name=Coal
 item.charcoal.name=Charcoal
 item.diamond.name=Diamond
@@ -963,12 +957,7 @@ item.saddle.name=Saddle
 item.doorIron.name=Iron Door
 item.redstone.name=Redstone
 item.snowball.name=Snowball
-item.boat.oak.name=Oak Boat
+item.boat.name=Boat
-item.boat.spruce.name=Spruce Boat
-item.boat.birch.name=Birch Boat
-item.boat.jungle.name=Jungle Boat
-item.boat.acacia.name=Acacia Boat
-item.boat.dark_oak.name=Dark Oak Boat
 item.leather.name=Leather
 item.milk.name=Milk
 item.brick.name=Brick
@@ -1037,7 +1026,7 @@ item.blazeRod.name=Blaze Rod
 item.ghastTear.name=Ghast Tear
 item.netherStalkSeeds.name=Nether Wart
 item.potion.name=Potion
-item.end_crystal.name=End Crystal
+item.emptyPotion.name=Water Bottle
 item.goldNugget.name=Gold Nugget
 item.glassBottle.name=Glass Bottle
 item.spiderEye.name=Spider Eye
@@ -1067,7 +1056,6 @@ item.skull.zombie.name=Zombie Head
 item.skull.char.name=Head
 item.skull.player.name=%s's Head
 item.skull.creeper.name=Creeper Head
-item.skull.dragon.name=Dragon Head
 item.carrotOnAStick.name=Carrot on a Stick
 item.netherStar.name=Nether Star
 item.pumpkinPie.name=Pumpkin Pie
@@ -1109,13 +1097,6 @@ item.horsearmorgold.name=Gold Horse Armor
 item.horsearmordiamond.name=Diamond Horse Armor
 item.prismarineShard.name=Prismarine Shard
 item.prismarineCrystals.name=Prismarine Crystals
-item.chorusFruit.name=Chorus Fruit
-item.chorusFruitPopped.name=Popped Chorus Fruit
-item.beetroot.name=Beetroot
-item.beetroot_seeds.name=Beetroot Seeds
-item.beetroot_soup.name=Beetroot Soup
-item.dragon_breath.name=Dragon's Breath
-item.elytra.name=Elytra
 
 container.inventory=Inventory
 container.hopper=Item Hopper
@@ -1136,10 +1117,10 @@ container.creative=Item Selection
 container.brewing=Brewing Stand
 container.chest=Chest
 container.chestDouble=Large Chest
+container.minecart=Minecart
 container.enderchest=Ender Chest
 container.beacon=Beacon
 
-container.spectatorCantOpen=Unable to open. Loot not generated yet.
 container.isLocked=%s is locked!
 
 item.dyed=Dyed
@@ -1151,7 +1132,6 @@ entity.Item.name=Item
 entity.XPOrb.name=Experience Orb
 entity.SmallFireball.name=Small Fireball
 entity.Fireball.name=Fireball
-entity.DragonFireball.name=Dragon Fireball
 entity.ThrownPotion.name=Potion
 
 entity.Arrow.name=Arrow
@@ -1184,7 +1164,6 @@ entity.EnderDragon.name=Ender Dragon
 entity.WitherBoss.name=Wither
 entity.Witch.name=Witch
 entity.Guardian.name=Guardian
-entity.Shulker.name=Shulker
 
 entity.Villager.farmer=Farmer
 entity.Villager.fisherman=Fisherman
@@ -1220,8 +1199,6 @@ entity.PrimedTnt.name=Block of TNT
 entity.FallingSand.name=Falling Block
 
 entity.Minecart.name=Minecart
-entity.MinecartHopper.name=Minecart with Hopper
-entity.MinecartChest.name=Minecart with Chest
 entity.Boat.name=Boat
 
 entity.generic.name=unknown
@@ -1270,137 +1247,105 @@ death.attack.indirectMagic.item=%1$s was killed by %2$s using %3$s
 death.attack.thorns=%1$s was killed trying to hurt %2$s
 death.attack.fall=%1$s hit the ground too hard
 death.attack.outOfWorld=%1$s fell out of the world
-death.attack.dragonBreath=%1$s was roasted in dragon breath
-death.attack.flyIntoWall=%1$s experienced kinetic energy
 
 deathScreen.respawn=Respawn
-deathScreen.spectate=Spectate world
 deathScreen.deleteWorld=Delete world
 deathScreen.titleScreen=Title screen
 deathScreen.score=Score
 deathScreen.title.hardcore=Game over!
+deathScreen.hardcoreInfo=You cannot respawn in hardcore mode!
 deathScreen.title=You died!
 deathScreen.leaveServer=Leave server
 deathScreen.quit.confirm=Are you sure you want to quit?
 
-effect.none=No Effects
+potion.effects.whenDrank=When Applied:
-effect.moveSpeed=Speed
+potion.empty=No Effects
-effect.moveSlowdown=Slowness
+potion.moveSpeed=Speed
-effect.digSpeed=Haste
+potion.moveSlowdown=Slowness
-effect.digSlowDown=Mining Fatigue
+potion.digSpeed=Haste
-effect.damageBoost=Strength
+potion.digSlowDown=Mining Fatigue
-effect.heal=Instant Health
+potion.damageBoost=Strength
-effect.harm=Instant Damage
+potion.heal=Instant Health
-effect.jump=Jump Boost
+potion.harm=Instant Damage
-effect.confusion=Nausea
+potion.jump=Jump Boost
-effect.regeneration=Regeneration
+potion.confusion=Nausea
-effect.resistance=Resistance
+potion.regeneration=Regeneration
-effect.fireResistance=Fire Resistance
+potion.resistance=Resistance
-effect.waterBreathing=Water Breathing
+potion.fireResistance=Fire Resistance
-effect.invisibility=Invisibility
+potion.waterBreathing=Water Breathing
-effect.blindness=Blindness
+potion.invisibility=Invisibility
-effect.nightVision=Night Vision
+potion.blindness=Blindness
-effect.hunger=Hunger
+potion.nightVision=Night Vision
-effect.weakness=Weakness
+potion.hunger=Hunger
-effect.poison=Poison
+potion.weakness=Weakness
-effect.wither=Wither
+potion.poison=Poison
-effect.healthBoost=Health Boost
+potion.wither=Wither
-effect.absorption=Absorption
+potion.healthBoost=Health Boost
-effect.saturation=Saturation
+potion.absorption=Absorption
-effect.glowing=Glowing
+potion.saturation=Saturation
-effect.luck=Luck
-effect.unluck=Bad Luck
-effect.levitation=Levitation
 
-tipped_arrow.effect.empty=Tipped Arrow
+potion.moveSpeed.postfix=Potion of Swiftness
-tipped_arrow.effect.water=Tipped Arrow
+potion.moveSlowdown.postfix=Potion of Slowness
-tipped_arrow.effect.mundane=Tipped Arrow
+potion.digSpeed.postfix=Potion of Haste
-tipped_arrow.effect.thick=Tipped Arrow
+potion.digSlowDown.postfix=Potion of Dullness
-tipped_arrow.effect.awkward=Tipped Arrow
+potion.damageBoost.postfix=Potion of Strength
-tipped_arrow.effect.night_vision=Arrow of Night Vision
+potion.weakness.postfix=Potion of Weakness
-tipped_arrow.effect.invisibility=Arrow of Invisibility
+potion.heal.postfix=Potion of Healing
-tipped_arrow.effect.leaping=Arrow of Leaping
+potion.harm.postfix=Potion of Harming
-tipped_arrow.effect.fire_resistance=Arrow of Fire Resistance
+potion.jump.postfix=Potion of Leaping
-tipped_arrow.effect.swiftness=Arrow of Swiftness
+potion.confusion.postfix=Potion of Nausea
-tipped_arrow.effect.slowness=Arrow of Slowness
+potion.regeneration.postfix=Potion of Regeneration
-tipped_arrow.effect.water=Arrow of Splashing
+potion.resistance.postfix=Potion of Resistance
-tipped_arrow.effect.water_breathing=Arrow of Water Breathing
+potion.fireResistance.postfix=Potion of Fire Resistance
-tipped_arrow.effect.healing=Arrow of Healing
+potion.waterBreathing.postfix=Potion of Water Breathing
-tipped_arrow.effect.harming=Arrow of Harming
+potion.invisibility.postfix=Potion of Invisibility
-tipped_arrow.effect.poison=Arrow of Poison
+potion.blindness.postfix=Potion of Blindness
-tipped_arrow.effect.regeneration=Arrow of Regeneration
+potion.nightVision.postfix=Potion of Night Vision
-tipped_arrow.effect.strength=Arrow of Strength
+potion.hunger.postfix=Potion of Hunger
-tipped_arrow.effect.weakness=Arrow of Weakness
+potion.poison.postfix=Potion of Poison
-tipped_arrow.effect.levitation=Arrow of Levitation
+potion.wither.postfix=Potion of Decay
-tipped_arrow.effect.luck=Arrow of Luck
+potion.healthBoost.postfix=Potion of Health Boost
-
+potion.absorption.postfix=Potion of Absorption
-potion.whenDrank=When Applied:
+potion.saturation.postfix=Potion of Saturation
-potion.effect.empty=Uncraftable Potion
-potion.effect.water=Water Bottle
-potion.effect.mundane=Mundane Potion
-potion.effect.thick=Thick Potion
-potion.effect.awkward=Awkward Potion
-potion.effect.night_vision=Potion of Night Vision
-potion.effect.invisibility=Potion of Invisibility
-potion.effect.leaping=Potion of Leaping
-potion.effect.fire_resistance=Potion of Fire Resistance
-potion.effect.swiftness=Potion of Swiftness
-potion.effect.slowness=Potion of Slowness
-potion.effect.water_breathing=Potion of Water Breathing
-potion.effect.healing=Potion of Healing
-potion.effect.harming=Potion of Harming
-potion.effect.poison=Potion of Poison
-potion.effect.regeneration=Potion of Regeneration
-potion.effect.strength=Potion of Strength
-potion.effect.weakness=Potion of Weakness
-potion.effect.levitation=Potion of Levitation
-potion.effect.luck=Potion of Luck
-
-splash_potion.effect.empty=Splash Uncraftable Potion
-splash_potion.effect.water=Splash Water Bottle
-splash_potion.effect.mundane=Mundane Splash Potion
-splash_potion.effect.thick=Thick Splash Potion
-splash_potion.effect.awkward=Awkward Splash Potion
-splash_potion.effect.night_vision=Splash Potion of Night Vision
-splash_potion.effect.invisibility=Splash Potion of Invisibility
-splash_potion.effect.leaping=Splash Potion of Leaping
-splash_potion.effect.fire_resistance=Splash Potion of Fire Resistance
-splash_potion.effect.swiftness=Splash Potion of Swiftness
-splash_potion.effect.slowness=Splash Potion of Slowness
-splash_potion.effect.water_breathing=Splash Potion of Water Breathing
-splash_potion.effect.healing=Splash Potion of Healing
-splash_potion.effect.harming=Splash Potion of Harming
-splash_potion.effect.poison=Splash Potion of Poison
-splash_potion.effect.regeneration=Splash Potion of Regeneration
-splash_potion.effect.strength=Splash Potion of Strength
-splash_potion.effect.weakness=Splash Potion of Weakness
-splash_potion.effect.levitation=Splash Potion of Levitation
-splash_potion.effect.luck=Splash Potion of Luck
-
-lingering_potion.effect.empty=Lingering Uncraftable Potion
-lingering_potion.effect.water=Lingering Water Bottle
-lingering_potion.effect.mundane=Mundane Lingering Potion
-lingering_potion.effect.thick=Thick Lingering Potion
-lingering_potion.effect.awkward=Awkward Lingering Potion
-lingering_potion.effect.night_vision=Lingering Potion of Night Vision
-lingering_potion.effect.invisibility=Lingering Potion of Invisibility
-lingering_potion.effect.leaping=Lingering Potion of Leaping
-lingering_potion.effect.fire_resistance=Lingering Potion of Fire Resistance
-lingering_potion.effect.swiftness=Lingering Potion of Swiftness
-lingering_potion.effect.slowness=Lingering Potion of Slowness
-lingering_potion.effect.water_breathing=Lingering Potion of Water Breathing
-lingering_potion.effect.healing=Lingering Potion of Healing
-lingering_potion.effect.harming=Lingering Potion of Harming
-lingering_potion.effect.poison=Lingering Potion of Poison
-lingering_potion.effect.regeneration=Lingering Potion of Regeneration
-lingering_potion.effect.strength=Lingering Potion of Strength
-lingering_potion.effect.weakness=Lingering Potion of Weakness
-lingering_potion.effect.levitation=Lingering Potion of Levitation
-lingering_potion.effect.luck=Lingering Potion of Luck
 
 potion.potency.0=
 potion.potency.1=II
 potion.potency.2=III
+potion.potency.3=IV
+
+potion.prefix.grenade=Splash
+potion.prefix.mundane=Mundane
+potion.prefix.uninteresting=Uninteresting
+potion.prefix.bland=Bland
+potion.prefix.clear=Clear
+potion.prefix.milky=Milky
+potion.prefix.diffuse=Diffuse
+potion.prefix.artless=Artless
+potion.prefix.thin=Thin
+potion.prefix.awkward=Awkward
+potion.prefix.flat=Flat
+potion.prefix.bulky=Bulky
+potion.prefix.bungling=Bungling
+potion.prefix.buttered=Buttered
+potion.prefix.smooth=Smooth
+potion.prefix.suave=Suave
+potion.prefix.debonair=Debonair
+potion.prefix.thick=Thick
+potion.prefix.elegant=Elegant
+potion.prefix.fancy=Fancy
+potion.prefix.charming=Charming
+potion.prefix.dashing=Dashing
+potion.prefix.refined=Refined
+potion.prefix.cordial=Cordial
+potion.prefix.sparkling=Sparkling
+potion.prefix.potent=Potent
+potion.prefix.foul=Foul
+potion.prefix.odorless=Odorless
+potion.prefix.rank=Rank
+potion.prefix.harsh=Harsh
+potion.prefix.acrid=Acrid
+potion.prefix.gross=Gross
+potion.prefix.stinky=Stinky
 
 enchantment.damage.all=Sharpness
 enchantment.damage.undead=Smite
@@ -1415,7 +1360,6 @@ enchantment.protect.projectile=Projectile Protection
 enchantment.oxygen=Respiration
 enchantment.waterWorker=Aqua Affinity
 enchantment.waterWalker=Depth Strider
-enchantment.frostWalker=Frost Walker
 enchantment.digging=Efficiency
 enchantment.untouching=Silk Touch
 enchantment.durability=Unbreaking
@@ -1428,7 +1372,6 @@ enchantment.arrowFire=Flame
 enchantment.arrowKnockback=Punch
 enchantment.arrowInfinite=Infinity
 enchantment.thorns=Thorns
-enchantment.mending=Mending
 
 enchantment.level.1=I
 enchantment.level.2=II
@@ -1468,7 +1411,6 @@ stat.leaveGame=Games quit
 
 stat.playOneMinute=Minutes Played
 stat.timeSinceDeath=Since Last Death
-stat.sneakTime=Sneak Time
 
 stat.walkOneCm=Distance Walked
 stat.crouchOneCm=Distance Crouched
@@ -1482,11 +1424,8 @@ stat.minecartOneCm=Distance by Minecart
 stat.boatOneCm=Distance by Boat
 stat.pigOneCm=Distance by Pig
 stat.horseOneCm=Distance by Horse
-stat.aviateOneCm=Distance by Elytra
 stat.jump=Jumps
 stat.drop=Items Dropped
-stat.dropped=Dropped
-stat.pickup=Picked Up
 
 stat.damageDealt=Damage Dealt
 stat.damageTaken=Damage Taken
@@ -1520,7 +1459,6 @@ stat.recordPlayed=Records Played
 stat.furnaceInteraction=Interactions with Furnace
 stat.workbenchInteraction=Interactions with Crafting Table
 stat.chestOpened=Chests Opened
-stat.sleepInBed=Times Slept in a Bed
 
 stat.mineBlock=%1$s Mined
 stat.craftItem=%1$s Crafted
@@ -1554,7 +1492,7 @@ achievement.bakeCake.desc=Wheat, sugar, milk and eggs!
 achievement.buildBetterPickaxe=Getting an Upgrade
 achievement.buildBetterPickaxe.desc=Construct a better pickaxe
 achievement.overpowered=Overpowered
-achievement.overpowered.desc=Eat a Notch apple
+achievement.overpowered.desc=Build a Notch apple
 achievement.cookFish=Delicious Fish
 achievement.cookFish.desc=Catch and cook fish!
 achievement.onARail=On A Rail
@@ -1626,10 +1564,9 @@ commands.xp.success=Given %d experience to %s
 commands.xp.success.levels=Given %d levels to %s
 commands.xp.success.negative.levels=Taken %d levels from %s
 commands.xp.usage=/xp <amount> [player] OR /xp <amount>L [player]
-commands.playsound.usage=/playsound <sound> <source> <player> [x] [y] [z] [volume] [pitch] [minimumVolume]
+commands.playsound.usage=/playsound <sound> <player> [x] [y] [z] [volume] [pitch] [minimumVolume]
 commands.playsound.success=Played sound '%s' to %s
 commands.playsound.playerTooFar=Player %s is too far away to hear the sound
-commands.playsound.unknownSoundSource=Source %s is unknown
 commands.give.usage=/give <player> <item> [amount] [data] [dataTag]
 commands.give.item.notFound=There is no such item with name %d
 commands.give.block.notFound=There is no such block with name %d
@@ -1713,10 +1650,9 @@ commands.enchant.noItem=The target doesn't hold an item
 commands.enchant.cantEnchant=The selected enchantment can't be added to the target item
 commands.enchant.cantCombine=%1$s can't be combined with %2$s
 commands.enchant.success=Enchanting succeeded
-commands.particle.usage=/particle <name> <x> <y> <z> <xd> <yd> <zd> <speed> [count] [mode] [player] [params]
+commands.particle.usage=/particle <name> <x> <y> <z> <xd> <yd> <zd> <speed> [count] [mode]
 commands.particle.success=Playing effect %s for %d times
 commands.particle.notFound=Unknown effect name (%s)
-commands.particle.invalidParam=Invalid param given (%s)
 commands.clear.usage=/clear [player] [item] [data] [maxCount] [dataTag]
 commands.clear.success=Cleared the inventory of %s, removing %d items
 commands.clear.testing=%s has %d items that match the criteria
@@ -1807,7 +1743,7 @@ commands.scoreboard.objectives.remove.success=Removed objective '%s' successfull
 commands.scoreboard.objectives.list.count=Showing %d objective(s) on scoreboard:
 commands.scoreboard.objectives.list.entry=- %s: displays as '%s' and is type '%s'
 commands.scoreboard.objectives.list.empty=There are no objectives on the scoreboard
-commands.scoreboard.players.usage=/scoreboard players <set|add|remove|reset|list|enable|test|operation|tag> ...
+commands.scoreboard.players.usage=/scoreboard players <set|add|remove|reset|list|enable|test|operation> ...
 commands.scoreboard.players.name.tooLong=The name '%s' is too long for a player, it can be at most %d characters long
 commands.scoreboard.players.set.success=Set score of %s for player %s to %d
 commands.scoreboard.players.set.tagMismatch=The dataTag does not match for %s
@@ -1835,13 +1771,6 @@ commands.scoreboard.players.operation.usage=/scoreboard players operation <targe
 commands.scoreboard.players.operation.notFound=No %s score for %s found
 commands.scoreboard.players.operation.invalidOperation=Invalid operation %s
 commands.scoreboard.players.operation.success=Operation applied successfully
-commands.scoreboard.players.tag.usage=/scoreboard players tag <player> <add|remove|list> <tagName> [dataTag]
-commands.scoreboard.players.tag.tagMismatch=The dataTag does not match for %s
-commands.scoreboard.players.tag.tooMany=Can't add more than %d tags to an entity
-commands.scoreboard.players.tag.notFound=Entity didn't have the %s tag
-commands.scoreboard.players.tag.success.add=Tag %s added
-commands.scoreboard.players.tag.success.remove=Tag %s removed
-commands.scoreboard.players.tag.list=Tags on entity %s are:
 commands.scoreboard.teams.usage=/scoreboard teams <list|add|remove|empty|join|leave|option> ...
 commands.scoreboard.teams.add.usage=/scoreboard teams add <name> [display name ...]
 commands.scoreboard.teams.add.alreadyExists=A team with the name '%s' already exists
@@ -1867,7 +1796,7 @@ commands.scoreboard.teams.leave.usage=/scoreboard teams leave [player]
 commands.scoreboard.teams.leave.success=Removed %d player(s) from their teams: %s
 commands.scoreboard.teams.leave.failure=Could not remove %d player(s) from their teams: %s
 commands.scoreboard.teams.leave.noTeam=You are not in a team
-commands.scoreboard.teams.option.usage=/scoreboard teams option <team> <friendlyfire|color|seeFriendlyInvisibles|nametagVisibility|deathMessageVisibility|collisionRule> <value>
+commands.scoreboard.teams.option.usage=/scoreboard teams option <team> <friendlyfire|color|seeFriendlyInvisibles|nametagVisibility|deathMessageVisibility> <value>
 commands.scoreboard.teams.option.noValue=Valid values for option %s are: %s
 commands.scoreboard.teams.option.success=Set option %s for team %s to %s
 commands.execute.usage=/execute <entity> <x> <y> <z> <command> OR /execute <entity> <x> <y> <z> detect <x> <y> <z> <block> <data> <command>
@@ -1920,7 +1849,7 @@ commands.spawnpoint.success=Set %s's spawn point to (%d, %d, %d)
 commands.setworldspawn.usage=/setworldspawn [<x> <y> <z>]
 commands.setworldspawn.success=Set the world spawn point to (%d, %d, %d)
 commands.gamerule.usage=/gamerule <rule name> [value]
-commands.gamerule.success=Game rule %s has been updated to %s
+commands.gamerule.success=Game rule has been updated
 commands.gamerule.norule=No game rule called '%s' is available
 commands.gamerule.nopermission=Only server owners can change '%s'
 commands.weather.usage=/weather <clear|rain|thunder> [duration in seconds]
@@ -1975,11 +1904,6 @@ commands.title.usage.title=/title <player> title|subtitle <raw json title>
 commands.title.usage.clear=/title <player> clear|reset
 commands.title.usage.times=/title <player> times <fadeIn> <stay> <fadeOut>
 commands.title.success=Title command successfully executed
-commands.stopsound.usage=/stopsound <player> [source] [sound]
-commands.stopsound.unknownSoundSource=Source %s is unknown
-commands.stopsound.success.individualSound=Stopped sound '%s' with source '%s' for %s
-commands.stopsound.success.soundSource=Stopped source '%s' for %s
-commands.stopsound.success.all=Stopped all sounds for %s
 
 itemGroup.buildingBlocks=Building Blocks
 itemGroup.decorations=Decoration Blocks
@@ -2004,13 +1928,6 @@ advMode.randomPlayer=Use "@r" to target random player
 advMode.allPlayers=Use "@a" to target all players
 advMode.allEntities=Use "@e" to target all entities
 advMode.previousOutput=Previous Output
-advMode.mode.sequence=Chain
-advMode.mode.auto=Repeat
-advMode.mode.redstone=Impulse
-advMode.mode.conditional=Conditional
-advMode.mode.unconditional=Unconditional
-advMode.mode.redstoneTriggered=Needs Redstone
-advMode.mode.autoexec.bat=Always Active
 
 advMode.notEnabled=Command blocks are not enabled on this server
 advMode.notAllowed=Must be an opped player in creative mode
@@ -2019,22 +1936,12 @@ mount.onboard=Press %1$s to dismount
 
 build.tooHigh=Height limit for building is %s blocks
 
-item.modifiers.mainhand=When in main hand:
-item.modifiers.offhand=When in off hand:
-item.modifiers.feet=When on feet:
-item.modifiers.legs=When on legs:
-item.modifiers.chest=When on body:
-item.modifiers.head=When on head:
-
 attribute.modifier.plus.0=+%d %s
 attribute.modifier.plus.1=+%d%% %s
 attribute.modifier.plus.2=+%d%% %s
 attribute.modifier.take.0=-%d %s
 attribute.modifier.take.1=-%d%% %s
 attribute.modifier.take.2=-%d%% %s
-attribute.modifier.equals.0=%d %s
-attribute.modifier.equals.1=%d%% %s
-attribute.modifier.equals.2=%d%% %s
 
 attribute.name.horse.jumpStrength=Horse Jump Strength
 attribute.name.zombie.spawnReinforcements=Zombie Reinforcements
@@ -2043,14 +1950,64 @@ attribute.name.generic.followRange=Mob Follow Range
 attribute.name.generic.knockbackResistance=Knockback Resistance
 attribute.name.generic.movementSpeed=Speed
 attribute.name.generic.attackDamage=Attack Damage
-attribute.name.generic.attackSpeed=Attack Speed
-attribute.name.generic.luck=Luck
-attribute.name.generic.armor=Armor
-attribute.name.generic.armorToughness=Armor Toughness
 
 screenshot.success=Saved screenshot as %s
 screenshot.failure=Couldn't save screenshot: %s
 
+stream.user.mode.moderator=Moderator
+stream.user.mode.moderator.self=Moderator on your channel
+stream.user.mode.moderator.other=Moderator on %s's channel
+stream.user.mode.broadcaster=Broadcaster
+stream.user.mode.broadcaster.self=Broadcaster (You!)
+stream.user.mode.broadcaster.other=Broadcaster
+stream.user.mode.administrator=Twitch Administrator
+stream.user.mode.staff=Twitch Staff
+stream.user.mode.banned=Banned
+stream.user.mode.banned.self=Banned on your channel
+stream.user.mode.banned.other=Banned on %s's channel
+stream.user.subscription.subscriber=Subscriber
+stream.user.subscription.subscriber.self=Subscriber to your channel
+stream.user.subscription.subscriber.other=Subscriber to %s's channel
+stream.user.subscription.turbo=Twitch Turbo
+
+stream.unavailable.title=Twitch Broadcasting Unavailable
+stream.unavailable.report_to_mojang=Report to Mojang
+
+stream.confirm_start=Are you sure you want to start broadcasting?
+
+stream.unavailable.account_not_bound=Before you can broadcast Minecraft through Twitch, you will need to link your Twitch account on mojang.com. Would you like to do that now?
+stream.unavailable.account_not_bound.okay=Link Accounts
+stream.unavailable.account_not_migrated=Before you can broadcast Minecraft through Twitch, you will need to migrate your Minecraft account to a Mojang account. Would you like to do that now?
+stream.unavailable.account_not_migrated.okay=Migrate Account
+stream.unavailable.failed_auth=Authentication to Twitch failed. Please go to mojang.com and rebind your Twitch account.
+stream.unavailable.failed_auth.okay=Rebind Accounts
+stream.unavailable.failed_auth_error=Unable to authenticate to Twitch. Please try again later.
+stream.unavailable.initialization_failure=Unable to initialize the Twitch SDK.
+stream.unavailable.initialization_failure.extra=(Reason: %s)
+stream.unavailable.library_arch_mismatch=The custom java version used to launch Minecraft has a different architecture than the one used to run the launcher. Please make sure these are the same, either 32-bit or 64-bit for both.
+stream.unavailable.library_failure=Unable to load the libraries needed for the integrated Twitch broadcasting service.
+stream.unavailable.no_fbo=Your video card needs to support at least OpenGL version 3.0 or support Framebuffer Objects via an extension to use the integrated Twitch broadcasting.
+stream.unavailable.no_fbo.version=You are currently using: %s
+stream.unavailable.no_fbo.blend=Separate blending support via EXT is: %s
+stream.unavailable.no_fbo.arb=Framebuffer object support via ARB is: %s
+stream.unavailable.no_fbo.ext=Framebuffer object support via EXT is: %s
+stream.unavailable.not_supported.windows=Unfortunately the integrated Twitch broadcasting requires a newer version of Windows than you are on. You must have at least Windows Vista or newer.
+stream.unavailable.not_supported.mac=Unfortunately the integrated Twitch broadcasting on Mac requires a version of OSX newer than the one you are on. You must use 10.7 (Mac OS X Lion) or newer to be able to use this service. Would you like to visit apple.com to learn about upgrading?
+stream.unavailable.not_supported.mac.okay=Upgrade
+stream.unavailable.not_supported.other=Unfortunately the integrated Twitch broadcasting service requires Windows (Vista or newer) or Mac OS X (10.7/Lion or newer)
+stream.unavailable.unknown=Unfortunately you cannot broadcast to Twitch at this time. And we don't know why :'(
+stream.unavailable.unknown.chat=Could not start stream: %s
+
+stream.unavailable.soundflower.chat=Soundflower is required to be able to stream on Mac. %s
+stream.unavailable.soundflower.chat.link=Please click here to install it.
+
+stream.userinfo.chatTooltip=Click to manage user
+stream.userinfo.timeout=Timeout
+stream.userinfo.ban=Ban
+stream.userinfo.unban=Unban
+stream.userinfo.mod=Promote to Moderator
+stream.userinfo.unmod=Demote from Moderator
+
 item.banner.black.name=Black Banner
 item.banner.red.name=Red Banner
 item.banner.green.name=Green Banner
@@ -2068,24 +2025,6 @@ item.banner.magenta.name=Magenta Banner
 item.banner.orange.name=Orange Banner
 item.banner.white.name=White Banner
 
-item.shield.name=Shield
-item.shield.black.name=Black Shield
-item.shield.red.name=Red Shield
-item.shield.green.name=Green Shield
-item.shield.brown.name=Brown Shield
-item.shield.blue.name=Blue Shield
-item.shield.purple.name=Purple Shield
-item.shield.cyan.name=Cyan Shield
-item.shield.silver.name=Light Gray Shield
-item.shield.gray.name=Gray Shield
-item.shield.pink.name=Pink Shield
-item.shield.lime.name=Lime Shield
-item.shield.yellow.name=Yellow Shield
-item.shield.lightBlue.name=Light Blue Shield
-item.shield.magenta.name=Magenta Shield
-item.shield.orange.name=Orange Shield
-item.shield.white.name=White Shield
-
 item.banner.square_bottom_left.black=Black Base Dexter Canton
 item.banner.square_bottom_left.red=Red Base Dexter Canton
 item.banner.square_bottom_left.green=Green Base Dexter Canton
@@ -2731,255 +2670,3 @@ item.banner.straight_cross.lightBlue=Light Blue Cross
 item.banner.straight_cross.magenta=Magenta Cross
 item.banner.straight_cross.orange=Orange Cross
 item.banner.straight_cross.white=White Cross
-
-subtitles.ambient.cave=Eerie noise
-subtitles.block.anvil.destroy=Anvil destroyed
-subtitles.block.anvil.land=Anvil landed
-subtitles.block.anvil.use=Anvil used
-subtitles.block.brewing_stand.brew=Brewing Stand bubbles
-subtitles.block.button.click=Button clicks
-subtitles.block.chest.close=Chest closes
-subtitles.block.chest.locked=Chest locked
-subtitles.block.chest.open=Chest opens
-subtitles.block.chorus_flower.death=Chorus Flower withers
-subtitles.block.chorus_flower.grow=Chorus Flower grows
-subtitles.block.comparator.click=Comparator clicks
-subtitles.block.dispenser.dispense=Dispensed item
-subtitles.block.dispenser.fail=Dispenser failed
-subtitles.block.door.toggle=Door creaks
-subtitles.block.fence_gate.toggle=Fence Gate creaks
-subtitles.block.fire.ambient=Fire crackles
-subtitles.block.fire.extinguish=Fire extinguished
-subtitles.block.furnace.fire_crackle=Furnace crackles
-subtitles.block.generic.break=Block broken
-subtitles.block.generic.footsteps=Footsteps
-subtitles.block.generic.hit=Block breaking
-subtitles.block.generic.place=Block placed
-subtitles.block.iron_trapdoor.close=Trapdoor opens
-subtitles.block.iron_trapdoor.open=Trapdoor closes
-subtitles.block.lava.ambient=Lava pops
-subtitles.block.lava.extinguish=Lava hisses
-subtitles.block.lever.click=Lever clicks
-subtitles.block.note.note=Noteblock plays
-subtitles.block.piston.move=Piston moves
-subtitles.block.portal.ambient=Portal whooshes
-subtitles.block.pressure_plate.click=Pressure Plate clicks
-subtitles.block.redstone_torch.burnout=Torch fizzes
-subtitles.block.trapdoor.toggle=Trapdoor creaks
-subtitles.block.tripwire.attach=Tripwire attaches
-subtitles.block.tripwire.click=Tripwire clicks
-subtitles.block.tripwire.detach=Tripwire detaches
-subtitles.block.water.ambient=Water flows
-subtitles.enchant.thorns.hit=Thorns prick
-subtitles.entity.armorstand.fall=Something fell
-subtitles.entity.arrow.hit=Arrow hits
-subtitles.entity.arrow.hit_player=Player hit
-subtitles.entity.arrow.shoot=Arrow fired
-subtitles.entity.bat.ambient=Bat screeches
-subtitles.entity.bat.death=Bat dies
-subtitles.entity.bat.hurt=Bat hurts
-subtitles.entity.bat.takeoff=Bat takes off
-subtitles.entity.blaze.ambient=Blaze breathes
-subtitles.entity.blaze.burn=Blaze crackles
-subtitles.entity.blaze.death=Blaze dies
-subtitles.entity.blaze.hurt=Blaze hurts
-subtitles.entity.blaze.shoot=Blaze shoots
-subtitles.entity.bobber.splash=Fishing hook splashes
-subtitles.entity.bobber.throw=Bobber thrown
-subtitles.entity.cat.ambient=Cat meows
-subtitles.entity.cat.death=Cat dies
-subtitles.entity.cat.hurt=Cat hurts
-subtitles.entity.chicken.ambient=Chicken clucks
-subtitles.entity.chicken.death=Chicken dies
-subtitles.entity.chicken.egg=Chicken plops
-subtitles.entity.chicken.hurt=Chicken hurts
-subtitles.entity.cow.ambient=Cow moos
-subtitles.entity.cow.death=Cow dies
-subtitles.entity.cow.hurt=Cow hurts
-subtitles.entity.cow.milk=Cow gets milked
-subtitles.entity.creeper.death=Creeper dies
-subtitles.entity.creeper.hurt=Creeper hurts
-subtitles.entity.creeper.primed=Creeper hisses
-subtitles.entity.donkey.ambient=Donkey hee-haws
-subtitles.entity.donkey.angry=Donkey neighs
-subtitles.entity.donkey.chest=Donkey Chest equips
-subtitles.entity.donkey.death=Donkey dies
-subtitles.entity.donkey.hurt=Donkey hurts
-subtitles.entity.egg.throw=Egg flies
-subtitles.entity.enderdragon.ambient=Dragon roars
-subtitles.entity.enderdragon.death=Dragon dies
-subtitles.entity.enderdragon.flap=Dragon flaps
-subtitles.entity.enderdragon.growl=Dragon growls
-subtitles.entity.enderdragon.hurt=Dragon hurts
-subtitles.entity.enderdragon.shoot=Dragon shoots
-subtitles.entity.endereye.launch=Eye of Ender shoots
-subtitles.entity.enderman.ambient=Enderman vwoops
-subtitles.entity.enderman.death=Enderman dies
-subtitles.entity.enderman.hurt=Enderman hurts
-subtitles.entity.enderman.stare=Enderman cries out
-subtitles.entity.enderman.teleport=Enderman teleports
-subtitles.entity.endermite.ambient=Endermite scuttles
-subtitles.entity.endermite.death=Endermite dies
-subtitles.entity.endermite.hurt=Endermite hurts
-subtitles.entity.enderpearl.throw=Ender Pearl flies
-subtitles.entity.experience_orb.pickup=Experience gained
-subtitles.entity.firework.blast=Firework blasts
-subtitles.entity.firework.launch=Firework launches
-subtitles.entity.firework.twinkle=Firework twinkles
-subtitles.entity.generic.big_fall=Something fell
-subtitles.entity.generic.burn=Burning
-subtitles.entity.generic.death=Dying
-subtitles.entity.generic.drink=Sipping
-subtitles.entity.generic.eat=Eating
-subtitles.entity.generic.explode=Explosion
-subtitles.entity.generic.extinguish_fire=Fire extinguishes
-subtitles.entity.generic.hurt=Something hurts
-subtitles.entity.generic.small_fall=Something tripped
-subtitles.entity.generic.splash=Splashing
-subtitles.entity.generic.swim=Swimming
-subtitles.entity.ghast.ambient=Ghast cries
-subtitles.entity.ghast.death=Ghast dies
-subtitles.entity.ghast.hurt=Ghast hurts
-subtitles.entity.ghast.shoot=Ghast shoots
-subtitles.entity.guardian.ambient.land=Guardian flaps
-subtitles.entity.guardian.ambient=Guardian moans
-subtitles.entity.guardian.attack=Guardian shoots
-subtitles.entity.guardian.curse=Guardian curses
-subtitles.entity.guardian.death=Guardian dies
-subtitles.entity.guardian.flop=Guardian flops
-subtitles.entity.guardian.hurt=Guardian hurts
-subtitles.entity.horse.ambient=Horse neighs
-subtitles.entity.horse.angry=Horse neighs
-subtitles.entity.horse.armor=Horse armor equips
-subtitles.entity.horse.breathe=Horse breathes
-subtitles.entity.horse.death=Horse dies
-subtitles.entity.horse.eat=Horse eats
-subtitles.entity.horse.gallop=Horse gallops
-subtitles.entity.horse.hurt=Horse hurts
-subtitles.entity.horse.jump=Horse jumps
-subtitles.entity.horse.saddle=Saddle equips
-subtitles.entity.iron_golem.attack=Iron Golem attacks
-subtitles.entity.iron_golem.death=Iron Golem dies
-subtitles.entity.iron_golem.hurt=Iron Golem hurts
-subtitles.entity.item.break=Item breaks
-subtitles.entity.item.pickup=Item plops
-subtitles.entity.itemframe.add_item=Item Frame fills
-subtitles.entity.itemframe.break=Item Frame breaks
-subtitles.entity.itemframe.place=Item Frame placed
-subtitles.entity.itemframe.remove_item=Item Frame empties
-subtitles.entity.itemframe.rotate_item=Item Frame clicks
-subtitles.entity.leashknot.break=Leash knot breaks
-subtitles.entity.leashknot.place=Leash knot tied
-subtitles.entity.lightning.impact=Lighting strikes
-subtitles.entity.lightning.thunder=Thunder roars
-subtitles.entity.magmacube.death=Magma Cube dies
-subtitles.entity.magmacube.hurt=Magma Cube hurts
-subtitles.entity.magmacube.squish=Magma Cube squishes
-subtitles.entity.minecart.riding=Minecart rolls
-subtitles.entity.mule.ambient=Mule hee-haws
-subtitles.entity.mule.death=Mule dies
-subtitles.entity.mule.hurt=Mule hurts
-subtitles.entity.painting.break=Painting breaks
-subtitles.entity.painting.place=Painting placed
-subtitles.entity.pig.ambient=Pig oinks
-subtitles.entity.pig.death=Pig dies
-subtitles.entity.pig.hurt=Pig hurts
-subtitles.entity.pig.saddle=Saddle equips
-subtitles.entity.player.burp=Burp
-subtitles.entity.player.death=Player dies
-subtitles.entity.player.hurt=Player hurts
-subtitles.entity.player.levelup=Player dings
-subtitles.entity.potion.splash=Bottle smashes
-subtitles.entity.potion.throw=Bottle thrown
-subtitles.entity.rabbit.ambient=Rabbit squeaks
-subtitles.entity.rabbit.attack=Rabbit attacks
-subtitles.entity.rabbit.death=Rabbit dies
-subtitles.entity.rabbit.hurt=Rabbit hurts
-subtitles.entity.rabbit.jump=Rabbit hops
-subtitles.entity.sheep.ambient=Sheep baahs
-subtitles.entity.sheep.death=Sheep dies
-subtitles.entity.sheep.hurt=Sheep hurts
-subtitles.entity.shulker.ambient=Shulker lurks
-subtitles.entity.shulker.close=Shulker closes
-subtitles.entity.shulker.death=Shulker dies
-subtitles.entity.shulker.hurt=Shulker hurts
-subtitles.entity.shulker.open=Shulker opens
-subtitles.entity.shulker.shoot=Shulker shoots
-subtitles.entity.shulker.teleport=Shulker teleports
-subtitles.entity.shulker_bullet.hit=Shulker bullet explodes
-subtitles.entity.shulker_bullet.hurt=Shulker bullet breaks
-subtitles.entity.silverfish.ambient=Silverfish hisses
-subtitles.entity.silverfish.death=Silverfish dies
-subtitles.entity.silverfish.hurt=Silverfish hurts
-subtitles.entity.skeleton.ambient=Skeleton rattles
-subtitles.entity.skeleton.death=Skeleton dies
-subtitles.entity.skeleton.hurt=Skeleton hurts
-subtitles.entity.skeleton.shoot=Skeleton shoots
-subtitles.entity.skeleton_horse.ambient=Skeleton Horse cries
-subtitles.entity.skeleton_horse.death=Skeleton Horse dies
-subtitles.entity.skeleton_horse.hurt=Skeleton Horse hurts
-subtitles.entity.slime.attack=Slime attacks
-subtitles.entity.slime.death=Slime dies
-subtitles.entity.slime.hurt=Slime hurts
-subtitles.entity.slime.squish=Slime squishes
-subtitles.entity.snowball.throw=Snowball flies
-subtitles.entity.snowman.death=Snow Golem dies
-subtitles.entity.snowman.hurt=Snow Golem hurts
-subtitles.entity.spider.ambient=Spider hisses
-subtitles.entity.spider.death=Spider dies
-subtitles.entity.spider.hurt=Spider hurts
-subtitles.entity.squid.ambient=Squid swims
-subtitles.entity.squid.death=Squid dies
-subtitles.entity.squid.hurt=Squid hurts
-subtitles.entity.tnt.primed=TNT fizzes
-subtitles.entity.villager.ambient=Villager mumbles
-subtitles.entity.villager.death=Villager dies
-subtitles.entity.villager.hurt=Villager hurts
-subtitles.entity.villager.no=Villager disagrees
-subtitles.entity.villager.trading=Villager trades
-subtitles.entity.villager.yes=Villager agrees
-subtitles.entity.witch.ambient=Witch giggles
-subtitles.entity.witch.death=Witch dies
-subtitles.entity.witch.drink=Witch drinks
-subtitles.entity.witch.hurt=Witch hurts
-subtitles.entity.witch.throw=Witch throws
-subtitles.entity.wither.ambient=Wither angers
-subtitles.entity.wither.death=Wither dies
-subtitles.entity.wither.hurt=Wither hurts
-subtitles.entity.wither.shoot=Wither attacks
-subtitles.entity.wither.spawn=Wither released
-subtitles.entity.wolf.ambient=Wolf pants
-subtitles.entity.wolf.death=Wolf dies
-subtitles.entity.wolf.growl=Wolf growls
-subtitles.entity.wolf.hurt=Wolf hurts
-subtitles.entity.wolf.shake=Wolf shakes
-subtitles.entity.zombie.ambient=Zombie groans
-subtitles.entity.zombie.death=Zombie dies
-subtitles.entity.zombie.hurt=Zombie hurts
-subtitles.entity.zombie.infect=Zombie infects
-subtitles.entity.zombie_horse.ambient=Zombie Horse cries
-subtitles.entity.zombie_horse.death=Zombie Horse dies
-subtitles.entity.zombie_horse.hurt=Zombie Horse hurts
-subtitles.entity.zombie_pigman.ambient=Zombie Pigman grunts
-subtitles.entity.zombie_pigman.angry=Zombie Pigman angers
-subtitles.entity.zombie_pigman.death=Zombie Pigman dies
-subtitles.entity.zombie_pigman.hurt=Zombie Pigman hurts
-subtitles.entity.zombie_villager.converted=Zombie vociferates
-subtitles.entity.zombie_villager.cure=Zombie snuffles
-subtitles.item.armor.equip=Gear equipped
-subtitles.item.armor.equip_chain=Chain armor jingles
-subtitles.item.armor.equip_diamond=Diamond armor clangs
-subtitles.item.armor.equip_gold=Gold armor clinks
-subtitles.item.armor.equip_iron=Iron armor clanks
-subtitles.item.armor.equip_leather=Leather armor rustles
-subtitles.item.bottle.fill=Bottle fills
-subtitles.item.bucket.empty=Bucket empties
-subtitles.item.bucket.fill=Bucket fills
-subtitles.item.chorus_fruit.teleport=Player teleports
-subtitles.item.firecharge.use=Fireball whooshes
-subtitles.item.flintandsteel.use=Flint and Steel click
-subtitles.item.hoe.till=Hoe tills
-subtitles.item.shear=Shears click
-subtitles.item.shield.block=Shield blocks
-subtitles.item.shovel.flatten=Shovel flattens
-subtitles.weather.rain=Rain falls