From 6599225f6b2a5e82646f2a1e7f6ae9280bb12966 Mon Sep 17 00:00:00 2001
From: MestreLion <linux@rodrigosilva.com>
Date: Tue, 4 Dec 2018 19:00:01 -0200
Subject: [PATCH 1/4] fix duplicated key in items JSON

---
 src/mceditlib/blocktypes/tmp_items.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/mceditlib/blocktypes/tmp_items.json b/src/mceditlib/blocktypes/tmp_items.json
index da0a8381..57d0a1c4 100644
--- a/src/mceditlib/blocktypes/tmp_items.json
+++ b/src/mceditlib/blocktypes/tmp_items.json
@@ -495,7 +495,6 @@
         "texture": "gold_boots.png",
         "obtainable": true,
         "maxdamage": 91,
-        "maxdamage": 0,
         "stacksize": 1
     },
     "flint": {

From 69da56db1cd28ea8909275ca223bdad1041e82ae Mon Sep 17 00:00:00 2001
From: MestreLion <linux@rodrigosilva.com>
Date: Wed, 5 Dec 2018 22:49:44 -0200
Subject: [PATCH 2/4] add Enchanted Golden Apple to items JSON

---
 src/mceditlib/blocktypes/tmp_items.json | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/mceditlib/blocktypes/tmp_items.json b/src/mceditlib/blocktypes/tmp_items.json
index 57d0a1c4..c0538997 100644
--- a/src/mceditlib/blocktypes/tmp_items.json
+++ b/src/mceditlib/blocktypes/tmp_items.json
@@ -531,7 +531,10 @@
     },
     "golden_apple": {
         "id": 322,
-        "displayName": "Golden Apple",
+        "displayName": [
+            "Golden Apple",
+            "Enchanted Golden Apple"
+         ],
         "texture": "apple_golden.png",
         "obtainable": true,
         "maxdamage": 1,

From 13d424a17284da4476a378072b3a2a755215e2fc Mon Sep 17 00:00:00 2001
From: MestreLion <linux@rodrigosilva.com>
Date: Wed, 5 Dec 2018 23:11:54 -0200
Subject: [PATCH 3/4] fix Spawn Egg maxdamage, DV is no longer used and was
 non-linear

---
 src/mceditlib/blocktypes/tmp_items.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mceditlib/blocktypes/tmp_items.json b/src/mceditlib/blocktypes/tmp_items.json
index c0538997..eb9fb20c 100644
--- a/src/mceditlib/blocktypes/tmp_items.json
+++ b/src/mceditlib/blocktypes/tmp_items.json
@@ -1065,7 +1065,7 @@
         "displayName": "Spawn Egg",
         "texture": "spawn_egg.png",
         "obtainable": true,
-        "maxdamage": 120,
+        "maxdamage": 0,
         "stacksize": 64
     },
     "experience_bottle": {

From 856bc53250edec93a75dddd4f3db402e51d10a74 Mon Sep 17 00:00:00 2001
From: MestreLion <linux@rodrigosilva.com>
Date: Thu, 6 Dec 2018 00:09:35 -0200
Subject: [PATCH 4/4] fix numeric ID and capitalize displayName of Discs

---
 src/mceditlib/blocktypes/tmp_items.json | 44 ++++++++++++-------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/mceditlib/blocktypes/tmp_items.json b/src/mceditlib/blocktypes/tmp_items.json
index eb9fb20c..6c6e615c 100644
--- a/src/mceditlib/blocktypes/tmp_items.json
+++ b/src/mceditlib/blocktypes/tmp_items.json
@@ -1465,7 +1465,7 @@
         "stacksize": 64
     },
     "record_13": {
-        "id": 432,
+        "id": 2256,
         "displayName": "13 Disc",
         "texture": "record_13.png",
         "obtainable": true,
@@ -1473,79 +1473,79 @@
         "stacksize": 1
     },
     "record_cat": {
-        "id": 433,
-        "displayName": "cat Disc",
+        "id": 2257,
+        "displayName": "Cat Disc",
         "texture": "record_cat.png",
         "obtainable": true,
         "maxdamage": 0,
         "stacksize": 1
     },
     "record_blocks": {
-        "id": 434,
-        "displayName": "blocks Disc",
+        "id": 2258,
+        "displayName": "Blocks Disc",
         "texture": "record_blocks.png",
         "obtainable": true,
         "maxdamage": 0,
         "stacksize": 1
     },
     "record_chirp": {
-        "id": 435,
-        "displayName": "chirp Disc",
+        "id": 2259,
+        "displayName": "Chirp Disc",
         "texture": "record_chirp.png",
         "obtainable": true,
         "maxdamage": 0,
         "stacksize": 1
     },
     "record_far": {
-        "id": 436,
-        "displayName": "far Disc",
+        "id": 2260,
+        "displayName": "Far Disc",
         "texture": "record_far.png",
         "obtainable": true,
         "maxdamage": 0,
         "stacksize": 1
     },
     "record_mall": {
-        "id": 437,
-        "displayName": "mall Disc",
+        "id": 2261,
+        "displayName": "Mall Disc",
         "texture": "record_mall.png",
         "obtainable": true,
         "maxdamage": 0,
         "stacksize": 1
     },
     "record_mellohi": {
-        "id": 438,
-        "displayName": "mellohi Disc",
+        "id": 2262,
+        "displayName": "Mellohi Disc",
         "texture": "record_mellohi.png",
         "obtainable": true,
         "maxdamage": 0,
         "stacksize": 1
     },
     "record_stal": {
-        "id": 439,
-        "displayName": "stal Disc",
+        "id": 2263,
+        "displayName": "Stal Disc",
         "texture": "record_stal.png",
         "obtainable": true,
         "maxdamage": 0,
         "stacksize": 1
     },
     "record_strad": {
-        "id": 440,
-        "displayName": "strad Disc",
+        "id": 2264,
+        "displayName": "Strad Disc",
         "texture": "record_strad.png",
         "obtainable": true,
         "maxdamage": 0,
         "stacksize": 1
     },
     "record_ward": {
-        "id": 441,
-        "displayName": "ward Disc",
+        "id": 2265,
+        "displayName": "Ward Disc",
         "texture": "record_ward.png",
         "obtainable": true,
         "maxdamage": 0,
         "stacksize": 1
     },
     "record_11": {
-        "id": 442,
+        "id": 2266,
         "displayName": "11 Disc",
         "texture": "record_11.png",
         "obtainable": true,
@@ -1553,8 +1553,8 @@
         "stacksize": 1
     },
     "record_wait": {
-        "id": 443,
-        "displayName": "wait Disc",
+        "id": 2267,
+        "displayName": "Wait Disc",
         "texture": "record_wait.png",
         "obtainable": true,
         "maxdamage": 0,