Improved schem import and more blocks

data/blocks.csv

@@ -1,110 +1,114 @@
 _Name,BlockID,BlockName,Biome Specific,MapGen Alias,Mineclone2,Minetest Game
-Acacia_Bark,,,,default:acacia_tree,mcl_core:acaciatree_bark,mcl_core:acaciatree_bark
+Acacia_Bark,,minecraft:acacia_wood,,default:acacia_tree,mcl_core:acaciatree_bark,mcl_core:acaciatree_bark
 Acacia_Bark_Slab,,,,,mcl_stairs:slab_acaciatree_bark,mcl_stairs:slab_acaciatree_bark
 Acacia_Bark_Stair,,,,,mcl_stairs:stair_acaciatree_bark,mcl_stairs:stair_acaciatree_bark
 Acacia_Button,,minecraft:acacia_button,,,mesecons_button:button_acaciawood_off,mesecons_button:button_acaciawood_off
 Acacia_Fence,192,minecraft:acacia_fence,,,mcl_fences:acacia_fence,default:fence_acacia_wood
 Acacia_Fence_Gate,187,minecraft:acacia_fence_gate,,,mcl_fences:acacia_fence_gate,doors:gate_acacia_wood_closed
 Acacia_Leaves,,minecraft:acacia_leaves,,,mcl_core:acacialeaves,default:acacia_leaves
-Acacia,,minecraft:acacia,,default:acacia_leaves,mcl_core:acaciatree,default:acacia_tree
-Acacia_Plank,,minecraft:acacia_log,,,mcl_core:acaciawood,default:acacia_wood
-Acacia_Pressure_Plate,147,minecraft:light_weighted_pressure_plate,,mesecons:pressure_plate_acaciawood,mesecons_pressureplates:pressure_plate_acaciawood_on,mesecons_pressureplates:pressure_plate_acaciawood_off
-Acacia_Sapling_Flower_Pot,,,,,mcl_flowerpots:flower_pot_acaciasapling,mcl_flowerpots:flower_pot_acaciasapling
-Acacia_Sapling,,,,,mcl_core:acaciasapling,default:acacia_sapling
+Acacia,,minecraft:acacia_log,,default:acacia_leaves,mcl_core:acaciatree,default:acacia_tree
+Acacia_Plank,,minecraft:acacia_planks,,,mcl_core:acaciawood,default:acacia_wood
+Acacia_Pressure_Plate,147,minecraft:acacia_pressure_plate,,mesecons:pressure_plate_acaciawood,mesecons_pressureplates:pressure_plate_acaciawood_on,mesecons_pressureplates:pressure_plate_acaciawood_off
+Acacia_Sapling_Flower_Pot,,minecraft:potted_acacia_sapling,,,mcl_flowerpots:flower_pot_acaciasapling,mcl_flowerpots:flower_pot_acaciasapling
+Acacia_Sapling,,minecraft:acacia_sapling,,,mcl_core:acaciasapling,default:acacia_sapling
 Acacia_Slab,,minecraft:acacia_slab,,stairs:slab_acaciawood,mcl_stairs:slab_acaciawood,stairs:slab_acacia_wood
 Acacia_Stair,163,minecraft:acacia_stairs,,stairs:stair_acaciawood,mcl_stairs:stair_acaciawood,stairs:stair_acacia_wood
 Acacia_Trapdoor,,minecraft:acacia_trapdoor,,,mcl_doors:acacia_trapdoor,mcl_doors:acacia_trapdoor
 Activator_Rail,157,minecraft:activator_rail,,,mcl_minecarts:activator_rail,mcl_minecarts:activator_rail
-Allium_Flower_Pot,,,,,mcl_flowerpots:flower_pot_allium,mcl_flowerpots:flower_pot_allium
+Allium_Flower_Pot,,minecraft:potted_allium,,,mcl_flowerpots:flower_pot_allium,mcl_flowerpots:flower_pot_allium
 Allium,,minecraft:allium,,,mcl_flowers:allium,mcl_flowers:allium
 Andesite,,minecraft:andesite,biome:node_stone,,mcl_core:andesite,default:andesite
 Andesite_Slab,,minecraft:andesite_slab,,,mcl_stairs:slab_andesite,mcl_stairs:slab_andesite
 Andesite_Stair,,minecraft:andesite_stairs,,,mcl_stairs:stair_andesite,mcl_stairs:stair_andesite
 Andesite_Wall,,minecraft:andesite_wall,,,mcl_walls:andesite,mcl_walls:andesite
+Armor_Stand,,minecraft:armour_stand,,3d_armor_stand:armor_stand,mcl_armor_stand:armor_stand,default:armor_stand
 Anvil,145,minecraft:anvil,,,mcl_anvils:anvil,mcl_anvils:anvil
-Azure_Bluet_Flower_Pot,,,,,mcl_flowerpots:flower_pot_azure_bluet,mcl_flowerpots:flower_pot_azure_bluet
-Azure_Bluet,,,,,mcl_flowers:azure_bluet,mcl_flowers:azure_bluet
+Azure_Bluet_Flower_Pot,,minecraft:potted_azure_bluet,,,mcl_flowerpots:flower_pot_azure_bluet,mcl_flowerpots:flower_pot_azure_bluet
+Azure_Bluet,,minecraft:azure_bluet,,,mcl_flowers:azure_bluet,mcl_flowers:azure_bluet
 Barrier,166,minecraft:barrier,,,mcl_core:barrier,mcl_core:barrier
 Bed_Red,26,minecraft:bed,,,mcl_beds:red,default:red
 Bedrock,7,minecraft:bedrock,,,mcl_core:bedrock,default:bedrock
 Bell,,minecraft:bell,,,mcl_core:bell,default:bell
-Birch_Bark,,,,,mcl_core:birchtree_bark,mcl_core:birchtree_bark
+Birch_Bark,,minecraft:birch_wood,,,mcl_core:birchtree_bark,mcl_core:birchtree_bark
 Birch_Bark_Slab,,,,,mcl_stairs:slab_birchtree_bark,mcl_stairs:slab_birchtree_bark
 Birch_Bark_Stair,,,,,mcl_stairs:stair_birchtree_bark,mcl_stairs:stair_birchtree_bark
-Birch_Button,,,,,mesecons_button:button_birchwood_off,mesecons_button:button_birchwood_off
-Birch_Door,,,,,mcl_doors:birch_door,doors:door_wood_a
+Birch_Button,,minecraft:birch_button,,,mesecons_button:button_birchwood_off,mesecons_button:button_birchwood_off
+Birch_Door,,minecraft:birch_door,,,mcl_doors:birch_door,doors:door_wood_a
 Birch_Fence,189,minecraft:birch_fence,,,mcl_fences:birch_fence,default:fence_wood
 Birch_Fence_Gate,184,minecraft:birch_fence_gate,,,mcl_fences:birch_fence_gate,doors:gate_wood_closed
 Birch_Leaves,,minecraft:birch_leaves,,,mcl_core:birchleaves,mcl_core:birchleaves
-Birch,,minecraft:birch,,,mcl_core:birchtree,default:apple
-Birch_Plank,,minecraft:birch_log,,,mcl_core:birchwood,mcl_core:birchwood
-Birch_Pressure_Plate,148,minecraft:heavy_weighted_pressure_plate,,mesecons:pressure_plate_birchwood,mesecons_pressureplates:pressure_plate_birchwood_off,mesecons_pressureplates:pressure_plate_birchwood_on
-Birch_Sapling_Flower_Pot,,,,,mcl_flowerpots:flower_pot_birchsapling,mcl_flowerpots:flower_pot_birchsapling
-Birch_Sapling,,,,,mcl_core:birchsapling,default:sapling
+Birch,,minecraft:birch_log,,,mcl_core:birchtree,default:apple
+Birch_Plank,,minecraft:birch_planks,,,mcl_core:birchwood,mcl_core:birchwood
+Birch_Pressure_Plate,148,minecraft:birch_pressure_plate,,mesecons:pressure_plate_birchwood,mesecons_pressureplates:pressure_plate_birchwood_off,mesecons_pressureplates:pressure_plate_birchwood_on
+Birch_Sapling_Flower_Pot,,minecraft:potted_birch_sapling,,,mcl_flowerpots:flower_pot_birchsapling,mcl_flowerpots:flower_pot_birchsapling
+Birch_Sapling,,minecraft:birch_sapling,,,mcl_core:birchsapling,default:sapling
 Birch_Slab,,minecraft:birch_slab,,stairs:slab_birchwood,mcl_stairs:slab_birchwood,mcl_stairs:slab_birchwood
 Birch_Stair,135,minecraft:birch_stairs,,stairs:stair_birchwood,mcl_stairs:stair_birchwood,mcl_stairs:stair_birchwood
 Birch_Trapdoor,,minecraft:birch_trapdoor,,,mcl_doors:birch_trapdoor,mcl_doors:birch_trapdoor
 Black_Bed,,minecraft:black_bed,,,mcl_beds:bed_black_bottom,mcl_beds:bed_black_bottom
-Black_Carpet,,,,,mcl_wool:black_carpet,mcl_wool:black_carpet
-Black_Concrete,,,,,mcl_colorblocks:concrete_black,mcl_colorblocks:concrete_black
-Black_Concrete_Powder,,,,,mcl_colorblocks:concrete_powder_black,mcl_colorblocks:concrete_powder_black
+Black_Carpet,,minecraft:black_carpet,,,mcl_wool:black_carpet,mcl_wool:black_carpet
+Black_Concrete,,minecraft:black_concrete,,,mcl_colorblocks:concrete_black,mcl_colorblocks:concrete_black
+Black_Concrete_Powder,,minecraft:black_concrete_powder,,,mcl_colorblocks:concrete_powder_black,mcl_colorblocks:concrete_powder_black
 Black_Concrete_Slab,,,,,mcl_stairs:slab_concrete_black,mcl_stairs:slab_concrete_black
 Black_Concrete_Stair,,,,,mcl_stairs:stair_concrete_black,mcl_stairs:stair_concrete_black
 Black_Glazed_Terracotta,250,minecraft:black_glazed_terracotta,,,mcl_colorblocks:glazed_terracotta_black,mcl_colorblocks:glazed_terracotta_black
 Black_Shulker_Box,234,minecraft:black_shulker_box,,,mcl_chests:black_shulker_box,mcl_chests:black_shulker_box
-Black_Stained_Glass,,,,,mcl_core:glass_black,xpanes:pane_black
-Black_Stained_Glass_Pane,,,,,xpanes:pane_black_flat,xpanes:pane_black_flat
-Black_Terracotta,,,,,mcl_colorblocks:hardened_clay_black,mcl_colorblocks:hardened_clay_black
-Black_Wool,,,,,mcl_wool:black,wool:black
-Blue_Bed,,,,,mcl_beds:bed_blue_bottom,mcl_beds:bed_blue_bottom
-Blue_Carpet,,,,,mcl_wool:blue_carpet,mcl_wool:blue_carpet
-Blue_Concrete,,,,,mcl_colorblocks:concrete_blue,mcl_colorblocks:concrete_blue
-Blue_Concrete_Powder,,,,,mcl_colorblocks:concrete_powder_blue,mcl_colorblocks:concrete_powder_blue
+Black_Stained_Glass,,minecraft:black_stained_glass,,,mcl_core:glass_black,xpanes:pane_black
+Black_Stained_Glass_Pane,,minecraft:black_stained_glass_pane,,,xpanes:pane_black_flat,xpanes:pane_black_flat
+Black_Terracotta,,minecraft:black_terracotta,,,mcl_colorblocks:hardened_clay_black,mcl_colorblocks:hardened_clay_black
+Black_Wool,,minecraft:black_wool,,,mcl_wool:black,wool:black
+Blue_Bed,,minecraft:blue_bed,,,mcl_beds:bed_blue_bottom,mcl_beds:bed_blue_bottom
+Blue_Carpet,,minecraft:blue_carpet,,,mcl_wool:blue_carpet,mcl_wool:blue_carpet
+Blue_Concrete,,minecraft:blue_concrete,,,mcl_colorblocks:concrete_blue,mcl_colorblocks:concrete_blue
+Blue_Concrete_Powder,,minecraft:blue_concrete_powder,,,mcl_colorblocks:concrete_powder_blue,mcl_colorblocks:concrete_powder_blue
 Blue_Concrete_Slab,,,,,mcl_stairs:slab_concrete_blue,mcl_stairs:slab_concrete_blue
 Blue_Concrete_Stair,,,,,mcl_stairs:stair_concrete_blue,mcl_stairs:stair_concrete_blue
 Blue_Glazed_Terracotta,246,minecraft:blue_glazed_terracotta,,,mcl_colorblocks:glazed_terracotta_blue,mcl_colorblocks:glazed_terracotta_blue
-Blue_Orchid_Flower_Pot,,,,,mcl_flowerpots:flower_pot_blue_orchid,mcl_flowerpots:flower_pot_blue_orchid
-Blue_Orchid,,,,,mcl_flowers:blue_orchid,mcl_flowers:blue_orchid
+Blue_Orchid_Flower_Pot,,minecraft:potted_blue_orchid,,,mcl_flowerpots:flower_pot_blue_orchid,mcl_flowerpots:flower_pot_blue_orchid
+Blue_Orchid,,minecraft:blue_orchid,,,mcl_flowers:blue_orchid,mcl_flowers:blue_orchid
 Blue_Shulker_Box,230,minecraft:blue_shulker_box,,,mcl_chests:blue_shulker_box,mcl_chests:blue_shulker_box
-Blue_Stained_Glass,,,,,mcl_core:glass_blue,xpanes:pane_blue
-Blue_Stained_Glass_Pane,,,,,xpanes:pane_blue_flat,xpanes:pane_blue_flat
-Blue_Terracotta,,,,,mcl_colorblocks:hardened_clay_blue,mcl_colorblocks:hardened_clay_blue
-Blue_Wool,,,,,mcl_wool:blue,wool:blue
+Blue_Stained_Glass,,minecraft:blue_stained_glass,,,mcl_core:glass_blue,xpanes:pane_blue
+Blue_Stained_Glass_Pane,,minecraft:blue_stained_glass_pane,,,xpanes:pane_blue_flat,xpanes:pane_blue_flat
+Blue_Terracotta,,minecraft:blue_terracotta,,,mcl_colorblocks:hardened_clay_blue,mcl_colorblocks:hardened_clay_blue
+Blue_Wool,,minecraft:blue_wool,,,mcl_wool:blue,wool:blue
 Bone_Block,216,minecraft:bone_block,,,mcl_core:bone_block,bones:bones
 Bookshelf,47,minecraft:bookshelf,,,mcl_books:bookshelf,default:bookshelf
+> Brain_Coral_Block,,,,,mcl_ocean:brain_coral_block,default:brain_coral_block
+> Brain_Coral_Fan,,,,,mcl_ocean:brain_coral_fan,default:brain_coral_fan
+> Brain_Coral,,,,,mcl_ocean:brain_coral,default:brain_coral
 Brewing_Stand,117,minecraft:brewing_stand,,,mcl_core:brewing_stand,default:brewing_stand
 Brick_Block,45,minecraft:brick_block,,,mcl_core:brick_block,default:brick
-Brick_Slab,,,,stairs:slab_brick_block,mcl_stairs:slab_brick_block,stairs:slab_brick
+Brick_Slab,,minecraft:brick_slab,,stairs:slab_brick_block,mcl_stairs:slab_brick_block,stairs:slab_brick
 Brick_Stair,108,minecraft:brick_stairs,,stairs:stair_brick_block,mcl_stairs:stair_brick_block,stairs:stair_brick
-Brick_Wall,,,,,mcl_walls:brick,mcl_walls:brick
-Brown_Bed,,,,,mcl_beds:bed_brown_bottom,mcl_beds:bed_brown_bottom
-Brown_Carpet,,,,,mcl_wool:brown_carpet,mcl_wool:brown_carpet
-Brown_Concrete,,,,,mcl_colorblocks:concrete_brown,mcl_colorblocks:concrete_brown
-Brown_Concrete_Powder,,,,,mcl_colorblocks:concrete_powder_brown,mcl_colorblocks:concrete_powder_brown
+Brick_Wall,,minecraft:brick_wall,,,mcl_walls:brick,mcl_walls:brick
+Brown_Bed,,minecraft:brown_bed,,,mcl_beds:bed_brown_bottom,mcl_beds:bed_brown_bottom
+Brown_Carpet,,minecraft:brown_carpet,,,mcl_wool:brown_carpet,mcl_wool:brown_carpet
+Brown_Concrete,,minecraft:brown_concrete_powder,,,mcl_colorblocks:concrete_brown,mcl_colorblocks:concrete_brown
+Brown_Concrete_Powder,,minecraft:brown_concrete_powder,,,mcl_colorblocks:concrete_powder_brown,mcl_colorblocks:concrete_powder_brown
 Brown_Concrete_Slab,,,,,mcl_stairs:slab_concrete_brown,mcl_stairs:slab_concrete_brown
 Brown_Concrete_Stair,,,,,mcl_stairs:stair_concrete_brown,mcl_stairs:stair_concrete_brown
 Brown_Glazed_Terracotta,247,minecraft:brown_glazed_terracotta,,,mcl_colorblocks:glazed_terracotta_brown,mcl_colorblocks:glazed_terracotta_brown
 Brown_Mushroom,39,minecraft:brown_mushroom,,,mcl_mushrooms:mushroom_brown,flowers:mushroom_brown
-Brown_Mushroom_Flower_Pot,,,,,mcl_flowerpots:flower_pot_mushroom_brown,mcl_flowerpots:flower_pot_mushroom_brown
+Brown_Mushroom_Flower_Pot,,minecraft:potted_brown_mushroom,,,mcl_flowerpots:flower_pot_mushroom_brown,mcl_flowerpots:flower_pot_mushroom_brown
 Brown_Shulker_Box,231,minecraft:brown_shulker_box,,,mcl_chests:brown_shulker_box,mcl_chests:brown_shulker_box
-Brown_Stained_Glass,,,,,mcl_core:glass_brown,xpanes:pane_brown
-Brown_Stained_Glass_Pane,,,,,xpanes:pane_brown_flat,xpanes:pane_brown_flat
-Brown_Terracotta,,,,,mcl_colorblocks:hardened_clay_brown,mcl_colorblocks:hardened_clay_brown
-Brown_Wool,,,,,mcl_wool:brown,wool:brown
+Brown_Stained_Glass,,minecraft:brown_stained_glass,,,mcl_core:glass_brown,xpanes:pane_brown
+Brown_Stained_Glass_Pane,,minecraft:brown_stained_glass_pane,,,xpanes:pane_brown_flat,xpanes:pane_brown_flat
+Brown_Terracotta,,minecraft:brown_terracotta,,,mcl_colorblocks:hardened_clay_brown,mcl_colorblocks:hardened_clay_brown
+Brown_Wool,,minecraft:brown_wool,,,mcl_wool:brown,wool:brown
 Burning_Furnace,62,minecraft:lit_furnace,,,mcl_furnaces:furnace_active,mcl_furnaces:furnace_active
 Cactus,81,minecraft:cactus,,,mcl_core:cactus,default:cactus
-Cactus_Flower_Pot,,,,,mcl_flowerpots:flower_pot_cactus,mcl_flowerpots:flower_pot_cactus
+Cactus_Flower_Pot,,minecraft:potted_cactus,,,mcl_flowerpots:flower_pot_cactus,mcl_flowerpots:flower_pot_cactus
 Cake,92,minecraft:cake,,,mcl_cake:cake,mcl_cake:cake
 Cauldron,118,minecraft:cauldron,,,mcl_cauldrons:cauldron,default:cauldron
 Chest,54,minecraft:chest,,,mcl_chests:chest,default:chest
-Chiseled_Quartz_Block,,,,,mcl_nether:quartz_chiseled,mcl_nether:quartz_chiseled
-Chiseled_Red_Sandstone,,,,,mcl_core:redsandstonecarved,mcl_core:redsandstonecarved
+Chiseled_Quartz_Block,,minecraft:chiseled_quartz_block,,,mcl_nether:quartz_chiseled,mcl_nether:quartz_chiseled
+Chiseled_Red_Sandstone,,minecraft:chiseled_red_sandstone,,,mcl_core:redsandstonecarved,mcl_core:redsandstonecarved
 Chorus_Flower,200,minecraft:chorus_flower,,,mcl_end:chorus_flower,mcl_end:chorus_flower
 Chorus_Plant_Stem,199,minecraft:chorus_plant,,,mcl_end:chorus_plant,mcl_end:chorus_plant
 Clay,82,minecraft:clay,,mapgen_clay,mcl_core:clay,default:clay
 Coal_Block,173,minecraft:coal_block,,,mcl_core:coalblock,default:coalblock
 Coal_Ore,16,minecraft:coal_ore,,mapgen_stone_with_coal,mcl_core:stone_with_coal,default:stone_with_coal
-Coarse_Dirt,,,biome:node_filler,,mcl_core:coarse_dirt,mcl_core:coarse_dirt
+Coarse_Dirt,,minecraft:coarse_dirt,biome:node_filler,,mcl_core:coarse_dirt,mcl_core:coarse_dirt
 Cobblestone,4,minecraft:cobblestone,,mapgen_cobble,mcl_core:cobble,default:cobble
 Cobblestone_Slab,,minecraft:cobblestone_slab,,stairs:slab_cobble,mcl_stairs:slab_cobble,stairs:slab_cobble
 Cobblestone_Stair,67,minecraft:stone_stairs/minecraft:cobblestone_stairs,,stairs:stair_cobble,mcl_stairs:stair_cobble,stairs:stair_cobble
@@ -114,35 +118,36 @@ Command_Block,137,minecraft:command_block,,,mesecons_commandblock:commandblock_o
 Cracked_Stone_Brick_Slab,,,,,mcl_stairs:slab_stonebrickcracked,mcl_stairs:slab_stonebrickcracked
 Cracked_Stone_Brick_Stair,,,,,mcl_stairs:stair_stonebrickcracked,mcl_stairs:stair_stonebrickcracked
 Crafting_Table,58,minecraft:crafting_table,,,mcl_crafting_table:crafting_table,default:crafting_table
-Creeper_Head,,,,,mcl_heads:creeper,mcl_heads:creeper
-Cut_Red_Sandstone,,,,,mcl_core:redsandstonesmooth,mcl_core:redsandstonesmooth
-Cut_Sandstone,,,,mapgen_sandstonebrick,mcl_core:sandstonesmooth,default:sandstonesmooth
-Cyan_Bed,,,,,mcl_beds:bed_cyan_bottom,mcl_beds:bed_cyan_bottom
-Cyan_Carpet,,,,,mcl_wool:cyan_carpet,mcl_wool:cyan_carpet
-Cyan_Concrete,,,,,mcl_colorblocks:concrete_cyan,mcl_colorblocks:concrete_cyan
-Cyan_Concrete_Powder,,,,,mcl_colorblocks:concrete_powder_cyan,mcl_colorblocks:concrete_powder_cyan
+Creeper_Head,,minecraft:creeper_head,,,mcl_heads:creeper,mcl_heads:creeper
+Creeper_Wall_Head,,minecraft:creeper_wall_head,,,mcl_heads:creeper_wall
+Cut_Red_Sandstone,,minecraft:cut_red_sandstone,,,mcl_core:redsandstonesmooth,mcl_core:redsandstonesmooth
+Cut_Sandstone,,minecraft:cut_sandstone,,mapgen_sandstonebrick,mcl_core:sandstonesmooth,default:sandstonesmooth
+Cyan_Bed,,minecraft:cyan_bed,,,mcl_beds:bed_cyan_bottom,mcl_beds:bed_cyan_bottom
+Cyan_Carpet,,minecraft:cyan_carpet,,,mcl_wool:cyan_carpet,mcl_wool:cyan_carpet
+Cyan_Concrete,,minecraft:cyan_concrete,,,mcl_colorblocks:concrete_cyan,mcl_colorblocks:concrete_cyan
+Cyan_Concrete_Powder,,minecraft:cyan_concrete_powder,,,mcl_colorblocks:concrete_powder_cyan,mcl_colorblocks:concrete_powder_cyan
 Cyan_Concrete_Slab,,,,,mcl_stairs:slab_concrete_cyan,mcl_stairs:slab_concrete_cyan
 Cyan_Concrete_Stair,,,,,mcl_stairs:stair_concrete_cyan,mcl_stairs:stair_concrete_cyan
 Cyan_Glazed_Terracotta,244,minecraft:cyan_glazed_terracotta,,,mcl_colorblocks:glazed_terracotta_cyan,mcl_colorblocks:glazed_terracotta_cyan
 Cyan_Shulker_Box,228,minecraft:cyan_shulker_box,,,mcl_chests:cyan_shulker_box,mcl_chests:cyan_shulker_box
-Cyan_Stained_Glass,,,,,mcl_core:glass_cyan,xpanes:pane_cyan
-Cyan_Stained_Glass_Pane,,,,,xpanes:pane_cyan_flat,xpanes:pane_cyan_flat
-Cyan_Terracotta,,,,,mcl_colorblocks:hardened_clay_cyan,mcl_colorblocks:hardened_clay_cyan
+Cyan_Stained_Glass,,minecraft:cyan_stained_glass,,,mcl_core:glass_cyan,xpanes:pane_cyan
+Cyan_Stained_Glass_Pane,,minecraft:cyan_stained_glass_pane,,,xpanes:pane_cyan_flat,xpanes:pane_cyan_flat
+Cyan_Terracotta,,minecraft:cyan_terracotta,,,mcl_colorblocks:hardened_clay_cyan,mcl_colorblocks:hardened_clay_cyan
 Cyan_Wool,,minecraft:cyan_wool,,,mcl_wool:cyan,wool:cyan
 Dandelion,37,minecraft:yellow_flower/minecraft:dandelion,,,mcl_flowers:dandelion,flowers:dandelion_yellow
-Dandelion_Flower_Pot,,,,,mcl_flowerpots:flower_pot_dandelion,mcl_flowerpots:flower_pot_dandelion
+Dandelion_Flower_Pot,,minecraft:potted_dandelion,,,mcl_flowerpots:flower_pot_dandelion,mcl_flowerpots:flower_pot_dandelion
 Dark_Oak,162,minecraft:log2/minecraft:dark_oak,,,mcl_core:darktree,mcl_core:darktree
-Dark_Oak_Bark,,,,,mcl_core:darktree_bark,mcl_core:darktree_bark
+Dark_Oak_Bark,,minecraft:dark_oak_wood,,,mcl_core:darktree_bark,mcl_core:darktree_bark
 Dark_Oak_Bark_Slab,,,,,mcl_stairs:slab_darktree_bark,mcl_stairs:slab_darktree_bark
 Dark_Oak_Bark_Stair,,,,,mcl_stairs:stair_darktree_bark,mcl_stairs:stair_darktree_bark
-Dark_Oak_Button,,,,,mesecons_button:button_darkwood_off,mesecons_button:button_darkwood_off
+Dark_Oak_Button,,minecraft:dark_oak_button,,,mesecons_button:button_darkwood_off,mesecons_button:button_darkwood_off
 Dark_Oak_Fence,191,minecraft:dark_oak_fence,,,mcl_fences:dark_oak_fence,mcl_fences:dark_oak_fence
 Dark_Oak_Fence_Gate,186,minecraft:dark_oak_fence_gate,,,mcl_fences:dark_oak_fence_gate,mcl_fences:dark_oak_fence_gate
 Dark_Oak_Leaves,161,minecraft:leaves2/minecraft:dark_oak_leaves,,,mcl_core:darkleaves,mcl_core:darkleaves
-Dark_Oak_Plank,,,,,mcl_core:darkwood,mcl_core:darkwood
-Dark_Oak_Pressure_Plate,,,,mesecons:pressure_plate_darkwood,mesecons_pressureplates:pressure_plate_darkwood_on,mesecons_pressureplates:pressure_plate_darkwood_off
-Dark_Oak_Sapling_Flower_Pot,,,,,mcl_flowerpots:flower_pot_darksapling,mcl_flowerpots:flower_pot_darksapling
-Dark_Oak_Sapling,,,,,mcl_core:darksapling,mcl_core:darksapling
+Dark_Oak_Plank,,minecraft:dark_oak_planks,,,mcl_core:darkwood,mcl_core:darkwood
+Dark_Oak_Pressure_Plate,,minecraft:dark_oak_pressure_plate,,mesecons:pressure_plate_darkwood,mesecons_pressureplates:pressure_plate_darkwood_on,mesecons_pressureplates:pressure_plate_darkwood_off
+Dark_Oak_Sapling_Flower_Pot,,minecraft:potted_dark_oak_sapling,,,mcl_flowerpots:flower_pot_darksapling,mcl_flowerpots:flower_pot_darksapling
+Dark_Oak_Sapling,,minecraft:dark_oak_sapling,,,mcl_core:darksapling,mcl_core:darksapling
 Dark_Oak_Slab,,minecraft:dark_oak_slab,,stairs:slab_darkwood,mcl_stairs:slab_darkwood,mcl_stairs:slab_darkwood
 Dark_Oak_Stair,164,minecraft:dark_oak_stairs,,stairs:stair_darkwood,mcl_stairs:stair_darkwood,mcl_stairs:stair_darkwood
 Dark_Oak_Trapdoor,,minecraft:dark_oak_trapdoor,,,mcl_doors:dark_oak_trapdoor,mcl_doors:dark_oak_trapdoor
@@ -150,7 +155,7 @@ Dark_Prismarine_Slab,,minecraft:dark_prismarine_slab,,,mcl_stairs:slab_prismarin
 Dark_Prismarine_Stair,,minecraft:dark_prismarine_stairs,,,mcl_stairs:stair_prismarine_dark,mcl_stairs:stair_prismarine_dark
 Daylight_Sensor,151,minecraft:daylight_detector,,mesecons:solarpanel,mesecons_solarpanel:solar_panel_on,mesecons_solarpanel:solar_panel_on
 Dead_Bush,32,minecraft:deadbush,,,mcl_core:deadbush,default:dry_grass
-Dead_Bush_Flower_Pot,,,,,mcl_flowerpots:flower_pot_deadbush,mcl_flowerpots:flower_pot_deadbush
+Dead_Bush_Flower_Pot,,minecraft:potted_dead_bush,,,mcl_flowerpots:flower_pot_deadbush,mcl_flowerpots:flower_pot_deadbush
 Dead_Chorus_Flower,,,,,mcl_end:chorus_flower_dead,mcl_end:chorus_flower_dead
 Detector_Rail,28,minecraft:detector_rail,,,mcl_minecarts:detector_rail,mcl_minecarts:detector_rail
 Diamond_Block,57,minecraft:diamond_block,,,mcl_core:diamondblock,default:diamondblock
@@ -234,15 +239,15 @@ End_Portal_Frame_with_Eye_of_Ender,,,,,mcl_portals:end_portal_frame_eye,mcl_port
 End_Rod,198,minecraft:end_rod,,,mcl_end:end_rod,mcl_end:end_rod
 End_Stone,121,minecraft:end_stone,,,mcl_end:end_stone,mcl_end:end_stone
 End_Stone_Brick,206,minecraft:end_bricks,,,mcl_end:end_bricks,mcl_end:end_bricks
-End_Stone_Brick_Slab,,,,,mcl_stairs:slab_end_bricks,mcl_stairs:slab_end_bricks
-End_Stone_Brick_Stair,,,,,mcl_stairs:stair_end_bricks,mcl_stairs:stair_end_bricks
-End_Stone_Brick_Wall,,,,,mcl_walls:endbricks,mcl_walls:endbricks
+End_Stone_Brick_Slab,,minecraft:end_stone_brick_slab,,,mcl_stairs:slab_end_bricks,mcl_stairs:slab_end_bricks
+End_Stone_Brick_Stair,,minecraft:end_stone_brick_stairs,,,mcl_stairs:stair_end_bricks,mcl_stairs:stair_end_bricks
+End_Stone_Brick_Wall,,minecraft:end_stone_brick_wall,,,mcl_walls:endbricks,mcl_walls:endbricks
 Eternal_Fire,,,,,mcl_fire:eternal_fire,mcl_fire:eternal_fire
-Faceless_Pumpkin,,,,,mcl_farming:pumpkin,mcl_farming:pumpkin
+Faceless_Pumpkin,,minecraft:pumpkin,,,mcl_farming:pumpkin,mcl_farming:pumpkin
 Farmland,60,minecraft:farmland,,,mcl_farming:soil,farming:soil
 Fence,85,minecraft:fence/minecraft:oak_fence,,,mcl_fences:fence,default:fence
-Fern_Flower_Pot,,,,,mcl_flowerpots:flower_pot_fern,mcl_flowerpots:flower_pot_fern
-Fern,,,,mapgen_junglegrass,mcl_flowers:fern,default:fern_3
+Fern_Flower_Pot,,minecraft:potted_fern,,,mcl_flowerpots:flower_pot_fern,mcl_flowerpots:flower_pot_fern
+Fern,,minecraft:fern,,mapgen_junglegrass,mcl_flowers:fern,default:fern_3
 Fire,51,minecraft:fire,,fire:basic_flame,mcl_fire:fire,mcl_fire:fire
 Flower_Pot,140,minecraft:flower_pot,,,mcl_flowerpots:flower_pot,mcl_flowerpots:flower_pot
 Flowing_Lava,10,minecraft:flowing_lava,,,mcl_core:lava_flowing,default:lava_flowing
@@ -252,7 +257,7 @@ Flowing_Water,8,minecraft:flowing_water,,,mcl_core:water_flowing,default:water_f
 Frosted_Ice,212,minecraft:frosted_ice,,,mcl_core:frosted_ice,mcl_core:frosted_ice
 Furnace,61,minecraft:furnace,,,mcl_furnaces:furnace,default:furnace
 Glass,20,minecraft:glass,,,mcl_core:glass,default:glass
-Glass_Pane,,,,,xpanes:pane_flat,xpanes:pane_flat
+Glass_Pane,,minecraft:glass_pane,,,xpanes:pane_flat,xpanes:pane_flat
 Glowstone,89,minecraft:glowstone,,,mcl_nether:glowstone,mcl_nether:glowstone
 Gold_Block,41,minecraft:gold_block,,,mcl_core:goldblock,default:goldblock
 Gold_Block_Slab,,minecraft:gold_block_slab,,,mcl_stairs:slab_goldblock,stairs:slab_goldblock
@@ -268,27 +273,27 @@ Grass_Dry,,,biome:node_top,,mcl_core:dirt_with_dry_grass,default:dirt_with_dry_g
 Grass_Path,208,minecraft:grass_path,,,mcl_core:grass_path,default:dirt_with_grass_footsteps
 Gravel,13,minecraft:gravel,biome:node_top,mapgen_gravel,mcl_core:gravel,default:gravel
 Green_Bed,,minecraft:green_bed,,,mcl_beds:bed_green_bottom,mcl_beds:bed_green_bottom
-Green_Carpet,,,,,mcl_wool:green_carpet,mcl_wool:green_carpet
+Green_Carpet,,minecraft:green_carpet,,,mcl_wool:green_carpet,mcl_wool:green_carpet
 Green_Concrete,,minecraft:green_concrete,,,mcl_colorblocks:concrete_green,mcl_colorblocks:concrete_green
-Green_Concrete_Powder,,,,,mcl_colorblocks:concrete_powder_green,mcl_colorblocks:concrete_powder_green
+Green_Concrete_Powder,,minecraft:green_concrete_powder,,,mcl_colorblocks:concrete_powder_green,mcl_colorblocks:concrete_powder_green
 Green_Concrete_Slab,,minecraft:green_concrete_slab,,,mcl_stairs:slab_concrete_green,mcl_stairs:slab_concrete_green
 Green_Concrete_Stair,,minecraft:green_concrete_stairs,,,mcl_stairs:stair_concrete_green,mcl_stairs:stair_concrete_green
 Green_Glazed_Terracotta,248,minecraft:green_glazed_terracotta,,,mcl_colorblocks:glazed_terracotta_green,mcl_colorblocks:glazed_terracotta_green
 Green_Shulker_Box,232,minecraft:green_shulker_box,,,mcl_chests:dark_green_shulker_box,mcl_chests:dark_green_shulker_box
-Green_Stained_Glass,,,,,mcl_core:glass_green,xpanes:pane_green
-Green_Stained_Glass_Pane,,,,,xpanes:pane_green_flat,xpanes:pane_green_flat
+Green_Stained_Glass,,minecraft:green_stained_glass,,,mcl_core:glass_green,xpanes:pane_green
+Green_Stained_Glass_Pane,,minecraft:green_stained_glass_pane,,,xpanes:pane_green_flat,xpanes:pane_green_flat
 Green_Terracotta,,minecraft:green_terracotta,,,mcl_colorblocks:hardened_clay_green,mcl_colorblocks:hardened_clay_green
 Green_Wool,,minecraft:green_wool,,,mcl_wool:green,wool:green
 Grey_Bed,,minecraft:gray_bed,,,mcl_beds:bed_grey_bottom,mcl_beds:bed_grey_bottom
-Grey_Carpet,,,,,mcl_wool:grey_carpet,mcl_wool:grey_carpet
+Grey_Carpet,,minecraft:gray_carpet,,,mcl_wool:grey_carpet,mcl_wool:grey_carpet
 Grey_Concrete,251,minecraft:concrete,,,mcl_colorblocks:concrete_grey,mcl_colorblocks:concrete_grey
 Grey_Concrete_Powder,252,minecraft:concrete_powder,,,mcl_colorblocks:concrete_powder_grey,mcl_colorblocks:concrete_powder_grey
 Grey_Concrete_Slab,,,,,mcl_stairs:slab_concrete_grey,mcl_stairs:slab_concrete_grey
 Grey_Concrete_Stair,,,,,mcl_stairs:stair_concrete_grey,mcl_stairs:stair_concrete_grey
 Grey_Glazed_Terracotta,242,minecraft:gray_glazed_terracotta/minecraft:light_gray_glazed_terracotta,,,mcl_colorblocks:glazed_terracotta_grey,mcl_colorblocks:glazed_terracotta_grey
 Grey_Shulker_Box,226,minecraft:gray_shulker_box,,,mcl_chests:dark_grey_shulker_box,mcl_chests:dark_grey_shulker_box
-Grey_Stained_Glass,,,,,mcl_core:glass_gray,xpanes:pane_gray
-Grey_Stained_Glass_Pane,,,,,xpanes:pane_gray_flat,xpanes:pane_gray_flat
+Grey_Stained_Glass,,minecraft:gray_stained_glass,,,mcl_core:glass_gray,xpanes:pane_gray
+Grey_Stained_Glass_Pane,,minecraft:gray_stained_glass_pane,,,xpanes:pane_gray_flat,xpanes:pane_gray_flat
 Grey_Terracotta,,minecraft:gray_terracotta,,,mcl_colorblocks:hardened_clay_grey,mcl_colorblocks:hardened_clay_grey
 Grey_Wool,,minecraft:gray_wool,,,mcl_wool:grey,wool:grey
 Hay_Bale,170,minecraft:hay_block,,,mcl_farming:hay_block,farming:straw
@@ -304,12 +309,12 @@ Hydrated_Farmland,,,,,mcl_farming:soil_wet,farming:soil_wet
 Ice,79,minecraft:ice,biome:node_water_top,mapgen_ice,mcl_core:ice,default:ice
 Ice_Slab,,minecraft:ice_slab,,,mcl_stairs:slab_ice,stairs:slab_ice
 Ice_Stair,,minecraft:ice_stairs,,,mcl_stairs:stair_ice,stairs:stair_ice
-Infested_Chiseled_Stone_Brick,,,,,mcl_monster_eggs:monster_egg_stonebrickcarved,mcl_monster_eggs:monster_egg_stonebrickcarved
-Infested_Cobblestone,,,,,mcl_monster_eggs:monster_egg_cobble,mcl_monster_eggs:monster_egg_cobble
-Infested_Cracked_Stone_Brick,,,,,mcl_monster_eggs:monster_egg_stonebrickcracked,mcl_monster_eggs:monster_egg_stonebrickcracked
-Infested_Mossy_Stone_Brick,,,,,mcl_monster_eggs:monster_egg_stonebrickmossy,mcl_monster_eggs:monster_egg_stonebrickmossy
-Infested_Stone,97,minecraft:monster_egg,,,mcl_monster_eggs:monster_egg_stone,mcl_monster_eggs:monster_egg_stone
-Infested_Stone_Brick,,,,,mcl_monster_eggs:monster_egg_stonebrick,mcl_monster_eggs:monster_egg_stonebrick
+Infested_Chiseled_Stone_Brick,,minecraft:infested_chiseled_stone_bricks,,,mcl_monster_eggs:monster_egg_stonebrickcarved,mcl_monster_eggs:monster_egg_stonebrickcarved
+Infested_Cobblestone,,minecraft:infested_cobblestone,,,mcl_monster_eggs:monster_egg_cobble,mcl_monster_eggs:monster_egg_cobble
+Infested_Cracked_Stone_Brick,,minecraft:infested_cracked_stone_bricks,,,mcl_monster_eggs:monster_egg_stonebrickcracked,mcl_monster_eggs:monster_egg_stonebrickcracked
+Infested_Mossy_Stone_Brick,,minecraft:infested_mossy_stone_bricks,,,mcl_monster_eggs:monster_egg_stonebrickmossy,mcl_monster_eggs:monster_egg_stonebrickmossy
+Infested_Stone,97,minecraft:monster_egg/minecraft:infested_stone,,,mcl_monster_eggs:monster_egg_stone,mcl_monster_eggs:monster_egg_stone
+Infested_Stone_Brick,,minecraft:infested_stone_bricks,,,mcl_monster_eggs:monster_egg_stonebrick,mcl_monster_eggs:monster_egg_stonebrick
 Inverted_Daylight_Sensor,178,minecraft:daylight_detector_inverted,,,mesecons_solarpanel:solar_panel_inverted_on,mesecons_solarpanel:solar_panel_inverted_off
 Iron_Bar,101,minecraft:iron_bars,,,xpanes:bar_flat,xpanes:bar_flat
 Iron_Block,42,minecraft:iron_block,,,mcl_core:ironblock,default:steelblock
@@ -318,21 +323,21 @@ Iron_Block_Stair,,minecraft:iron_block_stair,,,mcl_stairs:stair_ironblock,mcl_st
 Iron_Door,71,minecraft:iron_door,,,mcl_doors:iron_door,doors:door_steel_a
 Iron_Ore,15,minecraft:iron_ore,,mapgen_stone_with_iron,mcl_core:stone_with_iron,default:stone_with_iron
 Iron_Trapdoor,167,minecraft:iron_trapdoor,,doors:iron_trapdoor,mcl_doors:iron_trapdoor,doors:trapdoor_steel_closed
-Item_Frame,,,,itemframes:frame,mcl_itemframes:item_frame,mcl_itemframes:item_frame
+Item_Frame,,minecraft:item_frame,,itemframes:frame,mcl_itemframes:item_frame,mcl_itemframes:item_frame
 Jack_o_Lantern,91,minecraft:lit_pumpkin,,,mcl_farming:pumpkin_face_light,mcl_farming:pumpkin_face_light
 Jukebox,84,minecraft:jukebox,,,mcl_jukebox:jukebox,default:jukebox
-Jungle_Bark,,,,,mcl_core:jungletree_bark,mcl_core:jungletree_bark
+Jungle_Bark,,minecraft:jungle_wood,,,mcl_core:jungletree_bark,mcl_core:jungletree_bark
 Jungle_Bark_Slab,,,,,mcl_stairs:slab_jungletree_bark,mcl_stairs:slab_jungletree_bark
 Jungle_Bark_Stair,,,,,mcl_stairs:stair_jungletree_bark,mcl_stairs:stair_jungletree_bark
-Jungle_Button,,,,,mesecons_button:button_junglewood_off,mesecons_button:button_junglewood_off
+Jungle_Button,,minecraft:jungle_button,,,mesecons_button:button_junglewood_off,mesecons_button:button_junglewood_off
 Jungle_Fence,190,minecraft:jungle_fence,,,mcl_fences:jungle_fence,default:fence_junglewood
 Jungle_Fence_Gate,185,minecraft:jungle_fence_gate,,,mcl_fences:jungle_fence_gate,doors:gate_junglewood_open
-Jungle_Leaves,,,,mapgen_jungleleaves,mcl_core:jungleleaves,default:jungleleaves
-Jungle,,minecraft:jungle,,mapgen_jungletree,mcl_core:jungletree,default:jungletree
-Jungle_Plank,,minecraft:jungle_log,,,mcl_core:junglewood,default:junglewood
-Jungle_Pressure_Plate,,,,mesecons:pressure_plate_junglewood,mesecons_pressureplates:pressure_plate_junglewood_on,mesecons_pressureplates:pressure_plate_junglewood_off
-Jungle_Sapling_Flower_Pot,,,,,mcl_flowerpots:flower_pot_junglesapling,mcl_flowerpots:flower_pot_junglesapling
-Jungle_Sapling,,,,,mcl_core:junglesapling,default:junglesapling
+Jungle_Leaves,,minecraft:jungle_leaves,,mapgen_jungleleaves,mcl_core:jungleleaves,default:jungleleaves
+Jungle,,minecraft:jungle_log,,mapgen_jungletree,mcl_core:jungletree,default:jungletree
+Jungle_Plank,,minecraft:jungle_planks,,,mcl_core:junglewood,default:junglewood
+Jungle_Pressure_Plate,,minecraft:jungle_pressure_plate,,mesecons:pressure_plate_junglewood,mesecons_pressureplates:pressure_plate_junglewood_on,mesecons_pressureplates:pressure_plate_junglewood_off
+Jungle_Sapling_Flower_Pot,,minecraft:potted_jungle_sapling,,,mcl_flowerpots:flower_pot_junglesapling,mcl_flowerpots:flower_pot_junglesapling
+Jungle_Sapling,,minecraft:jungle_sapling,,,mcl_core:junglesapling,default:junglesapling
 Jungle_Slab,,minecraft:jungle_slab,,stairs:slab_junglewood,mcl_stairs:slab_junglewood,stairs:slab_junglewood
 Jungle_Stair,136,minecraft:jungle_stairs,,stairs:stair_junglewood,mcl_stairs:stair_junglewood,stairs:stair_junglewood
 Jungle_Trapdoor,,minecraft:jungle_trapdoor,,,mcl_doors:jungle_trapdoor,mcl_doors:jungle_trapdoor
@@ -341,60 +346,60 @@ Lapis_Lazuli_Block,22,minecraft:lapis_block,,,mcl_core:lapisblock,default:lapisb
 Lapis_Lazuli_Ore,21,minecraft:lapis_ore,,,mcl_core:stone_with_lapis,default:stone_with_lapis
 Lapis_Lazuli_Slab,,,,,mcl_stairs:slab_lapisblock,mcl_stairs:slab_lapisblock
 Lapis_Lazuli_Stair,,,,,mcl_stairs:stair_lapisblock,mcl_stairs:stair_lapisblock
-Large_Fern,,,,,mcl_flowers:double_fern,mcl_flowers:double_fern_top
+Large_Fern,,minecraft:large_fern,,,mcl_flowers:double_fern,mcl_flowers:double_fern_top
 Lava_Source,10,minecraft:lava,,,mcl_core:lava_source,default:lava_source
 Leaves,18,minecraft:leaves/minecraft:oak_leaves,,mapgen_apple,mcl_core:leaves,default:leaves
 Lever,69,minecraft:lever,,,mesecons_walllever:wall_lever_off,mesecons_walllever:wall_lever_off
-Light_Blue_Bed,,,,,mcl_beds:bed_light_blue_bottom,mcl_beds:bed_light_blue_bottom
-Light_Blue_Carpet,,,,,mcl_wool:light_blue_carpet,mcl_wool:light_blue_carpet
-Light_Blue_Concrete,,,,,mcl_colorblocks:concrete_light_blue,mcl_colorblocks:concrete_light_blue
-Light_Blue_Concrete_Powder,,,,,mcl_colorblocks:concrete_powder_light_blue,mcl_colorblocks:concrete_powder_light_blue
+Light_Blue_Bed,,minecraft:light_blue_bed,,,mcl_beds:bed_light_blue_bottom,mcl_beds:bed_light_blue_bottom
+Light_Blue_Carpet,,minecraft:light_blue_carpet,,,mcl_wool:light_blue_carpet,mcl_wool:light_blue_carpet
+Light_Blue_Concrete,,minecraft:light_blue_concrete,,,mcl_colorblocks:concrete_light_blue,mcl_colorblocks:concrete_light_blue
+Light_Blue_Concrete_Powder,,minecraft:light_blue_concrete_powder,,,mcl_colorblocks:concrete_powder_light_blue,mcl_colorblocks:concrete_powder_light_blue
 Light_Blue_Concrete_Slab,,,,,mcl_stairs:slab_concrete_light_blue,mcl_stairs:slab_concrete_light_blue
 Light_Blue_Concrete_Stair,,,,,mcl_stairs:stair_concrete_light_blue,mcl_stairs:stair_concrete_light_blue
 Light_Blue_Glazed_Terracotta,238,minecraft:light_blue_glazed_terracotta,,,mcl_colorblocks:glazed_terracotta_light_blue,mcl_colorblocks:glazed_terracotta_light_blue
 Light_Blue_Shulker_Box,222,minecraft:light_blue_shulker_box,,,mcl_chests:lightblue_shulker_box,mcl_chests:lightblue_shulker_box
-Light_Blue_Stained_Glass,,,,,mcl_core:glass_light_blue,xpanes:pane_light_blue
-Light_Blue_Stained_Glass_Pane,,,,,xpanes:pane_light_blue_flat,xpanes:pane_light_blue_flat
-Light_Blue_Terracotta,,,,,mcl_colorblocks:hardened_clay_light_blue,mcl_colorblocks:hardened_clay_light_blue
-Light_Blue_Wool,,,,,mcl_wool:light_blue,mcl_wool:light_blue
-Light_Grey_Bed,,,,,mcl_beds:bed_silver_bottom,mcl_beds:bed_silver_bottom
-Light_Grey_Carpet,,,,,mcl_wool:silver_carpet,mcl_wool:silver_carpet
-Light_Grey_Concrete,,,,,mcl_colorblocks:concrete_silver,mcl_colorblocks:concrete_silver
-Light_Grey_Concrete_Powder,,,,,mcl_colorblocks:concrete_powder_silver,mcl_colorblocks:concrete_powder_silver
+Light_Blue_Stained_Glass,,minecraft:light_blue_stained_glass,,,mcl_core:glass_light_blue,xpanes:pane_light_blue
+Light_Blue_Stained_Glass_Pane,,minecraft:light_blue_stained_glass_pane,,,xpanes:pane_light_blue_flat,xpanes:pane_light_blue_flat
+Light_Blue_Terracotta,,minecraft:light_blue_terracotta,,,mcl_colorblocks:hardened_clay_light_blue,mcl_colorblocks:hardened_clay_light_blue
+Light_Blue_Wool,,minecraft:light_blue_wool,,,mcl_wool:light_blue,mcl_wool:light_blue
+Light_Grey_Bed,,minecraft:light_gray_bed,,,mcl_beds:bed_silver_bottom,mcl_beds:bed_silver_bottom
+Light_Grey_Carpet,,minecraft:light_gray_carpet,,,mcl_wool:silver_carpet,mcl_wool:silver_carpet
+Light_Grey_Concrete,,minecraft:light_gray_concrete,,,mcl_colorblocks:concrete_silver,mcl_colorblocks:concrete_silver
+Light_Grey_Concrete_Powder,,minecraft:light_gray_concrete_powder,,,mcl_colorblocks:concrete_powder_silver,mcl_colorblocks:concrete_powder_silver
 Light_Grey_Concrete_Slab,,,,,mcl_stairs:slab_concrete_silver,mcl_stairs:slab_concrete_silver
 Light_Grey_Concrete_Stair,,,,,mcl_stairs:stair_concrete_silver,mcl_stairs:stair_concrete_silver
 Light_Grey_Glazed_Terracotta,243,minecraft:silver_glazed_terracotta,,,mcl_colorblocks:glazed_terracotta_silver,mcl_colorblocks:glazed_terracotta_silver
 Light_Grey_Shulker_Box,227,minecraft:silver_shulker_box,,,mcl_chests:grey_shulker_box,mcl_chests:grey_shulker_box
-Light_Grey_Stained_Glass,,,,,mcl_core:glass_silver,xpanes:pane_silver
-Light_Grey_Stained_Glass_Pane,,,,,xpanes:pane_silver_flat,xpanes:pane_silver_flat
-Light_Grey_Terracotta,,,,,mcl_colorblocks:hardened_clay_silver,mcl_colorblocks:hardened_clay_silver
-Light_Grey_Wool,,,,,mcl_wool:silver,mcl_wool:silver
-Lilac,,,,,mcl_flowers:lilac_top,mcl_flowers:lilac
-Lime_Bed,,,,,mcl_beds:bed_lime_bottom,mcl_beds:bed_lime_bottom
-Lime_Carpet,,,,,mcl_wool:lime_carpet,mcl_wool:lime_carpet
-Lime_Concrete,,,,,mcl_colorblocks:concrete_lime,mcl_colorblocks:concrete_lime
-Lime_Concrete_Powder,,,,,mcl_colorblocks:concrete_powder_lime,mcl_colorblocks:concrete_powder_lime
+Light_Grey_Stained_Glass,,minecraft:light_gray_stained_glass,,,mcl_core:glass_silver,xpanes:pane_silver
+Light_Grey_Stained_Glass_Pane,,minecraft:light_gray_stained_glass_pane,,,xpanes:pane_silver_flat,xpanes:pane_silver_flat
+Light_Grey_Terracotta,,minecraft:light_gray_terracotta,,,mcl_colorblocks:hardened_clay_silver,mcl_colorblocks:hardened_clay_silver
+Light_Grey_Wool,,minecraft:light_gray_wool,,,mcl_wool:silver,mcl_wool:silver
+Lilac,,minecraft:lilac,,,mcl_flowers:lilac_top,mcl_flowers:lilac
+Lime_Bed,,minecraft:lime_bed,,,mcl_beds:bed_lime_bottom,mcl_beds:bed_lime_bottom
+Lime_Carpet,,minecraft:lime_carpet,,,mcl_wool:lime_carpet,mcl_wool:lime_carpet
+Lime_Concrete,,minecraft:lime_concrete,,,mcl_colorblocks:concrete_lime,mcl_colorblocks:concrete_lime
+Lime_Concrete_Powder,,minecraft:lime_concrete_powder,,,mcl_colorblocks:concrete_powder_lime,mcl_colorblocks:concrete_powder_lime
 Lime_Concrete_Slab,,,,,mcl_stairs:slab_concrete_lime,mcl_stairs:slab_concrete_lime
 Lime_Concrete_Stair,,,,,mcl_stairs:stair_concrete_lime,mcl_stairs:stair_concrete_lime
 Lime_Glazed_Terracotta,240,minecraft:lime_glazed_terracotta,,,mcl_colorblocks:glazed_terracotta_lime,mcl_colorblocks:glazed_terracotta_lime
 Lime_Shulker_Box,224,minecraft:lime_shulker_box,,,mcl_chests:green_shulker_box,mcl_chests:green_shulker_box
-Lime_Stained_Glass,,,,,mcl_core:glass_lime,xpanes:pane_lime
-Lime_Stained_Glass_Pane,,,,,xpanes:pane_lime_flat,xpanes:pane_lime_flat
-Lime_Terracotta,,,,,mcl_colorblocks:hardened_clay_lime,mcl_colorblocks:hardened_clay_lime
-Lime_Wool,,,,,mcl_wool:lime,mcl_wool:lime
+Lime_Stained_Glass,,minecraft:lime_stained_glass,,,mcl_core:glass_lime,xpanes:pane_lime
+Lime_Stained_Glass_Pane,,minecraft:lime_stained_glass_pane,,,xpanes:pane_lime_flat,xpanes:pane_lime_flat
+Lime_Terracotta,,minecraft:lime_terracotta,,,mcl_colorblocks:hardened_clay_lime,mcl_colorblocks:hardened_clay_lime
+Lime_Wool,,minecraft:lime_wool,,,mcl_wool:lime,mcl_wool:lime
 Lit_Redstone_Ore,74,minecraft:lit_redstone_ore,,,mcl_core:stone_with_redstone_lit,default:mese_post_light
-Magenta_Bed,,,,,mcl_beds:bed_magenta_bottom,mcl_beds:bed_magenta_bottom
-Magenta_Carpet,,,,,mcl_wool:magenta_carpet,mcl_wool:magenta_carpet
-Magenta_Concrete,,,,,mcl_colorblocks:concrete_magenta,mcl_colorblocks:concrete_magenta
-Magenta_Concrete_Powder,,,,,mcl_colorblocks:concrete_powder_magenta,mcl_colorblocks:concrete_powder_magenta
+Magenta_Bed,,minecraft:magenta_bed,,,mcl_beds:bed_magenta_bottom,mcl_beds:bed_magenta_bottom
+Magenta_Carpet,,minecraft:magenta_carpet,,,mcl_wool:magenta_carpet,mcl_wool:magenta_carpet
+Magenta_Concrete,,minecraft:magenta_concrete,,,mcl_colorblocks:concrete_magenta,mcl_colorblocks:concrete_magenta
+Magenta_Concrete_Powder,,minecraft:magenta_concrete_powder,,,mcl_colorblocks:concrete_powder_magenta,mcl_colorblocks:concrete_powder_magenta
 Magenta_Concrete_Slab,,,,,mcl_stairs:slab_concrete_magenta,mcl_stairs:slab_concrete_magenta
 Magenta_Concrete_Stair,,,,,mcl_stairs:stair_concrete_magenta,mcl_stairs:stair_concrete_magenta
 Magenta_Glazed_Terracotta,237,minecraft:magenta_glazed_terracotta,,,mcl_colorblocks:glazed_terracotta_magenta,mcl_colorblocks:glazed_terracotta_magenta
 Magenta_Shulker_Box,221,minecraft:magenta_shulker_box,,,mcl_chests:magenta_shulker_box,mcl_chests:magenta_shulker_box
-Magenta_Stained_Glass,,,,,mcl_core:glass_magenta,xpanes:pane_magenta
-Magenta_Stained_Glass_Pane,,,,,xpanes:pane_magenta_flat,xpanes:pane_magenta_flat
-Magenta_Terracotta,,,,,mcl_colorblocks:hardened_clay_magenta,mcl_colorblocks:hardened_clay_magenta
-Magenta_Wool,,,,,mcl_wool:magenta,wool:magenta
+Magenta_Stained_Glass,,minecraft:magenta_stained_glass,,,mcl_core:glass_magenta,xpanes:pane_magenta
+Magenta_Stained_Glass_Pane,,minecraft:magenta_stained_glass_pane,,,xpanes:pane_magenta_flat,xpanes:pane_magenta_flat
+Magenta_Terracotta,,minecraft:magenta_terracotta,,,mcl_colorblocks:hardened_clay_magenta,mcl_colorblocks:hardened_clay_magenta
+Magenta_Wool,,minecraft:magenta_wool,,,mcl_wool:magenta,wool:magenta
 Magma_Block,213,minecraft:magma,,,mcl_nether:magma,mcl_nether:magma
 Mature_Beetroot_Plant,207,minecraft:beetroots,,,mcl_farming:beetroot,mcl_farming:beetroot
 Mature_Carrot_Plant,141,minecraft:carrots,,,mcl_farming:carrot,mcl_farming:carrot
@@ -419,17 +424,17 @@ Mycelium,110,minecraft:mycelium,biome:node_top,,mcl_core:mycelium,mcl_core:mycel
 Nether_Brick_Block,112,minecraft:nether_brick,,,mcl_nether:nether_brick,mcl_nether:nether_brick
 Nether_Brick_Fence,113,minecraft:nether_brick_fence,,,mcl_fences:nether_brick_fence,mcl_fences:nether_brick_fence
 Nether_Brick_Fence_Gate,,,,,mclx_fences:nether_brick_fence_gate,mclx_fences:nether_brick_fence_gate
-Nether_Brick_Slab,,,,stairs:slab_nether_brick,mcl_stairs:slab_nether_brick,mcl_stairs:slab_nether_brick
+Nether_Brick_Slab,,minecraft:nether_brick_slab,,stairs:slab_nether_brick,mcl_stairs:slab_nether_brick,mcl_stairs:slab_nether_brick
 Nether_Brick_Stair,114,minecraft:nether_brick_stairs,,stairs:stair_nether_brick,mcl_stairs:stair_nether_brick,mcl_stairs:stair_nether_brick
-Nether_Brick_Wall,,,,,mcl_walls:netherbrick,mcl_walls:netherbrick
+Nether_Brick_Wall,,minecraft:nether_brick_wall,,,mcl_walls:netherbrick,mcl_walls:netherbrick
 Nether_Lava_Source,,,,,mcl_nether:nether_lava_source,mcl_nether:nether_lava_source
 Nether_Portal,90,minecraft:portal,,,mcl_portals:portal,mcl_portals:portal
 Nether_Quartz_Ore,153,minecraft:quartz_ore,,,mcl_nether:quartz_ore,mcl_nether:quartz_ore
 Netherrack,87,minecraft:netherrack,biome:node_filler,,mcl_nether:netherrack,mcl_nether:netherrack
 Nether_Wart_Block,214,minecraft:nether_wart_block,,,mcl_nether:nether_wart_block,mcl_nether:nether_wart_block
 Note_Block,25,minecraft:noteblock,,mesecons:noteblock,mesecons_noteblock:noteblock,mesecons_noteblock:noteblock
-Oak,17,minecraft:log/minecraft:oak,,mapgen_tree,mcl_core:tree,default:tree
-Oak_Bark,,,,,mcl_core:tree_bark,mcl_core:tree_bark
+Oak,17,minecraft:log/minecraft:oak/minecraft:oak_log,,mapgen_tree,mcl_core:tree,default:tree
+Oak_Bark,,minecraft:oak_wood,,,mcl_core:tree_bark,mcl_core:tree_bark
 Oak_Bark_Slab,,,,,mcl_stairs:slab_tree_bark,mcl_stairs:slab_tree_bark
 Oak_Bark_Stair,,,,,mcl_stairs:stair_tree_bark,mcl_stairs:stair_tree_bark
 Oak_Button,143,minecraft:oak_button,,,mesecons_button:button_wood_off,mesecons_button:button_wood_off
@@ -439,67 +444,67 @@ Oak_Ladder,,minecraft:ladder,,,mcl_core:ladder,default:ladder_wood
 Oak_Plank,5,minecraft:planks/minecraft:oak_log/minecraft:oak_planks,,,mcl_core:wood,default:wood
 Oak_Pressure_Plate,72,minecraft:wooden_pressure_plate,,mesecons:pressure_plate_wood,mesecons_pressureplates:pressure_plate_wood_on,mesecons_pressureplates:pressure_plate_wood_off
 Oak_Sapling,6,minecraft:sapling,,,mcl_core:sapling,default:sapling
-Oak_Sapling_Flower_Pot,,,,,mcl_flowerpots:flower_pot_sapling,mcl_flowerpots:flower_pot_sapling
+Oak_Sapling_Flower_Pot,,minecraft:potted_oak_sapling,,,mcl_flowerpots:flower_pot_sapling,mcl_flowerpots:flower_pot_sapling
 Oak_Slab,126,minecraft:wooden_slab/minecraft:oak_slab,,stairs:slab_wood,mcl_stairs:slab_wood,stairs:slab_wood
 Oak_Stair,53,minecraft:oak_stairs,,stairs:stair_wood,mcl_stairs:stair_wood,stairs:stair_wood
 Oak_Wall_Sign,68,minecraft:wall_sign,,signs:sign_wall,mcl_signs:wall_sign,default:wall_sign
-Observer,,,,,mcl_observers:observer_off,mcl_observers:observer_off
+Observer,218,minecraft:observer,,,mcl_observers:observer_off,mcl_observers:observer_off
 Obsidian,49,minecraft:obsidian,,,mcl_core:obsidian,default:obsidian
 Obsidian_Glass_Pane,,,,,xpanes:obsidian_pane_flat,xpanes:obsidian_pane_flat
 Obsidian_Glass_Slab,,,,,mcl_stairs:slab_obsidian_glass,stairs:slab_obsidian_glass
 Obsidian_Glass_Stair,,,,,mcl_stairs:stair_obsidian_glass,stairs:stair_obsidian_glass
 Obsidian_Slab,,,,,mcl_stairs:slab_obsidian,stairs:slab_obsidian
 Obsidian_Stair,,,,,mcl_stairs:stair_obsidian,stairs:stair_obsidian
-Orange_Bed,,,,,mcl_beds:bed_orange_bottom,mcl_beds:bed_orange_bottom
-Orange_Carpet,,,,,mcl_wool:orange_carpet,mcl_wool:orange_carpet
-Orange_Concrete,,,,,mcl_colorblocks:concrete_orange,mcl_colorblocks:concrete_orange
-Orange_Concrete_Powder,,,,,mcl_colorblocks:concrete_powder_orange,mcl_colorblocks:concrete_powder_orange
+Orange_Bed,,minecraft:orange_bed,,,mcl_beds:bed_orange_bottom,mcl_beds:bed_orange_bottom
+Orange_Carpet,,minecraft:orange_carpet,,,mcl_wool:orange_carpet,mcl_wool:orange_carpet
+Orange_Concrete,,minecraft:orange_concrete,,,mcl_colorblocks:concrete_orange,mcl_colorblocks:concrete_orange
+Orange_Concrete_Powder,,minecraft:orange_concrete_powder,,,mcl_colorblocks:concrete_powder_orange,mcl_colorblocks:concrete_powder_orange
 Orange_Concrete_Slab,,,,,mcl_stairs:slab_concrete_orange,mcl_stairs:slab_concrete_orange
 Orange_Concrete_Stair,,,,,mcl_stairs:stair_concrete_orange,mcl_stairs:stair_concrete_orange
 Orange_Glazed_Terracotta,236,minecraft:orange_glazed_terracotta,,,mcl_colorblocks:glazed_terracotta_orange,mcl_colorblocks:glazed_terracotta_orange
 Orange_Shulker_Box,220,minecraft:orange_shulker_box,,,mcl_chests:orange_shulker_box,mcl_chests:orange_shulker_box
-Orange_Stained_Glass,,,,,mcl_core:glass_orange,xpanes:pane_orange
-Orange_Stained_Glass_Pane,,,,,xpanes:pane_orange_flat,xpanes:pane_orange_flat
-Orange_Terracotta,,,biome:node_filler,,mcl_colorblocks:hardened_clay_orange,mcl_colorblocks:hardened_clay_orange
-Orange_Tulip_Flower_Pot,,,,,mcl_flowerpots:flower_pot_tulip_orange,mcl_flowerpots:flower_pot_tulip_orange
-Orange_Tulip,,,,,mcl_flowers:tulip_orange,flowers:tulip
-Orange_Wool,,,,,mcl_wool:orange,wool:orange
-Oxeye_Daisy_Flower_Pot,,,,,mcl_flowerpots:flower_pot_oxeye_daisy,mcl_flowerpots:flower_pot_oxeye_daisy
+Orange_Stained_Glass,,minecraft:orange_stained_glass,,,mcl_core:glass_orange,xpanes:pane_orange
+Orange_Stained_Glass_Pane,,minecraft:orange_stained_glass_pane,,,xpanes:pane_orange_flat,xpanes:pane_orange_flat
+Orange_Terracotta,,minecraft:orange_terracotta,biome:node_filler,,mcl_colorblocks:hardened_clay_orange,mcl_colorblocks:hardened_clay_orange
+Orange_Tulip_Flower_Pot,,minecraft:potted_orange_tulip,,,mcl_flowerpots:flower_pot_tulip_orange,mcl_flowerpots:flower_pot_tulip_orange
+Orange_Tulip,,minecraft:orange_tulip,,,mcl_flowers:tulip_orange,flowers:tulip
+Orange_Wool,,minecraft:orange_wool,,,mcl_wool:orange,wool:orange
+Oxeye_Daisy_Flower_Pot,,minecraft:potted_oxeye_daisy,,,mcl_flowerpots:flower_pot_oxeye_daisy,mcl_flowerpots:flower_pot_oxeye_daisy
 Oxeye_Daisy,,minecraft:oxeye_daisy,,,mcl_flowers:oxeye_daisy,mcl_flowers:oxeye_daisy
 Packed_Ice,174,minecraft:packed_ice,,,mcl_core:packed_ice,mcl_core:packed_ice
 Peony,175,minecraft:double_plant,,,mcl_flowers:peony,mcl_flowers:peony_top
-Pillar_Quartz_Block,,,,,mcl_nether:quartz_pillar,mcl_nether:quartz_pillar
-Pink_Bed,,,,,mcl_beds:bed_pink_bottom,mcl_beds:bed_pink_bottom
-Pink_Carpet,,,,,mcl_wool:pink_carpet,mcl_wool:pink_carpet
-Pink_Concrete,,,,,mcl_colorblocks:concrete_pink,mcl_colorblocks:concrete_pink
-Pink_Concrete_Powder,,,,,mcl_colorblocks:concrete_powder_pink,mcl_colorblocks:concrete_powder_pink
+Pillar_Quartz_Block,,minecraft:quartz_pillar,,,mcl_nether:quartz_pillar,mcl_nether:quartz_pillar
+Pink_Bed,,minecraft:pink_bed,,,mcl_beds:bed_pink_bottom,mcl_beds:bed_pink_bottom
+Pink_Carpet,,minecraft:pink_carpet,,,mcl_wool:pink_carpet,mcl_wool:pink_carpet
+Pink_Concrete,,minecraft:pink_concrete,,,mcl_colorblocks:concrete_pink,mcl_colorblocks:concrete_pink
+Pink_Concrete_Powder,,minecraft:pink_concrete_powder,,,mcl_colorblocks:concrete_powder_pink,mcl_colorblocks:concrete_powder_pink
 Pink_Concrete_Slab,,,,,mcl_stairs:slab_concrete_pink,mcl_stairs:slab_concrete_pink
 Pink_Concrete_Stair,,,,,mcl_stairs:stair_concrete_pink,mcl_stairs:stair_concrete_pink
 Pink_Glazed_Terracotta,241,minecraft:pink_glazed_terracotta,,,mcl_colorblocks:glazed_terracotta_pink,mcl_colorblocks:glazed_terracotta_pink
 Pink_Shulker_Box,225,minecraft:pink_shulker_box,,,mcl_chests:pink_shulker_box,mcl_chests:pink_shulker_box
-Pink_Stained_Glass,,,,,mcl_core:glass_pink,xpanes:pane_pink
-Pink_Stained_Glass_Pane,,,,,xpanes:pane_pink_flat,xpanes:pane_pink_flat
-Pink_Terracotta,,,,,mcl_colorblocks:hardened_clay_pink,mcl_colorblocks:hardened_clay_pink
-Pink_Tulip_Flower_Pot,,,,,mcl_flowerpots:flower_pot_tulip_pink,mcl_flowerpots:flower_pot_tulip_pink
-Pink_Tulip,,minecraft:pink_flower/minecraft:tulip,,,mcl_flowers:tulip_pink,mcl_flowers:tulip_pink
+Pink_Stained_Glass,,minecraft:pink_stained_glass,,,mcl_core:glass_pink,xpanes:pane_pink
+Pink_Stained_Glass_Pane,,minecraft:pink_stained_glass_pane,,,xpanes:pane_pink_flat,xpanes:pane_pink_flat
+Pink_Terracotta,,minecraft:pink_terracotta,,,mcl_colorblocks:hardened_clay_pink,mcl_colorblocks:hardened_clay_pink
+Pink_Tulip_Flower_Pot,,minecraft:potted_pink_tulip,,,mcl_flowerpots:flower_pot_tulip_pink,mcl_flowerpots:flower_pot_tulip_pink
+Pink_Tulip,,minecraft:pink_flower/minecraft:pink_tulip,,,mcl_flowers:tulip_pink,mcl_flowers:tulip_pink
 Pink_Wool,,minecraft:pink_wool,,,mcl_wool:pink,wool:pink
 Piston,33,minecraft:piston,,mesecons:piston,mesecons_pistons:piston_normal_off,mesecons_pistons:piston_normal_off
 Podzol,,minecraft:podzol,biome:node_top,,mcl_core:podzol,mcl_core:podzol
-Polished_Andesite,,,,,mcl_core:andesite_smooth,mcl_core:andesite_smooth
-Polished_Andesite_Slab,,,,,mcl_stairs:slab_andesite_smooth,mcl_stairs:slab_andesite_smooth
-Polished_Andesite_Stair,,,,,mcl_stairs:stair_andesite_smooth,mcl_stairs:stair_andesite_smooth
-Polished_Diorite,,,,,mcl_core:diorite_smooth,mcl_core:diorite_smooth
-Polished_Diorite_Slab,,,,,mcl_stairs:slab_diorite_smooth,mcl_stairs:slab_diorite_smooth
-Polished_Diorite_Stair,,,,,mcl_stairs:stair_diorite_smooth,mcl_stairs:stair_diorite_smooth
-Polished_Granite,,,,,mcl_core:granite_smooth,mcl_core:granite_smooth
-Polished_Granite_Slab,,,,,mcl_stairs:slab_granite_smooth,mcl_stairs:slab_granite_smooth
-Polished_Granite_Stair,,,,,mcl_stairs:stair_granite_smooth,mcl_stairs:stair_granite_smooth
+Polished_Andesite,,minecraft:polished_andesite,,,mcl_core:andesite_smooth,mcl_core:andesite_smooth
+Polished_Andesite_Slab,,minecraft:polished_andesite_slab,,,mcl_stairs:slab_andesite_smooth,mcl_stairs:slab_andesite_smooth
+Polished_Andesite_Stair,,minecraft:polished_andesite_stairs,,,mcl_stairs:stair_andesite_smooth,mcl_stairs:stair_andesite_smooth
+Polished_Diorite,,minecraft:polished_diorite,,,mcl_core:diorite_smooth,mcl_core:diorite_smooth
+Polished_Diorite_Slab,,minecraft:polished_diorite_slab,,,mcl_stairs:slab_diorite_smooth,mcl_stairs:slab_diorite_smooth
+Polished_Diorite_Stair,,minecraft:polished_diorite_stairs,,,mcl_stairs:stair_diorite_smooth,mcl_stairs:stair_diorite_smooth
+Polished_Granite,,minecraft:polished_granite,,,mcl_core:granite_smooth,mcl_core:granite_smooth
+Polished_Granite_Slab,,minecraft:polished_granite_slab,,,mcl_stairs:slab_granite_smooth,mcl_stairs:slab_granite_smooth
+Polished_Granite_Stair,,minecraft:polished_granite_stairs,,,mcl_stairs:stair_granite_smooth,mcl_stairs:stair_granite_smooth
 Polished_Stone,,,,,mcl_core:stone_smooth,mcl_core:stone_smooth
 Poppy,38,minecraft:red_flower/minecraft:poppy,,,mcl_flowers:poppy,default:poppy
-Poppy_Flower_Pot,,,,,mcl_flowerpots:flower_pot_poppy,mcl_flowerpots:flower_pot_poppy
+Poppy_Flower_Pot,,minecraft:potted_poppy,,,mcl_flowerpots:flower_pot_poppy,mcl_flowerpots:flower_pot_poppy
 Powered_Rail,27,minecraft:golden_rail,,,mcl_minecarts:golden_rail,carts:powerrail
 Powered_Redstone_Spot,132,minecraft:tripwire,,,mesecons:wire_00000000_on,mesecons:wire_00000000_on
-Powered_Redstone_Trail,,,,,mesecons:wire_10000000_on,mesecons:wire_10010000_on
+Powered_Redstone_Trail,,minecraft:redstone_wire,,,mesecons:wire_10000000_on,mesecons:wire_10010000_on
 Prismarine,168,minecraft:prismarine,,,mcl_ocean:prismarine,default:prismarine
 Prismarine_Brick,,minecraft:prismarine_bricks,,,mcl_ocean:prismarine_brick,default:prismarine_brick
 Prismarine_Brick_Slab,,minecraft:prismarine_bricks_slab,,,mcl_stairs:slab_prismarine_brick,mcl_stairs:slab_prismarine_brick
@@ -510,49 +515,49 @@ Prismarine_Stair,,minecraft:prismarine_stairs,,,mcl_stairs:stair_prismarine,mcl_
 Prismarine_Wall,,minecraft:prismarine_wall,,,mcl_walls:prismarine,mcl_walls:prismarine
 Pumpkin,86,minecraft:pumpkin,,,mcl_farming:pumpkin_face,mcl_farming:pumpkin_face
 Purple_Bed,,minecraft:purple_bed,,,mcl_beds:bed_purple_bottom,mcl_beds:bed_purple_bottom
-Purple_Carpet,,,,,mcl_wool:purple_carpet,mcl_wool:purple_carpet
+Purple_Carpet,,minecraft:purple_carpet,,,mcl_wool:purple_carpet,mcl_wool:purple_carpet
 Purple_Concrete,,minecraft:purple_concrete,,,mcl_colorblocks:concrete_purple,mcl_colorblocks:concrete_purple
-Purple_Concrete_Powder,,,,,mcl_colorblocks:concrete_powder_purple,mcl_colorblocks:concrete_powder_purple
+Purple_Concrete_Powder,,minecraft:purple_concrete_powder,,,mcl_colorblocks:concrete_powder_purple,mcl_colorblocks:concrete_powder_purple
 Purple_Concrete_Slab,,,,,mcl_stairs:slab_concrete_purple,mcl_stairs:slab_concrete_purple
 Purple_Concrete_Stair,,,,,mcl_stairs:stair_concrete_purple,mcl_stairs:stair_concrete_purple
 Purple_Glazed_Terracotta,245,minecraft:purple_glazed_terracotta,,,mcl_colorblocks:glazed_terracotta_purple,mcl_colorblocks:glazed_terracotta_purple
 Purple_Shulker_Box,229,minecraft:purple_shulker_box,,,mcl_chests:violet_shulker_box,mcl_chests:violet_shulker_box
-Purple_Stained_Glass,,,,,mcl_core:glass_purple,xpanes:pane_purple
-Purple_Stained_Glass_Pane,,,,,xpanes:pane_purple_flat,xpanes:pane_purple_flat
-Purple_Terracotta,,,,,mcl_colorblocks:hardened_clay_purple,mcl_colorblocks:hardened_clay_purple
+Purple_Stained_Glass,,minecraft:purple_stained_glass,,,mcl_core:glass_purple,xpanes:pane_purple
+Purple_Stained_Glass_Pane,,minecraft:purple_stained_glass_pane,,,xpanes:pane_purple_flat,xpanes:pane_purple_flat
+Purple_Terracotta,,minecraft:purple_terracotta,,,mcl_colorblocks:hardened_clay_purple,mcl_colorblocks:hardened_clay_purple
 Purple_Wool,,minecraft:purple_wool,,,mcl_wool:purple,mcl_wool:purple
 Purpur_Block,201,minecraft:purpur_block,,,mcl_end:purpur_block,mcl_end:purpur_block
 Purpur_Pillar,202,minecraft:purpur_pillar,,,mcl_end:purpur_pillar,mcl_end:purpur_pillar
 Purpur_Slab,205,minecraft:purpur_slab,,stairs:slab_purpur_block,mcl_stairs:slab_purpur_block,mcl_stairs:slab_purpur_block
 Purpur_Stair,203,minecraft:purpur_stairs,,stairs:stair_purpur_block,mcl_stairs:stair_purpur_block,mcl_stairs:stair_purpur_block
 Quartz_Block,155,minecraft:quartz_block,,,mcl_nether:quartz_block,mcl_nether:quartz_block
-Quartz_Slab,,,,stairs:slab_quartzblock,mcl_stairs:slab_quartzblock,mcl_stairs:slab_quartzblock
+Quartz_Slab,,minecraft:quartz_slab,,stairs:slab_quartzblock,mcl_stairs:slab_quartzblock,mcl_stairs:slab_quartzblock
 Quartz_Stair,156,minecraft:quartz_stairs,,stairs:stair_quartzblock_outer,mcl_stairs:stair_quartzblock,mcl_stairs:stair_quartzblock
 Rail,66,minecraft:rail,,,mcl_minecarts:rail,carts:rail
 Realm_Barrier,,,,,mcl_core:realm_barrier,mcl_core:realm_barrier
-Red_Bed,,,,beds:bed_bottom,mcl_beds:bed_red_bottom,mcl_beds:bed_red_bottom
-Red_Carpet,,,,,mcl_wool:red_carpet,mcl_wool:red_carpet
-Red_Concrete,,,,,mcl_colorblocks:concrete_red,mcl_colorblocks:concrete_red
-Red_Concrete_Powder,,,,,mcl_colorblocks:concrete_powder_red,mcl_colorblocks:concrete_powder_red
+Red_Bed,,minecraft:red_bed,,beds:bed_bottom,mcl_beds:bed_red_bottom,mcl_beds:bed_red_bottom
+Red_Carpet,,minecraft:red_carpet,,,mcl_wool:red_carpet,mcl_wool:red_carpet
+Red_Concrete,,minecraft:red_concrete,,,mcl_colorblocks:concrete_red,mcl_colorblocks:concrete_red
+Red_Concrete_Powder,,minecraft:red_concrete_powder,,,mcl_colorblocks:concrete_powder_red,mcl_colorblocks:concrete_powder_red
 Red_Concrete_Slab,,,,,mcl_stairs:slab_concrete_red,mcl_stairs:slab_concrete_red
 Red_Concrete_Stair,,,,,mcl_stairs:stair_concrete_red,mcl_stairs:stair_concrete_red
 Red_Glazed_Terracotta,249,minecraft:red_glazed_terracotta,,,mcl_colorblocks:glazed_terracotta_red,mcl_colorblocks:glazed_terracotta_red
 Red_Mushroom,40,minecraft:red_mushroom,,,mcl_mushrooms:mushroom_red,flowers:mushroom_red
-Red_Mushroom_Flower_Pot,,,,,mcl_flowerpots:flower_pot_mushroom_red,mcl_flowerpots:flower_pot_mushroom_red
+Red_Mushroom_Flower_Pot,,minecraft:potted_red_mushroom,,,mcl_flowerpots:flower_pot_mushroom_red,mcl_flowerpots:flower_pot_mushroom_red
 Red_Nether_Brick_Block,215,minecraft:red_nether_brick,,,mcl_nether:red_nether_brick,mcl_nether:red_nether_brick
 Red_Nether_Brick_Fence_Gate,,,,,mclx_fences:red_nether_brick_fence_gate,mclx_fences:red_nether_brick_fence_gate
 Red_Nether_Brick_Fence,,,,,mclx_fences:red_nether_brick_fence,mclx_fences:red_nether_brick_fence
-Red_Nether_Brick_Slab,,,,,mcl_stairs:slab_red_nether_brick,mcl_stairs:slab_red_nether_brick
-Red_Nether_Brick_Stair,,,,,mcl_stairs:stair_red_nether_brick,mcl_stairs:stair_red_nether_brick
-Red_Nether_Brick_Wall,,,,,mcl_walls:rednetherbrick,mcl_walls:rednetherbrick
+Red_Nether_Brick_Slab,,minecraft:red_nether_brick_slab,,,mcl_stairs:slab_red_nether_brick,mcl_stairs:slab_red_nether_brick
+Red_Nether_Brick_Stair,,minecraft:red_nether_brick_stairs,,,mcl_stairs:stair_red_nether_brick,mcl_stairs:stair_red_nether_brick
+Red_Nether_Brick_Wall,,minecraft:red_nether_brick_wall,,,mcl_walls:rednetherbrick,mcl_walls:rednetherbrick
 Red_Sand,,minecraft:red_sand,biome:node_riverbed,,mcl_core:redsand,mcl_core:redsand
 Red_Sandstone,179,minecraft:red_sandstone,,,mcl_core:redsandstone,mcl_core:redsandstone
-Red_Sandstone_Slab,182,minecraft:stone_slab2,,stairs:slab_redsandstone,mcl_stairs:slab_redsandstone,mcl_stairs:slab_redsandstone
+Red_Sandstone_Slab,182,minecraft:stone_slab2/minecraft:red_sandstone_slab,,stairs:slab_redsandstone,mcl_stairs:slab_redsandstone,mcl_stairs:slab_redsandstone
 Red_Sandstone_Stair,180,minecraft:red_sandstone_stairs,,stairs:stair_redsandstone,mcl_stairs:stair_redsandstone,mcl_stairs:stair_redsandstone
-Red_Sandstone_Wall,,,,,mcl_walls:redsandstone,mcl_walls:redsandstone
+Red_Sandstone_Wall,,minecraft:red_sandstone_wall,,,mcl_walls:redsandstone,mcl_walls:redsandstone
 Red_Shulker_Box,233,minecraft:red_shulker_box,,,mcl_chests:red_shulker_box,mcl_chests:red_shulker_box
-Red_Stained_Glass,,,,,mcl_core:glass_red,xpanes:pane_red
-Red_Stained_Glass_Pane,,,,,xpanes:pane_red_flat,xpanes:pane_red_flat
+Red_Stained_Glass,,minecraft:red_stained_glass,,,mcl_core:glass_red,xpanes:pane_red
+Red_Stained_Glass_Pane,,minecraft:red_stained_glass_pane,,,xpanes:pane_red_flat,xpanes:pane_red_flat
 Redstone,55,minecraft:redstone_wire,,mesecons:redstone,mesecons:wire_00000000_off,mesecons:wire_00000000_off
 Redstone_Block,152,minecraft:redstone_block,,,mesecons_torch:redstoneblock,default:mese
 Redstone_Comparator_(Off),149,minecraft:unpowered_comparator,,,mcl_comparators:comparator_off_comp,mcl_comparators:comparator_off_comp
@@ -562,50 +567,53 @@ Redstone_Ore,73,minecraft:redstone_ore,,,mcl_core:stone_with_redstone,default:st
 Redstone_Repeater,93,minecraft:unpowered_repeater,,mesecons:delayer,mesecons_delayer:delayer_off,mesecons_delayer:delayer_off
 Redstone_Repeater_(Powered),94,minecraft:powered_repeater,,,mesecons_delayer:delayer_on,mesecons_delayer:delayer_on
 Redstone_Torch,76,minecraft:redstone_torch,,mesecons:torch,mesecons_torch:mesecon_torch_on,mesecons_torch:mesecon_torch_on
+Redstone_Torch_Wall,,minecraft:redstone_wall_torch,,,mesecons_torch:mesecon_torch_on_wall
 Redstone_Torch_(off),75,minecraft:unlit_redstone_torch,,,mesecons_torch:mesecon_torch_off,mesecons_torch:mesecon_torch_off
+Redstone_Torch_(off)_Wall,76,minecraft:unlit_redstone_wall_torch,,,mesecons_torch:mesecon_torch_off_wall,mesecons_torch:mesecon_torch_off
 Redstone_Trail,,,,,mesecons:wire_11000000_off,mesecons:wire_10000000_off
-Red_Terracotta,,,,,mcl_colorblocks:hardened_clay_red,mcl_colorblocks:hardened_clay_red
-Red_Tulip_Flower_Pot,,,,,mcl_flowerpots:flower_pot_tulip_red,mcl_flowerpots:flower_pot_tulip_red
-Red_Tulip,,,,,mcl_flowers:tulip_red,mcl_flowers:tulip_red
+Red_Terracotta,,minecraft:red_terracotta,,,mcl_colorblocks:hardened_clay_red,mcl_colorblocks:hardened_clay_red
+Red_Tulip_Flower_Pot,,minecraft:potted_red_tulip,,,mcl_flowerpots:flower_pot_tulip_red,mcl_flowerpots:flower_pot_tulip_red
+Red_Tulip,,minecraft:red_tulip,,,mcl_flowers:tulip_red,mcl_flowers:tulip_red
 Red_Wool,,minecraft:red_wool,,,mcl_wool:red,wool:red
 Riverwaterlogged_Sponge,,,,,mcl_sponges:sponge_wet_river_water,mcl_sponges:sponge_wet_river_water
 River_Water_Source,,,,mapgen_river_water_source,mclx_core:river_water_source,default:river_water_source
-Rose_Bush,,,,,mcl_flowers:rose_bush,mcl_flowers:rose_bush_top
+Rose_Bush,,minecraft:rose_bush,,,mcl_flowers:rose_bush,mcl_flowers:rose_bush_top
 Sand,12,minecraft:sand,biome:node_riverbed,mapgen_sand,mcl_core:sand,default:sand
 Sandstone,24,minecraft:sandstone,biome:node_stone,mapgen_desert_stone,mcl_core:sandstone,default:sandstone
 Sandstone_Carved,,,,,mcl_core:sandstonecarved,default:sandstonecarved
-Sandstone_Slab,,,,stairs:slab_sandstone,mcl_stairs:slab_sandstone,stairs:slab_sandstone
+Sandstone_Slab,,minecraft:sandstone_slab,,stairs:slab_sandstone,mcl_stairs:slab_sandstone,stairs:slab_sandstone
 Sandstone_Stair,128,minecraft:sandstone_stairs,,mapgen_stair_sandstone_block,mcl_stairs:stair_sandstone,stairs:stair_sandstone
-Sandstone_Wall,,,,,mcl_walls:sandstone,mcl_walls:sandstone
+Sandstone_Wall,,minecraft:sandstone_wall,,,mcl_walls:sandstone,mcl_walls:sandstone
 Sea_Lantern,169,minecraft:sea_lantern,,,mcl_ocean:sea_lantern,default:sea_Lantern
 Side_Hopper,,,,,mcl_hoppers:hopper_side,mcl_hoppers:hopper_side
-Skeleton_Skull,144,minecraft:skull,,,mcl_heads:skeleton,mcl_heads:skeleton
+Skeleton_Skull,144,minecraft:skeleton_skull,,,mcl_heads:skeleton,mcl_heads:skeleton
+Skeleton_Skull_Wall,145,minecraft:skeleton_wall_skull,,,mcl_heads:skeleton_wall,mcl_heads:skeleton
 Slime_Block,165,minecraft:slime,,,mcl_core:slimeblock,mcl_core:slimeblock
-Smooth_Quartz,,,,,mcl_nether:quartz_smooth,mcl_nether:quartz_smooth
-Smooth_Quartz_Slab,,,,,mcl_stairs:slab_quartz_smooth,mcl_stairs:slab_quartz_smooth
-Smooth_Quartz_Stair,,,,,mcl_stairs:stair_quartz_smooth,mcl_stairs:stair_quartz_smooth
-Smooth_Red_Sandstone,,,,,mcl_core:redsandstonesmooth2,mcl_core:redsandstonesmooth2
-Smooth_Red_Sandstone_Slab,,,,,mcl_stairs:slab_redsandstonesmooth2,mcl_stairs:slab_redsandstonesmooth2
-Smooth_Red_Sandstone_Stair,,,,,mcl_stairs:stair_redsandstonesmooth2,mcl_stairs:stair_redsandstonesmooth2
-Smooth_Sandstone,,,,,mcl_core:sandstonesmooth2,mcl_core:sandstonesmooth2
-Smooth_Sandstone_Slab,,,,,mcl_stairs:slab_sandstonesmooth2,mcl_stairs:slab_sandstonesmooth2
-Smooth_Sandstone_Stair,,,,,mcl_stairs:stair_sandstonesmooth2,mcl_stairs:stair_sandstonesmooth2
+Smooth_Quartz,,minecraft:smooth_quartz,,,mcl_nether:quartz_smooth,mcl_nether:quartz_smooth
+Smooth_Quartz_Slab,,minecraft:smooth_quartz_slab,,,mcl_stairs:slab_quartz_smooth,mcl_stairs:slab_quartz_smooth
+Smooth_Quartz_Stair,,minecraft:smooth_quartz_stairs,,,mcl_stairs:stair_quartz_smooth,mcl_stairs:stair_quartz_smooth
+Smooth_Red_Sandstone,,minecraft:smooth_red_sandstone,,,mcl_core:redsandstonesmooth2,mcl_core:redsandstonesmooth2
+Smooth_Red_Sandstone_Slab,,minecraft:smooth_red_sandstone_slab,,,mcl_stairs:slab_redsandstonesmooth2,mcl_stairs:slab_redsandstonesmooth2
+Smooth_Red_Sandstone_Stair,,minecraft:smooth_red_sandstone_stairs,,,mcl_stairs:stair_redsandstonesmooth2,mcl_stairs:stair_redsandstonesmooth2
+Smooth_Sandstone,,minecraft:smooth_sandstone,,,mcl_core:sandstonesmooth2,mcl_core:sandstonesmooth2
+Smooth_Sandstone_Slab,,minecraft:smooth_sandstone_slab,,,mcl_stairs:slab_sandstonesmooth2,mcl_stairs:slab_sandstonesmooth2
+Smooth_Sandstone_Stair,,minecraft:smooth_sandstone_stairs,,,mcl_stairs:stair_sandstonesmooth2,mcl_stairs:stair_sandstonesmooth2
 Snow_Block,80,minecraft:snow,biome:node_dust,mapgen_snowblock,mcl_core:snowblock,default:snow
 Snow_Layer,78,minecraft:snow_layer,,,mcl_core:snow_layer,default:snow_layer
 Soul_Sand,88,minecraft:soul_sand,,,mcl_nether:soul_sand,mcl_nether:soul_sand
 Sponge,19,minecraft:sponge,,,mcl_sponges:sponge,default:sponge
-Spruce_Bark,,,,,mcl_core:sprucetree_bark,mcl_core:sprucetree_bark
+Spruce_Bark,,minecraft:spruce_wood,,,mcl_core:sprucetree_bark,mcl_core:sprucetree_bark
 Spruce_Bark_Slab,,,,,mcl_stairs:slab_sprucetree_bark,mcl_stairs:slab_sprucetree_bark
 Spruce_Bark_Stair,,,,,mcl_stairs:stair_sprucetree_bark,mcl_stairs:stair_sprucetree_bark
-Spruce_Button,,,,,mesecons_button:button_sprucewood_off,mesecons_button:button_sprucewood_off
+Spruce_Button,,minecraft:spruce_button,,,mesecons_button:button_sprucewood_off,mesecons_button:button_sprucewood_off
 Spruce_Fence,188,minecraft:spruce_fence,,,mcl_fences:spruce_fence,default:spruce_fence
 Spruce_Fence_Gate,183,minecraft:spruce_fence_gate,,,mcl_fences:spruce_fence_gate,mcl_fences:spruce_fence_gate
 Spruce_Leaves,,minecraft:spruce_leaves,,mapgen_pine_needles,mcl_core:spruceleaves,mcl_core:spruceleaves
-Spruce_Log,,minecraft:spruce_log,,,mcl_core:sprucetree,mcl_core:sprucetree
-Spruce,,minecraft:spruce,,mapgen_pine_tree,mcl_core:sprucewood,mcl_core:sprucewood
-Spruce_Pressure_Plate,,,,mesecons:pressure_plate_sprucewood,mesecons_pressureplates:pressure_plate_sprucewood_on,mesecons_pressureplates:pressure_plate_sprucewood_off
-Spruce_Sapling_Flower_Pot,,,,,mcl_flowerpots:flower_pot_sprucesapling,mcl_flowerpots:flower_pot_sprucesapling
-Spruce_Sapling,,,,,mcl_core:sprucesapling,mcl_core:sprucesapling
+Spruce,,minecraft:spruce_log,,,mcl_core:sprucetree,mcl_core:sprucetree
+Spruce_Planks,,minecraft:spruce_planks,,mapgen_pine_tree,mcl_core:sprucewood,mcl_core:sprucewood
+Spruce_Pressure_Plate,,minecraft:spruce_pressure_plate,,mesecons:pressure_plate_sprucewood,mesecons_pressureplates:pressure_plate_sprucewood_on,mesecons_pressureplates:pressure_plate_sprucewood_off
+Spruce_Sapling_Flower_Pot,,minecraft:potted_spruce_sapling,,,mcl_flowerpots:flower_pot_sprucesapling,mcl_flowerpots:flower_pot_sprucesapling
+Spruce_Sapling,,minecraft:spruce_sapling,,,mcl_core:sprucesapling,mcl_core:sprucesapling
 Spruce_Slab,,minecraft:spruce_slab,,stairs:slab_sprucewood,mcl_stairs:slab_sprucewood,default:slab_sprucewood
 Spruce_Stair,134,minecraft:spruce_stairs,,stairs:stair_sprucewood,mcl_stairs:stair_sprucewood,default:stair_sprucewood
 Spruce_Trapdoor,,minecraft:spruce_trapdoor,,,mcl_doors:spruce_trapdoor,mcl_doors:spruce_trapdoor
@@ -620,24 +628,25 @@ Stone_Brick_Wall,,minecraft:stone_brick_wall,,,mcl_walls:stonebrick,default:wall
 Stone_Button,77,minecraft:stone_button,,,mesecons_button:button_stone_off,mesecons_button:button_stone_off
 Stone_Pressure_Plate,70,minecraft:stone_pressure_plate,,mesecons:pressure_plate_stone,mesecons_pressureplates:pressure_plate_stone_off,mesecons_pressureplates:pressure_plate_stone_off
 Stone_Slab,44,minecraft:stone_slab,,,mcl_stairs:slab_stone,stairs:slab_stone
-Stone_Stair,,,,,mcl_stairs:stair_stone_rough,stairs:stair_stone
-Sugar_Canes,83,minecraft:reeds,,,mcl_core:reeds,default:papyrus
-Sunflower,,,,,mcl_flowers:sunflower,mcl_flowers:sunflower
-Tall_Grass,,,,,mcl_flowers:tallgrass,default:tallgrass
+Stone_Stair,,minecraft:stone_stairs,,,mcl_stairs:stair_stone_rough,stairs:stair_stone
+Sugar_Canes,83,minecraft:sugar_cane,,,mcl_core:reeds,default:papyrus
+Sunflower,,minecraft:sunflower,,,mcl_flowers:sunflower,mcl_flowers:sunflower
+Tall_Grass,,minecraft:tall_grass,,,mcl_flowers:tallgrass,default:tallgrass
 Terracotta,172,minecraft:hardened_clay,biome:node_riverbed,,mcl_colorblocks:hardened_clay,mcl_colorblocks:hardened_clay
 TNT,46,minecraft:tnt,,,mcl_tnt:tnt,tnt:tnt
+Top_Snow,,,biome:node_dust,mapgen_snow,mcl_core:snow,default:snow
 Torch,50,minecraft:torch/minecraft:wall_torch,,,mcl_torches:torch_wall,default:torch
 Trapdoor,96,minecraft:trapdoor/minecraft:oak_trapdoor,,doors:trapdoor,mcl_doors:trapdoor,default:trapdoor
 Trapped_Chest,146,minecraft:trapped_chest,,,mcl_chests:trapped_chest,mcl_chests:trapped_chest
 Vines,106,minecraft:vine,,,mcl_core:vine,mcl_core:vine
 Void,217,minecraft:structure_void,,,mcl_core:void,mcl_core:void
 Waterlily,111,minecraft:waterlily/minecraft:lily_pad,,,mcl_flowers:waterlily,flowers:waterlily
-Waterlogged_Sponge,,,,,mcl_sponges:sponge_wet,mcl_sponges:sponge_wet
+Waterlogged_Sponge,,minecraft:wet_sponge,,,mcl_sponges:sponge_wet,mcl_sponges:sponge_wet
 Water_Source,9,minecraft:water,,mapgen_water_source,mcl_core:water_source,default:water_source
 White_Bed,,minecraft:white_bed,,,mcl_beds:bed_white_bottom,mcl_beds:bed_white_bottom
 White_Carpet,171,minecraft:carpet,,,mcl_wool:white_carpet,wool:white_carpet
 White_Concrete,,minecraft:white_concrete,,,mcl_colorblocks:concrete_white,mcl_colorblocks:concrete_white
-White_Concrete_Powder,,,,,mcl_colorblocks:concrete_powder_white,mcl_colorblocks:concrete_powder_white
+White_Concrete_Powder,,minecraft:white_concrete_powder,,,mcl_colorblocks:concrete_powder_white,mcl_colorblocks:concrete_powder_white
 White_Concrete_Slab,,minecraft:white_concrete_slab,,,mcl_stairs:slab_concrete_white,mcl_stairs:slab_concrete_white
 White_Concrete_Stair,,minecraft:white_concrete_stairs,,,mcl_stairs:stair_concrete_white,mcl_stairs:stair_concrete_white
 White_Glass_Pane,102,minecraft:glass_pane,,,xpanes:pane_white,xpanes:pane_white
@@ -645,21 +654,23 @@ White_Glazed_Terracotta,235,minecraft:white_glazed_terracotta,,,mcl_colorblocks:
 White_Shulker_Box,219,minecraft:white_shulker_box,,,mcl_chests:white_shulker_box,mcl_chests:white_shulker_box
 White_Stained_Glass,95,minecraft:stained_glass,,,mcl_core:glass_white,mcl_core:glass_white
 White_Stained_Glass_Pane,160,minecraft:stained_glass_pane,,,xpanes:pane_white_flat,xpanes:pane_white_flat
-White_Terracotta,,,,,mcl_colorblocks:hardened_clay_white,mcl_colorblocks:hardened_clay_white
-White_Tulip_Flower_Pot,,,,,mcl_flowerpots:flower_pot_tulip_white,mcl_flowerpots:flower_pot_tulip_white
-White_Tulip,,minecraft:kelp,,,mcl_flowers:tulip_white,mcl_flowers:tulip_white
-Wither_Skeleton_Skull,,,,,mcl_heads:wither_skeleton,mcl_heads:wither_skeleton
+White_Terracotta,,minecraft:white_terracotta,,,mcl_colorblocks:hardened_clay_white,mcl_colorblocks:hardened_clay_white
+White_Tulip_Flower_Pot,,minecraft:potted_white_tulip,,,mcl_flowerpots:flower_pot_tulip_white,mcl_flowerpots:flower_pot_tulip_white
+White_Tulip,,minecraft:white_tulip,,,mcl_flowers:tulip_white,mcl_flowers:tulip_white
+Wither_Skeleton_Skull,,minecraft:wither_skeleton_skull,,,mcl_heads:wither_skeleton,mcl_heads:wither_skeleton
+Wither_Skeleton_Skull_Wall,,minecraft:wither_skeleton_wall_skull,,,mcl_heads:wither_skeleton_wall,mcl_heads:wither_skeleton
 Wool,35,minecraft:wool/minecraft:white_wool,,,mcl_wool:white,wool:white
-Yellow_Bed,,,,,mcl_beds:bed_yellow_bottom,mcl_beds:bed_yellow_bottom
-Yellow_Carpet,,,,,mcl_wool:yellow_carpet,mcl_wool:yellow_carpet
-Yellow_Concrete,,,,,mcl_colorblocks:concrete_yellow,mcl_colorblocks:concrete_yellow
-Yellow_Concrete_Powder,,,,,mcl_colorblocks:concrete_powder_yellow,mcl_colorblocks:concrete_powder_yellow
+Yellow_Bed,,minecraft:yellow_bed,,,mcl_beds:bed_yellow_bottom,mcl_beds:bed_yellow_bottom
+Yellow_Carpet,,minecraft:yellow_carpet,,,mcl_wool:yellow_carpet,mcl_wool:yellow_carpet
+Yellow_Concrete,,minecraft:yellow_concrete,,,mcl_colorblocks:concrete_yellow,mcl_colorblocks:concrete_yellow
+Yellow_Concrete_Powder,,minecraft:yellow_concrete_powder,,,mcl_colorblocks:concrete_powder_yellow,mcl_colorblocks:concrete_powder_yellow
 Yellow_Concrete_Slab,,,,,mcl_stairs:slab_concrete_yellow,mcl_stairs:slab_concrete_yellow
 Yellow_Concrete_Stair,,,,,mcl_stairs:stair_concrete_yellow,mcl_stairs:stair_concrete_yellow
 Yellow_Glazed_Terracotta,239,minecraft:yellow_glazed_terracotta,,,mcl_colorblocks:glazed_terracotta_yellow,mcl_colorblocks:glazed_terracotta_yellow
 Yellow_Shulker_Box,223,minecraft:yellow_shulker_box,,,mcl_chests:yellow_shulker_box,mcl_chests:yellow_shulker_box
-Yellow_Stained_Glass,,,,,mcl_core:glass_yellow,xpanes:pane_yellow
-Yellow_Stained_Glass_Pane,,,,,xpanes:pane_yellow_flat,xpanes:pane_yellow_flat
-Yellow_Terracotta,159,minecraft:stained_hardened_clay,,,mcl_colorblocks:hardened_clay_yellow,mcl_colorblocks:hardened_clay_yellow
-Yellow_Wool,,,,,mcl_wool:yellow,wool:yellow
-Zombie_Head,,,,,mcl_heads:zombie,mcl_heads:zombie
+Yellow_Stained_Glass,,minecraft:yellow_stained_glass,,,mcl_core:glass_yellow,xpanes:pane_yellow
+Yellow_Stained_Glass_Pane,,minecraft:yellow_stained_glass_pane,,,xpanes:pane_yellow_flat,xpanes:pane_yellow_flat
+Yellow_Terracotta,159,minecraft:yellow_terracotta,,,mcl_colorblocks:hardened_clay_yellow,mcl_colorblocks:hardened_clay_yellow
+Yellow_Wool,,minecraft:yellow_wool,,,mcl_wool:yellow,wool:yellow
+Zombie_Head,,minecraft:zombie_head,,,mcl_heads:zombie,mcl_heads:zombie
+Zombie_Head_Wall,,minecraft:zombie_wall_head,,,mcl_heads:zombie,mcl_heads:zombie_wall

mt-mod/mtsedit/init.lua

@@ -48,6 +48,8 @@ mtsedit.translate = {
 }
 -- these will be substituted in names
 mtsedit.replacements = {
+    ["_inner"] = "",
+    ["_outer"] = "",
     ["_Wood"] = "",
     ["_Tree"] = "_Log",
     ["_Bars"] = "_Bar",

src/blocks.c

@@ -206,6 +206,7 @@ void blocks_parse()
         j = numpalettes++;
         palettes = (char**)realloc(palettes, numpalettes * sizeof(char*));
         if(!palettes) error(lang[ERR_MEM]);
+        if(e <= s) errorcsv(j+1);
         palettes[j] = (char*)malloc(e - s + 1);
         if(!palettes[j]) error(lang[ERR_MEM]);
         memcpy(palettes[j], s, e - s + 1);
@@ -364,6 +365,7 @@ void blocks_parse()
         while(*s <= ' ') s++;
         while(*(e-1) <= ' ') e--;
         if(e != s) {
+            if(e <= s) errorcsv(j+1);
             blocks[j].blocknames[k] = (char*)malloc(e - s + 1);
             if(!blocks[j].blocknames[k]) error(lang[ERR_MEM]);
             memcpy(blocks[j].blocknames[k], s, e - s + 1);

src/edit.c

@@ -148,12 +148,18 @@ void edit_redraw(int full)
                                 s = 32 * (blocks[i].numpar2 ? blocks[i].numpar2 : 1)*32 * 4;
                                 blocks[i].dr = (unsigned char *)malloc(s);
                                 if(!blocks[i].dr) error(lang[ERR_MEM]);
+                                memset(blocks[i].dr, 0, s);
                                 if(blocks[i].img)
                                     memcpy(blocks[i].dr, blocks[i].img, s);
                                 else {
                                     j = 0;
                                     s = 32 * 32 * 4;
                                     blocks[i].numpar2 = 1;
+                                    if(!blocks[i].tr) {
+                                        blocks[i].tr = (unsigned char *)malloc(s);
+                                        if(!blocks[i].tr) error(lang[ERR_MEM]);
+                                        memset(blocks[i].tr, 0, s);
+                                    }
                                     memcpy(blocks[i].tr, (uint8_t*)icons->pixels + 32 * icons->pitch, s);
                                 }
                                 for(l = 0; l < s; l += 4) {

src/schemimp.c

@@ -54,7 +54,7 @@ int namematch(char *a, char *b)
 void schem_load(unsigned char *data, unsigned int size)
 {
     int i, j, k, l, x, y, z, g = 0, min_x = 0, min_y = 0, min_z = 0, tr[1024];
-    char name[256], rep[1024];
+    char name[256], rep[1024], rot[1024];
     unsigned char *d, *s, *blk, *blkd = NULL, *blkp = NULL, *end = data + size;
     unsigned int n;
 
@@ -64,28 +64,38 @@ void schem_load(unsigned char *data, unsigned int size)
         if(!memcmp(d, "\000\006Length", 8)) { d += 8; SCHEM_GETINT(mts_z, d[-9]); d--; } else
         if(!memcmp(d, "\000\005Width", 7)) { d += 7; SCHEM_GETINT(mts_x, d[-8]); d--; } else
         if(!memcmp(d, "\000\009WEOffsetY", 11)) { d += 11; SCHEM_GETINT(g, d[-12]); d--; } else
-        if(!memcmp(d, "\007\000\004Data", 7)) { d += 7; blkd = d + 4; SCHEM_GETINT(i, 3); d += i; } else
-        if(!memcmp(d, "\007\000\006Blocks", 9)) { d += 9; SCHEM_GETINT(l, 3); blk = d; d += l; } else
+        if(!memcmp(d, "\007\000\004Data", 7)) { d += 7; SCHEM_GETINT(i, 3); blkd = d; d += i; d--; } else
+        if(!memcmp(d, "\007\000\006Blocks", 9)) { d += 9; SCHEM_GETINT(l, 3); blk = d; d += l; d--; } else
         if(!memcmp(d, "\012\000\007Palette", 10)) { d += 10; blkp = d; } else
-        if(!memcmp(d, "\007\000\011BlockData", 12)) { d += 12; SCHEM_GETINT(l, 3); blk = d; d += l; }
+        if(!memcmp(d, "\007\000\011BlockData", 12)) { d += 12; SCHEM_GETINT(l, 3); blk = d; d += l; d--; }
     }
     if(!blk || !mts_y || !mts_z || !mts_x || mts_y > 255 || mts_z > 255 || mts_x > 255 || l < mts_y * mts_z * mts_x) {
         mts_y = mts_z = mts_x = 0;
         return;
     }
-    memset(tr, 0, sizeof(tr));
+    memset(tr, 0xff, sizeof(tr));
     memset(rep, 0, sizeof(rep));
+    memset(rot, 0, sizeof(rot));
     if(!blkp) {
+        tr[0] = 0;
         for(i = 1; i < numblocks; i++)
             for(j = 0; j < 4; j++)
                 if(blocks[i].blockids[j])
                     tr[blocks[i].blockids[j]] = i;
+        rot[0] = 0; rot[1] = 2; rot[2] = 1; rot[3] = 3;
     } else {
         for(d = blkp; *d > 0 && *d < 4;) {
             j = *d++; d++; l = *d++; s = d; d += l;
             memcpy(name, s, l); name[l] = 0;
-            for(l = 0; name[l]; l++) if(name[l] == '[') { name[l] = 0; break; }
             SCHEM_GETINT(k, j);
+            for(l = 0; name[l]; l++) if(name[l] == '[') {
+                if(strstr(name + l, "=north")) rot[k] = 0; else
+                if(strstr(name + l, "=east")) rot[k] = 1; else
+                if(strstr(name + l, "=west")) rot[k] = 2; else
+                if(strstr(name + l, "=south")) rot[k] = 3;
+                name[l] = 0;
+                break;
+            }
             for(i = l = 0; i < numblocks; i++)
                 if((blocks[i].name && (!strcmp(blocks[i].name, name) || (!strncmp(name, "minecraft:", 10) &&
                     strlen(blocks[i].name) > 11 && !strcasecmp(blocks[i].name + 10, name)))) ||
@@ -106,7 +116,6 @@ void schem_load(unsigned char *data, unsigned int size)
     min_x = 127 - mts_x / 2;
     min_y = 127 - mts_y / 2;
     min_z = 127 - mts_z / 2;
-    gndlayer = min_y - g;
     /* now that we know the dimensions, and the blocks data, we can parse */
     for(d = blk, i = y = 0; y < mts_y; y++)
         for(z = 0; z < mts_z; z++)
@@ -121,12 +130,14 @@ void schem_load(unsigned char *data, unsigned int size)
                         if(!(*d & 0x80)) { d++; break; }
                     }
                 }
-                if(n < 1024 && (tr[n] || (!tr[n] && !n))) {
+                if(n < 1024 && tr[n] != -1) {
                     layerprob[y+min_y] = 127;
-                    nodes[y+min_y][z+min_z][x+min_x].param0 = tr[n];
-                    nodes[y+min_y][z+min_z][x+min_x].param1 = 127;
-                    if(blkd)
-                        nodes[y+min_y][z+min_z][x+min_x].param2 = blkd[i] & 3;
+                    nodes[y+min_y][255-(x+min_x)][z+min_z].param0 = tr[n];
+                    nodes[y+min_y][255-(x+min_x)][z+min_z].param1 = !tr[n] ? 0 : 127;
+                    if(blkp)
+                        nodes[y+min_y][255-(x+min_x)][z+min_z].param2 = rot[tr[n]];
+                    else if(blkd)
+                        nodes[y+min_y][255-(x+min_x)][z+min_z].param2 = rot[blkd[i] & 3];
                     blocks[tr[n]].numref++;
                 } else if(!blkp && !*d) {
                     if(n >= sizeof(rep) || !rep[n])
@@ -135,6 +146,11 @@ void schem_load(unsigned char *data, unsigned int size)
                         rep[n] = 1;
                 }
             }
+    mts_getbounds(0, NULL, NULL);
+    mts_x = max - mix + 1;
+    mts_y = may - miy + 1;
+    mts_z = maz - miz + 1;
+    gndlayer = miy - g;
     status = lang[LOADED];
 }