Merge remote-tracking branch 'origin/develop'

pom.xml

@@ -58,14 +58,14 @@
         <!-- Non-minecraft related dependencies -->
         <powermock.version>2.0.2</powermock.version>
         <!-- More visible way how to change dependency versions -->
-        <spigot.version>1.13.2-R0.1-SNAPSHOT</spigot.version>
+        <spigot.version>1.14.4-R0.1-SNAPSHOT</spigot.version>
-        <bentobox.version>1.6.0-SNAPSHOT</bentobox.version>
+        <bentobox.version>1.8.0</bentobox.version>
         <!-- Revision variable removes warning about dynamic version -->
         <revision>${build.version}-SNAPSHOT</revision>
         <!-- Do not change unless you want different name for local builds. -->
         <build.number>-LOCAL</build.number>
         <!-- This allows to change between versions. -->
-        <build.version>1.7.0</build.version>
+        <build.version>1.8.0</build.version>
 	</properties>
 
     <!-- Profiles will allow to automatically change build version. -->

src/main/resources/config.yml

@@ -84,21 +84,30 @@ blocks:
   ACACIA_PLANKS: 1
   ACACIA_PRESSURE_PLATE: 2
   ACACIA_SAPLING: 1
+  ACACIA_SIGN: 6
   ACACIA_SLAB: 1
   ACACIA_STAIRS: 2
   ACACIA_TRAPDOOR: 3
+  ACACIA_WALL_SIGN: 6
   ACACIA_WOOD: 1
   ACTIVATOR_RAIL: 1
   ALLIUM: 1
   ANDESITE: 1
+  ANDESITE_SLAB: 1
+  ANDESITE_STAIRS: 1
+  ANDESITE_WALL: 1
   ANVIL: 10
   ATTACHED_MELON_STEM: 1
   ATTACHED_PUMPKIN_STEM: 1
   AZURE_BLUET: 1
+  BAMBOO: 1
+  BAMBOO_SAPLING: 1
+  BARREL: 2
   BARRIER: 0
   BEACON: 500
   BEDROCK: 0
   BEETROOTS: 1
+  BELL: 100
   BIRCH_BUTTON: 1
   BIRCH_DOOR: 2
   BIRCH_FENCE: 2
@@ -108,9 +117,11 @@ blocks:
   BIRCH_PLANKS: 1
   BIRCH_PRESSURE_PLATE: 2
   BIRCH_SAPLING: 1
+  BIRCH_SIGN: 6
   BIRCH_SLAB: 1
   BIRCH_STAIRS: 2
   BIRCH_TRAPDOOR: 3
+  BIRCH_WALL_SIGN: 6
   BIRCH_WOOD: 1
   BLACK_BANNER: 2
   BLACK_BED: 6
@@ -124,6 +135,7 @@ blocks:
   BLACK_TERRACOTTA: 2
   BLACK_WALL_BANNER: 2
   BLACK_WOOL: 2
+  BLAST_FURNACE: 150
   BLUE_BANNER: 2
   BLUE_BED: 6
   BLUE_CARPET: 1
@@ -148,6 +160,7 @@ blocks:
   BRICKS: 5
   BRICK_SLAB: 3
   BRICK_STAIRS: 5
+  BRICK_WALL: 5
   BROWN_BANNER: 2
   BROWN_BED: 6
   BROWN_CARPET: 1
@@ -169,7 +182,9 @@ blocks:
   BUBBLE_CORAL_WALL_FAN: 1
   CACTUS: 1
   CAKE: 9
+  CAMPFIRE: 5
   CARROTS: 1
+  CARTOGRAPHY_TABLE: 6
   CARVED_PUMPKIN: 2
   CAULDRON: 10
   CAVE_AIR: 0
@@ -194,13 +209,17 @@ blocks:
   COCOA: 1
   COMMAND_BLOCK: 0
   COMPARATOR: 10
+  COMPOSTER: 9
   CONDUIT: 1
+  CORNFLOWER: 1
   CRACKED_STONE_BRICKS: 2
   CRAFTING_TABLE: 1
   CREEPER_HEAD: 1
   CREEPER_WALL_HEAD: 1
   CUT_RED_SANDSTONE: 1
+  CUT_RED_SANDSTONE_SLAB: 1
   CUT_SANDSTONE: 1
+  CUT_SANDSTONE_SLAB: 1
   CYAN_BANNER: 2
   CYAN_BED: 6
   CYAN_CARPET: 1
@@ -224,10 +243,12 @@ blocks:
   DARK_OAK_PLANKS: 1
   DARK_OAK_PRESSURE_PLATE: 2
   DARK_OAK_SAPLING: 1
+  DARK_OAK_SIGN: 6
   DARK_OAK_SLAB: 1
   DARK_OAK_STAIRS: 2
   DARK_OAK_TRAPDOOR: 3
   DARK_OAK_WOOD: 1
+  DARK_OAK_WALL_SIGN: 6
   DARK_PRISMARINE: 1
   DARK_PRISMARINE_SLAB: 1
   DARK_PRISMARINE_STAIRS: 2
@@ -252,6 +273,9 @@ blocks:
   DIAMOND_BLOCK: 300
   DIAMOND_ORE: 1
   DIORITE: 1
+  DIORITE_SLAB: 1
+  DIORITE_STAIRS: 1
+  DIORITE_WALL: 1
   DIRT: 3
   DISPENSER: 5
   DRAGON_EGG: 150
@@ -269,6 +293,9 @@ blocks:
   END_ROD: 1
   END_STONE: 1
   END_STONE_BRICKS: 2
+  END_STONE_BRICK_SLAB: 2
+  END_STONE_BRICK_STAIRS: 2
+  END_STONE_BRICK_WALL: 2
   FARMLAND: 1
   FERN: 1
   FIRE: 0
@@ -276,6 +303,7 @@ blocks:
   FIRE_CORAL_BLOCK: 1
   FIRE_CORAL_FAN: 1
   FIRE_CORAL_WALL_FAN: 1
+  FLETCHING_TABLE: 8
   FLOWER_POT: 1
   FROSTED_ICE: 1
   FURNACE: 8
@@ -285,6 +313,9 @@ blocks:
   GOLD_BLOCK: 150
   GOLD_ORE: 1
   GRANITE: 1
+  GRANITE_SLAB: 1
+  GRANITE_STAIRS: 1
+  GRANITE_WALL: 1
   GRASS: 4
   GRASS_BLOCK: 4
   GRASS_PATH: 4
@@ -313,10 +344,11 @@ blocks:
   GREEN_TERRACOTTA: 2
   GREEN_WALL_BANNER: 2
   GREEN_WOOL: 2
+  GRINDSTONE: 8
   HAY_BLOCK: 2
-  HEAVY_WEIGHTED_PRESSURE_PLATE: 3
+  HEART_OF_THE_SEA: 3
+  HEAVY_WEIGHTED_PRESSURE_PLATE: 2
   HOPPER: -10
-  HORN_CORAL: 1
   HORN_CORAL_BLOCK: 1
   HORN_CORAL_FAN: 1
   HORN_CORAL_WALL_FAN: 1
@@ -343,17 +375,21 @@ blocks:
   JUNGLE_PLANKS: 1
   JUNGLE_PRESSURE_PLATE: 2
   JUNGLE_SAPLING: 1
+  JUNGLE_SIGN: 6
   JUNGLE_SLAB: 1
   JUNGLE_STAIRS: 2
   JUNGLE_TRAPDOOR: 3
+  JUNGLE_WALL_SIGN: 6
   JUNGLE_WOOD: 1
   KELP: 1
   KELP_PLANT: 1
   LADDER: 2
+  LANTERN: 3
   LAPIS_BLOCK: 10
   LAPIS_ORE: 1
   LARGE_FERN: 1
   LAVA: 0
+  LECTERN: 8
   LEVER: 1
   LIGHT_BLUE_BANNER: 2
   LIGHT_BLUE_BED: 6
@@ -381,6 +417,7 @@ blocks:
   LIGHT_GRAY_WOOL: 2
   LIGHT_WEIGHTED_PRESSURE_PLATE: 3
   LILAC: 1
+  LILY_OF_THE_VALLEY: 1
   LILY_PAD: 5
   LIME_BANNER: 2
   LIME_BED: 6
@@ -394,6 +431,7 @@ blocks:
   LIME_TERRACOTTA: 2
   LIME_WALL_BANNER: 2
   LIME_WOOL: 2
+  LOOM: 5
   MAGENTA_BANNER: 2
   MAGENTA_BED: 6
   MAGENTA_CARPET: 1
@@ -410,19 +448,22 @@ blocks:
   MELON: 1
   MELON_STEM: 1
   MOSSY_COBBLESTONE: 1
+  MOSSY_COBBLESTONE_SLAB: 1
+  MOSSY_COBBLESTONE_STAIRS: 1
   MOSSY_COBBLESTONE_WALL: 1
   MOSSY_STONE_BRICKS: 2
-  MOVING_PISTON: 1
+  MOSSY_STONE_BRICK_SLAB: 2
-  MUSHROOM_STEM: 1
+  MOSSY_STONE_BRICK_STAIRS: 2
+  MOSSY_STONE_BRICK_WALL: 2
   MYCELIUM: 5
   NETHERRACK: 1
   NETHER_BRICKS: 2
   NETHER_BRICK_FENCE: 2
   NETHER_BRICK_SLAB: 1
   NETHER_BRICK_STAIRS: 2
+  NETHER_BRICK_WALL: 2
   NETHER_PORTAL: 1
   NETHER_QUARTZ_ORE: 1
-  NETHER_WART: 1
   NETHER_WART_BLOCK: 2
   NOTE_BLOCK: 10
   OAK_BUTTON: 1
@@ -434,9 +475,11 @@ blocks:
   OAK_PLANKS: 1
   OAK_PRESSURE_PLATE: 2
   OAK_SAPLING: 1
+  OAK_SIGN: 6
   OAK_SLAB: 1
   OAK_STAIRS: 2
   OAK_TRAPDOOR: 3
+  OAK_WALL_SIGN: 6
   OAK_WOOD: 1
   OBSERVER: 1
   OBSIDIAN: 10
@@ -471,27 +514,35 @@ blocks:
   PINK_WALL_BANNER: 2
   PINK_WOOL: 2
   PISTON: 2
-  PISTON_HEAD: 1
   PLAYER_HEAD: 1
   PLAYER_WALL_HEAD: 1
   PODZOL: 2
   POLISHED_ANDESITE: 1
+  POLISHED_ANDESITE_SLAB: 1
+  POLISHED_ANDESITE_STAIRS: 1
   POLISHED_DIORITE: 1
+  POLISHED_DIORITE_SLAB: 1
+  POLISHED_DIORITE_STAIRS: 1
   POLISHED_GRANITE: 1
+  POLISHED_GRANITE_SLAB: 1
+  POLISHED_GRANITE_STAIRS: 1
   POPPY: 1
   POTATOES: 1
   POTTED_ACACIA_SAPLING: 1
   POTTED_ALLIUM: 1
   POTTED_AZURE_BLUET: 1
+  POTTED_BAMBOO: 1
   POTTED_BIRCH_SAPLING: 1
   POTTED_BLUE_ORCHID: 1
   POTTED_BROWN_MUSHROOM: 1
   POTTED_CACTUS: 1
+  POTTED_CORNFLOWER: 1
   POTTED_DANDELION: 1
   POTTED_DARK_OAK_SAPLING: 1
   POTTED_DEAD_BUSH: 1
   POTTED_FERN: 1
   POTTED_JUNGLE_SAPLING: 1
+  POTTED_LILY_OF_THE_VALLEY: 1
   POTTED_OAK_SAPLING: 1
   POTTED_ORANGE_TULIP: 1
   POTTED_OXEYE_DAISY: 1
@@ -501,6 +552,7 @@ blocks:
   POTTED_RED_TULIP: 1
   POTTED_SPRUCE_SAPLING: 1
   POTTED_WHITE_TULIP: 1
+  POTTED_WITHER_ROSE: 1
   POWERED_RAIL: 2
   PRISMARINE: 1
   PRISMARINE_BRICKS: 2
@@ -508,6 +560,7 @@ blocks:
   PRISMARINE_BRICK_STAIRS: 2
   PRISMARINE_SLAB: 1
   PRISMARINE_STAIRS: 2
+  PRISMARINE_WALL: 2
   PUMPKIN: 1
   PUMPKIN_STEM: 1
   PURPLE_BANNER: 2
@@ -537,6 +590,7 @@ blocks:
   REDSTONE_TORCH: 5
   REDSTONE_WALL_TORCH: 5
   REDSTONE_WIRE: 1
+  RED_BANNER: 2
   RED_BED: 6
   RED_CARPET: 1
   RED_CONCRETE: 3
@@ -545,10 +599,14 @@ blocks:
   RED_MUSHROOM: 1
   RED_MUSHROOM_BLOCK: 1
   RED_NETHER_BRICKS: 2
+  RED_NETHER_BRICK_SLAB: 2
+  RED_NETHER_BRICK_STAIRS: 2
+  RED_NETHER_BRICK_WALL: 2
   RED_SAND: 1
   RED_SANDSTONE: 1
   RED_SANDSTONE_SLAB: 1
   RED_SANDSTONE_STAIRS: 2
+  RED_SANDSTONE_WALL: 2
   RED_SHULKER_BOX: 11
   RED_STAINED_GLASS: 2
   RED_STAINED_GLASS_PANE: 1
@@ -563,18 +621,28 @@ blocks:
   SANDSTONE: 1
   SANDSTONE_SLAB: 1
   SANDSTONE_STAIRS: 2
+  SANDSTONE_WALL: 2
+  SCAFFOLDING: 1
   SEAGRASS: 1
   SEA_LANTERN: 9
   SEA_PICKLE: 1
   SHULKER_BOX: 10
-  SIGN: 6
   SKELETON_SKULL: 10
   SKELETON_WALL_SKULL: 100
   SLIME_BLOCK: 10
+  SMITHING_TABLE: 6
+  SMOKER: 10
   SMOOTH_QUARTZ: 1
+  SMOOTH_QUARTZ_SLAB: 1
+  SMOOTH_QUARTZ_STAIRS: 1
   SMOOTH_RED_SANDSTONE: 1
+  SMOOTH_RED_SANDSTONE_SLAB: 1
+  SMOOTH_RED_SANDSTONE_STAIRS: 1
   SMOOTH_SANDSTONE: 1
+  SMOOTH_SANDSTONE_SLAB: 1
+  SMOOTH_SANDSTONE_STAIRS: 1
   SMOOTH_STONE: 1
+  SMOOTH_STONE_SLAB: 1
   SNOW: 1
   SNOW_BLOCK: 1
   SOUL_SAND: 2
@@ -589,18 +657,23 @@ blocks:
   SPRUCE_PLANKS: 1
   SPRUCE_PRESSURE_PLATE: 2
   SPRUCE_SAPLING: 1
+  SPRUCE_SIGN: 6
   SPRUCE_SLAB: 1
   SPRUCE_STAIRS: 2
   SPRUCE_TRAPDOOR: 3
+  SPRUCE_WALL_SIGN: 6
   SPRUCE_WOOD: 1
   STICKY_PISTON: 1
   STONE: 1
+  STONECUTTER: 4
   STONE_BRICKS: 2
   STONE_BRICK_SLAB: 1
   STONE_BRICK_STAIRS: 2
+  STONE_BRICK_WALL: 2
   STONE_BUTTON: 1
   STONE_PRESSURE_PLATE: 2
   STONE_SLAB: 1
+  STONE_STAIRS: 1
   STRIPPED_ACACIA_LOG: 0
   STRIPPED_ACACIA_WOOD: 1
   STRIPPED_BIRCH_LOG: 0
@@ -615,6 +688,7 @@ blocks:
   STRIPPED_SPRUCE_WOOD: 1
   SUGAR_CANE: 1
   SUNFLOWER: 1
+  SWEET_BERRY_BUSH: 1
   TALL_GRASS: 1
   TALL_SEAGRASS: 1
   TERRACOTTA: 2
@@ -623,14 +697,12 @@ blocks:
   TRAPPED_CHEST: 10
   TRIPWIRE: 2
   TRIPWIRE_HOOK: 2
-  TUBE_CORAL: 1
   TUBE_CORAL_BLOCK: 1
   TUBE_CORAL_FAN: 1
   TUBE_CORAL_WALL_FAN: 1
   TURTLE_EGG: 1
   VINE: 1
   VOID_AIR: 0
-  WALL_SIGN: 6
   WALL_TORCH: 1
   WATER: 0
   WET_SPONGE: 10
@@ -648,6 +720,7 @@ blocks:
   WHITE_TULIP: 1
   WHITE_WALL_BANNER: 2
   WHITE_WOOL: 2
+  WITHER_ROSE: 1
   WITHER_SKELETON_SKULL: 10
   WITHER_SKELETON_WALL_SKULL: 10
   YELLOW_BANNER: 2