diff --git a/_/items.json b/_/items.json
index f97faa4..cb1e199 100644
--- a/_/items.json
+++ b/_/items.json
@@ -413,9 +413,12 @@
   "chest": {
     "id": 54
   },
+<<<<<<< HEAD
   "redstone_wire": {
     "id": 55
   },
+=======
+>>>>>>> 7194ff2 (fix some item ids)
   "diamond_ore": {
     "id": 56
   },
@@ -425,21 +428,27 @@
   "crafting_table": {
     "id": 58
   },
+<<<<<<< HEAD
   "wheat": {
     "id": 59
   },
+=======
+>>>>>>> 7194ff2 (fix some item ids)
   "farmland": {
     "id": 60
   },
   "furnace": {
     "id": 61
   },
+<<<<<<< HEAD
   "sign": {
     "id": 63
   },
   "oak_door": {
     "id": 64
   },
+=======
+>>>>>>> 7194ff2 (fix some item ids)
   "ladder": {
     "id": 65
   },
@@ -455,9 +464,12 @@
   "stone_pressure_plate": {
     "id": 70
   },
+<<<<<<< HEAD
   "iron_door": {
     "id": 71
   },
+=======
+>>>>>>> 7194ff2 (fix some item ids)
   "oak_pressure_plate": {
     "id": 72
   },
@@ -485,9 +497,12 @@
   "clay": {
     "id": 82
   },
+<<<<<<< HEAD
   "sugar_cane": {
     "id": 83
   },
+=======
+>>>>>>> 7194ff2 (fix some item ids)
   "jukebox": {
     "id": 84
   },
@@ -687,9 +702,6 @@
   "cauldron": {
     "id": 118
   },
-  "water_cauldron": {
-    "id": 118
-  },
   "end_portal": {
     "id": 119
   },
@@ -821,7 +833,8 @@
     "meta": 1
   },
   "quartz_pillar": {
-    "id": 155
+    "id": 155,
+    "meta": 2
   },
   "quartz_stairs": {
     "id": 156
@@ -1468,5 +1481,320 @@
   },
   "structure_block": {
     "id": 255
+  },
+  "iron_shovel": {
+    "id": 256
+  },
+  "iron_pickaxe": {
+    "id": 257
+  },
+  "iron_axe": {
+    "id": 258
+  },
+  "flint_and_steel": {
+    "id": 259
+  },
+  "apple": {
+    "id": 260
+  },
+  "bow": {
+    "id": 261
+  },
+  "arrow": {
+    "id": 262
+  },
+  "coal": {
+    "id": 263
+  },
+  "charcoal": {
+    "id": 263,
+    "meta": 1
+  },
+  "diamond": {
+    "id": 264
+  },
+  "iron_ingot": {
+    "id": 265
+  },
+  "gold_ingot": {
+    "id": 266
+  },
+  "iron_sword": {
+    "id": 267
+  },
+  "wooden_sword": {
+    "id": 268
+  },
+  "wooden_shovel": {
+    "id": 269
+  },
+  "wooden_pickaxe": {
+    "id": 270
+  },
+  "wooden_axe": {
+    "id": 271
+  },
+  "stone_sword": {
+    "id": 272
+  },
+  "stone_shovel": {
+    "id": 273
+  },
+  "stone_pickaxe": {
+    "id": 274
+  },
+  "stone_axe": {
+    "id": 275
+  },
+  "diamond_sword": {
+    "id": 276
+  },
+  "diamond_shovel": {
+    "id": 277
+  },
+  "diamond_pickaxe": {
+    "id": 278
+  },
+  "diamond_axe": {
+    "id": 279
+  },
+  "stick": {
+    "id": 280
+  },
+  "bowl": {
+    "id": 281
+  },
+  "mushroom_stew": {
+    "id": 282
+  },
+  "golden_sword": {
+    "id": 283
+  },
+  "golden_shovel": {
+    "id": 284
+  },
+  "golden_pickaxe": {
+    "id": 285
+  },
+  "golden_axe": {
+    "id": 286
+  },
+  "string": {
+    "id": 287
+  },
+  "feather": {
+    "id": 288
+  },
+  "gunpowder": {
+    "id": 289
+  },
+  "wooden_hoe": {
+    "id": 290
+  },
+  "stone_hoe": {
+    "id": 291
+  },
+  "iron_hoe": {
+    "id": 292
+  },
+  "diamond_hoe": {
+    "id": 293
+  },
+  "golden_hoe": {
+    "id": 294
+  },
+  "wheat_seeds": {
+    "id": 295
+  },
+  "wheat": {
+    "id": 296
+  },
+  "bread": {
+    "id": 297
+  },
+  "leather_helmet": {
+    "id": 298
+  },
+  "leather_chestplate": {
+    "id": 299
+  },
+  "leather_leggings": {
+    "id": 300
+  },
+  "leather_boots": {
+    "id": 301
+  },
+  "chainmail_helmet": {
+    "id": 302
+  },
+  "chainmail_chestplate": {
+    "id": 303
+  },
+  "chainmail_leggings": {
+    "id": 304
+  },
+  "chainmail_boots": {
+    "id": 305
+  },
+  "iron_helmet": {
+    "id": 306
+  },
+  "iron_chestplate": {
+    "id": 307
+  },
+  "iron_leggings": {
+    "id": 308
+  },
+  "iron_boots": {
+    "id": 309
+  },
+  "diamond_helmet": {
+    "id": 310
+  },
+  "diamond_chestplate": {
+    "id": 311
+  },
+  "diamond_leggings": {
+    "id": 312
+  },
+  "diamond_boots": {
+    "id": 313
+  },
+  "golden_helmet": {
+    "id": 314
+  },
+  "golden_chestplate": {
+    "id": 315
+  },
+  "golden_leggings": {
+    "id": 316
+  },
+  "golden_boots": {
+    "id": 317
+  },
+  "flint": {
+    "id": 318
+  },
+  "porkchop": {
+    "id": 319
+  },
+  "cooked_porkchop": {
+    "id": 320
+  },
+  "painting": {
+    "id": 321
+  },
+  "golden_apple": {
+    "id": 322
+  },
+  "enchanted_golden_apple": {
+    "id": 322,
+    "meta": 1
+  },
+  "sign": {
+    "id": 323
+  },
+  "oak_door": {
+    "id": 324
+  },
+  "bucket": {
+    "id": 325
+  },
+  "water_bucket": {
+    "id": 326
+  },
+  "lava_bucket": {
+    "id": 327
+  },
+  "minecart": {
+    "id": 328
+  },
+  "saddle": {
+    "id": 329
+  },
+  "iron_door": {
+    "id": 330
+  },
+  "redstone": {
+    "id": 331
+  },
+  "snowball": {
+    "id": 332
+  },
+  "boat": {
+    "id": 333
+  },
+  "leather": {
+    "id": 334
+  },
+  "milk_bucket": {
+    "id": 335
+  },
+  "brick": {
+    "id": 336
+  },
+  "clay_ball": {
+    "id": 337
+  },
+  "sugar_cane": {
+    "id": 338
+  },
+  "paper": {
+    "id": 339
+  },
+  "book": {
+    "id": 340
+  },
+  "slime_ball": {
+    "id": 341
+  },
+  "chest_minecart": {
+    "id": 342
+  },
+  "furnace_minecart": {
+    "id": 343
+  },
+  "egg": {
+    "id": 344
+  },
+  "compass": {
+    "id": 345
+  },
+  "fishing_rod": {
+    "id": 346
+  },
+  "clock": {
+    "id": 347
+  },
+  "glowstone_dust": {
+    "id": 348
+  },
+  "cod": {
+    "id": 349,
+    "meta": 0
+  },
+  "salmon": {
+    "id": 349,
+    "meta": 1
+  },
+  "tropical_fish": {
+    "id": 349,
+    "meta": 2
+  },
+  "pufferfish": {
+    "id": 349,
+    "meta": 3
+  },
+  "cooked_cod": {
+    "id": 350,
+    "meta": 0
+  },
+  "cooked_salmon": {
+    "id": 350,
+    "meta": 1
+  },
+  "ink_sac": {
+    "id": 351,
+    "meta": 1
   }
 }
diff --git a/index.json b/index.json
deleted file mode 100644
index f98378c..0000000
--- a/index.json
+++ /dev/null
@@ -1,64 +0,0 @@
-{
-  "biomes": [
-    {
-      "version": "_",
-      "hash": "abc"
-    }
-  ],
-  "dimensions": [
-    {
-      "version": "_",
-      "hash": "abc"
-    }
-  ],
-  "blocks": [
-    {
-      "version": "_",
-      "hash": "abc"
-    }
-  ],
-  "entities": [
-    {
-      "version": "_",
-      "hash": "abc"
-    },
-    {
-      "version": "1.8.9",
-      "hash": "abc"
-    },
-    {
-      "version": "1.12.2",
-      "hash": "abc"
-    }
-  ],
-  "fluids": [
-    {
-      "version": "_",
-      "hash": "abc"
-    }
-  ],
-  "particle_type": [
-    {
-      "version": "_",
-      "hash": "abc"
-    }
-  ],
-  "status_effects": [
-    {
-      "version": "_",
-      "hash": "abc"
-    }
-  ],
-  "enchantments": [
-    {
-      "version": "_",
-      "hash": "abc"
-    }
-  ],
-  "motif": [
-    {
-      "version": "_",
-      "hash": "abc"
-    }
-  ]
-}