Create/Update assets for version 18w44a

_list.json

@@ -1 +1 @@
-{"directories":["assets","data"],"files":["18w45a.json","version.json"]}
+{"directories":["assets","data"],"files":["18w44a.json","version.json"]}

assets/minecraft/blockstates/lectern.json

@@ -1,8 +1,8 @@
 {
     "variants": {
-        "facing=north": { "model": "block/lectern" },
-        "facing=south": { "model": "block/lectern", "y": 180 },
-        "facing=west":  { "model": "block/lectern", "y": 270 },
-        "facing=east":  { "model": "block/lectern", "y": 90 }
+        "facing=north": { "model": "block/lectern", "y": 180 },
+        "facing=south": { "model": "block/lectern" },
+        "facing=west":  { "model": "block/lectern", "y": 90 },
+        "facing=east":  { "model": "block/lectern", "y": 270 }
     }
 }

assets/minecraft/blockstates/scaffolding.json

@@ -1,10 +0,0 @@
-{
-    "variants": {
-        "distance=0": { "model": "block/scaffolding_stable" },
-        "distance=1": { "model": "block/scaffolding_unstable" },
-        "distance=2": { "model": "block/scaffolding_unstable" },
-        "distance=3": { "model": "block/scaffolding_unstable" },
-        "distance=4": { "model": "block/scaffolding_unstable" },
-        "distance=5": { "model": "block/scaffolding_unstable" }
-    }
-}

assets/minecraft/lang/en_us.json

@@ -885,7 +885,6 @@
   "block.minecraft.jungle_wall_sign": "Jungle Wall Sign",
   "block.minecraft.dark_oak_wall_sign": "Dark Oak Wall Sign",
   "block.minecraft.ladder": "Ladder",
-  "block.minecraft.scaffolding": "Scaffolding",
   "block.minecraft.rail": "Rail",
   "block.minecraft.powered_rail": "Powered Rail",
   "block.minecraft.activator_rail": "Activator Rail",
@@ -1306,7 +1305,6 @@
   "block.minecraft.lectern": "Lectern",
   "block.minecraft.stonecutter": "Stonecutter",
   "block.minecraft.bell": "Bell",
-  "block.minecraft.illager_banner": "Illager Banner",
   "item.minecraft.name_tag": "Name Tag",
   "item.minecraft.lead": "Lead",
   "item.minecraft.iron_shovel": "Iron Shovel",

assets/minecraft/models/block/barrel.json

@@ -1,8 +1,8 @@
 {
-    "parent": "block/cube_bottom_top",
-    "textures": {
-        "top": "block/barrel_top",
-        "side": "block/barrel_side",
-        "bottom": "block/barrel_bottom"
-    }
+	"parent": "block/cube_bottom_top",
+	"textures": {
+		"top": "block/barrel_top",
+		"side": "block/barrel_side",
+		"bottom": "block/barrel_bottom"
+	}
 }

assets/minecraft/models/block/grindstone.json

@@ -1,67 +1,72 @@
 {
-    "parent": "block/block",
     "textures": {
+        "particle": "block/grindstone_side",
         "pivot": "block/grindstone_pivot",
         "round": "block/grindstone_round",
         "side": "block/grindstone_side",
-        "particle": "block/grindstone_side",
         "leg": "block/dark_oak_log"
     },
     "elements": [
         {
-            "from": [12, 0, 6],
-            "to": [14, 7, 10],
+            "from": [ 12, 0, 6 ],
+            "to": [ 14, 7, 10 ],
             "faces": {
-                "north": {"uv": [2, 9, 4, 16], "texture": "#leg"},
-                "east": {"uv": [10, 16, 6, 9], "texture": "#leg"},
-                "south": {"uv": [12, 9, 14, 16], "texture": "#leg"},
-                "west": {"uv": [6, 9, 10, 16], "texture": "#leg"},
-                "down": {"uv": [12, 6, 14, 10], "texture": "#leg", "cullface": "down" }
+                "down": { "uv": [ 14, 0, 16, 4 ], "texture": "#leg", "rotation": 90 },
+                "up": { "uv": [ 12, 0, 14, 4 ], "texture": "#leg" },
+                "north": { "uv": [ 0, 0, 2, 7 ], "texture": "#leg" },
+                "south": { "uv": [ 2, 0, 4, 7 ], "texture": "#leg" },
+                "east": { "uv": [ 8, 0, 12, 7 ], "texture": "#leg" },
+                "west": { "uv": [ 4, 0, 8, 7 ], "texture": "#leg" }
+                
+                
             }
         },
         {
-            "from": [2, 0, 6],
-            "to": [4, 7, 10],
+            "from": [ 12, 7, 5 ],
+            "to": [ 14, 13, 11 ],
             "faces": {
-                "north": {"uv": [12, 9, 14, 16], "texture": "#leg"},
-                "east": {"uv": [10, 16, 6, 9], "texture": "#leg"},
-                "south": {"uv": [2, 9, 4, 16], "texture": "#leg"},
-                "west": {"uv": [6, 9, 10, 16], "texture": "#leg"},
-                "down": {"uv": [2, 6, 4, 10], "texture": "#leg", "cullface": "down"}
+                "down": { "uv": [ 2, 0, 8, 2 ], "texture": "#pivot", "rotation": 90 },
+                "up": { "uv": [ 2, 0, 8, 2 ], "texture": "#pivot", "rotation": 90 },
+                "north": { "uv": [ 0, 2, 2, 8 ], "texture": "#pivot" },
+                "south": { "uv": [ 0, 2, 2, 8 ], "texture": "#pivot" },
+                "east": { "uv": [ 2, 2, 8, 8 ], "texture": "#pivot" },
+                "west": { "uv": [ 2, 2, 8, 8 ], "texture": "#pivot" }
             }
         },
         {
-            "from": [12, 7, 5],
-            "to": [14, 13, 11],
+            "from": [ 2, 0, 6 ],
+            "to": [ 4, 7, 10 ],
             "faces": {
-                "north": {"uv": [6, 0, 8, 6], "texture": "#pivot"},
-                "east": {"uv": [0, 0, 6, 6], "texture": "#pivot"},
-                "south": {"uv": [6, 0, 8, 6], "texture": "#pivot"},
-                "up": {"uv": [8, 0, 10, 6], "texture": "#pivot"},
-                "down": {"uv": [8, 0, 10, 6], "texture": "#pivot"}
+                "down": { "uv": [ 14, 0, 16, 4 ], "texture": "#leg", "rotation": 90 },
+                "up": { "uv": [ 12, 0, 14, 4 ], "texture": "#leg" },
+                "north": { "uv": [ 0, 0, 2, 7 ], "texture": "#leg" },
+                "south": { "uv": [ 2, 0, 4, 7 ], "texture": "#leg" },
+                "east": { "uv": [ 8, 0, 12, 7 ], "texture": "#leg" },
+                "west": { "uv": [ 4, 0, 8, 7 ], "texture": "#leg" }
             }
         },
         {
-            "from": [2, 7, 5],
-            "to": [4, 13, 11],
+            "from": [ 2, 7, 5 ],
+            "to": [ 4, 13, 11 ],
             "faces": {
-                "north": {"uv": [6, 0, 8, 6], "texture": "#pivot"},
-                "south": {"uv": [6, 0, 8, 6], "texture": "#pivot"},
-                "west": {"uv": [0, 0, 6, 6], "texture": "#pivot"},
-                "up": {"uv": [8, 0, 10, 6], "texture": "#pivot"},
-                "down": {"uv": [8, 0, 10, 6], "texture": "#pivot"}
+                "down": { "uv": [ 2, 0, 8, 2 ], "texture": "#pivot", "rotation": 90 },
+                "up": { "uv": [ 2, 0, 8, 2 ], "texture": "#pivot", "rotation": 90 },
+                "north": { "uv": [ 0, 2, 2, 8 ], "texture": "#pivot" },
+                "south": { "uv": [ 0, 2, 2, 8 ], "texture": "#pivot" },
+                "east": { "uv": [ 2, 2, 8, 8 ], "texture": "#pivot" },
+                "west": { "uv": [ 2, 2, 8, 8 ], "texture": "#pivot" }
             }
         },
         {
-            "from": [4, 4, 2],
-            "to": [12, 16, 14],
+            "from": [ 4, 4, 2 ],
+            "to": [ 12, 16, 14 ],
             "faces": {
-                "north": {"uv": [0, 0, 8, 12], "texture": "#round"},
-                "east": {"uv": [0, 0, 12, 12], "texture": "#side"},
-                "south": {"uv": [0, 0, 8, 12], "texture": "#round"},
-                "west": {"uv": [0, 0, 12, 12], "texture": "#side"},
-                "up": {"uv": [0, 0, 8, 12], "texture": "#round"},
-                "down": {"uv": [0, 0, 8, 12], "texture": "#round"}
+                "down": { "uv": [ 0, 0, 8, 12 ], "texture": "#round" },
+                "up": { "uv": [ 0, 0, 8, 12 ], "texture": "#round" },
+                "north": { "uv": [ 0, 0, 8, 12 ], "texture": "#round" },
+                "south": { "uv": [ 0, 0, 8, 12 ], "texture": "#round" },
+                "east": { "uv": [ 0, 0, 12, 12 ], "texture": "#side" },
+                "west": { "uv": [ 0, 0, 12, 12 ], "texture": "#side" }
             }
         }
     ]

assets/minecraft/models/block/grindstone_inventory.json

@@ -0,0 +1,34 @@
+{
+	"parent": "block/grindstone",
+	"display": {
+		"thirdperson_righthand": {
+			"scale": [ 0.525, 0.525, 0.525 ]
+		},
+		"thirdperson_lefthand": {
+			"scale": [ 0.525, 0.525, 0.525 ]
+		},
+		"firstperson_righthand": {
+			"scale": [ 0.4, 0.4, 0.4 ],
+			"rotation": [ 0, 0, 0 ]
+		},
+		"firstperson_lefthand": {
+			"scale": [ 0.4, 0.4, 0.4 ]
+		},
+		"head": {
+			"scale": [ 1.675, 1.675, 1.675 ],
+			"translation": [ 0, 7.5, 0 ],
+			"rotation": [ 0, 0, 0 ]
+		},
+		"ground": {
+			"scale": [ 0.5, 0.5, 0.5 ]
+		},
+		"fixed": {
+			"rotation": [ 0, 0, 0 ]
+		},
+		"gui": {
+			"scale": [ 0.75, 0.75, 0.75 ],
+			"rotation": [ 20, 25, 0 ],
+			"translation": [ 0, -0.5, 0 ]
+		}
+	}
+}

assets/minecraft/models/block/lectern.json

@@ -1,54 +1,78 @@
 {
-    "parent": "block/block",
     "display": {
+        "thirdperson_righthand": {
+            "scale": [0.51, 0.51, 0.51]
+        },
+        "thirdperson_lefthand": {
+            "scale": [0.51, 0.51, 0.51]
+        },
         "firstperson_righthand": {
-            "rotation": [0, 135, 0],
-            "translation": [0, 0, 0],
-            "scale": [0.4, 0.4, 0.4]
+            "scale": [0.5, 0.5, 0.5]
+        },
+        "firstperson_lefthand": {
+            "scale": [0.5, 0.5, 0.5]
+        },
+        "head": {
+            "rotation": [0, 180, 0]
+        },
+        "ground": {
+            "scale": [0.5, 0.5, 0.5]
+        },
+        "fixed": {
+            "scale": [0.75, 0.75, 0.75],
+            "rotation": [0, 180, 0],
+            "translation": [0, -1.5, 0]
+        },
+        "gui": {
+            "scale": [0.5, 0.5, 0.5],
+            "translation": [0, -1.5, 0],
+            "rotation": [24, 24, 0]
         }
     },
     "textures": {
-        "particle": "block/lectern_sides",
-        "bottom": "block/oak_planks",
-        "base": "block/lectern_base",
+        "particle": "block/lectern_base_sides",
+        "base_sides": "block/lectern_base_sides",
+        "base_top": "block/lectern_base_top",
+        "bottom": "block/lectern_bottom",
         "front": "block/lectern_front",
         "sides": "block/lectern_sides",
-        "top": "block/lectern_top"
+        "top": "block/lectern_top",
+        "top_sides": "block/lectern_top_sides"
     },
     "elements": [
         {
-            "from": [0, 0, 0],
-            "to": [16, 2, 16],
+            "from": [ 0, 0, 0 ],
+            "to": [ 16, 2, 16 ],
             "faces": {
-                "north": {"uv": [0, 14, 16, 16], "texture": "#base"},
-                "east": {"uv": [0, 6, 16, 8], "texture": "#base"},
-                "south": {"uv": [0, 6, 16, 8], "texture": "#base"},
-                "west": {"uv": [0, 6, 16, 8], "texture": "#base"},
-                "up": {"uv": [0, 0, 16, 16], "rotation": 180, "texture": "#base"},
-                "down": {"uv": [0, 0, 16, 16], "texture": "#bottom", "cullface": "bottom"}
+                "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom" },
+                "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#base_top" },
+                "north": { "uv": [ 0, 4, 16, 6 ], "texture": "#base_sides" },
+                "south": { "uv": [ 0, 0, 16, 2 ], "texture": "#base_sides" },
+                "west": { "uv": [ 0, 2, 16, 4 ], "texture": "#base_sides" },
+                "east": { "uv": [ 0, 6, 16, 8 ], "texture": "#base_sides" }
             }
         },
         {
-            "from": [4, 2, 4],
-            "to": [12, 15, 12],
+            "from": [ 4, 2, 4 ],
+            "to": [ 12, 15, 12 ],
             "faces": {
-                "north": {"uv": [0, 0, 8, 13], "texture": "#front"},
-                "east": {"uv": [2, 16, 15, 8], "rotation": 90, "texture": "#sides"},
-                "south": {"uv": [8, 3, 16, 16], "texture": "#front"},
-                "west": {"uv": [2, 8, 15, 16], "rotation": 90, "texture": "#sides"}
+                "north": {"uv": [8, 3, 16, 16], "texture": "#sides" },
+                "south": {"uv": [0, 0, 8, 13], "texture": "#front" },
+				"west": {"uv": [0, 3, 8, 16], "texture": "#sides" },
+                "east": {"uv": [8, 3, 16, 16], "texture": "#front" }
             }
         },
         {
-            "from": [0.01, 12, 3],
-            "to": [15.99, 16, 16],
-            "rotation": {"angle": -22.5, "axis": "x", "origin": [8, 8, 8]},
+            "from": [0.01, 12, 0],
+            "to": [15.99, 16, 13],
+            "rotation": {"angle": 22.5, "axis": "x", "origin": [8, 8, 8]},
             "faces": {
-                "north": {"uv": [0, 0, 16, 4], "texture": "#sides"},
-                "east": {"uv": [0, 4, 13, 8], "texture": "#sides"},
-                "south": {"uv": [0, 4, 16, 8], "texture": "#sides"},
-                "west": {"uv": [0, 4, 13, 8], "texture": "#sides"},
-                "up": {"uv": [0, 1, 16, 14], "rotation": 180, "texture": "#top"},
-                "down": {"uv": [0, 0, 16, 13], "texture": "#bottom"}
+                "down": {"uv": [0, 0, 16, 13], "texture": "#bottom"},
+                "up": {"uv": [0, 1, 16, 14], "texture": "#top"},
+                "north": {"uv": [0, 8, 16, 12], "texture": "#top_sides"},
+                "south": {"uv": [0, 0, 16, 4], "texture": "#top_sides"},
+                "west": {"uv": [0, 4, 13, 8], "texture": "#top_sides"},
+                "east": {"uv": [0, 12, 13, 16], "texture": "#top_sides"}
             }
         }
     ]

assets/minecraft/models/block/orientable.json

@@ -1,6 +1,19 @@
 {
-    "parent": "block/orientable_with_bottom",
+    "parent": "block/cube",
+    "display": {
+        "firstperson_righthand": {
+            "rotation": [ 0, 135, 0 ],
+            "translation": [ 0, 0, 0 ],
+            "scale": [ 0.40, 0.40, 0.40 ]
+        }
+    },
     "textures": {
-        "bottom": "#top"
+        "particle": "#front",
+        "down": "#top",
+        "up": "#top",
+        "north": "#front",
+        "east": "#side",
+        "south": "#side",
+        "west": "#side"
     }
 }

assets/minecraft/models/block/orientable_with_bottom.json

@@ -1,19 +0,0 @@
-{
-    "parent": "block/cube",
-    "display": {
-        "firstperson_righthand": {
-            "rotation": [ 0, 135, 0 ],
-            "translation": [ 0, 0, 0 ],
-            "scale": [ 0.40, 0.40, 0.40 ]
-        }
-    },
-    "textures": {
-        "particle": "#front",
-        "down": "#bottom",
-        "up": "#top",
-        "north": "#front",
-        "east": "#side",
-        "south": "#side",
-        "west": "#side"
-    }
-}

assets/minecraft/models/block/scaffolding_stable.json

@@ -1,99 +0,0 @@
-{
-    "parent": "block/block",
-    "textures": {
-        "particle": "block/scaffolding_top",
-        "top": "block/scaffolding_top",
-        "side": "block/scaffolding_side",
-        "bottom": "block/scaffolding_bottom"
-    },
-    "elements": [
-        {
-            "from": [0, 15.99, 0],
-            "to": [16, 16, 16],
-            "faces": {
-                "up": { "texture": "#top", "cullface": "up" },
-                "down": { "texture": "#top", "uv": [0, 16, 16, 0] }
-            }
-        },
-        {
-            "from": [0, 0, 0],
-            "to": [2, 16, 2],
-            "faces": {
-                "north": { "texture": "#side", "cullface": "north" },
-                "east": { "texture": "#side" },
-                "south": { "texture": "#side" },
-                "west": { "texture": "#side", "cullface": "west" },
-                "down": { "texture": "#bottom", "cullface": "down" }
-            }
-        },
-        {
-            "from": [0, 0, 14],
-            "to": [2, 16, 16],
-            "faces": {
-                "north": { "texture": "#side" },
-                "east": { "texture": "#side" },
-                "south": { "texture": "#side", "cullface": "south" },
-                "west": { "texture": "#side", "cullface": "west" },
-                "down": { "texture": "#bottom", "cullface": "down" }
-            }
-        },
-        {
-            "from": [14, 0, 14],
-            "to": [16, 16, 16],
-            "faces": {
-                "north": { "texture": "#side" },
-                "east": { "texture": "#side", "cullface": "east" },
-                "south": { "texture": "#side", "cullface": "south" },
-                "west": { "texture": "#side" },
-                "down": { "texture": "#bottom", "cullface": "down" }
-            }
-        },
-        {
-            "from": [14, 0, 0],
-            "to": [16, 16, 2],
-            "faces": {
-                "north": { "texture": "#side", "cullface": "north" },
-                "east": { "texture": "#side", "cullface": "east" },
-                "south": { "texture": "#side" },
-                "west": { "texture": "#side" },
-                "down": { "texture": "#bottom", "cullface": "down" }
-            }
-        },
-        {
-            "from": [2, 14, 0],
-            "to": [14, 16, 2],
-            "faces": {
-                "north": { "texture": "#side", "cullface": "north" },
-                "south": { "texture": "#side" },
-                "down": { "texture": "#bottom" }
-            }
-        },
-        {
-            "from": [2, 14, 14],
-            "to": [14, 16, 16],
-            "faces": {
-                "north": { "texture": "#side", "uv": [14, 0, 2, 2] },
-                "south": { "texture": "#side", "cullface": "south" },
-                "down": { "texture": "#bottom" }
-            }
-        },
-        {
-            "from": [14, 14, 2],
-            "to": [16, 16, 14],
-            "faces": {
-                "east": { "texture": "#side", "uv": [14, 0, 2, 2], "cullface": "east" },
-                "west": { "texture": "#side", "uv": [14, 0, 2, 2] },
-                "down": { "texture": "#bottom" }
-            }
-        },
-        {
-            "from": [0, 14, 2],
-            "to": [2, 16, 14],
-            "faces": {
-                "east": { "texture": "#side" },
-                "west": { "texture": "#side", "uv": [14, 0, 2, 2], "cullface": "west" },
-                "down": { "texture": "#bottom" }
-            }
-        }
-    ]
-}

assets/minecraft/models/block/scaffolding_unstable.json

@@ -1,139 +0,0 @@
-{
-    "parent": "block/block",
-    "textures": {
-        "particle": "block/scaffolding_top",
-        "top": "block/scaffolding_top",
-        "side": "block/scaffolding_side",
-        "bottom": "block/scaffolding_bottom"
-    },
-    "elements": [
-        {
-            "from": [0, 15.99, 0],
-            "to": [16, 16, 16],
-            "faces": {
-                "up": { "texture": "#top", "cullface": "up" },
-                "down": { "texture": "#top", "uv": [0, 16, 16, 0] }
-            }
-        },
-        {
-            "from": [0, 0, 0],
-            "to": [2, 16, 2],
-            "faces": {
-                "north": { "texture": "#side", "cullface": "north" },
-                "east": { "texture": "#side" },
-                "south": { "texture": "#side" },
-                "west": { "texture": "#side", "cullface": "west" },
-                "down": { "texture": "#bottom", "cullface": "down" }
-            }
-        },
-        {
-            "from": [0, 0, 14],
-            "to": [2, 16, 16],
-            "faces": {
-                "north": { "texture": "#side" },
-                "east": { "texture": "#side" },
-                "south": { "texture": "#side", "cullface": "south" },
-                "west": { "texture": "#side", "cullface": "west" },
-                "down": { "texture": "#bottom", "cullface": "down" }
-            }
-        },
-        {
-            "from": [14, 0, 14],
-            "to": [16, 16, 16],
-            "faces": {
-                "north": { "texture": "#side" },
-                "east": { "texture": "#side", "cullface": "east" },
-                "south": { "texture": "#side", "cullface": "south" },
-                "west": { "texture": "#side" },
-                "down": { "texture": "#bottom", "cullface": "down" }
-            }
-        },
-        {
-            "from": [14, 0, 0],
-            "to": [16, 16, 2],
-            "faces": {
-                "north": { "texture": "#side", "cullface": "north" },
-                "east": { "texture": "#side", "cullface": "east" },
-                "south": { "texture": "#side" },
-                "west": { "texture": "#side" },
-                "down": { "texture": "#bottom", "cullface": "down" }
-            }
-        },
-        {
-            "from": [2, 14, 0],
-            "to": [14, 16, 2],
-            "faces": {
-                "north": { "texture": "#side", "cullface": "north" },
-                "south": { "texture": "#side" },
-                "down": { "texture": "#bottom" }
-            }
-        },
-        {
-            "from": [2, 14, 14],
-            "to": [14, 16, 16],
-            "faces": {
-                "north": { "texture": "#side", "uv": [14, 0, 2, 2] },
-                "south": { "texture": "#side", "cullface": "south" },
-                "down": { "texture": "#bottom" }
-            }
-        },
-        {
-            "from": [14, 14, 2],
-            "to": [16, 16, 14],
-            "faces": {
-                "east": { "texture": "#side", "uv": [14, 0, 2, 2], "cullface": "east" },
-                "west": { "texture": "#side", "uv": [14, 0, 2, 2] },
-                "down": { "texture": "#bottom" }
-            }
-        },
-        {
-            "from": [0, 14, 2],
-            "to": [2, 16, 14],
-            "faces": {
-                "east": { "texture": "#side" },
-                "west": { "texture": "#side", "uv": [14, 0, 2, 2], "cullface": "west" },
-                "down": { "texture": "#bottom" }
-            }
-        },
-        {
-            "from": [2, 0, 0],
-            "to": [14, 2, 2],
-            "faces": {
-                "north": { "texture": "#side", "cullface": "north" },
-                "south": { "texture": "#side" },
-                "up": { "texture": "#bottom" },
-                "down": { "texture": "#bottom", "cullface": "bottom" }
-            }
-        },
-        {
-            "from": [2, 0, 14],
-            "to": [14, 2, 16],
-            "faces": {
-                "north": { "texture": "#side" },
-                "south": { "texture": "#side", "cullface": "south" },
-                "up": { "texture": "#bottom" },
-                "down": { "texture": "#bottom", "cullface": "bottom" }
-            }
-        },
-        {
-            "from": [14, 0, 2],
-            "to": [16, 2, 14],
-            "faces": {
-                "east": { "texture": "#side", "cullface": "east" },
-                "west": { "texture": "#side" },
-                "up": { "texture": "#bottom" },
-                "down": { "texture": "#bottom", "cullface": "bottom" }
-            }
-        },
-        {
-            "from": [0, 0, 2],
-            "to": [2, 2, 14],
-            "faces": {
-                "east": { "texture": "#side" },
-                "west": { "texture": "#side", "cullface": "west" },
-                "up": { "texture": "#bottom" },
-                "down": { "texture": "#bottom", "cullface": "bottom" }
-            }
-        }
-    ]
-}

assets/minecraft/models/block/smoker.json

@@ -1,9 +1,19 @@
 {
-    "parent": "block/orientable_with_bottom",
+    "parent": "block/cube",
+    "display": {
+        "firstperson_righthand": {
+            "rotation": [ 0, 135, 0 ],
+            "translation": [ 0, 0, 0 ],
+            "scale": [ 0.40, 0.40, 0.40 ]
+        }
+    },
     "textures": {
-        "bottom": "block/smoker_bottom",
-        "top": "block/smoker_top",
-        "front": "block/smoker_front",
-        "side": "block/smoker_side"
+        "particle": "block/smoker_front",
+        "down": "block/smoker_bottom",
+        "up": "block/smoker_top",
+        "north": "block/smoker_front",
+        "east": "block/smoker_side",
+        "south": "block/smoker_side",
+        "west": "block/smoker_side"
     }
 }

assets/minecraft/models/item/bamboo.json

@@ -1,5 +1,5 @@
 {
-    "parent": "item/handheld",
+    "parent": "item/generated",
     "textures": {
         "layer0": "item/bamboo"
     }

assets/minecraft/models/item/grindstone.json

@@ -1,3 +1,3 @@
 {
-    "parent": "block/grindstone"
+    "parent": "block/grindstone_inventory"
 }

assets/minecraft/models/item/scaffolding.json

@@ -1,3 +0,0 @@
-{
-    "parent": "block/scaffolding_stable"
-}

data/minecraft/advancements/adventure/adventuring_time.json

@@ -258,18 +258,6 @@
       "conditions": {
         "biome": "minecraft:deep_frozen_ocean"
       }
-    },
-    "minecraft:bamboo_jungle": {
-      "trigger": "minecraft:location",
-      "conditions": {
-        "biome": "minecraft:bamboo_jungle"
-      }
-    },
-    "minecraft:bamboo_jungle_hills": {
-      "trigger": "minecraft:location",
-      "conditions": {
-        "biome": "minecraft:bamboo_jungle_hills"
-      }
     }
   },
   "requirements": [
@@ -392,12 +380,6 @@
     ],
     [
       "minecraft:deep_frozen_ocean"
-    ],
-    [
-      "minecraft:bamboo_jungle"
-    ],
-    [
-      "minecraft:bamboo_jungle_hills"
     ]
   ]
 }

data/minecraft/advancements/adventure/kill_a_mob.json

@@ -207,22 +207,6 @@
           "type": "minecraft:drowned"
         }
       }
-    },
-    "minecraft:pillager": {
-      "trigger": "minecraft:player_killed_entity",
-      "conditions": {
-        "entity": {
-          "type": "minecraft:pillager"
-        }
-      }
-    },
-    "minecraft:illager_beast": {
-      "trigger": "minecraft:player_killed_entity",
-      "conditions": {
-        "entity": {
-          "type": "minecraft:illager_beast"
-        }
-      }
     }
   },
   "requirements": [
@@ -250,9 +234,7 @@
       "minecraft:zombie",
       "minecraft:zombie_villager",
       "minecraft:phantom",
-      "minecraft:drowned",
-      "minecraft:pillager",
-      "minecraft:illager_beast"
+      "minecraft:drowned"
     ]
   ]
 }

data/minecraft/advancements/adventure/kill_all_mobs.json

@@ -210,22 +210,6 @@
           "type": "minecraft:drowned"
         }
       }
-    },
-    "minecraft:pillager": {
-      "trigger": "minecraft:player_killed_entity",
-      "conditions": {
-        "entity": {
-          "type": "minecraft:pillager"
-        }
-      }
-    },
-    "minecraft:illager_beast": {
-      "trigger": "minecraft:player_killed_entity",
-      "conditions": {
-        "entity": {
-          "type": "minecraft:illager_beast"
-        }
-      }
     }
   },
   "requirements": [
@@ -300,12 +284,6 @@
     ],
     [
       "minecraft:drowned"
-    ],
-    [
-      "minecraft:pillager"
-    ],
-    [
-      "minecraft:illager_beast"
     ]
   ]
 }

data/minecraft/advancements/nether/all_effects.json

@@ -23,31 +23,29 @@
       "trigger": "minecraft:effects_changed",
       "conditions": {
         "effects": {
-          "minecraft:absorption": {},
-          "minecraft:nausea": {},
           "minecraft:jump_boost": {},
-          "minecraft:night_vision": {},
-          "minecraft:fire_resistance": {},
-          "minecraft:wither": {},
-          "minecraft:slow_falling": {},
-          "minecraft:resistance": {},
-          "minecraft:weakness": {},
-          "minecraft:hunger": {},
-          "minecraft:haste": {},
-          "minecraft:slowness": {},
-          "minecraft:saturation": {},
-          "minecraft:regeneration": {},
-          "minecraft:mining_fatigue": {},
-          "minecraft:strength": {},
-          "minecraft:blindness": {},
           "minecraft:invisibility": {},
-          "minecraft:conduit_power": {},
-          "minecraft:levitation": {},
-          "minecraft:dolphins_grace": {},
+          "minecraft:slow_falling": {},
           "minecraft:water_breathing": {},
+          "minecraft:haste": {},
+          "minecraft:resistance": {},
+          "minecraft:nausea": {},
+          "minecraft:regeneration": {},
+          "minecraft:slowness": {},
+          "minecraft:wither": {},
+          "minecraft:mining_fatigue": {},
+          "minecraft:hunger": {},
+          "minecraft:levitation": {},
           "minecraft:poison": {},
+          "minecraft:dolphins_grace": {},
+          "minecraft:speed": {},
+          "minecraft:night_vision": {},
+          "minecraft:weakness": {},
+          "minecraft:fire_resistance": {},
+          "minecraft:strength": {},
           "minecraft:glowing": {},
-          "minecraft:speed": {}
+          "minecraft:conduit_power": {},
+          "minecraft:absorption": {}
         }
       }
     }

data/minecraft/advancements/nether/all_potions.json

@@ -23,19 +23,19 @@
       "trigger": "minecraft:effects_changed",
       "conditions": {
         "effects": {
-          "minecraft:slowness": {},
-          "minecraft:regeneration": {},
           "minecraft:jump_boost": {},
-          "minecraft:strength": {},
-          "minecraft:night_vision": {},
-          "minecraft:fire_resistance": {},
-          "minecraft:slow_falling": {},
           "minecraft:invisibility": {},
+          "minecraft:slow_falling": {},
           "minecraft:water_breathing": {},
           "minecraft:resistance": {},
+          "minecraft:regeneration": {},
+          "minecraft:slowness": {},
           "minecraft:poison": {},
+          "minecraft:speed": {},
+          "minecraft:night_vision": {},
           "minecraft:weakness": {},
-          "minecraft:speed": {}
+          "minecraft:fire_resistance": {},
+          "minecraft:strength": {}
         }
       }
     }

data/minecraft/advancements/recipes/decorations/_list.json

@@ -1 +1 @@
-{"directories":[],"files":["acacia_fence.json","acacia_sign.json","anvil.json","armor_stand.json","birch_fence.json","birch_sign.json","black_banner.json","black_bed.json","black_bed_from_white_bed.json","black_carpet.json","black_carpet_from_white_carpet.json","black_glazed_terracotta.json","black_stained_glass_pane.json","black_stained_glass_pane_from_glass_pane.json","blue_banner.json","blue_bed.json","blue_bed_from_white_bed.json","blue_carpet.json","blue_carpet_from_white_carpet.json","blue_glazed_terracotta.json","blue_stained_glass_pane.json","blue_stained_glass_pane_from_glass_pane.json","brown_banner.json","brown_bed.json","brown_bed_from_white_bed.json","brown_carpet.json","brown_carpet_from_white_carpet.json","brown_glazed_terracotta.json","brown_stained_glass_pane.json","brown_stained_glass_pane_from_glass_pane.json","chest.json","cobblestone_wall.json","crafting_table.json","cyan_banner.json","cyan_bed.json","cyan_bed_from_white_bed.json","cyan_carpet.json","cyan_carpet_from_white_carpet.json","cyan_glazed_terracotta.json","cyan_stained_glass_pane.json","cyan_stained_glass_pane_from_glass_pane.json","dark_oak_fence.json","dark_oak_sign.json","enchanting_table.json","end_crystal.json","end_rod.json","ender_chest.json","flower_pot.json","furnace.json","glass_pane.json","gray_banner.json","gray_bed.json","gray_bed_from_white_bed.json","gray_carpet.json","gray_carpet_from_white_carpet.json","gray_glazed_terracotta.json","gray_stained_glass_pane.json","gray_stained_glass_pane_from_glass_pane.json","green_banner.json","green_bed.json","green_bed_from_white_bed.json","green_carpet.json","green_carpet_from_white_carpet.json","green_glazed_terracotta.json","green_stained_glass_pane.json","green_stained_glass_pane_from_glass_pane.json","iron_bars.json","item_frame.json","jukebox.json","jungle_fence.json","jungle_sign.json","ladder.json","light_blue_banner.json","light_blue_bed.json","light_blue_bed_from_white_bed.json","light_blue_carpet.json","light_blue_carpet_from_white_carpet.json","light_blue_glazed_terracotta.json","light_blue_stained_glass_pane.json","light_blue_stained_glass_pane_from_glass_pane.json","light_gray_banner.json","light_gray_bed.json","light_gray_bed_from_white_bed.json","light_gray_carpet.json","light_gray_carpet_from_white_carpet.json","light_gray_glazed_terracotta.json","light_gray_stained_glass_pane.json","light_gray_stained_glass_pane_from_glass_pane.json","lime_banner.json","lime_bed.json","lime_bed_from_white_bed.json","lime_carpet.json","lime_carpet_from_white_carpet.json","lime_glazed_terracotta.json","lime_stained_glass_pane.json","lime_stained_glass_pane_from_glass_pane.json","loom.json","magenta_banner.json","magenta_bed.json","magenta_bed_from_white_bed.json","magenta_carpet.json","magenta_carpet_from_white_carpet.json","magenta_glazed_terracotta.json","magenta_stained_glass_pane.json","magenta_stained_glass_pane_from_glass_pane.json","mossy_cobblestone_wall.json","nether_brick_fence.json","oak_fence.json","oak_sign.json","orange_banner.json","orange_bed.json","orange_bed_from_white_bed.json","orange_carpet.json","orange_carpet_from_white_carpet.json","orange_glazed_terracotta.json","orange_stained_glass_pane.json","orange_stained_glass_pane_from_glass_pane.json","painting.json","pink_banner.json","pink_bed.json","pink_bed_from_white_bed.json","pink_carpet.json","pink_carpet_from_white_carpet.json","pink_glazed_terracotta.json","pink_stained_glass_pane.json","pink_stained_glass_pane_from_glass_pane.json","purple_banner.json","purple_bed.json","purple_bed_from_white_bed.json","purple_carpet.json","purple_carpet_from_white_carpet.json","purple_glazed_terracotta.json","purple_stained_glass_pane.json","purple_stained_glass_pane_from_glass_pane.json","red_banner.json","red_bed.json","red_bed_from_white_bed.json","red_carpet.json","red_carpet_from_white_carpet.json","red_glazed_terracotta.json","red_stained_glass_pane.json","red_stained_glass_pane_from_glass_pane.json","scaffolding.json","shulker_box.json","slime_block.json","snow.json","spruce_fence.json","spruce_sign.json","torch.json","white_banner.json","white_bed.json","white_carpet.json","white_glazed_terracotta.json","white_stained_glass_pane.json","white_stained_glass_pane_from_glass_pane.json","yellow_banner.json","yellow_bed.json","yellow_bed_from_white_bed.json","yellow_carpet.json","yellow_carpet_from_white_carpet.json","yellow_glazed_terracotta.json","yellow_stained_glass_pane.json","yellow_stained_glass_pane_from_glass_pane.json"]}
+{"directories":[],"files":["acacia_fence.json","acacia_sign.json","anvil.json","armor_stand.json","birch_fence.json","birch_sign.json","black_banner.json","black_bed.json","black_bed_from_white_bed.json","black_carpet.json","black_carpet_from_white_carpet.json","black_glazed_terracotta.json","black_stained_glass_pane.json","black_stained_glass_pane_from_glass_pane.json","blue_banner.json","blue_bed.json","blue_bed_from_white_bed.json","blue_carpet.json","blue_carpet_from_white_carpet.json","blue_glazed_terracotta.json","blue_stained_glass_pane.json","blue_stained_glass_pane_from_glass_pane.json","brown_banner.json","brown_bed.json","brown_bed_from_white_bed.json","brown_carpet.json","brown_carpet_from_white_carpet.json","brown_glazed_terracotta.json","brown_stained_glass_pane.json","brown_stained_glass_pane_from_glass_pane.json","chest.json","cobblestone_wall.json","crafting_table.json","cyan_banner.json","cyan_bed.json","cyan_bed_from_white_bed.json","cyan_carpet.json","cyan_carpet_from_white_carpet.json","cyan_glazed_terracotta.json","cyan_stained_glass_pane.json","cyan_stained_glass_pane_from_glass_pane.json","dark_oak_fence.json","dark_oak_sign.json","enchanting_table.json","end_crystal.json","end_rod.json","ender_chest.json","flower_pot.json","furnace.json","glass_pane.json","gray_banner.json","gray_bed.json","gray_bed_from_white_bed.json","gray_carpet.json","gray_carpet_from_white_carpet.json","gray_glazed_terracotta.json","gray_stained_glass_pane.json","gray_stained_glass_pane_from_glass_pane.json","green_banner.json","green_bed.json","green_bed_from_white_bed.json","green_carpet.json","green_carpet_from_white_carpet.json","green_glazed_terracotta.json","green_stained_glass_pane.json","green_stained_glass_pane_from_glass_pane.json","iron_bars.json","item_frame.json","jukebox.json","jungle_fence.json","jungle_sign.json","ladder.json","light_blue_banner.json","light_blue_bed.json","light_blue_bed_from_white_bed.json","light_blue_carpet.json","light_blue_carpet_from_white_carpet.json","light_blue_glazed_terracotta.json","light_blue_stained_glass_pane.json","light_blue_stained_glass_pane_from_glass_pane.json","light_gray_banner.json","light_gray_bed.json","light_gray_bed_from_white_bed.json","light_gray_carpet.json","light_gray_carpet_from_white_carpet.json","light_gray_glazed_terracotta.json","light_gray_stained_glass_pane.json","light_gray_stained_glass_pane_from_glass_pane.json","lime_banner.json","lime_bed.json","lime_bed_from_white_bed.json","lime_carpet.json","lime_carpet_from_white_carpet.json","lime_glazed_terracotta.json","lime_stained_glass_pane.json","lime_stained_glass_pane_from_glass_pane.json","loom.json","magenta_banner.json","magenta_bed.json","magenta_bed_from_white_bed.json","magenta_carpet.json","magenta_carpet_from_white_carpet.json","magenta_glazed_terracotta.json","magenta_stained_glass_pane.json","magenta_stained_glass_pane_from_glass_pane.json","mossy_cobblestone_wall.json","nether_brick_fence.json","oak_fence.json","oak_sign.json","orange_banner.json","orange_bed.json","orange_bed_from_white_bed.json","orange_carpet.json","orange_carpet_from_white_carpet.json","orange_glazed_terracotta.json","orange_stained_glass_pane.json","orange_stained_glass_pane_from_glass_pane.json","painting.json","pink_banner.json","pink_bed.json","pink_bed_from_white_bed.json","pink_carpet.json","pink_carpet_from_white_carpet.json","pink_glazed_terracotta.json","pink_stained_glass_pane.json","pink_stained_glass_pane_from_glass_pane.json","purple_banner.json","purple_bed.json","purple_bed_from_white_bed.json","purple_carpet.json","purple_carpet_from_white_carpet.json","purple_glazed_terracotta.json","purple_stained_glass_pane.json","purple_stained_glass_pane_from_glass_pane.json","red_banner.json","red_bed.json","red_bed_from_white_bed.json","red_carpet.json","red_carpet_from_white_carpet.json","red_glazed_terracotta.json","red_stained_glass_pane.json","red_stained_glass_pane_from_glass_pane.json","shulker_box.json","slime_block.json","snow.json","spruce_fence.json","spruce_sign.json","torch.json","white_banner.json","white_bed.json","white_carpet.json","white_glazed_terracotta.json","white_stained_glass_pane.json","white_stained_glass_pane_from_glass_pane.json","yellow_banner.json","yellow_bed.json","yellow_bed_from_white_bed.json","yellow_carpet.json","yellow_carpet_from_white_carpet.json","yellow_glazed_terracotta.json","yellow_stained_glass_pane.json","yellow_stained_glass_pane_from_glass_pane.json"]}

data/minecraft/advancements/recipes/decorations/scaffolding.json

@@ -1,32 +0,0 @@
-{
-  "parent": "minecraft:recipes/root",
-  "rewards": {
-    "recipes": [
-      "minecraft:scaffolding"
-    ]
-  },
-  "criteria": {
-    "has_bamboo": {
-      "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "item": "minecraft:bamboo"
-          }
-        ]
-      }
-    },
-    "has_the_recipe": {
-      "trigger": "minecraft:recipe_unlocked",
-      "conditions": {
-        "recipe": "minecraft:scaffolding"
-      }
-    }
-  },
-  "requirements": [
-    [
-      "has_bamboo",
-      "has_the_recipe"
-    ]
-  ]
-}

data/minecraft/loot_tables/blocks/acacia_leaves.json

@@ -81,11 +81,7 @@
           "functions": [
             {
               "function": "minecraft:set_count",
-              "count": {
-                "min": 1.0,
-                "max": 2.0,
-                "type": "minecraft:uniform"
-              }
+              "count": 2
             },
             {
               "function": "minecraft:explosion_decay"

data/minecraft/loot_tables/blocks/birch_leaves.json

@@ -81,11 +81,7 @@
           "functions": [
             {
               "function": "minecraft:set_count",
-              "count": {
-                "min": 1.0,
-                "max": 2.0,
-                "type": "minecraft:uniform"
-              }
+              "count": 2
             },
             {
               "function": "minecraft:explosion_decay"

data/minecraft/loot_tables/blocks/cartography_table.json

@@ -6,12 +6,6 @@
       "entries": [
         {
           "type": "minecraft:item",
-          "functions": [
-            {
-              "function": "minecraft:copy_name",
-              "source": "block_entity"
-            }
-          ],
           "name": "minecraft:cartography_table"
         }
       ],

data/minecraft/loot_tables/blocks/dark_oak_leaves.json

@@ -81,11 +81,7 @@
           "functions": [
             {
               "function": "minecraft:set_count",
-              "count": {
-                "min": 1.0,
-                "max": 2.0,
-                "type": "minecraft:uniform"
-              }
+              "count": 2
             },
             {
               "function": "minecraft:explosion_decay"

data/minecraft/loot_tables/blocks/fletching_table.json

@@ -6,12 +6,6 @@
       "entries": [
         {
           "type": "minecraft:item",
-          "functions": [
-            {
-              "function": "minecraft:copy_name",
-              "source": "block_entity"
-            }
-          ],
           "name": "minecraft:fletching_table"
         }
       ],

data/minecraft/loot_tables/blocks/grindstone.json

@@ -6,12 +6,6 @@
       "entries": [
         {
           "type": "minecraft:item",
-          "functions": [
-            {
-              "function": "minecraft:copy_name",
-              "source": "block_entity"
-            }
-          ],
           "name": "minecraft:grindstone"
         }
       ],

data/minecraft/loot_tables/blocks/jungle_leaves.json

@@ -82,11 +82,7 @@
           "functions": [
             {
               "function": "minecraft:set_count",
-              "count": {
-                "min": 1.0,
-                "max": 2.0,
-                "type": "minecraft:uniform"
-              }
+              "count": 2
             },
             {
               "function": "minecraft:explosion_decay"

data/minecraft/loot_tables/blocks/lectern.json

@@ -6,12 +6,6 @@
       "entries": [
         {
           "type": "minecraft:item",
-          "functions": [
-            {
-              "function": "minecraft:copy_name",
-              "source": "block_entity"
-            }
-          ],
           "name": "minecraft:lectern"
         }
       ],

data/minecraft/loot_tables/blocks/oak_leaves.json

@@ -81,11 +81,7 @@
           "functions": [
             {
               "function": "minecraft:set_count",
-              "count": {
-                "min": 1.0,
-                "max": 2.0,
-                "type": "minecraft:uniform"
-              }
+              "count": 2
             },
             {
               "function": "minecraft:explosion_decay"

data/minecraft/loot_tables/blocks/scaffolding.json

@@ -1,19 +0,0 @@
-{
-  "type": "minecraft:block",
-  "pools": [
-    {
-      "rolls": 1,
-      "entries": [
-        {
-          "type": "minecraft:item",
-          "name": "minecraft:scaffolding"
-        }
-      ],
-      "conditions": [
-        {
-          "condition": "minecraft:survives_explosion"
-        }
-      ]
-    }
-  ]
-}

data/minecraft/loot_tables/blocks/smithing_table.json

@@ -6,12 +6,6 @@
       "entries": [
         {
           "type": "minecraft:item",
-          "functions": [
-            {
-              "function": "minecraft:copy_name",
-              "source": "block_entity"
-            }
-          ],
           "name": "minecraft:smithing_table"
         }
       ],

data/minecraft/loot_tables/blocks/spruce_leaves.json

@@ -81,11 +81,7 @@
           "functions": [
             {
               "function": "minecraft:set_count",
-              "count": {
-                "min": 1.0,
-                "max": 2.0,
-                "type": "minecraft:uniform"
-              }
+              "count": 2
             },
             {
               "function": "minecraft:explosion_decay"

data/minecraft/loot_tables/blocks/stonecutter.json

@@ -6,12 +6,6 @@
       "entries": [
         {
           "type": "minecraft:item",
-          "functions": [
-            {
-              "function": "minecraft:copy_name",
-              "source": "block_entity"
-            }
-          ],
           "name": "minecraft:stonecutter"
         }
       ],

data/minecraft/loot_tables/chests/shipwreck_supply.json

@@ -90,13 +90,6 @@
             {
               "function": "minecraft:set_stew_effect",
               "effects": [
-                {
-                  "type": "minecraft:saturation",
-                  "duration": {
-                    "min": 7.0,
-                    "max": 10.0
-                  }
-                },
                 {
                   "type": "minecraft:jump_boost",
                   "duration": {
@@ -112,10 +105,10 @@
                   }
                 },
                 {
-                  "type": "minecraft:weakness",
+                  "type": "minecraft:blindness",
                   "duration": {
-                    "min": 6.0,
-                    "max": 8.0
+                    "min": 5.0,
+                    "max": 7.0
                   }
                 },
                 {
@@ -126,10 +119,17 @@
                   }
                 },
                 {
-                  "type": "minecraft:blindness",
+                  "type": "minecraft:weakness",
                   "duration": {
-                    "min": 5.0,
-                    "max": 7.0
+                    "min": 6.0,
+                    "max": 8.0
+                  }
+                },
+                {
+                  "type": "minecraft:saturation",
+                  "duration": {
+                    "min": 7.0,
+                    "max": 10.0
                   }
                 }
               ]

data/minecraft/recipes/scaffolding.json

@@ -1,20 +0,0 @@
-{
-  "type": "crafting_shaped",
-  "pattern": [
-    "I~I",
-    "I I",
-    "I I"
-  ],
-  "key": {
-    "~": {
-      "item": "minecraft:string"
-    },
-    "I": {
-      "item": "minecraft:bamboo"
-    }
-  },
-  "result": {
-    "item": "minecraft:scaffolding",
-    "count": 6
-  }
-}

version.json

@@ -1,8 +1,8 @@
 {
-  "id": "18w45a",
+  "id": "18w44a",
   "type": "snapshot",
-  "url": "https://launchermeta.mojang.com/v1/packages/71db320cff7a34460bb108aaa0666c85ec3fe7de/18w45a.json",
+  "url": "https://launchermeta.mojang.com/v1/packages/d415d669f31e322f09598464c182b63e9c1ac8c9/18w44a.json",
   "time": "2019-08-22T12:46:36+00:00",
-  "releaseTime": "2018-11-07T14:40:06+00:00",
-  "downloadTimestamp": 1615419899070
+  "releaseTime": "2018-10-31T15:29:16+00:00",
+  "downloadTimestamp": 1615413330567
 }