Merge branch '1.12.2' into 4.3-dev

2020-04-14 17:41:33 +01:00
parent aecc8b0889 937617d7af
commit 91b2ee1a13
32 changed files with 869 additions and 1313 deletions
@@ -7,7 +7,8 @@
    ],
    "key": {
        "x": {
-            "item": "minecraft:string"
+            "type": "forge:ore_dict",
+            "ore": "string"
        },
        "y": [
            {
@@ -48,4 +49,4 @@
        "item": "ebwizardry:magic_silk",
        "count": 2
    }
-}
+}