diff --git a/README.md b/README.md
index 27c73f1..3f1b1cb 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ for more details.
-The User Interface is translatable. Supported languages: English, Magyar, Español, Français, Deutch, Polski and русский.
+The User Interface is translatable. Supported languages: English, Magyar, Español, Français, Deutch, Polski and Русский.
The other component is a Minetest mod, under the [mt-mod](https://gitlab.com/bztsrc/mtsedit/tree/master/mt-mod) directory. This
small Lua script runs inside the game, and can import your edited MTS files into the game's world. It can also save MTS files
diff --git a/data/Acacia_00.png b/data/Acacia.png
similarity index 100%
rename from data/Acacia_00.png
rename to data/Acacia.png
diff --git a/data/Acacia_Bark_00.png b/data/Acacia_Bark.png
similarity index 100%
rename from data/Acacia_Bark_00.png
rename to data/Acacia_Bark.png
diff --git a/data/Acacia_Bark_Slab_00.png b/data/Acacia_Bark_Slab.png
similarity index 100%
rename from data/Acacia_Bark_Slab_00.png
rename to data/Acacia_Bark_Slab.png
diff --git a/data/Acacia_Bark_Stair.png b/data/Acacia_Bark_Stair.png
new file mode 100644
index 0000000..3e4ad32
Binary files /dev/null and b/data/Acacia_Bark_Stair.png differ
diff --git a/data/Acacia_Bark_Stair_00.png b/data/Acacia_Bark_Stair_00.png
deleted file mode 100644
index 831a191..0000000
Binary files a/data/Acacia_Bark_Stair_00.png and /dev/null differ
diff --git a/data/Acacia_Bark_Stair_01.png b/data/Acacia_Bark_Stair_01.png
deleted file mode 100644
index 0aef938..0000000
Binary files a/data/Acacia_Bark_Stair_01.png and /dev/null differ
diff --git a/data/Acacia_Bark_Stair_02.png b/data/Acacia_Bark_Stair_02.png
deleted file mode 100644
index 28e2043..0000000
Binary files a/data/Acacia_Bark_Stair_02.png and /dev/null differ
diff --git a/data/Acacia_Bark_Stair_03.png b/data/Acacia_Bark_Stair_03.png
deleted file mode 100644
index 5794c51..0000000
Binary files a/data/Acacia_Bark_Stair_03.png and /dev/null differ
diff --git a/data/Acacia_Button.png b/data/Acacia_Button.png
new file mode 100644
index 0000000..86e91cb
Binary files /dev/null and b/data/Acacia_Button.png differ
diff --git a/data/Acacia_Button_00.png b/data/Acacia_Button_00.png
deleted file mode 100644
index 46b1b97..0000000
Binary files a/data/Acacia_Button_00.png and /dev/null differ
diff --git a/data/Acacia_Button_01.png b/data/Acacia_Button_01.png
deleted file mode 100644
index e8eca5f..0000000
Binary files a/data/Acacia_Button_01.png and /dev/null differ
diff --git a/data/Acacia_Fence.png b/data/Acacia_Fence.png
new file mode 100644
index 0000000..8193838
Binary files /dev/null and b/data/Acacia_Fence.png differ
diff --git a/data/Acacia_Fence_00.png b/data/Acacia_Fence_00.png
deleted file mode 100644
index 8962c75..0000000
Binary files a/data/Acacia_Fence_00.png and /dev/null differ
diff --git a/data/Acacia_Fence_01.png b/data/Acacia_Fence_01.png
deleted file mode 100644
index a6f0d22..0000000
Binary files a/data/Acacia_Fence_01.png and /dev/null differ
diff --git a/data/Acacia_Fence_Gate_00.png b/data/Acacia_Fence_Gate.png
similarity index 68%
rename from data/Acacia_Fence_Gate_00.png
rename to data/Acacia_Fence_Gate.png
index 92ba628..195427f 100644
Binary files a/data/Acacia_Fence_Gate_00.png and b/data/Acacia_Fence_Gate.png differ
diff --git a/data/Acacia_Fence_Gate_01.png b/data/Acacia_Fence_Gate_01.png
deleted file mode 100644
index 7936bc6..0000000
Binary files a/data/Acacia_Fence_Gate_01.png and /dev/null differ
diff --git a/data/Acacia_Leaves_00.png b/data/Acacia_Leaves.png
similarity index 100%
rename from data/Acacia_Leaves_00.png
rename to data/Acacia_Leaves.png
diff --git a/data/Acacia_Plank_00.png b/data/Acacia_Plank.png
similarity index 100%
rename from data/Acacia_Plank_00.png
rename to data/Acacia_Plank.png
diff --git a/data/Acacia_Pressure_Plate_00.png b/data/Acacia_Pressure_Plate.png
similarity index 100%
rename from data/Acacia_Pressure_Plate_00.png
rename to data/Acacia_Pressure_Plate.png
diff --git a/data/Acacia_Sapling_00.png b/data/Acacia_Sapling.png
similarity index 100%
rename from data/Acacia_Sapling_00.png
rename to data/Acacia_Sapling.png
diff --git a/data/Acacia_Sapling_Flower_Pot_00.png b/data/Acacia_Sapling_Flower_Pot.png
similarity index 100%
rename from data/Acacia_Sapling_Flower_Pot_00.png
rename to data/Acacia_Sapling_Flower_Pot.png
diff --git a/data/Acacia_Slab_00.png b/data/Acacia_Slab.png
similarity index 100%
rename from data/Acacia_Slab_00.png
rename to data/Acacia_Slab.png
diff --git a/data/Acacia_Stair.png b/data/Acacia_Stair.png
new file mode 100644
index 0000000..1db3b8e
Binary files /dev/null and b/data/Acacia_Stair.png differ
diff --git a/data/Acacia_Stair_00.png b/data/Acacia_Stair_00.png
deleted file mode 100644
index 5b234c3..0000000
Binary files a/data/Acacia_Stair_00.png and /dev/null differ
diff --git a/data/Acacia_Stair_01.png b/data/Acacia_Stair_01.png
deleted file mode 100644
index c1349e8..0000000
Binary files a/data/Acacia_Stair_01.png and /dev/null differ
diff --git a/data/Acacia_Stair_02.png b/data/Acacia_Stair_02.png
deleted file mode 100644
index 881c3bf..0000000
Binary files a/data/Acacia_Stair_02.png and /dev/null differ
diff --git a/data/Acacia_Stair_03.png b/data/Acacia_Stair_03.png
deleted file mode 100644
index 43a0194..0000000
Binary files a/data/Acacia_Stair_03.png and /dev/null differ
diff --git a/data/Acacia_Trapdoor_00.png b/data/Acacia_Trapdoor.png
similarity index 100%
rename from data/Acacia_Trapdoor_00.png
rename to data/Acacia_Trapdoor.png
diff --git a/data/Activator_Rail.png b/data/Activator_Rail.png
new file mode 100644
index 0000000..77f968a
Binary files /dev/null and b/data/Activator_Rail.png differ
diff --git a/data/Activator_Rail_00.png b/data/Activator_Rail_00.png
deleted file mode 100644
index 49c3377..0000000
Binary files a/data/Activator_Rail_00.png and /dev/null differ
diff --git a/data/Activator_Rail_01.png b/data/Activator_Rail_01.png
deleted file mode 100644
index 3336217..0000000
Binary files a/data/Activator_Rail_01.png and /dev/null differ
diff --git a/data/Allium_00.png b/data/Allium.png
similarity index 100%
rename from data/Allium_00.png
rename to data/Allium.png
diff --git a/data/Allium_Flower_Pot_00.png b/data/Allium_Flower_Pot.png
similarity index 100%
rename from data/Allium_Flower_Pot_00.png
rename to data/Allium_Flower_Pot.png
diff --git a/data/Andesite_00.png b/data/Andesite.png
similarity index 100%
rename from data/Andesite_00.png
rename to data/Andesite.png
diff --git a/data/Andesite_Slab_00.png b/data/Andesite_Slab.png
similarity index 100%
rename from data/Andesite_Slab_00.png
rename to data/Andesite_Slab.png
diff --git a/data/Andesite_Stair.png b/data/Andesite_Stair.png
new file mode 100644
index 0000000..1d94561
Binary files /dev/null and b/data/Andesite_Stair.png differ
diff --git a/data/Andesite_Stair_00.png b/data/Andesite_Stair_00.png
deleted file mode 100644
index ad0d657..0000000
Binary files a/data/Andesite_Stair_00.png and /dev/null differ
diff --git a/data/Andesite_Stair_01.png b/data/Andesite_Stair_01.png
deleted file mode 100644
index 4d299ab..0000000
Binary files a/data/Andesite_Stair_01.png and /dev/null differ
diff --git a/data/Andesite_Stair_02.png b/data/Andesite_Stair_02.png
deleted file mode 100644
index ac76f03..0000000
Binary files a/data/Andesite_Stair_02.png and /dev/null differ
diff --git a/data/Andesite_Stair_03.png b/data/Andesite_Stair_03.png
deleted file mode 100644
index dc4856f..0000000
Binary files a/data/Andesite_Stair_03.png and /dev/null differ
diff --git a/data/Andesite_Wall.png b/data/Andesite_Wall.png
new file mode 100644
index 0000000..c29520d
Binary files /dev/null and b/data/Andesite_Wall.png differ
diff --git a/data/Andesite_Wall_00.png b/data/Andesite_Wall_00.png
deleted file mode 100644
index 2528d3c..0000000
Binary files a/data/Andesite_Wall_00.png and /dev/null differ
diff --git a/data/Andesite_Wall_01.png b/data/Andesite_Wall_01.png
deleted file mode 100644
index 719d2f2..0000000
Binary files a/data/Andesite_Wall_01.png and /dev/null differ
diff --git a/data/Anvil.png b/data/Anvil.png
new file mode 100644
index 0000000..f44acc8
Binary files /dev/null and b/data/Anvil.png differ
diff --git a/data/Anvil_00.png b/data/Anvil_00.png
deleted file mode 100644
index 4020eb0..0000000
Binary files a/data/Anvil_00.png and /dev/null differ
diff --git a/data/Anvil_01.png b/data/Anvil_01.png
deleted file mode 100644
index 425d1a7..0000000
Binary files a/data/Anvil_01.png and /dev/null differ
diff --git a/data/Azure_Bluet_00.png b/data/Azure_Bluet.png
similarity index 100%
rename from data/Azure_Bluet_00.png
rename to data/Azure_Bluet.png
diff --git a/data/Azure_Bluet_Flower_Pot_00.png b/data/Azure_Bluet_Flower_Pot.png
similarity index 100%
rename from data/Azure_Bluet_Flower_Pot_00.png
rename to data/Azure_Bluet_Flower_Pot.png
diff --git a/data/Barrier_00.png b/data/Barrier.png
similarity index 100%
rename from data/Barrier_00.png
rename to data/Barrier.png
diff --git a/data/Bed_Red.png b/data/Bed_Red.png
new file mode 100644
index 0000000..5932a20
Binary files /dev/null and b/data/Bed_Red.png differ
diff --git a/data/Bed_Red_00.png b/data/Bed_Red_00.png
deleted file mode 100644
index 000142d..0000000
Binary files a/data/Bed_Red_00.png and /dev/null differ
diff --git a/data/Bed_Red_01.png b/data/Bed_Red_01.png
deleted file mode 100644
index 179fe8c..0000000
Binary files a/data/Bed_Red_01.png and /dev/null differ
diff --git a/data/Bedrock_00.png b/data/Bedrock.png
similarity index 100%
rename from data/Bedrock_00.png
rename to data/Bedrock.png
diff --git a/data/Bell_00.png b/data/Bell.png
similarity index 100%
rename from data/Bell_00.png
rename to data/Bell.png
diff --git a/data/Birch_00.png b/data/Birch.png
similarity index 100%
rename from data/Birch_00.png
rename to data/Birch.png
diff --git a/data/Birch_Bark_00.png b/data/Birch_Bark.png
similarity index 100%
rename from data/Birch_Bark_00.png
rename to data/Birch_Bark.png
diff --git a/data/Birch_Bark_Slab_00.png b/data/Birch_Bark_Slab.png
similarity index 100%
rename from data/Birch_Bark_Slab_00.png
rename to data/Birch_Bark_Slab.png
diff --git a/data/Birch_Bark_Stair.png b/data/Birch_Bark_Stair.png
new file mode 100644
index 0000000..b7e1ff5
Binary files /dev/null and b/data/Birch_Bark_Stair.png differ
diff --git a/data/Birch_Bark_Stair_00.png b/data/Birch_Bark_Stair_00.png
deleted file mode 100644
index a496f70..0000000
Binary files a/data/Birch_Bark_Stair_00.png and /dev/null differ
diff --git a/data/Birch_Bark_Stair_01.png b/data/Birch_Bark_Stair_01.png
deleted file mode 100644
index ba9e520..0000000
Binary files a/data/Birch_Bark_Stair_01.png and /dev/null differ
diff --git a/data/Birch_Bark_Stair_02.png b/data/Birch_Bark_Stair_02.png
deleted file mode 100644
index 3a3f91e..0000000
Binary files a/data/Birch_Bark_Stair_02.png and /dev/null differ
diff --git a/data/Birch_Bark_Stair_03.png b/data/Birch_Bark_Stair_03.png
deleted file mode 100644
index b2e95f1..0000000
Binary files a/data/Birch_Bark_Stair_03.png and /dev/null differ
diff --git a/data/Birch_Button.png b/data/Birch_Button.png
new file mode 100644
index 0000000..6f1de78
Binary files /dev/null and b/data/Birch_Button.png differ
diff --git a/data/Birch_Button_00.png b/data/Birch_Button_00.png
deleted file mode 100644
index f4b0aa2..0000000
Binary files a/data/Birch_Button_00.png and /dev/null differ
diff --git a/data/Birch_Button_01.png b/data/Birch_Button_01.png
deleted file mode 100644
index 4f5fa06..0000000
Binary files a/data/Birch_Button_01.png and /dev/null differ
diff --git a/data/Birch_Door.png b/data/Birch_Door.png
new file mode 100644
index 0000000..871a7b1
Binary files /dev/null and b/data/Birch_Door.png differ
diff --git a/data/Birch_Door_00.png b/data/Birch_Door_00.png
deleted file mode 100644
index 3fbf503..0000000
Binary files a/data/Birch_Door_00.png and /dev/null differ
diff --git a/data/Birch_Door_01.png b/data/Birch_Door_01.png
deleted file mode 100644
index 7a4ed4e..0000000
Binary files a/data/Birch_Door_01.png and /dev/null differ
diff --git a/data/Birch_Fence.png b/data/Birch_Fence.png
new file mode 100644
index 0000000..8533c6a
Binary files /dev/null and b/data/Birch_Fence.png differ
diff --git a/data/Birch_Fence_00.png b/data/Birch_Fence_00.png
deleted file mode 100644
index 98f2f27..0000000
Binary files a/data/Birch_Fence_00.png and /dev/null differ
diff --git a/data/Birch_Fence_01.png b/data/Birch_Fence_01.png
deleted file mode 100644
index 774d51e..0000000
Binary files a/data/Birch_Fence_01.png and /dev/null differ
diff --git a/data/Birch_Fence_Gate_00.png b/data/Birch_Fence_Gate.png
similarity index 69%
rename from data/Birch_Fence_Gate_00.png
rename to data/Birch_Fence_Gate.png
index f44f60b..8779b0f 100644
Binary files a/data/Birch_Fence_Gate_00.png and b/data/Birch_Fence_Gate.png differ
diff --git a/data/Birch_Fence_Gate_01.png b/data/Birch_Fence_Gate_01.png
deleted file mode 100644
index 406c3fe..0000000
Binary files a/data/Birch_Fence_Gate_01.png and /dev/null differ
diff --git a/data/Birch_Leaves_00.png b/data/Birch_Leaves.png
similarity index 100%
rename from data/Birch_Leaves_00.png
rename to data/Birch_Leaves.png
diff --git a/data/Birch_Plank_00.png b/data/Birch_Plank.png
similarity index 100%
rename from data/Birch_Plank_00.png
rename to data/Birch_Plank.png
diff --git a/data/Birch_Pressure_Plate_00.png b/data/Birch_Pressure_Plate.png
similarity index 100%
rename from data/Birch_Pressure_Plate_00.png
rename to data/Birch_Pressure_Plate.png
diff --git a/data/Birch_Sapling_00.png b/data/Birch_Sapling.png
similarity index 100%
rename from data/Birch_Sapling_00.png
rename to data/Birch_Sapling.png
diff --git a/data/Birch_Sapling_Flower_Pot_00.png b/data/Birch_Sapling_Flower_Pot.png
similarity index 100%
rename from data/Birch_Sapling_Flower_Pot_00.png
rename to data/Birch_Sapling_Flower_Pot.png
diff --git a/data/Birch_Slab_00.png b/data/Birch_Slab.png
similarity index 100%
rename from data/Birch_Slab_00.png
rename to data/Birch_Slab.png
diff --git a/data/Birch_Stair.png b/data/Birch_Stair.png
new file mode 100644
index 0000000..c9dbc62
Binary files /dev/null and b/data/Birch_Stair.png differ
diff --git a/data/Birch_Stair_00.png b/data/Birch_Stair_00.png
deleted file mode 100644
index 2e4e1eb..0000000
Binary files a/data/Birch_Stair_00.png and /dev/null differ
diff --git a/data/Birch_Stair_01.png b/data/Birch_Stair_01.png
deleted file mode 100644
index a118151..0000000
Binary files a/data/Birch_Stair_01.png and /dev/null differ
diff --git a/data/Birch_Stair_02.png b/data/Birch_Stair_02.png
deleted file mode 100644
index 53050bc..0000000
Binary files a/data/Birch_Stair_02.png and /dev/null differ
diff --git a/data/Birch_Stair_03.png b/data/Birch_Stair_03.png
deleted file mode 100644
index ba32dbf..0000000
Binary files a/data/Birch_Stair_03.png and /dev/null differ
diff --git a/data/Birch_Trapdoor_00.png b/data/Birch_Trapdoor.png
similarity index 100%
rename from data/Birch_Trapdoor_00.png
rename to data/Birch_Trapdoor.png
diff --git a/data/Black_Bed.png b/data/Black_Bed.png
new file mode 100644
index 0000000..dd23fad
Binary files /dev/null and b/data/Black_Bed.png differ
diff --git a/data/Black_Bed_00.png b/data/Black_Bed_00.png
deleted file mode 100644
index 155a134..0000000
Binary files a/data/Black_Bed_00.png and /dev/null differ
diff --git a/data/Black_Bed_01.png b/data/Black_Bed_01.png
deleted file mode 100644
index 1c13791..0000000
Binary files a/data/Black_Bed_01.png and /dev/null differ
diff --git a/data/Black_Carpet_00.png b/data/Black_Carpet.png
similarity index 100%
rename from data/Black_Carpet_00.png
rename to data/Black_Carpet.png
diff --git a/data/Black_Concrete_00.png b/data/Black_Concrete.png
similarity index 100%
rename from data/Black_Concrete_00.png
rename to data/Black_Concrete.png
diff --git a/data/Black_Concrete_Powder_00.png b/data/Black_Concrete_Powder.png
similarity index 100%
rename from data/Black_Concrete_Powder_00.png
rename to data/Black_Concrete_Powder.png
diff --git a/data/Black_Concrete_Slab_00.png b/data/Black_Concrete_Slab.png
similarity index 100%
rename from data/Black_Concrete_Slab_00.png
rename to data/Black_Concrete_Slab.png
diff --git a/data/Black_Concrete_Stair.png b/data/Black_Concrete_Stair.png
new file mode 100644
index 0000000..5a1b26f
Binary files /dev/null and b/data/Black_Concrete_Stair.png differ
diff --git a/data/Black_Concrete_Stair_00.png b/data/Black_Concrete_Stair_00.png
deleted file mode 100644
index 44ec482..0000000
Binary files a/data/Black_Concrete_Stair_00.png and /dev/null differ
diff --git a/data/Black_Concrete_Stair_01.png b/data/Black_Concrete_Stair_01.png
deleted file mode 100644
index cc613ad..0000000
Binary files a/data/Black_Concrete_Stair_01.png and /dev/null differ
diff --git a/data/Black_Concrete_Stair_02.png b/data/Black_Concrete_Stair_02.png
deleted file mode 100644
index a54cd0c..0000000
Binary files a/data/Black_Concrete_Stair_02.png and /dev/null differ
diff --git a/data/Black_Concrete_Stair_03.png b/data/Black_Concrete_Stair_03.png
deleted file mode 100644
index 8c0519f..0000000
Binary files a/data/Black_Concrete_Stair_03.png and /dev/null differ
diff --git a/data/Black_Glazed_Terracotta_00.png b/data/Black_Glazed_Terracotta.png
similarity index 100%
rename from data/Black_Glazed_Terracotta_00.png
rename to data/Black_Glazed_Terracotta.png
diff --git a/data/Black_Shulker_Box_00.png b/data/Black_Shulker_Box.png
similarity index 100%
rename from data/Black_Shulker_Box_00.png
rename to data/Black_Shulker_Box.png
diff --git a/data/Black_Stained_Glass_00.png b/data/Black_Stained_Glass.png
similarity index 100%
rename from data/Black_Stained_Glass_00.png
rename to data/Black_Stained_Glass.png
diff --git a/data/Black_Stained_Glass_Pane.png b/data/Black_Stained_Glass_Pane.png
new file mode 100644
index 0000000..aaf44ed
Binary files /dev/null and b/data/Black_Stained_Glass_Pane.png differ
diff --git a/data/Black_Stained_Glass_Pane_00.png b/data/Black_Stained_Glass_Pane_00.png
deleted file mode 100644
index 85a8e2e..0000000
Binary files a/data/Black_Stained_Glass_Pane_00.png and /dev/null differ
diff --git a/data/Black_Stained_Glass_Pane_01.png b/data/Black_Stained_Glass_Pane_01.png
deleted file mode 100644
index 5cafde1..0000000
Binary files a/data/Black_Stained_Glass_Pane_01.png and /dev/null differ
diff --git a/data/Black_Terracotta_00.png b/data/Black_Terracotta.png
similarity index 100%
rename from data/Black_Terracotta_00.png
rename to data/Black_Terracotta.png
diff --git a/data/Black_Wool_00.png b/data/Black_Wool.png
similarity index 100%
rename from data/Black_Wool_00.png
rename to data/Black_Wool.png
diff --git a/data/Blue_Bed.png b/data/Blue_Bed.png
new file mode 100644
index 0000000..242eb04
Binary files /dev/null and b/data/Blue_Bed.png differ
diff --git a/data/Blue_Bed_00.png b/data/Blue_Bed_00.png
deleted file mode 100644
index 4a0485e..0000000
Binary files a/data/Blue_Bed_00.png and /dev/null differ
diff --git a/data/Blue_Bed_01.png b/data/Blue_Bed_01.png
deleted file mode 100644
index 3384312..0000000
Binary files a/data/Blue_Bed_01.png and /dev/null differ
diff --git a/data/Blue_Carpet_00.png b/data/Blue_Carpet.png
similarity index 100%
rename from data/Blue_Carpet_00.png
rename to data/Blue_Carpet.png
diff --git a/data/Blue_Concrete.png b/data/Blue_Concrete.png
new file mode 100644
index 0000000..61fa49e
Binary files /dev/null and b/data/Blue_Concrete.png differ
diff --git a/data/Blue_Concrete_00.png b/data/Blue_Concrete_00.png
deleted file mode 100644
index 482adaf..0000000
Binary files a/data/Blue_Concrete_00.png and /dev/null differ
diff --git a/data/Blue_Concrete_01.png b/data/Blue_Concrete_01.png
deleted file mode 100644
index 704022b..0000000
Binary files a/data/Blue_Concrete_01.png and /dev/null differ
diff --git a/data/Blue_Concrete_Powder_00.png b/data/Blue_Concrete_Powder.png
similarity index 100%
rename from data/Blue_Concrete_Powder_00.png
rename to data/Blue_Concrete_Powder.png
diff --git a/data/Blue_Concrete_Slab_00.png b/data/Blue_Concrete_Slab.png
similarity index 100%
rename from data/Blue_Concrete_Slab_00.png
rename to data/Blue_Concrete_Slab.png
diff --git a/data/Blue_Concrete_Stair.png b/data/Blue_Concrete_Stair.png
new file mode 100644
index 0000000..5adce2f
Binary files /dev/null and b/data/Blue_Concrete_Stair.png differ
diff --git a/data/Blue_Concrete_Stair_00.png b/data/Blue_Concrete_Stair_00.png
deleted file mode 100644
index 6ca4a64..0000000
Binary files a/data/Blue_Concrete_Stair_00.png and /dev/null differ
diff --git a/data/Blue_Concrete_Stair_01.png b/data/Blue_Concrete_Stair_01.png
deleted file mode 100644
index 9a825f9..0000000
Binary files a/data/Blue_Concrete_Stair_01.png and /dev/null differ
diff --git a/data/Blue_Concrete_Stair_02.png b/data/Blue_Concrete_Stair_02.png
deleted file mode 100644
index 2091816..0000000
Binary files a/data/Blue_Concrete_Stair_02.png and /dev/null differ
diff --git a/data/Blue_Concrete_Stair_03.png b/data/Blue_Concrete_Stair_03.png
deleted file mode 100644
index a8ecf18..0000000
Binary files a/data/Blue_Concrete_Stair_03.png and /dev/null differ
diff --git a/data/Blue_Glazed_Terracotta_00.png b/data/Blue_Glazed_Terracotta.png
similarity index 100%
rename from data/Blue_Glazed_Terracotta_00.png
rename to data/Blue_Glazed_Terracotta.png
diff --git a/data/Blue_Orchid_00.png b/data/Blue_Orchid.png
similarity index 100%
rename from data/Blue_Orchid_00.png
rename to data/Blue_Orchid.png
diff --git a/data/Blue_Orchid_Flower_Pot_00.png b/data/Blue_Orchid_Flower_Pot.png
similarity index 100%
rename from data/Blue_Orchid_Flower_Pot_00.png
rename to data/Blue_Orchid_Flower_Pot.png
diff --git a/data/Blue_Shulker_Box_00.png b/data/Blue_Shulker_Box.png
similarity index 100%
rename from data/Blue_Shulker_Box_00.png
rename to data/Blue_Shulker_Box.png
diff --git a/data/Blue_Stained_Glass_00.png b/data/Blue_Stained_Glass.png
similarity index 100%
rename from data/Blue_Stained_Glass_00.png
rename to data/Blue_Stained_Glass.png
diff --git a/data/Blue_Stained_Glass_Pane.png b/data/Blue_Stained_Glass_Pane.png
new file mode 100644
index 0000000..4e94355
Binary files /dev/null and b/data/Blue_Stained_Glass_Pane.png differ
diff --git a/data/Blue_Stained_Glass_Pane_00.png b/data/Blue_Stained_Glass_Pane_00.png
deleted file mode 100644
index 98a22a2..0000000
Binary files a/data/Blue_Stained_Glass_Pane_00.png and /dev/null differ
diff --git a/data/Blue_Stained_Glass_Pane_01.png b/data/Blue_Stained_Glass_Pane_01.png
deleted file mode 100644
index a1ef3a7..0000000
Binary files a/data/Blue_Stained_Glass_Pane_01.png and /dev/null differ
diff --git a/data/Blue_Terracotta_00.png b/data/Blue_Terracotta.png
similarity index 100%
rename from data/Blue_Terracotta_00.png
rename to data/Blue_Terracotta.png
diff --git a/data/Blue_Wool_00.png b/data/Blue_Wool.png
similarity index 100%
rename from data/Blue_Wool_00.png
rename to data/Blue_Wool.png
diff --git a/data/Bone_Block_00.png b/data/Bone_Block.png
similarity index 100%
rename from data/Bone_Block_00.png
rename to data/Bone_Block.png
diff --git a/data/Bookshelf.png b/data/Bookshelf.png
new file mode 100644
index 0000000..5a62b05
Binary files /dev/null and b/data/Bookshelf.png differ
diff --git a/data/Bookshelf_00.png b/data/Bookshelf_00.png
deleted file mode 100644
index 5eacd05..0000000
Binary files a/data/Bookshelf_00.png and /dev/null differ
diff --git a/data/Bookshelf_01.png b/data/Bookshelf_01.png
deleted file mode 100644
index b490bbe..0000000
Binary files a/data/Bookshelf_01.png and /dev/null differ
diff --git a/data/Brewing_Stand_00.png b/data/Brewing_Stand.png
similarity index 100%
rename from data/Brewing_Stand_00.png
rename to data/Brewing_Stand.png
diff --git a/data/Brick_Block_00.png b/data/Brick_Block.png
similarity index 100%
rename from data/Brick_Block_00.png
rename to data/Brick_Block.png
diff --git a/data/Brick_Slab_00.png b/data/Brick_Slab.png
similarity index 100%
rename from data/Brick_Slab_00.png
rename to data/Brick_Slab.png
diff --git a/data/Brick_Stair.png b/data/Brick_Stair.png
new file mode 100644
index 0000000..2dbc65f
Binary files /dev/null and b/data/Brick_Stair.png differ
diff --git a/data/Brick_Stair_00.png b/data/Brick_Stair_00.png
deleted file mode 100644
index ca12790..0000000
Binary files a/data/Brick_Stair_00.png and /dev/null differ
diff --git a/data/Brick_Stair_01.png b/data/Brick_Stair_01.png
deleted file mode 100644
index 1708a92..0000000
Binary files a/data/Brick_Stair_01.png and /dev/null differ
diff --git a/data/Brick_Stair_02.png b/data/Brick_Stair_02.png
deleted file mode 100644
index ce5e4af..0000000
Binary files a/data/Brick_Stair_02.png and /dev/null differ
diff --git a/data/Brick_Stair_03.png b/data/Brick_Stair_03.png
deleted file mode 100644
index 6d96600..0000000
Binary files a/data/Brick_Stair_03.png and /dev/null differ
diff --git a/data/Brick_Wall.png b/data/Brick_Wall.png
new file mode 100644
index 0000000..d6c9d93
Binary files /dev/null and b/data/Brick_Wall.png differ
diff --git a/data/Brick_Wall_00.png b/data/Brick_Wall_00.png
deleted file mode 100644
index 6e3987b..0000000
Binary files a/data/Brick_Wall_00.png and /dev/null differ
diff --git a/data/Brick_Wall_01.png b/data/Brick_Wall_01.png
deleted file mode 100644
index d0ed8bd..0000000
Binary files a/data/Brick_Wall_01.png and /dev/null differ
diff --git a/data/Brown_Bed.png b/data/Brown_Bed.png
new file mode 100644
index 0000000..5f9a02a
Binary files /dev/null and b/data/Brown_Bed.png differ
diff --git a/data/Brown_Bed_00.png b/data/Brown_Bed_00.png
deleted file mode 100644
index 8a9d550..0000000
Binary files a/data/Brown_Bed_00.png and /dev/null differ
diff --git a/data/Brown_Bed_01.png b/data/Brown_Bed_01.png
deleted file mode 100644
index 8a1a269..0000000
Binary files a/data/Brown_Bed_01.png and /dev/null differ
diff --git a/data/Brown_Carpet_00.png b/data/Brown_Carpet.png
similarity index 100%
rename from data/Brown_Carpet_00.png
rename to data/Brown_Carpet.png
diff --git a/data/Brown_Concrete_00.png b/data/Brown_Concrete.png
similarity index 100%
rename from data/Brown_Concrete_00.png
rename to data/Brown_Concrete.png
diff --git a/data/Brown_Concrete_Powder_00.png b/data/Brown_Concrete_Powder.png
similarity index 100%
rename from data/Brown_Concrete_Powder_00.png
rename to data/Brown_Concrete_Powder.png
diff --git a/data/Brown_Concrete_Slab_00.png b/data/Brown_Concrete_Slab.png
similarity index 100%
rename from data/Brown_Concrete_Slab_00.png
rename to data/Brown_Concrete_Slab.png
diff --git a/data/Brown_Concrete_Stair.png b/data/Brown_Concrete_Stair.png
new file mode 100644
index 0000000..d855b91
Binary files /dev/null and b/data/Brown_Concrete_Stair.png differ
diff --git a/data/Brown_Concrete_Stair_00.png b/data/Brown_Concrete_Stair_00.png
deleted file mode 100644
index 5301243..0000000
Binary files a/data/Brown_Concrete_Stair_00.png and /dev/null differ
diff --git a/data/Brown_Concrete_Stair_01.png b/data/Brown_Concrete_Stair_01.png
deleted file mode 100644
index d0ab261..0000000
Binary files a/data/Brown_Concrete_Stair_01.png and /dev/null differ
diff --git a/data/Brown_Concrete_Stair_02.png b/data/Brown_Concrete_Stair_02.png
deleted file mode 100644
index 75b058c..0000000
Binary files a/data/Brown_Concrete_Stair_02.png and /dev/null differ
diff --git a/data/Brown_Concrete_Stair_03.png b/data/Brown_Concrete_Stair_03.png
deleted file mode 100644
index 11176c7..0000000
Binary files a/data/Brown_Concrete_Stair_03.png and /dev/null differ
diff --git a/data/Brown_Glazed_Terracotta_00.png b/data/Brown_Glazed_Terracotta.png
similarity index 100%
rename from data/Brown_Glazed_Terracotta_00.png
rename to data/Brown_Glazed_Terracotta.png
diff --git a/data/Brown_Mushroom_00.png b/data/Brown_Mushroom.png
similarity index 100%
rename from data/Brown_Mushroom_00.png
rename to data/Brown_Mushroom.png
diff --git a/data/Brown_Mushroom_Flower_Pot_00.png b/data/Brown_Mushroom_Flower_Pot.png
similarity index 100%
rename from data/Brown_Mushroom_Flower_Pot_00.png
rename to data/Brown_Mushroom_Flower_Pot.png
diff --git a/data/Brown_Shulker_Box_00.png b/data/Brown_Shulker_Box.png
similarity index 100%
rename from data/Brown_Shulker_Box_00.png
rename to data/Brown_Shulker_Box.png
diff --git a/data/Brown_Stained_Glass_00.png b/data/Brown_Stained_Glass.png
similarity index 100%
rename from data/Brown_Stained_Glass_00.png
rename to data/Brown_Stained_Glass.png
diff --git a/data/Brown_Stained_Glass_Pane.png b/data/Brown_Stained_Glass_Pane.png
new file mode 100644
index 0000000..0d7d557
Binary files /dev/null and b/data/Brown_Stained_Glass_Pane.png differ
diff --git a/data/Brown_Stained_Glass_Pane_00.png b/data/Brown_Stained_Glass_Pane_00.png
deleted file mode 100644
index 10ce47f..0000000
Binary files a/data/Brown_Stained_Glass_Pane_00.png and /dev/null differ
diff --git a/data/Brown_Stained_Glass_Pane_01.png b/data/Brown_Stained_Glass_Pane_01.png
deleted file mode 100644
index 77b7a77..0000000
Binary files a/data/Brown_Stained_Glass_Pane_01.png and /dev/null differ
diff --git a/data/Brown_Terracotta_00.png b/data/Brown_Terracotta.png
similarity index 100%
rename from data/Brown_Terracotta_00.png
rename to data/Brown_Terracotta.png
diff --git a/data/Brown_Wool_00.png b/data/Brown_Wool.png
similarity index 100%
rename from data/Brown_Wool_00.png
rename to data/Brown_Wool.png
diff --git a/data/Burning_Furnace.png b/data/Burning_Furnace.png
new file mode 100644
index 0000000..b276bf8
Binary files /dev/null and b/data/Burning_Furnace.png differ
diff --git a/data/Burning_Furnace_00.png b/data/Burning_Furnace_00.png
deleted file mode 100644
index cb561ad..0000000
Binary files a/data/Burning_Furnace_00.png and /dev/null differ
diff --git a/data/Burning_Furnace_01.png b/data/Burning_Furnace_01.png
deleted file mode 100644
index 3fcbf2d..0000000
Binary files a/data/Burning_Furnace_01.png and /dev/null differ
diff --git a/data/Cactus_00.png b/data/Cactus.png
similarity index 100%
rename from data/Cactus_00.png
rename to data/Cactus.png
diff --git a/data/Cactus_Flower_Pot_00.png b/data/Cactus_Flower_Pot.png
similarity index 100%
rename from data/Cactus_Flower_Pot_00.png
rename to data/Cactus_Flower_Pot.png
diff --git a/data/Cake_00.png b/data/Cake.png
similarity index 100%
rename from data/Cake_00.png
rename to data/Cake.png
diff --git a/data/Cauldron_00.png b/data/Cauldron.png
similarity index 100%
rename from data/Cauldron_00.png
rename to data/Cauldron.png
diff --git a/data/Chest.png b/data/Chest.png
new file mode 100644
index 0000000..7028757
Binary files /dev/null and b/data/Chest.png differ
diff --git a/data/Chest_00.png b/data/Chest_00.png
deleted file mode 100644
index 7ff02a7..0000000
Binary files a/data/Chest_00.png and /dev/null differ
diff --git a/data/Chest_01.png b/data/Chest_01.png
deleted file mode 100644
index f8dfb47..0000000
Binary files a/data/Chest_01.png and /dev/null differ
diff --git a/data/Chiseled_Quartz_Block_00.png b/data/Chiseled_Quartz_Block.png
similarity index 100%
rename from data/Chiseled_Quartz_Block_00.png
rename to data/Chiseled_Quartz_Block.png
diff --git a/data/Chiseled_Red_Sandstone_00.png b/data/Chiseled_Red_Sandstone.png
similarity index 100%
rename from data/Chiseled_Red_Sandstone_00.png
rename to data/Chiseled_Red_Sandstone.png
diff --git a/data/Chorus_Flower_00.png b/data/Chorus_Flower.png
similarity index 100%
rename from data/Chorus_Flower_00.png
rename to data/Chorus_Flower.png
diff --git a/data/Chorus_Plant_Stem_00.png b/data/Chorus_Plant_Stem.png
similarity index 100%
rename from data/Chorus_Plant_Stem_00.png
rename to data/Chorus_Plant_Stem.png
diff --git a/data/Clay_00.png b/data/Clay.png
similarity index 100%
rename from data/Clay_00.png
rename to data/Clay.png
diff --git a/data/Coal_Block_00.png b/data/Coal_Block.png
similarity index 100%
rename from data/Coal_Block_00.png
rename to data/Coal_Block.png
diff --git a/data/Coal_Ore_00.png b/data/Coal_Ore.png
similarity index 100%
rename from data/Coal_Ore_00.png
rename to data/Coal_Ore.png
diff --git a/data/Coarse_Dirt_00.png b/data/Coarse_Dirt.png
similarity index 100%
rename from data/Coarse_Dirt_00.png
rename to data/Coarse_Dirt.png
diff --git a/data/Cobblestone_00.png b/data/Cobblestone.png
similarity index 100%
rename from data/Cobblestone_00.png
rename to data/Cobblestone.png
diff --git a/data/Cobblestone_Slab_00.png b/data/Cobblestone_Slab.png
similarity index 100%
rename from data/Cobblestone_Slab_00.png
rename to data/Cobblestone_Slab.png
diff --git a/data/Cobblestone_Stair.png b/data/Cobblestone_Stair.png
new file mode 100644
index 0000000..d22a8ca
Binary files /dev/null and b/data/Cobblestone_Stair.png differ
diff --git a/data/Cobblestone_Stair_00.png b/data/Cobblestone_Stair_00.png
deleted file mode 100644
index 3936b8e..0000000
Binary files a/data/Cobblestone_Stair_00.png and /dev/null differ
diff --git a/data/Cobblestone_Stair_01.png b/data/Cobblestone_Stair_01.png
deleted file mode 100644
index fe7e180..0000000
Binary files a/data/Cobblestone_Stair_01.png and /dev/null differ
diff --git a/data/Cobblestone_Stair_02.png b/data/Cobblestone_Stair_02.png
deleted file mode 100644
index 1d6a892..0000000
Binary files a/data/Cobblestone_Stair_02.png and /dev/null differ
diff --git a/data/Cobblestone_Stair_03.png b/data/Cobblestone_Stair_03.png
deleted file mode 100644
index 4aad03c..0000000
Binary files a/data/Cobblestone_Stair_03.png and /dev/null differ
diff --git a/data/Cobblestone_Wall_00.png b/data/Cobblestone_Wall.png
similarity index 100%
rename from data/Cobblestone_Wall_00.png
rename to data/Cobblestone_Wall.png
diff --git a/data/Cobweb_00.png b/data/Cobweb.png
similarity index 100%
rename from data/Cobweb_00.png
rename to data/Cobweb.png
diff --git a/data/Command_Block_00.png b/data/Command_Block.png
similarity index 100%
rename from data/Command_Block_00.png
rename to data/Command_Block.png
diff --git a/data/Cracked_Stone_Brick_Slab_00.png b/data/Cracked_Stone_Brick_Slab.png
similarity index 100%
rename from data/Cracked_Stone_Brick_Slab_00.png
rename to data/Cracked_Stone_Brick_Slab.png
diff --git a/data/Cracked_Stone_Brick_Stair.png b/data/Cracked_Stone_Brick_Stair.png
new file mode 100644
index 0000000..891ff59
Binary files /dev/null and b/data/Cracked_Stone_Brick_Stair.png differ
diff --git a/data/Cracked_Stone_Brick_Stair_00.png b/data/Cracked_Stone_Brick_Stair_00.png
deleted file mode 100644
index b3d986d..0000000
Binary files a/data/Cracked_Stone_Brick_Stair_00.png and /dev/null differ
diff --git a/data/Cracked_Stone_Brick_Stair_01.png b/data/Cracked_Stone_Brick_Stair_01.png
deleted file mode 100644
index 7427722..0000000
Binary files a/data/Cracked_Stone_Brick_Stair_01.png and /dev/null differ
diff --git a/data/Cracked_Stone_Brick_Stair_02.png b/data/Cracked_Stone_Brick_Stair_02.png
deleted file mode 100644
index ca462ae..0000000
Binary files a/data/Cracked_Stone_Brick_Stair_02.png and /dev/null differ
diff --git a/data/Cracked_Stone_Brick_Stair_03.png b/data/Cracked_Stone_Brick_Stair_03.png
deleted file mode 100644
index 08f5eec..0000000
Binary files a/data/Cracked_Stone_Brick_Stair_03.png and /dev/null differ
diff --git a/data/Crafting_Table.png b/data/Crafting_Table.png
new file mode 100644
index 0000000..f47c5b8
Binary files /dev/null and b/data/Crafting_Table.png differ
diff --git a/data/Crafting_Table_00.png b/data/Crafting_Table_00.png
deleted file mode 100644
index e912e7d..0000000
Binary files a/data/Crafting_Table_00.png and /dev/null differ
diff --git a/data/Crafting_Table_01.png b/data/Crafting_Table_01.png
deleted file mode 100644
index 92a7fee..0000000
Binary files a/data/Crafting_Table_01.png and /dev/null differ
diff --git a/data/Creeper_Head_00.png b/data/Creeper_Head.png
similarity index 100%
rename from data/Creeper_Head_00.png
rename to data/Creeper_Head.png
diff --git a/data/Cut_Red_Sandstone_00.png b/data/Cut_Red_Sandstone.png
similarity index 100%
rename from data/Cut_Red_Sandstone_00.png
rename to data/Cut_Red_Sandstone.png
diff --git a/data/Cut_Sandstone_00.png b/data/Cut_Sandstone.png
similarity index 100%
rename from data/Cut_Sandstone_00.png
rename to data/Cut_Sandstone.png
diff --git a/data/Cyan_Bed.png b/data/Cyan_Bed.png
new file mode 100644
index 0000000..7233c39
Binary files /dev/null and b/data/Cyan_Bed.png differ
diff --git a/data/Cyan_Bed_00.png b/data/Cyan_Bed_00.png
deleted file mode 100644
index 57466e4..0000000
Binary files a/data/Cyan_Bed_00.png and /dev/null differ
diff --git a/data/Cyan_Bed_01.png b/data/Cyan_Bed_01.png
deleted file mode 100644
index 7351185..0000000
Binary files a/data/Cyan_Bed_01.png and /dev/null differ
diff --git a/data/Cyan_Carpet_00.png b/data/Cyan_Carpet.png
similarity index 100%
rename from data/Cyan_Carpet_00.png
rename to data/Cyan_Carpet.png
diff --git a/data/Cyan_Concrete_00.png b/data/Cyan_Concrete.png
similarity index 100%
rename from data/Cyan_Concrete_00.png
rename to data/Cyan_Concrete.png
diff --git a/data/Cyan_Concrete_Powder_00.png b/data/Cyan_Concrete_Powder.png
similarity index 100%
rename from data/Cyan_Concrete_Powder_00.png
rename to data/Cyan_Concrete_Powder.png
diff --git a/data/Cyan_Concrete_Slab_00.png b/data/Cyan_Concrete_Slab.png
similarity index 100%
rename from data/Cyan_Concrete_Slab_00.png
rename to data/Cyan_Concrete_Slab.png
diff --git a/data/Cyan_Concrete_Stair.png b/data/Cyan_Concrete_Stair.png
new file mode 100644
index 0000000..eb468d1
Binary files /dev/null and b/data/Cyan_Concrete_Stair.png differ
diff --git a/data/Cyan_Concrete_Stair_00.png b/data/Cyan_Concrete_Stair_00.png
deleted file mode 100644
index 2c59c31..0000000
Binary files a/data/Cyan_Concrete_Stair_00.png and /dev/null differ
diff --git a/data/Cyan_Concrete_Stair_01.png b/data/Cyan_Concrete_Stair_01.png
deleted file mode 100644
index 1026a8f..0000000
Binary files a/data/Cyan_Concrete_Stair_01.png and /dev/null differ
diff --git a/data/Cyan_Concrete_Stair_02.png b/data/Cyan_Concrete_Stair_02.png
deleted file mode 100644
index 9a4554b..0000000
Binary files a/data/Cyan_Concrete_Stair_02.png and /dev/null differ
diff --git a/data/Cyan_Concrete_Stair_03.png b/data/Cyan_Concrete_Stair_03.png
deleted file mode 100644
index 5cc1f5a..0000000
Binary files a/data/Cyan_Concrete_Stair_03.png and /dev/null differ
diff --git a/data/Cyan_Glazed_Terracotta_00.png b/data/Cyan_Glazed_Terracotta.png
similarity index 100%
rename from data/Cyan_Glazed_Terracotta_00.png
rename to data/Cyan_Glazed_Terracotta.png
diff --git a/data/Cyan_Shulker_Box_00.png b/data/Cyan_Shulker_Box.png
similarity index 100%
rename from data/Cyan_Shulker_Box_00.png
rename to data/Cyan_Shulker_Box.png
diff --git a/data/Cyan_Stained_Glass_00.png b/data/Cyan_Stained_Glass.png
similarity index 100%
rename from data/Cyan_Stained_Glass_00.png
rename to data/Cyan_Stained_Glass.png
diff --git a/data/Cyan_Stained_Glass_Pane.png b/data/Cyan_Stained_Glass_Pane.png
new file mode 100644
index 0000000..b2089b9
Binary files /dev/null and b/data/Cyan_Stained_Glass_Pane.png differ
diff --git a/data/Cyan_Stained_Glass_Pane_00.png b/data/Cyan_Stained_Glass_Pane_00.png
deleted file mode 100644
index 1e45c64..0000000
Binary files a/data/Cyan_Stained_Glass_Pane_00.png and /dev/null differ
diff --git a/data/Cyan_Stained_Glass_Pane_01.png b/data/Cyan_Stained_Glass_Pane_01.png
deleted file mode 100644
index bf8f0fd..0000000
Binary files a/data/Cyan_Stained_Glass_Pane_01.png and /dev/null differ
diff --git a/data/Cyan_Terracotta_00.png b/data/Cyan_Terracotta.png
similarity index 100%
rename from data/Cyan_Terracotta_00.png
rename to data/Cyan_Terracotta.png
diff --git a/data/Cyan_Wool_00.png b/data/Cyan_Wool.png
similarity index 100%
rename from data/Cyan_Wool_00.png
rename to data/Cyan_Wool.png
diff --git a/data/Dandelion_00.png b/data/Dandelion.png
similarity index 100%
rename from data/Dandelion_00.png
rename to data/Dandelion.png
diff --git a/data/Dandelion_Flower_Pot_00.png b/data/Dandelion_Flower_Pot.png
similarity index 100%
rename from data/Dandelion_Flower_Pot_00.png
rename to data/Dandelion_Flower_Pot.png
diff --git a/data/Dark_Oak.png b/data/Dark_Oak.png
new file mode 100644
index 0000000..2e47081
Binary files /dev/null and b/data/Dark_Oak.png differ
diff --git a/data/Dark_Oak_00.png b/data/Dark_Oak_00.png
deleted file mode 100644
index 2edbb22..0000000
Binary files a/data/Dark_Oak_00.png and /dev/null differ
diff --git a/data/Dark_Oak_01.png b/data/Dark_Oak_01.png
deleted file mode 100644
index dd38dd2..0000000
Binary files a/data/Dark_Oak_01.png and /dev/null differ
diff --git a/data/Dark_Oak_Bark_00.png b/data/Dark_Oak_Bark.png
similarity index 100%
rename from data/Dark_Oak_Bark_00.png
rename to data/Dark_Oak_Bark.png
diff --git a/data/Dark_Oak_Bark_Slab_00.png b/data/Dark_Oak_Bark_Slab.png
similarity index 100%
rename from data/Dark_Oak_Bark_Slab_00.png
rename to data/Dark_Oak_Bark_Slab.png
diff --git a/data/Dark_Oak_Bark_Stair.png b/data/Dark_Oak_Bark_Stair.png
new file mode 100644
index 0000000..bd69555
Binary files /dev/null and b/data/Dark_Oak_Bark_Stair.png differ
diff --git a/data/Dark_Oak_Bark_Stair_00.png b/data/Dark_Oak_Bark_Stair_00.png
deleted file mode 100644
index 440c01e..0000000
Binary files a/data/Dark_Oak_Bark_Stair_00.png and /dev/null differ
diff --git a/data/Dark_Oak_Bark_Stair_01.png b/data/Dark_Oak_Bark_Stair_01.png
deleted file mode 100644
index fa91688..0000000
Binary files a/data/Dark_Oak_Bark_Stair_01.png and /dev/null differ
diff --git a/data/Dark_Oak_Bark_Stair_02.png b/data/Dark_Oak_Bark_Stair_02.png
deleted file mode 100644
index 4942fb8..0000000
Binary files a/data/Dark_Oak_Bark_Stair_02.png and /dev/null differ
diff --git a/data/Dark_Oak_Bark_Stair_03.png b/data/Dark_Oak_Bark_Stair_03.png
deleted file mode 100644
index 40bbac8..0000000
Binary files a/data/Dark_Oak_Bark_Stair_03.png and /dev/null differ
diff --git a/data/Dark_Oak_Button.png b/data/Dark_Oak_Button.png
new file mode 100644
index 0000000..0c68fcd
Binary files /dev/null and b/data/Dark_Oak_Button.png differ
diff --git a/data/Dark_Oak_Button_00.png b/data/Dark_Oak_Button_00.png
deleted file mode 100644
index ae2d7b0..0000000
Binary files a/data/Dark_Oak_Button_00.png and /dev/null differ
diff --git a/data/Dark_Oak_Button_01.png b/data/Dark_Oak_Button_01.png
deleted file mode 100644
index d13d64c..0000000
Binary files a/data/Dark_Oak_Button_01.png and /dev/null differ
diff --git a/data/Dark_Oak_Fence.png b/data/Dark_Oak_Fence.png
new file mode 100644
index 0000000..d59e74e
Binary files /dev/null and b/data/Dark_Oak_Fence.png differ
diff --git a/data/Dark_Oak_Fence_00.png b/data/Dark_Oak_Fence_00.png
deleted file mode 100644
index 84aac0e..0000000
Binary files a/data/Dark_Oak_Fence_00.png and /dev/null differ
diff --git a/data/Dark_Oak_Fence_01.png b/data/Dark_Oak_Fence_01.png
deleted file mode 100644
index bdc5bce..0000000
Binary files a/data/Dark_Oak_Fence_01.png and /dev/null differ
diff --git a/data/Dark_Oak_Fence_Gate_00.png b/data/Dark_Oak_Fence_Gate.png
similarity index 69%
rename from data/Dark_Oak_Fence_Gate_00.png
rename to data/Dark_Oak_Fence_Gate.png
index 72236a8..60b6f68 100644
Binary files a/data/Dark_Oak_Fence_Gate_00.png and b/data/Dark_Oak_Fence_Gate.png differ
diff --git a/data/Dark_Oak_Fence_Gate_01.png b/data/Dark_Oak_Fence_Gate_01.png
deleted file mode 100644
index 33256ce..0000000
Binary files a/data/Dark_Oak_Fence_Gate_01.png and /dev/null differ
diff --git a/data/Dark_Oak_Leaves_00.png b/data/Dark_Oak_Leaves.png
similarity index 100%
rename from data/Dark_Oak_Leaves_00.png
rename to data/Dark_Oak_Leaves.png
diff --git a/data/Dark_Oak_Plank_00.png b/data/Dark_Oak_Plank.png
similarity index 100%
rename from data/Dark_Oak_Plank_00.png
rename to data/Dark_Oak_Plank.png
diff --git a/data/Dark_Oak_Pressure_Plate_00.png b/data/Dark_Oak_Pressure_Plate.png
similarity index 100%
rename from data/Dark_Oak_Pressure_Plate_00.png
rename to data/Dark_Oak_Pressure_Plate.png
diff --git a/data/Dark_Oak_Sapling_00.png b/data/Dark_Oak_Sapling.png
similarity index 100%
rename from data/Dark_Oak_Sapling_00.png
rename to data/Dark_Oak_Sapling.png
diff --git a/data/Dark_Oak_Sapling_Flower_Pot_00.png b/data/Dark_Oak_Sapling_Flower_Pot.png
similarity index 100%
rename from data/Dark_Oak_Sapling_Flower_Pot_00.png
rename to data/Dark_Oak_Sapling_Flower_Pot.png
diff --git a/data/Dark_Oak_Slab_00.png b/data/Dark_Oak_Slab.png
similarity index 100%
rename from data/Dark_Oak_Slab_00.png
rename to data/Dark_Oak_Slab.png
diff --git a/data/Dark_Oak_Stair.png b/data/Dark_Oak_Stair.png
new file mode 100644
index 0000000..6b38110
Binary files /dev/null and b/data/Dark_Oak_Stair.png differ
diff --git a/data/Dark_Oak_Stair_00.png b/data/Dark_Oak_Stair_00.png
deleted file mode 100644
index 92ff988..0000000
Binary files a/data/Dark_Oak_Stair_00.png and /dev/null differ
diff --git a/data/Dark_Oak_Stair_01.png b/data/Dark_Oak_Stair_01.png
deleted file mode 100644
index fd61e81..0000000
Binary files a/data/Dark_Oak_Stair_01.png and /dev/null differ
diff --git a/data/Dark_Oak_Stair_02.png b/data/Dark_Oak_Stair_02.png
deleted file mode 100644
index fb72111..0000000
Binary files a/data/Dark_Oak_Stair_02.png and /dev/null differ
diff --git a/data/Dark_Oak_Stair_03.png b/data/Dark_Oak_Stair_03.png
deleted file mode 100644
index 34fc7b3..0000000
Binary files a/data/Dark_Oak_Stair_03.png and /dev/null differ
diff --git a/data/Dark_Oak_Trapdoor_00.png b/data/Dark_Oak_Trapdoor.png
similarity index 100%
rename from data/Dark_Oak_Trapdoor_00.png
rename to data/Dark_Oak_Trapdoor.png
diff --git a/data/Dark_Prismarine_Slab_00.png b/data/Dark_Prismarine_Slab.png
similarity index 100%
rename from data/Dark_Prismarine_Slab_00.png
rename to data/Dark_Prismarine_Slab.png
diff --git a/data/Dark_Prismarine_Stair.png b/data/Dark_Prismarine_Stair.png
new file mode 100644
index 0000000..52c3bcd
Binary files /dev/null and b/data/Dark_Prismarine_Stair.png differ
diff --git a/data/Dark_Prismarine_Stair_00.png b/data/Dark_Prismarine_Stair_00.png
deleted file mode 100644
index 59704cc..0000000
Binary files a/data/Dark_Prismarine_Stair_00.png and /dev/null differ
diff --git a/data/Dark_Prismarine_Stair_01.png b/data/Dark_Prismarine_Stair_01.png
deleted file mode 100644
index 21c852a..0000000
Binary files a/data/Dark_Prismarine_Stair_01.png and /dev/null differ
diff --git a/data/Dark_Prismarine_Stair_02.png b/data/Dark_Prismarine_Stair_02.png
deleted file mode 100644
index 4d21020..0000000
Binary files a/data/Dark_Prismarine_Stair_02.png and /dev/null differ
diff --git a/data/Dark_Prismarine_Stair_03.png b/data/Dark_Prismarine_Stair_03.png
deleted file mode 100644
index 71e1010..0000000
Binary files a/data/Dark_Prismarine_Stair_03.png and /dev/null differ
diff --git a/data/Daylight_Sensor_00.png b/data/Daylight_Sensor.png
similarity index 100%
rename from data/Daylight_Sensor_00.png
rename to data/Daylight_Sensor.png
diff --git a/data/Dead_Bush_00.png b/data/Dead_Bush.png
similarity index 100%
rename from data/Dead_Bush_00.png
rename to data/Dead_Bush.png
diff --git a/data/Dead_Bush_Flower_Pot_00.png b/data/Dead_Bush_Flower_Pot.png
similarity index 100%
rename from data/Dead_Bush_Flower_Pot_00.png
rename to data/Dead_Bush_Flower_Pot.png
diff --git a/data/Dead_Chorus_Flower_00.png b/data/Dead_Chorus_Flower.png
similarity index 100%
rename from data/Dead_Chorus_Flower_00.png
rename to data/Dead_Chorus_Flower.png
diff --git a/data/Detector_Rail_00.png b/data/Detector_Rail.png
similarity index 100%
rename from data/Detector_Rail_00.png
rename to data/Detector_Rail.png
diff --git a/data/Diamond_Block_00.png b/data/Diamond_Block.png
similarity index 100%
rename from data/Diamond_Block_00.png
rename to data/Diamond_Block.png
diff --git a/data/Diamond_Ore_00.png b/data/Diamond_Ore.png
similarity index 100%
rename from data/Diamond_Ore_00.png
rename to data/Diamond_Ore.png
diff --git a/data/Diorite_00.png b/data/Diorite.png
similarity index 100%
rename from data/Diorite_00.png
rename to data/Diorite.png
diff --git a/data/Diorite_Slab_00.png b/data/Diorite_Slab.png
similarity index 100%
rename from data/Diorite_Slab_00.png
rename to data/Diorite_Slab.png
diff --git a/data/Diorite_Stair.png b/data/Diorite_Stair.png
new file mode 100644
index 0000000..82cff32
Binary files /dev/null and b/data/Diorite_Stair.png differ
diff --git a/data/Diorite_Stair_00.png b/data/Diorite_Stair_00.png
deleted file mode 100644
index b200c3e..0000000
Binary files a/data/Diorite_Stair_00.png and /dev/null differ
diff --git a/data/Diorite_Stair_01.png b/data/Diorite_Stair_01.png
deleted file mode 100644
index cf92d37..0000000
Binary files a/data/Diorite_Stair_01.png and /dev/null differ
diff --git a/data/Diorite_Stair_02.png b/data/Diorite_Stair_02.png
deleted file mode 100644
index 54661dc..0000000
Binary files a/data/Diorite_Stair_02.png and /dev/null differ
diff --git a/data/Diorite_Stair_03.png b/data/Diorite_Stair_03.png
deleted file mode 100644
index a306940..0000000
Binary files a/data/Diorite_Stair_03.png and /dev/null differ
diff --git a/data/Diorite_Wall.png b/data/Diorite_Wall.png
new file mode 100644
index 0000000..dc24c1f
Binary files /dev/null and b/data/Diorite_Wall.png differ
diff --git a/data/Diorite_Wall_00.png b/data/Diorite_Wall_00.png
deleted file mode 100644
index 888837f..0000000
Binary files a/data/Diorite_Wall_00.png and /dev/null differ
diff --git a/data/Diorite_Wall_01.png b/data/Diorite_Wall_01.png
deleted file mode 100644
index fe0e31d..0000000
Binary files a/data/Diorite_Wall_01.png and /dev/null differ
diff --git a/data/Dirt_00.png b/data/Dirt.png
similarity index 100%
rename from data/Dirt_00.png
rename to data/Dirt.png
diff --git a/data/Disabled_Hopper_00.png b/data/Disabled_Hopper.png
similarity index 100%
rename from data/Disabled_Hopper_00.png
rename to data/Disabled_Hopper.png
diff --git a/data/Disabled_Side_Hopper_00.png b/data/Disabled_Side_Hopper.png
similarity index 100%
rename from data/Disabled_Side_Hopper_00.png
rename to data/Disabled_Side_Hopper.png
diff --git a/data/Dispenser.png b/data/Dispenser.png
new file mode 100644
index 0000000..aefb55f
Binary files /dev/null and b/data/Dispenser.png differ
diff --git a/data/Dispenser_00.png b/data/Dispenser_00.png
deleted file mode 100644
index 2c79cb9..0000000
Binary files a/data/Dispenser_00.png and /dev/null differ
diff --git a/data/Dispenser_01.png b/data/Dispenser_01.png
deleted file mode 100644
index 5f835ef..0000000
Binary files a/data/Dispenser_01.png and /dev/null differ
diff --git a/data/Double_Acacia_Bark_Slab_00.png b/data/Double_Acacia_Bark_Slab.png
similarity index 100%
rename from data/Double_Acacia_Bark_Slab_00.png
rename to data/Double_Acacia_Bark_Slab.png
diff --git a/data/Double_Acacia_Slab_00.png b/data/Double_Acacia_Slab.png
similarity index 100%
rename from data/Double_Acacia_Slab_00.png
rename to data/Double_Acacia_Slab.png
diff --git a/data/Double_Andesite_Slab_00.png b/data/Double_Andesite_Slab.png
similarity index 100%
rename from data/Double_Andesite_Slab_00.png
rename to data/Double_Andesite_Slab.png
diff --git a/data/Double_Birch_Bark_Slab_00.png b/data/Double_Birch_Bark_Slab.png
similarity index 100%
rename from data/Double_Birch_Bark_Slab_00.png
rename to data/Double_Birch_Bark_Slab.png
diff --git a/data/Double_Birch_Slab_00.png b/data/Double_Birch_Slab.png
similarity index 100%
rename from data/Double_Birch_Slab_00.png
rename to data/Double_Birch_Slab.png
diff --git a/data/Double_Black_Concrete_Slab_00.png b/data/Double_Black_Concrete_Slab.png
similarity index 100%
rename from data/Double_Black_Concrete_Slab_00.png
rename to data/Double_Black_Concrete_Slab.png
diff --git a/data/Double_Blue_Concrete_Slab_00.png b/data/Double_Blue_Concrete_Slab.png
similarity index 100%
rename from data/Double_Blue_Concrete_Slab_00.png
rename to data/Double_Blue_Concrete_Slab.png
diff --git a/data/Double_Brick_Slab_00.png b/data/Double_Brick_Slab.png
similarity index 100%
rename from data/Double_Brick_Slab_00.png
rename to data/Double_Brick_Slab.png
diff --git a/data/Double_Brown_Concrete_Slab_00.png b/data/Double_Brown_Concrete_Slab.png
similarity index 100%
rename from data/Double_Brown_Concrete_Slab_00.png
rename to data/Double_Brown_Concrete_Slab.png
diff --git a/data/Double_Cobblestone_Slab_00.png b/data/Double_Cobblestone_Slab.png
similarity index 100%
rename from data/Double_Cobblestone_Slab_00.png
rename to data/Double_Cobblestone_Slab.png
diff --git a/data/Double_Cracked_Stone_Brick_Slab_00.png b/data/Double_Cracked_Stone_Brick_Slab.png
similarity index 100%
rename from data/Double_Cracked_Stone_Brick_Slab_00.png
rename to data/Double_Cracked_Stone_Brick_Slab.png
diff --git a/data/Double_Cyan_Concrete_Slab_00.png b/data/Double_Cyan_Concrete_Slab.png
similarity index 100%
rename from data/Double_Cyan_Concrete_Slab_00.png
rename to data/Double_Cyan_Concrete_Slab.png
diff --git a/data/Double_Dark_Oak_Bark_Slab_00.png b/data/Double_Dark_Oak_Bark_Slab.png
similarity index 100%
rename from data/Double_Dark_Oak_Bark_Slab_00.png
rename to data/Double_Dark_Oak_Bark_Slab.png
diff --git a/data/Double_Dark_Oak_Slab_00.png b/data/Double_Dark_Oak_Slab.png
similarity index 100%
rename from data/Double_Dark_Oak_Slab_00.png
rename to data/Double_Dark_Oak_Slab.png
diff --git a/data/Double_Dark_Prismarine_Slab_00.png b/data/Double_Dark_Prismarine_Slab.png
similarity index 100%
rename from data/Double_Dark_Prismarine_Slab_00.png
rename to data/Double_Dark_Prismarine_Slab.png
diff --git a/data/Double_Diorite_Slab_00.png b/data/Double_Diorite_Slab.png
similarity index 100%
rename from data/Double_Diorite_Slab_00.png
rename to data/Double_Diorite_Slab.png
diff --git a/data/Double_End_Stone_Brick_Slab_00.png b/data/Double_End_Stone_Brick_Slab.png
similarity index 100%
rename from data/Double_End_Stone_Brick_Slab_00.png
rename to data/Double_End_Stone_Brick_Slab.png
diff --git a/data/Double_Gold_Block_Slab_00.png b/data/Double_Gold_Block_Slab.png
similarity index 100%
rename from data/Double_Gold_Block_Slab_00.png
rename to data/Double_Gold_Block_Slab.png
diff --git a/data/Double_Granite_Slab_00.png b/data/Double_Granite_Slab.png
similarity index 100%
rename from data/Double_Granite_Slab_00.png
rename to data/Double_Granite_Slab.png
diff --git a/data/Double_Green_Concrete_Slab_00.png b/data/Double_Green_Concrete_Slab.png
similarity index 100%
rename from data/Double_Green_Concrete_Slab_00.png
rename to data/Double_Green_Concrete_Slab.png
diff --git a/data/Double_Grey_Concrete_Slab_00.png b/data/Double_Grey_Concrete_Slab.png
similarity index 100%
rename from data/Double_Grey_Concrete_Slab_00.png
rename to data/Double_Grey_Concrete_Slab.png
diff --git a/data/Double_Iron_Block_Slab_00.png b/data/Double_Iron_Block_Slab.png
similarity index 100%
rename from data/Double_Iron_Block_Slab_00.png
rename to data/Double_Iron_Block_Slab.png
diff --git a/data/Double_Jungle_Bark_Slab_00.png b/data/Double_Jungle_Bark_Slab.png
similarity index 100%
rename from data/Double_Jungle_Bark_Slab_00.png
rename to data/Double_Jungle_Bark_Slab.png
diff --git a/data/Double_Jungle_Slab_00.png b/data/Double_Jungle_Slab.png
similarity index 100%
rename from data/Double_Jungle_Slab_00.png
rename to data/Double_Jungle_Slab.png
diff --git a/data/Double_Lapis_Lazuli_Slab_00.png b/data/Double_Lapis_Lazuli_Slab.png
similarity index 100%
rename from data/Double_Lapis_Lazuli_Slab_00.png
rename to data/Double_Lapis_Lazuli_Slab.png
diff --git a/data/Double_Light_Blue_Concrete_Slab_00.png b/data/Double_Light_Blue_Concrete_Slab.png
similarity index 100%
rename from data/Double_Light_Blue_Concrete_Slab_00.png
rename to data/Double_Light_Blue_Concrete_Slab.png
diff --git a/data/Double_Light_Grey_Concrete_Slab_00.png b/data/Double_Light_Grey_Concrete_Slab.png
similarity index 100%
rename from data/Double_Light_Grey_Concrete_Slab_00.png
rename to data/Double_Light_Grey_Concrete_Slab.png
diff --git a/data/Double_Lime_Concrete_Slab_00.png b/data/Double_Lime_Concrete_Slab.png
similarity index 100%
rename from data/Double_Lime_Concrete_Slab_00.png
rename to data/Double_Lime_Concrete_Slab.png
diff --git a/data/Double_Magenta_Concrete_Slab_00.png b/data/Double_Magenta_Concrete_Slab.png
similarity index 100%
rename from data/Double_Magenta_Concrete_Slab_00.png
rename to data/Double_Magenta_Concrete_Slab.png
diff --git a/data/Double_Mossy_Stone_Brick_Slab_00.png b/data/Double_Mossy_Stone_Brick_Slab.png
similarity index 100%
rename from data/Double_Mossy_Stone_Brick_Slab_00.png
rename to data/Double_Mossy_Stone_Brick_Slab.png
diff --git a/data/Double_Mossy_Stone_Slab_00.png b/data/Double_Mossy_Stone_Slab.png
similarity index 100%
rename from data/Double_Mossy_Stone_Slab_00.png
rename to data/Double_Mossy_Stone_Slab.png
diff --git a/data/Double_Nether_Brick_Slab_00.png b/data/Double_Nether_Brick_Slab.png
similarity index 100%
rename from data/Double_Nether_Brick_Slab_00.png
rename to data/Double_Nether_Brick_Slab.png
diff --git a/data/Double_Oak_Bark_Slab_00.png b/data/Double_Oak_Bark_Slab.png
similarity index 100%
rename from data/Double_Oak_Bark_Slab_00.png
rename to data/Double_Oak_Bark_Slab.png
diff --git a/data/Double_Oak_Slab_00.png b/data/Double_Oak_Slab.png
similarity index 100%
rename from data/Double_Oak_Slab_00.png
rename to data/Double_Oak_Slab.png
diff --git a/data/Double_Orange_Concrete_Slab_00.png b/data/Double_Orange_Concrete_Slab.png
similarity index 100%
rename from data/Double_Orange_Concrete_Slab_00.png
rename to data/Double_Orange_Concrete_Slab.png
diff --git a/data/Double_Pink_Concrete_Slab_00.png b/data/Double_Pink_Concrete_Slab.png
similarity index 100%
rename from data/Double_Pink_Concrete_Slab_00.png
rename to data/Double_Pink_Concrete_Slab.png
diff --git a/data/Double_Polished_Andesite_Slab_00.png b/data/Double_Polished_Andesite_Slab.png
similarity index 100%
rename from data/Double_Polished_Andesite_Slab_00.png
rename to data/Double_Polished_Andesite_Slab.png
diff --git a/data/Double_Polished_Diorite_Slab_00.png b/data/Double_Polished_Diorite_Slab.png
similarity index 100%
rename from data/Double_Polished_Diorite_Slab_00.png
rename to data/Double_Polished_Diorite_Slab.png
diff --git a/data/Double_Polished_Granite_Slab_00.png b/data/Double_Polished_Granite_Slab.png
similarity index 100%
rename from data/Double_Polished_Granite_Slab_00.png
rename to data/Double_Polished_Granite_Slab.png
diff --git a/data/Double_Polished_Stone_Slab_00.png b/data/Double_Polished_Stone_Slab.png
similarity index 100%
rename from data/Double_Polished_Stone_Slab_00.png
rename to data/Double_Polished_Stone_Slab.png
diff --git a/data/Double_Prismarine_Brick_Slab_00.png b/data/Double_Prismarine_Brick_Slab.png
similarity index 100%
rename from data/Double_Prismarine_Brick_Slab_00.png
rename to data/Double_Prismarine_Brick_Slab.png
diff --git a/data/Double_Prismarine_Slab_00.png b/data/Double_Prismarine_Slab.png
similarity index 100%
rename from data/Double_Prismarine_Slab_00.png
rename to data/Double_Prismarine_Slab.png
diff --git a/data/Double_Purple_Concrete_Slab_00.png b/data/Double_Purple_Concrete_Slab.png
similarity index 100%
rename from data/Double_Purple_Concrete_Slab_00.png
rename to data/Double_Purple_Concrete_Slab.png
diff --git a/data/Double_Purpur_Slab_00.png b/data/Double_Purpur_Slab.png
similarity index 100%
rename from data/Double_Purpur_Slab_00.png
rename to data/Double_Purpur_Slab.png
diff --git a/data/Double_Quartz_Slab_00.png b/data/Double_Quartz_Slab.png
similarity index 100%
rename from data/Double_Quartz_Slab_00.png
rename to data/Double_Quartz_Slab.png
diff --git a/data/Double_Red_Concrete_Slab_00.png b/data/Double_Red_Concrete_Slab.png
similarity index 100%
rename from data/Double_Red_Concrete_Slab_00.png
rename to data/Double_Red_Concrete_Slab.png
diff --git a/data/Double_Red_Nether_Brick_Slab_00.png b/data/Double_Red_Nether_Brick_Slab.png
similarity index 100%
rename from data/Double_Red_Nether_Brick_Slab_00.png
rename to data/Double_Red_Nether_Brick_Slab.png
diff --git a/data/Double_Red_Sandstone_Slab_00.png b/data/Double_Red_Sandstone_Slab.png
similarity index 100%
rename from data/Double_Red_Sandstone_Slab_00.png
rename to data/Double_Red_Sandstone_Slab.png
diff --git a/data/Double_Sandstone_Slab_00.png b/data/Double_Sandstone_Slab.png
similarity index 100%
rename from data/Double_Sandstone_Slab_00.png
rename to data/Double_Sandstone_Slab.png
diff --git a/data/Double_Smooth_Quartz_Slab_00.png b/data/Double_Smooth_Quartz_Slab.png
similarity index 100%
rename from data/Double_Smooth_Quartz_Slab_00.png
rename to data/Double_Smooth_Quartz_Slab.png
diff --git a/data/Double_Smooth_Red_Sandstone_Slab_00.png b/data/Double_Smooth_Red_Sandstone_Slab.png
similarity index 100%
rename from data/Double_Smooth_Red_Sandstone_Slab_00.png
rename to data/Double_Smooth_Red_Sandstone_Slab.png
diff --git a/data/Double_Smooth_Sandstone_Slab_00.png b/data/Double_Smooth_Sandstone_Slab.png
similarity index 100%
rename from data/Double_Smooth_Sandstone_Slab_00.png
rename to data/Double_Smooth_Sandstone_Slab.png
diff --git a/data/Double_Spruce_Bark_Slab_00.png b/data/Double_Spruce_Bark_Slab.png
similarity index 100%
rename from data/Double_Spruce_Bark_Slab_00.png
rename to data/Double_Spruce_Bark_Slab.png
diff --git a/data/Double_Spruce_Slab_00.png b/data/Double_Spruce_Slab.png
similarity index 100%
rename from data/Double_Spruce_Slab_00.png
rename to data/Double_Spruce_Slab.png
diff --git a/data/Double_Stone_Brick_Slab_00.png b/data/Double_Stone_Brick_Slab.png
similarity index 100%
rename from data/Double_Stone_Brick_Slab_00.png
rename to data/Double_Stone_Brick_Slab.png
diff --git a/data/Double_Stone_Slab_00.png b/data/Double_Stone_Slab.png
similarity index 100%
rename from data/Double_Stone_Slab_00.png
rename to data/Double_Stone_Slab.png
diff --git a/data/Double_Tallgrass_00.png b/data/Double_Tallgrass.png
similarity index 100%
rename from data/Double_Tallgrass_00.png
rename to data/Double_Tallgrass.png
diff --git a/data/Double_White_Concrete_Slab_00.png b/data/Double_White_Concrete_Slab.png
similarity index 100%
rename from data/Double_White_Concrete_Slab_00.png
rename to data/Double_White_Concrete_Slab.png
diff --git a/data/Double_Yellow_Concrete_Slab_00.png b/data/Double_Yellow_Concrete_Slab.png
similarity index 100%
rename from data/Double_Yellow_Concrete_Slab_00.png
rename to data/Double_Yellow_Concrete_Slab.png
diff --git a/data/Dragon_Egg_00.png b/data/Dragon_Egg.png
similarity index 100%
rename from data/Dragon_Egg_00.png
rename to data/Dragon_Egg.png
diff --git a/data/Dropper.png b/data/Dropper.png
new file mode 100644
index 0000000..6526a2e
Binary files /dev/null and b/data/Dropper.png differ
diff --git a/data/Dropper_00.png b/data/Dropper_00.png
deleted file mode 100644
index 30d16ef..0000000
Binary files a/data/Dropper_00.png and /dev/null differ
diff --git a/data/Dropper_01.png b/data/Dropper_01.png
deleted file mode 100644
index f288875..0000000
Binary files a/data/Dropper_01.png and /dev/null differ
diff --git a/data/Emerald_Block_00.png b/data/Emerald_Block.png
similarity index 100%
rename from data/Emerald_Block_00.png
rename to data/Emerald_Block.png
diff --git a/data/Emerald_Ore_00.png b/data/Emerald_Ore.png
similarity index 100%
rename from data/Emerald_Ore_00.png
rename to data/Emerald_Ore.png
diff --git a/data/Enchanting_Table_00.png b/data/Enchanting_Table.png
similarity index 100%
rename from data/Enchanting_Table_00.png
rename to data/Enchanting_Table.png
diff --git a/data/End_Portal_00.png b/data/End_Portal.png
similarity index 100%
rename from data/End_Portal_00.png
rename to data/End_Portal.png
diff --git a/data/End_Portal_Frame_00.png b/data/End_Portal_Frame.png
similarity index 100%
rename from data/End_Portal_Frame_00.png
rename to data/End_Portal_Frame.png
diff --git a/data/End_Portal_Frame_with_Eye_of_Ender_00.png b/data/End_Portal_Frame_with_Eye_of_Ender.png
similarity index 100%
rename from data/End_Portal_Frame_with_Eye_of_Ender_00.png
rename to data/End_Portal_Frame_with_Eye_of_Ender.png
diff --git a/data/End_Rod_00.png b/data/End_Rod.png
similarity index 100%
rename from data/End_Rod_00.png
rename to data/End_Rod.png
diff --git a/data/End_Stone_00.png b/data/End_Stone.png
similarity index 100%
rename from data/End_Stone_00.png
rename to data/End_Stone.png
diff --git a/data/End_Stone_Brick_00.png b/data/End_Stone_Brick.png
similarity index 100%
rename from data/End_Stone_Brick_00.png
rename to data/End_Stone_Brick.png
diff --git a/data/End_Stone_Brick_Slab_00.png b/data/End_Stone_Brick_Slab.png
similarity index 100%
rename from data/End_Stone_Brick_Slab_00.png
rename to data/End_Stone_Brick_Slab.png
diff --git a/data/End_Stone_Brick_Stair.png b/data/End_Stone_Brick_Stair.png
new file mode 100644
index 0000000..ff6f521
Binary files /dev/null and b/data/End_Stone_Brick_Stair.png differ
diff --git a/data/End_Stone_Brick_Stair_00.png b/data/End_Stone_Brick_Stair_00.png
deleted file mode 100644
index 47ab163..0000000
Binary files a/data/End_Stone_Brick_Stair_00.png and /dev/null differ
diff --git a/data/End_Stone_Brick_Stair_01.png b/data/End_Stone_Brick_Stair_01.png
deleted file mode 100644
index 471f529..0000000
Binary files a/data/End_Stone_Brick_Stair_01.png and /dev/null differ
diff --git a/data/End_Stone_Brick_Stair_02.png b/data/End_Stone_Brick_Stair_02.png
deleted file mode 100644
index 62c8848..0000000
Binary files a/data/End_Stone_Brick_Stair_02.png and /dev/null differ
diff --git a/data/End_Stone_Brick_Stair_03.png b/data/End_Stone_Brick_Stair_03.png
deleted file mode 100644
index 1006914..0000000
Binary files a/data/End_Stone_Brick_Stair_03.png and /dev/null differ
diff --git a/data/End_Stone_Brick_Wall.png b/data/End_Stone_Brick_Wall.png
new file mode 100644
index 0000000..c1b75a9
Binary files /dev/null and b/data/End_Stone_Brick_Wall.png differ
diff --git a/data/End_Stone_Brick_Wall_00.png b/data/End_Stone_Brick_Wall_00.png
deleted file mode 100644
index 94dcc57..0000000
Binary files a/data/End_Stone_Brick_Wall_00.png and /dev/null differ
diff --git a/data/End_Stone_Brick_Wall_01.png b/data/End_Stone_Brick_Wall_01.png
deleted file mode 100644
index 4dbfd1e..0000000
Binary files a/data/End_Stone_Brick_Wall_01.png and /dev/null differ
diff --git a/data/Ender_Chest.png b/data/Ender_Chest.png
new file mode 100644
index 0000000..2947704
Binary files /dev/null and b/data/Ender_Chest.png differ
diff --git a/data/Ender_Chest_00.png b/data/Ender_Chest_00.png
deleted file mode 100644
index ca150bf..0000000
Binary files a/data/Ender_Chest_00.png and /dev/null differ
diff --git a/data/Ender_Chest_01.png b/data/Ender_Chest_01.png
deleted file mode 100644
index 1ccf547..0000000
Binary files a/data/Ender_Chest_01.png and /dev/null differ
diff --git a/data/Eternal_Fire_00.png b/data/Eternal_Fire.png
similarity index 100%
rename from data/Eternal_Fire_00.png
rename to data/Eternal_Fire.png
diff --git a/data/Faceless_Pumpkin_00.png b/data/Faceless_Pumpkin.png
similarity index 100%
rename from data/Faceless_Pumpkin_00.png
rename to data/Faceless_Pumpkin.png
diff --git a/data/Farmland_00.png b/data/Farmland.png
similarity index 100%
rename from data/Farmland_00.png
rename to data/Farmland.png
diff --git a/data/Fence.png b/data/Fence.png
new file mode 100644
index 0000000..c28650a
Binary files /dev/null and b/data/Fence.png differ
diff --git a/data/Fence_00.png b/data/Fence_00.png
deleted file mode 100644
index 573b83b..0000000
Binary files a/data/Fence_00.png and /dev/null differ
diff --git a/data/Fence_01.png b/data/Fence_01.png
deleted file mode 100644
index d364a9a..0000000
Binary files a/data/Fence_01.png and /dev/null differ
diff --git a/data/Fern_00.png b/data/Fern.png
similarity index 100%
rename from data/Fern_00.png
rename to data/Fern.png
diff --git a/data/Fern_Flower_Pot_00.png b/data/Fern_Flower_Pot.png
similarity index 100%
rename from data/Fern_Flower_Pot_00.png
rename to data/Fern_Flower_Pot.png
diff --git a/data/Fire_00.png b/data/Fire.png
similarity index 100%
rename from data/Fire_00.png
rename to data/Fire.png
diff --git a/data/Flower_Pot_00.png b/data/Flower_Pot.png
similarity index 100%
rename from data/Flower_Pot_00.png
rename to data/Flower_Pot.png
diff --git a/data/Flowing_Lava_00.png b/data/Flowing_Lava.png
similarity index 100%
rename from data/Flowing_Lava_00.png
rename to data/Flowing_Lava.png
diff --git a/data/Flowing_Nether_Lava_00.png b/data/Flowing_Nether_Lava.png
similarity index 100%
rename from data/Flowing_Nether_Lava_00.png
rename to data/Flowing_Nether_Lava.png
diff --git a/data/Flowing_River_Water_00.png b/data/Flowing_River_Water.png
similarity index 100%
rename from data/Flowing_River_Water_00.png
rename to data/Flowing_River_Water.png
diff --git a/data/Flowing_Water_00.png b/data/Flowing_Water.png
similarity index 100%
rename from data/Flowing_Water_00.png
rename to data/Flowing_Water.png
diff --git a/data/Frosted_Ice_00.png b/data/Frosted_Ice.png
similarity index 100%
rename from data/Frosted_Ice_00.png
rename to data/Frosted_Ice.png
diff --git a/data/Furnace.png b/data/Furnace.png
new file mode 100644
index 0000000..b276bf8
Binary files /dev/null and b/data/Furnace.png differ
diff --git a/data/Furnace_00.png b/data/Furnace_00.png
deleted file mode 100644
index cb561ad..0000000
Binary files a/data/Furnace_00.png and /dev/null differ
diff --git a/data/Furnace_01.png b/data/Furnace_01.png
deleted file mode 100644
index 3fcbf2d..0000000
Binary files a/data/Furnace_01.png and /dev/null differ
diff --git a/data/Glass_00.png b/data/Glass.png
similarity index 100%
rename from data/Glass_00.png
rename to data/Glass.png
diff --git a/data/Glass_Pane.png b/data/Glass_Pane.png
new file mode 100644
index 0000000..633bda0
Binary files /dev/null and b/data/Glass_Pane.png differ
diff --git a/data/Glass_Pane_00.png b/data/Glass_Pane_00.png
deleted file mode 100644
index 967ab5a..0000000
Binary files a/data/Glass_Pane_00.png and /dev/null differ
diff --git a/data/Glass_Pane_01.png b/data/Glass_Pane_01.png
deleted file mode 100644
index eed7da4..0000000
Binary files a/data/Glass_Pane_01.png and /dev/null differ
diff --git a/data/Glowstone_00.png b/data/Glowstone.png
similarity index 100%
rename from data/Glowstone_00.png
rename to data/Glowstone.png
diff --git a/data/Gold_Block_00.png b/data/Gold_Block.png
similarity index 100%
rename from data/Gold_Block_00.png
rename to data/Gold_Block.png
diff --git a/data/Gold_Block_Slab_00.png b/data/Gold_Block_Slab.png
similarity index 100%
rename from data/Gold_Block_Slab_00.png
rename to data/Gold_Block_Slab.png
diff --git a/data/Gold_Block_Stair.png b/data/Gold_Block_Stair.png
new file mode 100644
index 0000000..78d512d
Binary files /dev/null and b/data/Gold_Block_Stair.png differ
diff --git a/data/Gold_Block_Stair_00.png b/data/Gold_Block_Stair_00.png
deleted file mode 100644
index c9039dd..0000000
Binary files a/data/Gold_Block_Stair_00.png and /dev/null differ
diff --git a/data/Gold_Block_Stair_01.png b/data/Gold_Block_Stair_01.png
deleted file mode 100644
index da947dd..0000000
Binary files a/data/Gold_Block_Stair_01.png and /dev/null differ
diff --git a/data/Gold_Block_Stair_02.png b/data/Gold_Block_Stair_02.png
deleted file mode 100644
index dbdbe8e..0000000
Binary files a/data/Gold_Block_Stair_02.png and /dev/null differ
diff --git a/data/Gold_Block_Stair_03.png b/data/Gold_Block_Stair_03.png
deleted file mode 100644
index 8d9eb4c..0000000
Binary files a/data/Gold_Block_Stair_03.png and /dev/null differ
diff --git a/data/Gold_Ore_00.png b/data/Gold_Ore.png
similarity index 100%
rename from data/Gold_Ore_00.png
rename to data/Gold_Ore.png
diff --git a/data/Granite_00.png b/data/Granite.png
similarity index 100%
rename from data/Granite_00.png
rename to data/Granite.png
diff --git a/data/Granite_Slab_00.png b/data/Granite_Slab.png
similarity index 100%
rename from data/Granite_Slab_00.png
rename to data/Granite_Slab.png
diff --git a/data/Granite_Stair.png b/data/Granite_Stair.png
new file mode 100644
index 0000000..2bb70f0
Binary files /dev/null and b/data/Granite_Stair.png differ
diff --git a/data/Granite_Stair_00.png b/data/Granite_Stair_00.png
deleted file mode 100644
index 79680eb..0000000
Binary files a/data/Granite_Stair_00.png and /dev/null differ
diff --git a/data/Granite_Stair_01.png b/data/Granite_Stair_01.png
deleted file mode 100644
index d5ce1e4..0000000
Binary files a/data/Granite_Stair_01.png and /dev/null differ
diff --git a/data/Granite_Stair_02.png b/data/Granite_Stair_02.png
deleted file mode 100644
index 89db3ed..0000000
Binary files a/data/Granite_Stair_02.png and /dev/null differ
diff --git a/data/Granite_Stair_03.png b/data/Granite_Stair_03.png
deleted file mode 100644
index bc159d7..0000000
Binary files a/data/Granite_Stair_03.png and /dev/null differ
diff --git a/data/Granite_Wall.png b/data/Granite_Wall.png
new file mode 100644
index 0000000..8c6880a
Binary files /dev/null and b/data/Granite_Wall.png differ
diff --git a/data/Granite_Wall_00.png b/data/Granite_Wall_00.png
deleted file mode 100644
index 3e0c787..0000000
Binary files a/data/Granite_Wall_00.png and /dev/null differ
diff --git a/data/Granite_Wall_01.png b/data/Granite_Wall_01.png
deleted file mode 100644
index 7df5c09..0000000
Binary files a/data/Granite_Wall_01.png and /dev/null differ
diff --git a/data/Grass_00.png b/data/Grass.png
similarity index 100%
rename from data/Grass_00.png
rename to data/Grass.png
diff --git a/data/Grass_Block_00.png b/data/Grass_Block.png
similarity index 100%
rename from data/Grass_Block_00.png
rename to data/Grass_Block.png
diff --git a/data/Grass_Dry_00.png b/data/Grass_Dry.png
similarity index 100%
rename from data/Grass_Dry_00.png
rename to data/Grass_Dry.png
diff --git a/data/Grass_Path_00.png b/data/Grass_Path.png
similarity index 100%
rename from data/Grass_Path_00.png
rename to data/Grass_Path.png
diff --git a/data/Gravel_00.png b/data/Gravel.png
similarity index 100%
rename from data/Gravel_00.png
rename to data/Gravel.png
diff --git a/data/Green_Bed.png b/data/Green_Bed.png
new file mode 100644
index 0000000..85cb1e0
Binary files /dev/null and b/data/Green_Bed.png differ
diff --git a/data/Green_Bed_00.png b/data/Green_Bed_00.png
deleted file mode 100644
index 9773044..0000000
Binary files a/data/Green_Bed_00.png and /dev/null differ
diff --git a/data/Green_Bed_01.png b/data/Green_Bed_01.png
deleted file mode 100644
index 6dd5c37..0000000
Binary files a/data/Green_Bed_01.png and /dev/null differ
diff --git a/data/Green_Carpet_00.png b/data/Green_Carpet.png
similarity index 100%
rename from data/Green_Carpet_00.png
rename to data/Green_Carpet.png
diff --git a/data/Green_Concrete_00.png b/data/Green_Concrete.png
similarity index 100%
rename from data/Green_Concrete_00.png
rename to data/Green_Concrete.png
diff --git a/data/Green_Concrete_Powder_00.png b/data/Green_Concrete_Powder.png
similarity index 100%
rename from data/Green_Concrete_Powder_00.png
rename to data/Green_Concrete_Powder.png
diff --git a/data/Green_Concrete_Slab_00.png b/data/Green_Concrete_Slab.png
similarity index 100%
rename from data/Green_Concrete_Slab_00.png
rename to data/Green_Concrete_Slab.png
diff --git a/data/Green_Concrete_Stair.png b/data/Green_Concrete_Stair.png
new file mode 100644
index 0000000..f47a279
Binary files /dev/null and b/data/Green_Concrete_Stair.png differ
diff --git a/data/Green_Concrete_Stair_00.png b/data/Green_Concrete_Stair_00.png
deleted file mode 100644
index 3660598..0000000
Binary files a/data/Green_Concrete_Stair_00.png and /dev/null differ
diff --git a/data/Green_Concrete_Stair_01.png b/data/Green_Concrete_Stair_01.png
deleted file mode 100644
index fb3ba57..0000000
Binary files a/data/Green_Concrete_Stair_01.png and /dev/null differ
diff --git a/data/Green_Concrete_Stair_02.png b/data/Green_Concrete_Stair_02.png
deleted file mode 100644
index 7fa6aa9..0000000
Binary files a/data/Green_Concrete_Stair_02.png and /dev/null differ
diff --git a/data/Green_Concrete_Stair_03.png b/data/Green_Concrete_Stair_03.png
deleted file mode 100644
index 9d90948..0000000
Binary files a/data/Green_Concrete_Stair_03.png and /dev/null differ
diff --git a/data/Green_Glazed_Terracotta_00.png b/data/Green_Glazed_Terracotta.png
similarity index 100%
rename from data/Green_Glazed_Terracotta_00.png
rename to data/Green_Glazed_Terracotta.png
diff --git a/data/Green_Shulker_Box_00.png b/data/Green_Shulker_Box.png
similarity index 100%
rename from data/Green_Shulker_Box_00.png
rename to data/Green_Shulker_Box.png
diff --git a/data/Green_Stained_Glass_00.png b/data/Green_Stained_Glass.png
similarity index 100%
rename from data/Green_Stained_Glass_00.png
rename to data/Green_Stained_Glass.png
diff --git a/data/Green_Stained_Glass_Pane.png b/data/Green_Stained_Glass_Pane.png
new file mode 100644
index 0000000..2327544
Binary files /dev/null and b/data/Green_Stained_Glass_Pane.png differ
diff --git a/data/Green_Stained_Glass_Pane_00.png b/data/Green_Stained_Glass_Pane_00.png
deleted file mode 100644
index e552127..0000000
Binary files a/data/Green_Stained_Glass_Pane_00.png and /dev/null differ
diff --git a/data/Green_Stained_Glass_Pane_01.png b/data/Green_Stained_Glass_Pane_01.png
deleted file mode 100644
index 4443d23..0000000
Binary files a/data/Green_Stained_Glass_Pane_01.png and /dev/null differ
diff --git a/data/Green_Terracotta_00.png b/data/Green_Terracotta.png
similarity index 100%
rename from data/Green_Terracotta_00.png
rename to data/Green_Terracotta.png
diff --git a/data/Green_Wool_00.png b/data/Green_Wool.png
similarity index 100%
rename from data/Green_Wool_00.png
rename to data/Green_Wool.png
diff --git a/data/Grey_Bed.png b/data/Grey_Bed.png
new file mode 100644
index 0000000..ce72373
Binary files /dev/null and b/data/Grey_Bed.png differ
diff --git a/data/Grey_Bed_00.png b/data/Grey_Bed_00.png
deleted file mode 100644
index 87cce70..0000000
Binary files a/data/Grey_Bed_00.png and /dev/null differ
diff --git a/data/Grey_Bed_01.png b/data/Grey_Bed_01.png
deleted file mode 100644
index 3507f71..0000000
Binary files a/data/Grey_Bed_01.png and /dev/null differ
diff --git a/data/Grey_Carpet_00.png b/data/Grey_Carpet.png
similarity index 100%
rename from data/Grey_Carpet_00.png
rename to data/Grey_Carpet.png
diff --git a/data/Grey_Concrete_00.png b/data/Grey_Concrete.png
similarity index 100%
rename from data/Grey_Concrete_00.png
rename to data/Grey_Concrete.png
diff --git a/data/Grey_Concrete_Powder_00.png b/data/Grey_Concrete_Powder.png
similarity index 100%
rename from data/Grey_Concrete_Powder_00.png
rename to data/Grey_Concrete_Powder.png
diff --git a/data/Grey_Concrete_Slab_00.png b/data/Grey_Concrete_Slab.png
similarity index 100%
rename from data/Grey_Concrete_Slab_00.png
rename to data/Grey_Concrete_Slab.png
diff --git a/data/Grey_Concrete_Stair.png b/data/Grey_Concrete_Stair.png
new file mode 100644
index 0000000..ce413f7
Binary files /dev/null and b/data/Grey_Concrete_Stair.png differ
diff --git a/data/Grey_Concrete_Stair_00.png b/data/Grey_Concrete_Stair_00.png
deleted file mode 100644
index bd2c00f..0000000
Binary files a/data/Grey_Concrete_Stair_00.png and /dev/null differ
diff --git a/data/Grey_Concrete_Stair_01.png b/data/Grey_Concrete_Stair_01.png
deleted file mode 100644
index 7577226..0000000
Binary files a/data/Grey_Concrete_Stair_01.png and /dev/null differ
diff --git a/data/Grey_Concrete_Stair_02.png b/data/Grey_Concrete_Stair_02.png
deleted file mode 100644
index 07fa4d8..0000000
Binary files a/data/Grey_Concrete_Stair_02.png and /dev/null differ
diff --git a/data/Grey_Concrete_Stair_03.png b/data/Grey_Concrete_Stair_03.png
deleted file mode 100644
index 0c80b84..0000000
Binary files a/data/Grey_Concrete_Stair_03.png and /dev/null differ
diff --git a/data/Grey_Glazed_Terracotta_00.png b/data/Grey_Glazed_Terracotta.png
similarity index 100%
rename from data/Grey_Glazed_Terracotta_00.png
rename to data/Grey_Glazed_Terracotta.png
diff --git a/data/Grey_Shulker_Box_00.png b/data/Grey_Shulker_Box.png
similarity index 100%
rename from data/Grey_Shulker_Box_00.png
rename to data/Grey_Shulker_Box.png
diff --git a/data/Grey_Stained_Glass_00.png b/data/Grey_Stained_Glass.png
similarity index 100%
rename from data/Grey_Stained_Glass_00.png
rename to data/Grey_Stained_Glass.png
diff --git a/data/Grey_Stained_Glass_Pane.png b/data/Grey_Stained_Glass_Pane.png
new file mode 100644
index 0000000..f8ff4cd
Binary files /dev/null and b/data/Grey_Stained_Glass_Pane.png differ
diff --git a/data/Grey_Stained_Glass_Pane_00.png b/data/Grey_Stained_Glass_Pane_00.png
deleted file mode 100644
index 9955e14..0000000
Binary files a/data/Grey_Stained_Glass_Pane_00.png and /dev/null differ
diff --git a/data/Grey_Stained_Glass_Pane_01.png b/data/Grey_Stained_Glass_Pane_01.png
deleted file mode 100644
index d004039..0000000
Binary files a/data/Grey_Stained_Glass_Pane_01.png and /dev/null differ
diff --git a/data/Grey_Terracotta_00.png b/data/Grey_Terracotta.png
similarity index 100%
rename from data/Grey_Terracotta_00.png
rename to data/Grey_Terracotta.png
diff --git a/data/Grey_Wool_00.png b/data/Grey_Wool.png
similarity index 100%
rename from data/Grey_Wool_00.png
rename to data/Grey_Wool.png
diff --git a/data/Hay_Bale_00.png b/data/Hay_Bale.png
similarity index 100%
rename from data/Hay_Bale_00.png
rename to data/Hay_Bale.png
diff --git a/data/Hopper_00.png b/data/Hopper.png
similarity index 100%
rename from data/Hopper_00.png
rename to data/Hopper.png
diff --git a/data/Huge_Brown_Mushroom_All-Faces_Stem_00.png b/data/Huge_Brown_Mushroom_All-Faces_Stem.png
similarity index 100%
rename from data/Huge_Brown_Mushroom_All-Faces_Stem_00.png
rename to data/Huge_Brown_Mushroom_All-Faces_Stem.png
diff --git a/data/Huge_Brown_Mushroom_Block_00.png b/data/Huge_Brown_Mushroom_Block.png
similarity index 100%
rename from data/Huge_Brown_Mushroom_Block_00.png
rename to data/Huge_Brown_Mushroom_Block.png
diff --git a/data/Huge_Brown_Mushroom_Stem_00.png b/data/Huge_Brown_Mushroom_Stem.png
similarity index 100%
rename from data/Huge_Brown_Mushroom_Stem_00.png
rename to data/Huge_Brown_Mushroom_Stem.png
diff --git a/data/Huge_Red_Mushroom_All-Faces_Stem_00.png b/data/Huge_Red_Mushroom_All-Faces_Stem.png
similarity index 100%
rename from data/Huge_Red_Mushroom_All-Faces_Stem_00.png
rename to data/Huge_Red_Mushroom_All-Faces_Stem.png
diff --git a/data/Huge_Red_Mushroom_Block_00.png b/data/Huge_Red_Mushroom_Block.png
similarity index 100%
rename from data/Huge_Red_Mushroom_Block_00.png
rename to data/Huge_Red_Mushroom_Block.png
diff --git a/data/Huge_Red_Mushroom_Stem_00.png b/data/Huge_Red_Mushroom_Stem.png
similarity index 100%
rename from data/Huge_Red_Mushroom_Stem_00.png
rename to data/Huge_Red_Mushroom_Stem.png
diff --git a/data/Human_Head.png b/data/Human_Head.png
new file mode 100644
index 0000000..5bd25df
Binary files /dev/null and b/data/Human_Head.png differ
diff --git a/data/Human_Head_00.png b/data/Human_Head_00.png
deleted file mode 100644
index aa40d0f..0000000
Binary files a/data/Human_Head_00.png and /dev/null differ
diff --git a/data/Human_Head_01.png b/data/Human_Head_01.png
deleted file mode 100644
index 1af26b2..0000000
Binary files a/data/Human_Head_01.png and /dev/null differ
diff --git a/data/Hydrated_Farmland_00.png b/data/Hydrated_Farmland.png
similarity index 100%
rename from data/Hydrated_Farmland_00.png
rename to data/Hydrated_Farmland.png
diff --git a/data/Ice_00.png b/data/Ice.png
similarity index 100%
rename from data/Ice_00.png
rename to data/Ice.png
diff --git a/data/Ice_Slab_00.png b/data/Ice_Slab.png
similarity index 100%
rename from data/Ice_Slab_00.png
rename to data/Ice_Slab.png
diff --git a/data/Ice_Stair.png b/data/Ice_Stair.png
new file mode 100644
index 0000000..ee79158
Binary files /dev/null and b/data/Ice_Stair.png differ
diff --git a/data/Ice_Stair_00.png b/data/Ice_Stair_00.png
deleted file mode 100644
index 209565a..0000000
Binary files a/data/Ice_Stair_00.png and /dev/null differ
diff --git a/data/Ice_Stair_01.png b/data/Ice_Stair_01.png
deleted file mode 100644
index 5373983..0000000
Binary files a/data/Ice_Stair_01.png and /dev/null differ
diff --git a/data/Ice_Stair_02.png b/data/Ice_Stair_02.png
deleted file mode 100644
index 036cb3a..0000000
Binary files a/data/Ice_Stair_02.png and /dev/null differ
diff --git a/data/Ice_Stair_03.png b/data/Ice_Stair_03.png
deleted file mode 100644
index 0538f59..0000000
Binary files a/data/Ice_Stair_03.png and /dev/null differ
diff --git a/data/Infested_Chiseled_Stone_Brick_00.png b/data/Infested_Chiseled_Stone_Brick.png
similarity index 100%
rename from data/Infested_Chiseled_Stone_Brick_00.png
rename to data/Infested_Chiseled_Stone_Brick.png
diff --git a/data/Infested_Cobblestone_00.png b/data/Infested_Cobblestone.png
similarity index 100%
rename from data/Infested_Cobblestone_00.png
rename to data/Infested_Cobblestone.png
diff --git a/data/Infested_Cracked_Stone_Brick_00.png b/data/Infested_Cracked_Stone_Brick.png
similarity index 100%
rename from data/Infested_Cracked_Stone_Brick_00.png
rename to data/Infested_Cracked_Stone_Brick.png
diff --git a/data/Infested_Mossy_Stone_Brick_00.png b/data/Infested_Mossy_Stone_Brick.png
similarity index 100%
rename from data/Infested_Mossy_Stone_Brick_00.png
rename to data/Infested_Mossy_Stone_Brick.png
diff --git a/data/Infested_Stone_00.png b/data/Infested_Stone.png
similarity index 100%
rename from data/Infested_Stone_00.png
rename to data/Infested_Stone.png
diff --git a/data/Infested_Stone_Brick_00.png b/data/Infested_Stone_Brick.png
similarity index 100%
rename from data/Infested_Stone_Brick_00.png
rename to data/Infested_Stone_Brick.png
diff --git a/data/Inverted_Daylight_Sensor_00.png b/data/Inverted_Daylight_Sensor.png
similarity index 100%
rename from data/Inverted_Daylight_Sensor_00.png
rename to data/Inverted_Daylight_Sensor.png
diff --git a/data/Iron_Bar.png b/data/Iron_Bar.png
new file mode 100644
index 0000000..6e828f9
Binary files /dev/null and b/data/Iron_Bar.png differ
diff --git a/data/Iron_Bar_00.png b/data/Iron_Bar_00.png
deleted file mode 100644
index 8a6299a..0000000
Binary files a/data/Iron_Bar_00.png and /dev/null differ
diff --git a/data/Iron_Bar_01.png b/data/Iron_Bar_01.png
deleted file mode 100644
index cea3088..0000000
Binary files a/data/Iron_Bar_01.png and /dev/null differ
diff --git a/data/Iron_Block_00.png b/data/Iron_Block.png
similarity index 100%
rename from data/Iron_Block_00.png
rename to data/Iron_Block.png
diff --git a/data/Iron_Block_Slab_00.png b/data/Iron_Block_Slab.png
similarity index 100%
rename from data/Iron_Block_Slab_00.png
rename to data/Iron_Block_Slab.png
diff --git a/data/Iron_Block_Stair.png b/data/Iron_Block_Stair.png
new file mode 100644
index 0000000..11b99fc
Binary files /dev/null and b/data/Iron_Block_Stair.png differ
diff --git a/data/Iron_Block_Stair_00.png b/data/Iron_Block_Stair_00.png
deleted file mode 100644
index 44fbd5d..0000000
Binary files a/data/Iron_Block_Stair_00.png and /dev/null differ
diff --git a/data/Iron_Block_Stair_01.png b/data/Iron_Block_Stair_01.png
deleted file mode 100644
index 6c6be34..0000000
Binary files a/data/Iron_Block_Stair_01.png and /dev/null differ
diff --git a/data/Iron_Block_Stair_02.png b/data/Iron_Block_Stair_02.png
deleted file mode 100644
index e3db262..0000000
Binary files a/data/Iron_Block_Stair_02.png and /dev/null differ
diff --git a/data/Iron_Block_Stair_03.png b/data/Iron_Block_Stair_03.png
deleted file mode 100644
index 0ffa366..0000000
Binary files a/data/Iron_Block_Stair_03.png and /dev/null differ
diff --git a/data/Iron_Door.png b/data/Iron_Door.png
new file mode 100644
index 0000000..72296a7
Binary files /dev/null and b/data/Iron_Door.png differ
diff --git a/data/Iron_Door_00.png b/data/Iron_Door_00.png
deleted file mode 100644
index 6ad2e45..0000000
Binary files a/data/Iron_Door_00.png and /dev/null differ
diff --git a/data/Iron_Door_01.png b/data/Iron_Door_01.png
deleted file mode 100644
index f4b9773..0000000
Binary files a/data/Iron_Door_01.png and /dev/null differ
diff --git a/data/Iron_Ore_00.png b/data/Iron_Ore.png
similarity index 100%
rename from data/Iron_Ore_00.png
rename to data/Iron_Ore.png
diff --git a/data/Iron_Trapdoor_00.png b/data/Iron_Trapdoor.png
similarity index 100%
rename from data/Iron_Trapdoor_00.png
rename to data/Iron_Trapdoor.png
diff --git a/data/Item_Frame.png b/data/Item_Frame.png
new file mode 100644
index 0000000..e165ccf
Binary files /dev/null and b/data/Item_Frame.png differ
diff --git a/data/Item_Frame_00.png b/data/Item_Frame_00.png
deleted file mode 100644
index a2aa467..0000000
Binary files a/data/Item_Frame_00.png and /dev/null differ
diff --git a/data/Item_Frame_01.png b/data/Item_Frame_01.png
deleted file mode 100644
index c081f90..0000000
Binary files a/data/Item_Frame_01.png and /dev/null differ
diff --git a/data/Jack_o_Lantern_00.png b/data/Jack_o_Lantern.png
similarity index 100%
rename from data/Jack_o_Lantern_00.png
rename to data/Jack_o_Lantern.png
diff --git a/data/Jukebox_00.png b/data/Jukebox.png
similarity index 100%
rename from data/Jukebox_00.png
rename to data/Jukebox.png
diff --git a/data/Jungle_00.png b/data/Jungle.png
similarity index 100%
rename from data/Jungle_00.png
rename to data/Jungle.png
diff --git a/data/Jungle_Bark_00.png b/data/Jungle_Bark.png
similarity index 100%
rename from data/Jungle_Bark_00.png
rename to data/Jungle_Bark.png
diff --git a/data/Jungle_Bark_Slab_00.png b/data/Jungle_Bark_Slab.png
similarity index 100%
rename from data/Jungle_Bark_Slab_00.png
rename to data/Jungle_Bark_Slab.png
diff --git a/data/Jungle_Bark_Stair.png b/data/Jungle_Bark_Stair.png
new file mode 100644
index 0000000..dbc4669
Binary files /dev/null and b/data/Jungle_Bark_Stair.png differ
diff --git a/data/Jungle_Bark_Stair_00.png b/data/Jungle_Bark_Stair_00.png
deleted file mode 100644
index 1d88d23..0000000
Binary files a/data/Jungle_Bark_Stair_00.png and /dev/null differ
diff --git a/data/Jungle_Bark_Stair_01.png b/data/Jungle_Bark_Stair_01.png
deleted file mode 100644
index d4e103a..0000000
Binary files a/data/Jungle_Bark_Stair_01.png and /dev/null differ
diff --git a/data/Jungle_Bark_Stair_02.png b/data/Jungle_Bark_Stair_02.png
deleted file mode 100644
index be04467..0000000
Binary files a/data/Jungle_Bark_Stair_02.png and /dev/null differ
diff --git a/data/Jungle_Bark_Stair_03.png b/data/Jungle_Bark_Stair_03.png
deleted file mode 100644
index e88ee5f..0000000
Binary files a/data/Jungle_Bark_Stair_03.png and /dev/null differ
diff --git a/data/Jungle_Button.png b/data/Jungle_Button.png
new file mode 100644
index 0000000..16f8b12
Binary files /dev/null and b/data/Jungle_Button.png differ
diff --git a/data/Jungle_Button_00.png b/data/Jungle_Button_00.png
deleted file mode 100644
index ea2f19f..0000000
Binary files a/data/Jungle_Button_00.png and /dev/null differ
diff --git a/data/Jungle_Button_01.png b/data/Jungle_Button_01.png
deleted file mode 100644
index f95a753..0000000
Binary files a/data/Jungle_Button_01.png and /dev/null differ
diff --git a/data/Jungle_Fence.png b/data/Jungle_Fence.png
new file mode 100644
index 0000000..442856e
Binary files /dev/null and b/data/Jungle_Fence.png differ
diff --git a/data/Jungle_Fence_00.png b/data/Jungle_Fence_00.png
deleted file mode 100644
index 5343ae5..0000000
Binary files a/data/Jungle_Fence_00.png and /dev/null differ
diff --git a/data/Jungle_Fence_01.png b/data/Jungle_Fence_01.png
deleted file mode 100644
index c4b41e5..0000000
Binary files a/data/Jungle_Fence_01.png and /dev/null differ
diff --git a/data/Jungle_Fence_Gate.png b/data/Jungle_Fence_Gate.png
new file mode 100644
index 0000000..0c8289d
Binary files /dev/null and b/data/Jungle_Fence_Gate.png differ
diff --git a/data/Jungle_Fence_Gate_00.png b/data/Jungle_Fence_Gate_00.png
deleted file mode 100644
index 445e246..0000000
Binary files a/data/Jungle_Fence_Gate_00.png and /dev/null differ
diff --git a/data/Jungle_Fence_Gate_01.png b/data/Jungle_Fence_Gate_01.png
deleted file mode 100644
index a86d2ba..0000000
Binary files a/data/Jungle_Fence_Gate_01.png and /dev/null differ
diff --git a/data/Jungle_Leaves_00.png b/data/Jungle_Leaves.png
similarity index 100%
rename from data/Jungle_Leaves_00.png
rename to data/Jungle_Leaves.png
diff --git a/data/Jungle_Plank_00.png b/data/Jungle_Plank.png
similarity index 100%
rename from data/Jungle_Plank_00.png
rename to data/Jungle_Plank.png
diff --git a/data/Jungle_Pressure_Plate_00.png b/data/Jungle_Pressure_Plate.png
similarity index 100%
rename from data/Jungle_Pressure_Plate_00.png
rename to data/Jungle_Pressure_Plate.png
diff --git a/data/Jungle_Sapling_00.png b/data/Jungle_Sapling.png
similarity index 100%
rename from data/Jungle_Sapling_00.png
rename to data/Jungle_Sapling.png
diff --git a/data/Jungle_Sapling_Flower_Pot_00.png b/data/Jungle_Sapling_Flower_Pot.png
similarity index 100%
rename from data/Jungle_Sapling_Flower_Pot_00.png
rename to data/Jungle_Sapling_Flower_Pot.png
diff --git a/data/Jungle_Slab_00.png b/data/Jungle_Slab.png
similarity index 100%
rename from data/Jungle_Slab_00.png
rename to data/Jungle_Slab.png
diff --git a/data/Jungle_Stair.png b/data/Jungle_Stair.png
new file mode 100644
index 0000000..bd4b089
Binary files /dev/null and b/data/Jungle_Stair.png differ
diff --git a/data/Jungle_Stair_00.png b/data/Jungle_Stair_00.png
deleted file mode 100644
index 803c9ec..0000000
Binary files a/data/Jungle_Stair_00.png and /dev/null differ
diff --git a/data/Jungle_Stair_01.png b/data/Jungle_Stair_01.png
deleted file mode 100644
index ed523e2..0000000
Binary files a/data/Jungle_Stair_01.png and /dev/null differ
diff --git a/data/Jungle_Stair_02.png b/data/Jungle_Stair_02.png
deleted file mode 100644
index d5cfc3d..0000000
Binary files a/data/Jungle_Stair_02.png and /dev/null differ
diff --git a/data/Jungle_Stair_03.png b/data/Jungle_Stair_03.png
deleted file mode 100644
index d29cdd4..0000000
Binary files a/data/Jungle_Stair_03.png and /dev/null differ
diff --git a/data/Jungle_Trapdoor_00.png b/data/Jungle_Trapdoor.png
similarity index 100%
rename from data/Jungle_Trapdoor_00.png
rename to data/Jungle_Trapdoor.png
diff --git a/data/Ladder.png b/data/Ladder.png
new file mode 100644
index 0000000..43ecdd3
Binary files /dev/null and b/data/Ladder.png differ
diff --git a/data/Ladder_00.png b/data/Ladder_00.png
deleted file mode 100644
index a0bed30..0000000
Binary files a/data/Ladder_00.png and /dev/null differ
diff --git a/data/Ladder_01.png b/data/Ladder_01.png
deleted file mode 100644
index d771b4e..0000000
Binary files a/data/Ladder_01.png and /dev/null differ
diff --git a/data/Lapis_Lazuli_Block_00.png b/data/Lapis_Lazuli_Block.png
similarity index 100%
rename from data/Lapis_Lazuli_Block_00.png
rename to data/Lapis_Lazuli_Block.png
diff --git a/data/Lapis_Lazuli_Ore_00.png b/data/Lapis_Lazuli_Ore.png
similarity index 100%
rename from data/Lapis_Lazuli_Ore_00.png
rename to data/Lapis_Lazuli_Ore.png
diff --git a/data/Lapis_Lazuli_Slab_00.png b/data/Lapis_Lazuli_Slab.png
similarity index 100%
rename from data/Lapis_Lazuli_Slab_00.png
rename to data/Lapis_Lazuli_Slab.png
diff --git a/data/Lapis_Lazuli_Stair.png b/data/Lapis_Lazuli_Stair.png
new file mode 100644
index 0000000..931f01b
Binary files /dev/null and b/data/Lapis_Lazuli_Stair.png differ
diff --git a/data/Lapis_Lazuli_Stair_00.png b/data/Lapis_Lazuli_Stair_00.png
deleted file mode 100644
index 0ffd040..0000000
Binary files a/data/Lapis_Lazuli_Stair_00.png and /dev/null differ
diff --git a/data/Lapis_Lazuli_Stair_01.png b/data/Lapis_Lazuli_Stair_01.png
deleted file mode 100644
index fa57e22..0000000
Binary files a/data/Lapis_Lazuli_Stair_01.png and /dev/null differ
diff --git a/data/Lapis_Lazuli_Stair_02.png b/data/Lapis_Lazuli_Stair_02.png
deleted file mode 100644
index 66c34c5..0000000
Binary files a/data/Lapis_Lazuli_Stair_02.png and /dev/null differ
diff --git a/data/Lapis_Lazuli_Stair_03.png b/data/Lapis_Lazuli_Stair_03.png
deleted file mode 100644
index bce2884..0000000
Binary files a/data/Lapis_Lazuli_Stair_03.png and /dev/null differ
diff --git a/data/Large_Fern_00.png b/data/Large_Fern.png
similarity index 100%
rename from data/Large_Fern_00.png
rename to data/Large_Fern.png
diff --git a/data/Lava_Source_00.png b/data/Lava_Source.png
similarity index 100%
rename from data/Lava_Source_00.png
rename to data/Lava_Source.png
diff --git a/data/Leaves_00.png b/data/Leaves.png
similarity index 100%
rename from data/Leaves_00.png
rename to data/Leaves.png
diff --git a/data/Lever.png b/data/Lever.png
new file mode 100644
index 0000000..d4f08b6
Binary files /dev/null and b/data/Lever.png differ
diff --git a/data/Lever_00.png b/data/Lever_00.png
deleted file mode 100644
index 2473fbb..0000000
Binary files a/data/Lever_00.png and /dev/null differ
diff --git a/data/Lever_01.png b/data/Lever_01.png
deleted file mode 100644
index 3bc8ccf..0000000
Binary files a/data/Lever_01.png and /dev/null differ
diff --git a/data/Light_Blue_Bed.png b/data/Light_Blue_Bed.png
new file mode 100644
index 0000000..d9c7463
Binary files /dev/null and b/data/Light_Blue_Bed.png differ
diff --git a/data/Light_Blue_Bed_00.png b/data/Light_Blue_Bed_00.png
deleted file mode 100644
index c2b848a..0000000
Binary files a/data/Light_Blue_Bed_00.png and /dev/null differ
diff --git a/data/Light_Blue_Bed_01.png b/data/Light_Blue_Bed_01.png
deleted file mode 100644
index a4a2a1d..0000000
Binary files a/data/Light_Blue_Bed_01.png and /dev/null differ
diff --git a/data/Light_Blue_Carpet_00.png b/data/Light_Blue_Carpet.png
similarity index 100%
rename from data/Light_Blue_Carpet_00.png
rename to data/Light_Blue_Carpet.png
diff --git a/data/Light_Blue_Concrete_00.png b/data/Light_Blue_Concrete.png
similarity index 100%
rename from data/Light_Blue_Concrete_00.png
rename to data/Light_Blue_Concrete.png
diff --git a/data/Light_Blue_Concrete_Powder_00.png b/data/Light_Blue_Concrete_Powder.png
similarity index 100%
rename from data/Light_Blue_Concrete_Powder_00.png
rename to data/Light_Blue_Concrete_Powder.png
diff --git a/data/Light_Blue_Concrete_Slab_00.png b/data/Light_Blue_Concrete_Slab.png
similarity index 100%
rename from data/Light_Blue_Concrete_Slab_00.png
rename to data/Light_Blue_Concrete_Slab.png
diff --git a/data/Light_Blue_Concrete_Stair.png b/data/Light_Blue_Concrete_Stair.png
new file mode 100644
index 0000000..d366bf0
Binary files /dev/null and b/data/Light_Blue_Concrete_Stair.png differ
diff --git a/data/Light_Blue_Concrete_Stair_00.png b/data/Light_Blue_Concrete_Stair_00.png
deleted file mode 100644
index b5bff52..0000000
Binary files a/data/Light_Blue_Concrete_Stair_00.png and /dev/null differ
diff --git a/data/Light_Blue_Concrete_Stair_01.png b/data/Light_Blue_Concrete_Stair_01.png
deleted file mode 100644
index d208bfa..0000000
Binary files a/data/Light_Blue_Concrete_Stair_01.png and /dev/null differ
diff --git a/data/Light_Blue_Concrete_Stair_02.png b/data/Light_Blue_Concrete_Stair_02.png
deleted file mode 100644
index f078532..0000000
Binary files a/data/Light_Blue_Concrete_Stair_02.png and /dev/null differ
diff --git a/data/Light_Blue_Concrete_Stair_03.png b/data/Light_Blue_Concrete_Stair_03.png
deleted file mode 100644
index c0ab852..0000000
Binary files a/data/Light_Blue_Concrete_Stair_03.png and /dev/null differ
diff --git a/data/Light_Blue_Glazed_Terracotta_00.png b/data/Light_Blue_Glazed_Terracotta.png
similarity index 100%
rename from data/Light_Blue_Glazed_Terracotta_00.png
rename to data/Light_Blue_Glazed_Terracotta.png
diff --git a/data/Light_Blue_Shulker_Box_00.png b/data/Light_Blue_Shulker_Box.png
similarity index 100%
rename from data/Light_Blue_Shulker_Box_00.png
rename to data/Light_Blue_Shulker_Box.png
diff --git a/data/Light_Blue_Stained_Glass_00.png b/data/Light_Blue_Stained_Glass.png
similarity index 100%
rename from data/Light_Blue_Stained_Glass_00.png
rename to data/Light_Blue_Stained_Glass.png
diff --git a/data/Light_Blue_Stained_Glass_Pane.png b/data/Light_Blue_Stained_Glass_Pane.png
new file mode 100644
index 0000000..51aa32b
Binary files /dev/null and b/data/Light_Blue_Stained_Glass_Pane.png differ
diff --git a/data/Light_Blue_Stained_Glass_Pane_00.png b/data/Light_Blue_Stained_Glass_Pane_00.png
deleted file mode 100644
index 3794848..0000000
Binary files a/data/Light_Blue_Stained_Glass_Pane_00.png and /dev/null differ
diff --git a/data/Light_Blue_Stained_Glass_Pane_01.png b/data/Light_Blue_Stained_Glass_Pane_01.png
deleted file mode 100644
index ae6ba51..0000000
Binary files a/data/Light_Blue_Stained_Glass_Pane_01.png and /dev/null differ
diff --git a/data/Light_Blue_Terracotta_00.png b/data/Light_Blue_Terracotta.png
similarity index 100%
rename from data/Light_Blue_Terracotta_00.png
rename to data/Light_Blue_Terracotta.png
diff --git a/data/Light_Blue_Wool_00.png b/data/Light_Blue_Wool.png
similarity index 100%
rename from data/Light_Blue_Wool_00.png
rename to data/Light_Blue_Wool.png
diff --git a/data/Light_Grey_Bed.png b/data/Light_Grey_Bed.png
new file mode 100644
index 0000000..2fb3973
Binary files /dev/null and b/data/Light_Grey_Bed.png differ
diff --git a/data/Light_Grey_Bed_00.png b/data/Light_Grey_Bed_00.png
deleted file mode 100644
index 0198519..0000000
Binary files a/data/Light_Grey_Bed_00.png and /dev/null differ
diff --git a/data/Light_Grey_Bed_01.png b/data/Light_Grey_Bed_01.png
deleted file mode 100644
index 2514ae2..0000000
Binary files a/data/Light_Grey_Bed_01.png and /dev/null differ
diff --git a/data/Light_Grey_Carpet_00.png b/data/Light_Grey_Carpet.png
similarity index 100%
rename from data/Light_Grey_Carpet_00.png
rename to data/Light_Grey_Carpet.png
diff --git a/data/Light_Grey_Concrete_00.png b/data/Light_Grey_Concrete.png
similarity index 100%
rename from data/Light_Grey_Concrete_00.png
rename to data/Light_Grey_Concrete.png
diff --git a/data/Light_Grey_Concrete_Powder_00.png b/data/Light_Grey_Concrete_Powder.png
similarity index 100%
rename from data/Light_Grey_Concrete_Powder_00.png
rename to data/Light_Grey_Concrete_Powder.png
diff --git a/data/Light_Grey_Concrete_Slab_00.png b/data/Light_Grey_Concrete_Slab.png
similarity index 100%
rename from data/Light_Grey_Concrete_Slab_00.png
rename to data/Light_Grey_Concrete_Slab.png
diff --git a/data/Light_Grey_Concrete_Stair.png b/data/Light_Grey_Concrete_Stair.png
new file mode 100644
index 0000000..c3c26c9
Binary files /dev/null and b/data/Light_Grey_Concrete_Stair.png differ
diff --git a/data/Light_Grey_Concrete_Stair_00.png b/data/Light_Grey_Concrete_Stair_00.png
deleted file mode 100644
index 9937131..0000000
Binary files a/data/Light_Grey_Concrete_Stair_00.png and /dev/null differ
diff --git a/data/Light_Grey_Concrete_Stair_01.png b/data/Light_Grey_Concrete_Stair_01.png
deleted file mode 100644
index 11c20d7..0000000
Binary files a/data/Light_Grey_Concrete_Stair_01.png and /dev/null differ
diff --git a/data/Light_Grey_Concrete_Stair_02.png b/data/Light_Grey_Concrete_Stair_02.png
deleted file mode 100644
index 7d6e6b6..0000000
Binary files a/data/Light_Grey_Concrete_Stair_02.png and /dev/null differ
diff --git a/data/Light_Grey_Concrete_Stair_03.png b/data/Light_Grey_Concrete_Stair_03.png
deleted file mode 100644
index 117fd61..0000000
Binary files a/data/Light_Grey_Concrete_Stair_03.png and /dev/null differ
diff --git a/data/Light_Grey_Glazed_Terracotta_00.png b/data/Light_Grey_Glazed_Terracotta.png
similarity index 100%
rename from data/Light_Grey_Glazed_Terracotta_00.png
rename to data/Light_Grey_Glazed_Terracotta.png
diff --git a/data/Light_Grey_Shulker_Box_00.png b/data/Light_Grey_Shulker_Box.png
similarity index 100%
rename from data/Light_Grey_Shulker_Box_00.png
rename to data/Light_Grey_Shulker_Box.png
diff --git a/data/Light_Grey_Stained_Glass_00.png b/data/Light_Grey_Stained_Glass.png
similarity index 100%
rename from data/Light_Grey_Stained_Glass_00.png
rename to data/Light_Grey_Stained_Glass.png
diff --git a/data/Light_Grey_Stained_Glass_Pane.png b/data/Light_Grey_Stained_Glass_Pane.png
new file mode 100644
index 0000000..4910618
Binary files /dev/null and b/data/Light_Grey_Stained_Glass_Pane.png differ
diff --git a/data/Light_Grey_Stained_Glass_Pane_00.png b/data/Light_Grey_Stained_Glass_Pane_00.png
deleted file mode 100644
index d203260..0000000
Binary files a/data/Light_Grey_Stained_Glass_Pane_00.png and /dev/null differ
diff --git a/data/Light_Grey_Stained_Glass_Pane_01.png b/data/Light_Grey_Stained_Glass_Pane_01.png
deleted file mode 100644
index 401c79a..0000000
Binary files a/data/Light_Grey_Stained_Glass_Pane_01.png and /dev/null differ
diff --git a/data/Light_Grey_Terracotta_00.png b/data/Light_Grey_Terracotta.png
similarity index 100%
rename from data/Light_Grey_Terracotta_00.png
rename to data/Light_Grey_Terracotta.png
diff --git a/data/Light_Grey_Wool_00.png b/data/Light_Grey_Wool.png
similarity index 100%
rename from data/Light_Grey_Wool_00.png
rename to data/Light_Grey_Wool.png
diff --git a/data/Lilac_00.png b/data/Lilac.png
similarity index 100%
rename from data/Lilac_00.png
rename to data/Lilac.png
diff --git a/data/Lime_Bed.png b/data/Lime_Bed.png
new file mode 100644
index 0000000..6ea3155
Binary files /dev/null and b/data/Lime_Bed.png differ
diff --git a/data/Lime_Bed_00.png b/data/Lime_Bed_00.png
deleted file mode 100644
index 8086b8c..0000000
Binary files a/data/Lime_Bed_00.png and /dev/null differ
diff --git a/data/Lime_Bed_01.png b/data/Lime_Bed_01.png
deleted file mode 100644
index e893b85..0000000
Binary files a/data/Lime_Bed_01.png and /dev/null differ
diff --git a/data/Lime_Carpet_00.png b/data/Lime_Carpet.png
similarity index 100%
rename from data/Lime_Carpet_00.png
rename to data/Lime_Carpet.png
diff --git a/data/Lime_Concrete_00.png b/data/Lime_Concrete.png
similarity index 100%
rename from data/Lime_Concrete_00.png
rename to data/Lime_Concrete.png
diff --git a/data/Lime_Concrete_Powder_00.png b/data/Lime_Concrete_Powder.png
similarity index 100%
rename from data/Lime_Concrete_Powder_00.png
rename to data/Lime_Concrete_Powder.png
diff --git a/data/Lime_Concrete_Slab_00.png b/data/Lime_Concrete_Slab.png
similarity index 100%
rename from data/Lime_Concrete_Slab_00.png
rename to data/Lime_Concrete_Slab.png
diff --git a/data/Lime_Concrete_Stair.png b/data/Lime_Concrete_Stair.png
new file mode 100644
index 0000000..97ddbd8
Binary files /dev/null and b/data/Lime_Concrete_Stair.png differ
diff --git a/data/Lime_Concrete_Stair_00.png b/data/Lime_Concrete_Stair_00.png
deleted file mode 100644
index 6a6be1f..0000000
Binary files a/data/Lime_Concrete_Stair_00.png and /dev/null differ
diff --git a/data/Lime_Concrete_Stair_01.png b/data/Lime_Concrete_Stair_01.png
deleted file mode 100644
index 214d079..0000000
Binary files a/data/Lime_Concrete_Stair_01.png and /dev/null differ
diff --git a/data/Lime_Concrete_Stair_02.png b/data/Lime_Concrete_Stair_02.png
deleted file mode 100644
index ce58a81..0000000
Binary files a/data/Lime_Concrete_Stair_02.png and /dev/null differ
diff --git a/data/Lime_Concrete_Stair_03.png b/data/Lime_Concrete_Stair_03.png
deleted file mode 100644
index 257e186..0000000
Binary files a/data/Lime_Concrete_Stair_03.png and /dev/null differ
diff --git a/data/Lime_Glazed_Terracotta_00.png b/data/Lime_Glazed_Terracotta.png
similarity index 100%
rename from data/Lime_Glazed_Terracotta_00.png
rename to data/Lime_Glazed_Terracotta.png
diff --git a/data/Lime_Shulker_Box_00.png b/data/Lime_Shulker_Box.png
similarity index 100%
rename from data/Lime_Shulker_Box_00.png
rename to data/Lime_Shulker_Box.png
diff --git a/data/Lime_Stained_Glass_00.png b/data/Lime_Stained_Glass.png
similarity index 100%
rename from data/Lime_Stained_Glass_00.png
rename to data/Lime_Stained_Glass.png
diff --git a/data/Lime_Stained_Glass_Pane.png b/data/Lime_Stained_Glass_Pane.png
new file mode 100644
index 0000000..ddc2897
Binary files /dev/null and b/data/Lime_Stained_Glass_Pane.png differ
diff --git a/data/Lime_Stained_Glass_Pane_00.png b/data/Lime_Stained_Glass_Pane_00.png
deleted file mode 100644
index 7415c0d..0000000
Binary files a/data/Lime_Stained_Glass_Pane_00.png and /dev/null differ
diff --git a/data/Lime_Stained_Glass_Pane_01.png b/data/Lime_Stained_Glass_Pane_01.png
deleted file mode 100644
index 8942d44..0000000
Binary files a/data/Lime_Stained_Glass_Pane_01.png and /dev/null differ
diff --git a/data/Lime_Terracotta_00.png b/data/Lime_Terracotta.png
similarity index 100%
rename from data/Lime_Terracotta_00.png
rename to data/Lime_Terracotta.png
diff --git a/data/Lime_Wool_00.png b/data/Lime_Wool.png
similarity index 100%
rename from data/Lime_Wool_00.png
rename to data/Lime_Wool.png
diff --git a/data/Lit_Redstone_Ore_00.png b/data/Lit_Redstone_Ore.png
similarity index 100%
rename from data/Lit_Redstone_Ore_00.png
rename to data/Lit_Redstone_Ore.png
diff --git a/data/Magenta_Bed.png b/data/Magenta_Bed.png
new file mode 100644
index 0000000..1f384b6
Binary files /dev/null and b/data/Magenta_Bed.png differ
diff --git a/data/Magenta_Bed_00.png b/data/Magenta_Bed_00.png
deleted file mode 100644
index acd3fcf..0000000
Binary files a/data/Magenta_Bed_00.png and /dev/null differ
diff --git a/data/Magenta_Bed_01.png b/data/Magenta_Bed_01.png
deleted file mode 100644
index ae64841..0000000
Binary files a/data/Magenta_Bed_01.png and /dev/null differ
diff --git a/data/Magenta_Carpet_00.png b/data/Magenta_Carpet.png
similarity index 100%
rename from data/Magenta_Carpet_00.png
rename to data/Magenta_Carpet.png
diff --git a/data/Magenta_Concrete_00.png b/data/Magenta_Concrete.png
similarity index 100%
rename from data/Magenta_Concrete_00.png
rename to data/Magenta_Concrete.png
diff --git a/data/Magenta_Concrete_Powder_00.png b/data/Magenta_Concrete_Powder.png
similarity index 100%
rename from data/Magenta_Concrete_Powder_00.png
rename to data/Magenta_Concrete_Powder.png
diff --git a/data/Magenta_Concrete_Slab_00.png b/data/Magenta_Concrete_Slab.png
similarity index 100%
rename from data/Magenta_Concrete_Slab_00.png
rename to data/Magenta_Concrete_Slab.png
diff --git a/data/Magenta_Concrete_Stair.png b/data/Magenta_Concrete_Stair.png
new file mode 100644
index 0000000..80c65ee
Binary files /dev/null and b/data/Magenta_Concrete_Stair.png differ
diff --git a/data/Magenta_Concrete_Stair_00.png b/data/Magenta_Concrete_Stair_00.png
deleted file mode 100644
index 419aa23..0000000
Binary files a/data/Magenta_Concrete_Stair_00.png and /dev/null differ
diff --git a/data/Magenta_Concrete_Stair_01.png b/data/Magenta_Concrete_Stair_01.png
deleted file mode 100644
index 9482e4d..0000000
Binary files a/data/Magenta_Concrete_Stair_01.png and /dev/null differ
diff --git a/data/Magenta_Concrete_Stair_02.png b/data/Magenta_Concrete_Stair_02.png
deleted file mode 100644
index 5aaa82c..0000000
Binary files a/data/Magenta_Concrete_Stair_02.png and /dev/null differ
diff --git a/data/Magenta_Concrete_Stair_03.png b/data/Magenta_Concrete_Stair_03.png
deleted file mode 100644
index f601bbf..0000000
Binary files a/data/Magenta_Concrete_Stair_03.png and /dev/null differ
diff --git a/data/Magenta_Glazed_Terracotta_00.png b/data/Magenta_Glazed_Terracotta.png
similarity index 100%
rename from data/Magenta_Glazed_Terracotta_00.png
rename to data/Magenta_Glazed_Terracotta.png
diff --git a/data/Magenta_Shulker_Box_00.png b/data/Magenta_Shulker_Box.png
similarity index 100%
rename from data/Magenta_Shulker_Box_00.png
rename to data/Magenta_Shulker_Box.png
diff --git a/data/Magenta_Stained_Glass_00.png b/data/Magenta_Stained_Glass.png
similarity index 100%
rename from data/Magenta_Stained_Glass_00.png
rename to data/Magenta_Stained_Glass.png
diff --git a/data/Magenta_Stained_Glass_Pane.png b/data/Magenta_Stained_Glass_Pane.png
new file mode 100644
index 0000000..7e709a0
Binary files /dev/null and b/data/Magenta_Stained_Glass_Pane.png differ
diff --git a/data/Magenta_Stained_Glass_Pane_00.png b/data/Magenta_Stained_Glass_Pane_00.png
deleted file mode 100644
index 3fc46a7..0000000
Binary files a/data/Magenta_Stained_Glass_Pane_00.png and /dev/null differ
diff --git a/data/Magenta_Stained_Glass_Pane_01.png b/data/Magenta_Stained_Glass_Pane_01.png
deleted file mode 100644
index f073743..0000000
Binary files a/data/Magenta_Stained_Glass_Pane_01.png and /dev/null differ
diff --git a/data/Magenta_Terracotta_00.png b/data/Magenta_Terracotta.png
similarity index 100%
rename from data/Magenta_Terracotta_00.png
rename to data/Magenta_Terracotta.png
diff --git a/data/Magenta_Wool_00.png b/data/Magenta_Wool.png
similarity index 100%
rename from data/Magenta_Wool_00.png
rename to data/Magenta_Wool.png
diff --git a/data/Magma_Block_00.png b/data/Magma_Block.png
similarity index 100%
rename from data/Magma_Block_00.png
rename to data/Magma_Block.png
diff --git a/data/Mature_Beetroot_Plant_00.png b/data/Mature_Beetroot_Plant.png
similarity index 100%
rename from data/Mature_Beetroot_Plant_00.png
rename to data/Mature_Beetroot_Plant.png
diff --git a/data/Mature_Carrot_Plant_00.png b/data/Mature_Carrot_Plant.png
similarity index 100%
rename from data/Mature_Carrot_Plant_00.png
rename to data/Mature_Carrot_Plant.png
diff --git a/data/Mature_Cocoa_Pod_00.png b/data/Mature_Cocoa_Pod.png
similarity index 100%
rename from data/Mature_Cocoa_Pod_00.png
rename to data/Mature_Cocoa_Pod.png
diff --git a/data/Mature_Melon_Stem_00.png b/data/Mature_Melon_Stem.png
similarity index 100%
rename from data/Mature_Melon_Stem_00.png
rename to data/Mature_Melon_Stem.png
diff --git a/data/Mature_Nether_Wart_00.png b/data/Mature_Nether_Wart.png
similarity index 100%
rename from data/Mature_Nether_Wart_00.png
rename to data/Mature_Nether_Wart.png
diff --git a/data/Mature_Potato_Plant_00.png b/data/Mature_Potato_Plant.png
similarity index 100%
rename from data/Mature_Potato_Plant_00.png
rename to data/Mature_Potato_Plant.png
diff --git a/data/Mature_Pumpkin_Stem_00.png b/data/Mature_Pumpkin_Stem.png
similarity index 100%
rename from data/Mature_Pumpkin_Stem_00.png
rename to data/Mature_Pumpkin_Stem.png
diff --git a/data/Mature_Wheat_Plant_00.png b/data/Mature_Wheat_Plant.png
similarity index 100%
rename from data/Mature_Wheat_Plant_00.png
rename to data/Mature_Wheat_Plant.png
diff --git a/data/Medium_Cocoa_Pod_00.png b/data/Medium_Cocoa_Pod.png
similarity index 100%
rename from data/Medium_Cocoa_Pod_00.png
rename to data/Medium_Cocoa_Pod.png
diff --git a/data/Melon_00.png b/data/Melon.png
similarity index 100%
rename from data/Melon_00.png
rename to data/Melon.png
diff --git a/data/Mob_Spawner_00.png b/data/Mob_Spawner.png
similarity index 100%
rename from data/Mob_Spawner_00.png
rename to data/Mob_Spawner.png
diff --git a/data/Mossy_Cobblestone_00.png b/data/Mossy_Cobblestone.png
similarity index 100%
rename from data/Mossy_Cobblestone_00.png
rename to data/Mossy_Cobblestone.png
diff --git a/data/Mossy_Cobblestone_Wall.png b/data/Mossy_Cobblestone_Wall.png
new file mode 100644
index 0000000..faeee06
Binary files /dev/null and b/data/Mossy_Cobblestone_Wall.png differ
diff --git a/data/Mossy_Cobblestone_Wall_00.png b/data/Mossy_Cobblestone_Wall_00.png
deleted file mode 100644
index 98719a3..0000000
Binary files a/data/Mossy_Cobblestone_Wall_00.png and /dev/null differ
diff --git a/data/Mossy_Cobblestone_Wall_01.png b/data/Mossy_Cobblestone_Wall_01.png
deleted file mode 100644
index 61b7439..0000000
Binary files a/data/Mossy_Cobblestone_Wall_01.png and /dev/null differ
diff --git a/data/Mossy_Stone_Brick_00.png b/data/Mossy_Stone_Brick.png
similarity index 100%
rename from data/Mossy_Stone_Brick_00.png
rename to data/Mossy_Stone_Brick.png
diff --git a/data/Mossy_Stone_Brick_Slab_00.png b/data/Mossy_Stone_Brick_Slab.png
similarity index 100%
rename from data/Mossy_Stone_Brick_Slab_00.png
rename to data/Mossy_Stone_Brick_Slab.png
diff --git a/data/Mossy_Stone_Brick_Stair.png b/data/Mossy_Stone_Brick_Stair.png
new file mode 100644
index 0000000..f5137d9
Binary files /dev/null and b/data/Mossy_Stone_Brick_Stair.png differ
diff --git a/data/Mossy_Stone_Brick_Stair_00.png b/data/Mossy_Stone_Brick_Stair_00.png
deleted file mode 100644
index 63ccd71..0000000
Binary files a/data/Mossy_Stone_Brick_Stair_00.png and /dev/null differ
diff --git a/data/Mossy_Stone_Brick_Stair_01.png b/data/Mossy_Stone_Brick_Stair_01.png
deleted file mode 100644
index 256357c..0000000
Binary files a/data/Mossy_Stone_Brick_Stair_01.png and /dev/null differ
diff --git a/data/Mossy_Stone_Brick_Stair_02.png b/data/Mossy_Stone_Brick_Stair_02.png
deleted file mode 100644
index 728d0a0..0000000
Binary files a/data/Mossy_Stone_Brick_Stair_02.png and /dev/null differ
diff --git a/data/Mossy_Stone_Brick_Stair_03.png b/data/Mossy_Stone_Brick_Stair_03.png
deleted file mode 100644
index 00d329c..0000000
Binary files a/data/Mossy_Stone_Brick_Stair_03.png and /dev/null differ
diff --git a/data/Mossy_Stone_Brick_Wall.png b/data/Mossy_Stone_Brick_Wall.png
new file mode 100644
index 0000000..3d9286b
Binary files /dev/null and b/data/Mossy_Stone_Brick_Wall.png differ
diff --git a/data/Mossy_Stone_Brick_Wall_00.png b/data/Mossy_Stone_Brick_Wall_00.png
deleted file mode 100644
index 407f1e9..0000000
Binary files a/data/Mossy_Stone_Brick_Wall_00.png and /dev/null differ
diff --git a/data/Mossy_Stone_Brick_Wall_01.png b/data/Mossy_Stone_Brick_Wall_01.png
deleted file mode 100644
index df77ccd..0000000
Binary files a/data/Mossy_Stone_Brick_Wall_01.png and /dev/null differ
diff --git a/data/Mossy_Stone_Slab_00.png b/data/Mossy_Stone_Slab.png
similarity index 100%
rename from data/Mossy_Stone_Slab_00.png
rename to data/Mossy_Stone_Slab.png
diff --git a/data/Mossy_Stone_Stair.png b/data/Mossy_Stone_Stair.png
new file mode 100644
index 0000000..f5137d9
Binary files /dev/null and b/data/Mossy_Stone_Stair.png differ
diff --git a/data/Mossy_Stone_Stair_00.png b/data/Mossy_Stone_Stair_00.png
deleted file mode 100644
index 63ccd71..0000000
Binary files a/data/Mossy_Stone_Stair_00.png and /dev/null differ
diff --git a/data/Mossy_Stone_Stair_01.png b/data/Mossy_Stone_Stair_01.png
deleted file mode 100644
index 256357c..0000000
Binary files a/data/Mossy_Stone_Stair_01.png and /dev/null differ
diff --git a/data/Mossy_Stone_Stair_02.png b/data/Mossy_Stone_Stair_02.png
deleted file mode 100644
index 728d0a0..0000000
Binary files a/data/Mossy_Stone_Stair_02.png and /dev/null differ
diff --git a/data/Mossy_Stone_Stair_03.png b/data/Mossy_Stone_Stair_03.png
deleted file mode 100644
index 00d329c..0000000
Binary files a/data/Mossy_Stone_Stair_03.png and /dev/null differ
diff --git a/data/Mycelium_00.png b/data/Mycelium.png
similarity index 100%
rename from data/Mycelium_00.png
rename to data/Mycelium.png
diff --git a/data/Nether_Brick_Block_00.png b/data/Nether_Brick_Block.png
similarity index 100%
rename from data/Nether_Brick_Block_00.png
rename to data/Nether_Brick_Block.png
diff --git a/data/Nether_Brick_Fence.png b/data/Nether_Brick_Fence.png
new file mode 100644
index 0000000..88eb1c5
Binary files /dev/null and b/data/Nether_Brick_Fence.png differ
diff --git a/data/Nether_Brick_Fence_00.png b/data/Nether_Brick_Fence_00.png
deleted file mode 100644
index 54ae36f..0000000
Binary files a/data/Nether_Brick_Fence_00.png and /dev/null differ
diff --git a/data/Nether_Brick_Fence_01.png b/data/Nether_Brick_Fence_01.png
deleted file mode 100644
index c9745e5..0000000
Binary files a/data/Nether_Brick_Fence_01.png and /dev/null differ
diff --git a/data/Red_Nether_Brick_Fence_Gate_00.png b/data/Nether_Brick_Fence_Gate.png
similarity index 69%
rename from data/Red_Nether_Brick_Fence_Gate_00.png
rename to data/Nether_Brick_Fence_Gate.png
index 72236a8..60b6f68 100644
Binary files a/data/Red_Nether_Brick_Fence_Gate_00.png and b/data/Nether_Brick_Fence_Gate.png differ
diff --git a/data/Nether_Brick_Fence_Gate_01.png b/data/Nether_Brick_Fence_Gate_01.png
deleted file mode 100644
index 33256ce..0000000
Binary files a/data/Nether_Brick_Fence_Gate_01.png and /dev/null differ
diff --git a/data/Nether_Brick_Slab_00.png b/data/Nether_Brick_Slab.png
similarity index 100%
rename from data/Nether_Brick_Slab_00.png
rename to data/Nether_Brick_Slab.png
diff --git a/data/Nether_Brick_Stair.png b/data/Nether_Brick_Stair.png
new file mode 100644
index 0000000..43d5f69
Binary files /dev/null and b/data/Nether_Brick_Stair.png differ
diff --git a/data/Nether_Brick_Stair_00.png b/data/Nether_Brick_Stair_00.png
deleted file mode 100644
index b00b78b..0000000
Binary files a/data/Nether_Brick_Stair_00.png and /dev/null differ
diff --git a/data/Nether_Brick_Stair_01.png b/data/Nether_Brick_Stair_01.png
deleted file mode 100644
index 182a10c..0000000
Binary files a/data/Nether_Brick_Stair_01.png and /dev/null differ
diff --git a/data/Nether_Brick_Stair_02.png b/data/Nether_Brick_Stair_02.png
deleted file mode 100644
index 5e28ade..0000000
Binary files a/data/Nether_Brick_Stair_02.png and /dev/null differ
diff --git a/data/Nether_Brick_Stair_03.png b/data/Nether_Brick_Stair_03.png
deleted file mode 100644
index a2dca4a..0000000
Binary files a/data/Nether_Brick_Stair_03.png and /dev/null differ
diff --git a/data/Nether_Brick_Wall.png b/data/Nether_Brick_Wall.png
new file mode 100644
index 0000000..f256318
Binary files /dev/null and b/data/Nether_Brick_Wall.png differ
diff --git a/data/Nether_Brick_Wall_00.png b/data/Nether_Brick_Wall_00.png
deleted file mode 100644
index 6429149..0000000
Binary files a/data/Nether_Brick_Wall_00.png and /dev/null differ
diff --git a/data/Nether_Brick_Wall_01.png b/data/Nether_Brick_Wall_01.png
deleted file mode 100644
index a96bf63..0000000
Binary files a/data/Nether_Brick_Wall_01.png and /dev/null differ
diff --git a/data/Nether_Lava_Source_00.png b/data/Nether_Lava_Source.png
similarity index 100%
rename from data/Nether_Lava_Source_00.png
rename to data/Nether_Lava_Source.png
diff --git a/data/Nether_Portal_00.png b/data/Nether_Portal.png
similarity index 100%
rename from data/Nether_Portal_00.png
rename to data/Nether_Portal.png
diff --git a/data/Nether_Quartz_Ore_00.png b/data/Nether_Quartz_Ore.png
similarity index 100%
rename from data/Nether_Quartz_Ore_00.png
rename to data/Nether_Quartz_Ore.png
diff --git a/data/Nether_Wart_Block_00.png b/data/Nether_Wart_Block.png
similarity index 100%
rename from data/Nether_Wart_Block_00.png
rename to data/Nether_Wart_Block.png
diff --git a/data/Netherrack_00.png b/data/Netherrack.png
similarity index 100%
rename from data/Netherrack_00.png
rename to data/Netherrack.png
diff --git a/data/Note_Block_00.png b/data/Note_Block.png
similarity index 100%
rename from data/Note_Block_00.png
rename to data/Note_Block.png
diff --git a/data/Oak_00.png b/data/Oak.png
similarity index 100%
rename from data/Oak_00.png
rename to data/Oak.png
diff --git a/data/Oak_Bark_00.png b/data/Oak_Bark.png
similarity index 100%
rename from data/Oak_Bark_00.png
rename to data/Oak_Bark.png
diff --git a/data/Oak_Bark_Slab_00.png b/data/Oak_Bark_Slab.png
similarity index 100%
rename from data/Oak_Bark_Slab_00.png
rename to data/Oak_Bark_Slab.png
diff --git a/data/Oak_Bark_Stair.png b/data/Oak_Bark_Stair.png
new file mode 100644
index 0000000..58d1564
Binary files /dev/null and b/data/Oak_Bark_Stair.png differ
diff --git a/data/Oak_Bark_Stair_00.png b/data/Oak_Bark_Stair_00.png
deleted file mode 100644
index fec9aa1..0000000
Binary files a/data/Oak_Bark_Stair_00.png and /dev/null differ
diff --git a/data/Oak_Bark_Stair_01.png b/data/Oak_Bark_Stair_01.png
deleted file mode 100644
index 371cd8e..0000000
Binary files a/data/Oak_Bark_Stair_01.png and /dev/null differ
diff --git a/data/Oak_Bark_Stair_02.png b/data/Oak_Bark_Stair_02.png
deleted file mode 100644
index 5e7ab9c..0000000
Binary files a/data/Oak_Bark_Stair_02.png and /dev/null differ
diff --git a/data/Oak_Bark_Stair_03.png b/data/Oak_Bark_Stair_03.png
deleted file mode 100644
index 13d8732..0000000
Binary files a/data/Oak_Bark_Stair_03.png and /dev/null differ
diff --git a/data/Oak_Button.png b/data/Oak_Button.png
new file mode 100644
index 0000000..49dc04f
Binary files /dev/null and b/data/Oak_Button.png differ
diff --git a/data/Oak_Button_00.png b/data/Oak_Button_00.png
deleted file mode 100644
index e7ca5f7..0000000
Binary files a/data/Oak_Button_00.png and /dev/null differ
diff --git a/data/Oak_Button_01.png b/data/Oak_Button_01.png
deleted file mode 100644
index 02da011..0000000
Binary files a/data/Oak_Button_01.png and /dev/null differ
diff --git a/data/Oak_Door.png b/data/Oak_Door.png
new file mode 100644
index 0000000..b2c273a
Binary files /dev/null and b/data/Oak_Door.png differ
diff --git a/data/Oak_Door_00.png b/data/Oak_Door_00.png
deleted file mode 100644
index 7f521eb..0000000
Binary files a/data/Oak_Door_00.png and /dev/null differ
diff --git a/data/Oak_Door_01.png b/data/Oak_Door_01.png
deleted file mode 100644
index e56e59c..0000000
Binary files a/data/Oak_Door_01.png and /dev/null differ
diff --git a/data/Oak_Fence_Gate.png b/data/Oak_Fence_Gate.png
new file mode 100644
index 0000000..aefddf8
Binary files /dev/null and b/data/Oak_Fence_Gate.png differ
diff --git a/data/Oak_Fence_Gate_00.png b/data/Oak_Fence_Gate_00.png
deleted file mode 100644
index 7a17e90..0000000
Binary files a/data/Oak_Fence_Gate_00.png and /dev/null differ
diff --git a/data/Oak_Fence_Gate_01.png b/data/Oak_Fence_Gate_01.png
deleted file mode 100644
index a8054cb..0000000
Binary files a/data/Oak_Fence_Gate_01.png and /dev/null differ
diff --git a/data/Oak_Ladder.png b/data/Oak_Ladder.png
new file mode 100644
index 0000000..c347966
Binary files /dev/null and b/data/Oak_Ladder.png differ
diff --git a/data/Oak_Ladder_00.png b/data/Oak_Ladder_00.png
deleted file mode 100644
index e104742..0000000
Binary files a/data/Oak_Ladder_00.png and /dev/null differ
diff --git a/data/Oak_Ladder_01.png b/data/Oak_Ladder_01.png
deleted file mode 100644
index d427868..0000000
Binary files a/data/Oak_Ladder_01.png and /dev/null differ
diff --git a/data/Oak_Plank_00.png b/data/Oak_Plank.png
similarity index 100%
rename from data/Oak_Plank_00.png
rename to data/Oak_Plank.png
diff --git a/data/Oak_Pressure_Plate_00.png b/data/Oak_Pressure_Plate.png
similarity index 100%
rename from data/Oak_Pressure_Plate_00.png
rename to data/Oak_Pressure_Plate.png
diff --git a/data/Oak_Sapling_00.png b/data/Oak_Sapling.png
similarity index 100%
rename from data/Oak_Sapling_00.png
rename to data/Oak_Sapling.png
diff --git a/data/Oak_Sapling_Flower_Pot_00.png b/data/Oak_Sapling_Flower_Pot.png
similarity index 100%
rename from data/Oak_Sapling_Flower_Pot_00.png
rename to data/Oak_Sapling_Flower_Pot.png
diff --git a/data/Oak_Slab_00.png b/data/Oak_Slab.png
similarity index 100%
rename from data/Oak_Slab_00.png
rename to data/Oak_Slab.png
diff --git a/data/Oak_Stair.png b/data/Oak_Stair.png
new file mode 100644
index 0000000..7e472ba
Binary files /dev/null and b/data/Oak_Stair.png differ
diff --git a/data/Oak_Stair_00.png b/data/Oak_Stair_00.png
deleted file mode 100644
index d9e7988..0000000
Binary files a/data/Oak_Stair_00.png and /dev/null differ
diff --git a/data/Oak_Stair_01.png b/data/Oak_Stair_01.png
deleted file mode 100644
index de8f518..0000000
Binary files a/data/Oak_Stair_01.png and /dev/null differ
diff --git a/data/Oak_Stair_02.png b/data/Oak_Stair_02.png
deleted file mode 100644
index aa39618..0000000
Binary files a/data/Oak_Stair_02.png and /dev/null differ
diff --git a/data/Oak_Stair_03.png b/data/Oak_Stair_03.png
deleted file mode 100644
index 30699fc..0000000
Binary files a/data/Oak_Stair_03.png and /dev/null differ
diff --git a/data/Oak_Wall_Sign.png b/data/Oak_Wall_Sign.png
new file mode 100644
index 0000000..68b7905
Binary files /dev/null and b/data/Oak_Wall_Sign.png differ
diff --git a/data/Oak_Wall_Sign_00.png b/data/Oak_Wall_Sign_00.png
deleted file mode 100644
index cb6476a..0000000
Binary files a/data/Oak_Wall_Sign_00.png and /dev/null differ
diff --git a/data/Oak_Wall_Sign_01.png b/data/Oak_Wall_Sign_01.png
deleted file mode 100644
index de374c1..0000000
Binary files a/data/Oak_Wall_Sign_01.png and /dev/null differ
diff --git a/data/Observer_00.png b/data/Observer.png
similarity index 100%
rename from data/Observer_00.png
rename to data/Observer.png
diff --git a/data/Obsidian_00.png b/data/Obsidian.png
similarity index 100%
rename from data/Obsidian_00.png
rename to data/Obsidian.png
diff --git a/data/Obsidian_Glass_Pane.png b/data/Obsidian_Glass_Pane.png
new file mode 100644
index 0000000..aaf44ed
Binary files /dev/null and b/data/Obsidian_Glass_Pane.png differ
diff --git a/data/Obsidian_Glass_Pane_00.png b/data/Obsidian_Glass_Pane_00.png
deleted file mode 100644
index 85a8e2e..0000000
Binary files a/data/Obsidian_Glass_Pane_00.png and /dev/null differ
diff --git a/data/Obsidian_Glass_Pane_01.png b/data/Obsidian_Glass_Pane_01.png
deleted file mode 100644
index 5cafde1..0000000
Binary files a/data/Obsidian_Glass_Pane_01.png and /dev/null differ
diff --git a/data/Obsidian_Glass_Slab_00.png b/data/Obsidian_Glass_Slab.png
similarity index 100%
rename from data/Obsidian_Glass_Slab_00.png
rename to data/Obsidian_Glass_Slab.png
diff --git a/data/Obsidian_Glass_Stair.png b/data/Obsidian_Glass_Stair.png
new file mode 100644
index 0000000..02a9635
Binary files /dev/null and b/data/Obsidian_Glass_Stair.png differ
diff --git a/data/Obsidian_Glass_Stair_00.png b/data/Obsidian_Glass_Stair_00.png
deleted file mode 100644
index 98072ca..0000000
Binary files a/data/Obsidian_Glass_Stair_00.png and /dev/null differ
diff --git a/data/Obsidian_Glass_Stair_01.png b/data/Obsidian_Glass_Stair_01.png
deleted file mode 100644
index 0365755..0000000
Binary files a/data/Obsidian_Glass_Stair_01.png and /dev/null differ
diff --git a/data/Obsidian_Glass_Stair_02.png b/data/Obsidian_Glass_Stair_02.png
deleted file mode 100644
index 0365755..0000000
Binary files a/data/Obsidian_Glass_Stair_02.png and /dev/null differ
diff --git a/data/Obsidian_Glass_Stair_03.png b/data/Obsidian_Glass_Stair_03.png
deleted file mode 100644
index 43183af..0000000
Binary files a/data/Obsidian_Glass_Stair_03.png and /dev/null differ
diff --git a/data/Obsidian_Slab_00.png b/data/Obsidian_Slab.png
similarity index 100%
rename from data/Obsidian_Slab_00.png
rename to data/Obsidian_Slab.png
diff --git a/data/Obsidian_Stair.png b/data/Obsidian_Stair.png
new file mode 100644
index 0000000..b1054b8
Binary files /dev/null and b/data/Obsidian_Stair.png differ
diff --git a/data/Obsidian_Stair_00.png b/data/Obsidian_Stair_00.png
deleted file mode 100644
index d994453..0000000
Binary files a/data/Obsidian_Stair_00.png and /dev/null differ
diff --git a/data/Obsidian_Stair_01.png b/data/Obsidian_Stair_01.png
deleted file mode 100644
index c0097a3..0000000
Binary files a/data/Obsidian_Stair_01.png and /dev/null differ
diff --git a/data/Obsidian_Stair_02.png b/data/Obsidian_Stair_02.png
deleted file mode 100644
index 5725f67..0000000
Binary files a/data/Obsidian_Stair_02.png and /dev/null differ
diff --git a/data/Obsidian_Stair_03.png b/data/Obsidian_Stair_03.png
deleted file mode 100644
index 840f62b..0000000
Binary files a/data/Obsidian_Stair_03.png and /dev/null differ
diff --git a/data/Orange_Bed.png b/data/Orange_Bed.png
new file mode 100644
index 0000000..552837e
Binary files /dev/null and b/data/Orange_Bed.png differ
diff --git a/data/Orange_Bed_00.png b/data/Orange_Bed_00.png
deleted file mode 100644
index 9af3222..0000000
Binary files a/data/Orange_Bed_00.png and /dev/null differ
diff --git a/data/Orange_Bed_01.png b/data/Orange_Bed_01.png
deleted file mode 100644
index 695ee40..0000000
Binary files a/data/Orange_Bed_01.png and /dev/null differ
diff --git a/data/Orange_Carpet_00.png b/data/Orange_Carpet.png
similarity index 100%
rename from data/Orange_Carpet_00.png
rename to data/Orange_Carpet.png
diff --git a/data/Orange_Concrete_00.png b/data/Orange_Concrete.png
similarity index 100%
rename from data/Orange_Concrete_00.png
rename to data/Orange_Concrete.png
diff --git a/data/Orange_Concrete_Powder_00.png b/data/Orange_Concrete_Powder.png
similarity index 100%
rename from data/Orange_Concrete_Powder_00.png
rename to data/Orange_Concrete_Powder.png
diff --git a/data/Orange_Concrete_Slab_00.png b/data/Orange_Concrete_Slab.png
similarity index 100%
rename from data/Orange_Concrete_Slab_00.png
rename to data/Orange_Concrete_Slab.png
diff --git a/data/Orange_Concrete_Stair.png b/data/Orange_Concrete_Stair.png
new file mode 100644
index 0000000..75af8c9
Binary files /dev/null and b/data/Orange_Concrete_Stair.png differ
diff --git a/data/Orange_Concrete_Stair_00.png b/data/Orange_Concrete_Stair_00.png
deleted file mode 100644
index 157bd37..0000000
Binary files a/data/Orange_Concrete_Stair_00.png and /dev/null differ
diff --git a/data/Orange_Concrete_Stair_01.png b/data/Orange_Concrete_Stair_01.png
deleted file mode 100644
index d43148a..0000000
Binary files a/data/Orange_Concrete_Stair_01.png and /dev/null differ
diff --git a/data/Orange_Concrete_Stair_02.png b/data/Orange_Concrete_Stair_02.png
deleted file mode 100644
index e0cdb60..0000000
Binary files a/data/Orange_Concrete_Stair_02.png and /dev/null differ
diff --git a/data/Orange_Concrete_Stair_03.png b/data/Orange_Concrete_Stair_03.png
deleted file mode 100644
index 01a4014..0000000
Binary files a/data/Orange_Concrete_Stair_03.png and /dev/null differ
diff --git a/data/Orange_Glazed_Terracotta_00.png b/data/Orange_Glazed_Terracotta.png
similarity index 100%
rename from data/Orange_Glazed_Terracotta_00.png
rename to data/Orange_Glazed_Terracotta.png
diff --git a/data/Orange_Shulker_Box_00.png b/data/Orange_Shulker_Box.png
similarity index 100%
rename from data/Orange_Shulker_Box_00.png
rename to data/Orange_Shulker_Box.png
diff --git a/data/Orange_Stained_Glass_00.png b/data/Orange_Stained_Glass.png
similarity index 100%
rename from data/Orange_Stained_Glass_00.png
rename to data/Orange_Stained_Glass.png
diff --git a/data/Orange_Stained_Glass_Pane.png b/data/Orange_Stained_Glass_Pane.png
new file mode 100644
index 0000000..676b27c
Binary files /dev/null and b/data/Orange_Stained_Glass_Pane.png differ
diff --git a/data/Orange_Stained_Glass_Pane_00.png b/data/Orange_Stained_Glass_Pane_00.png
deleted file mode 100644
index b761ffa..0000000
Binary files a/data/Orange_Stained_Glass_Pane_00.png and /dev/null differ
diff --git a/data/Orange_Stained_Glass_Pane_01.png b/data/Orange_Stained_Glass_Pane_01.png
deleted file mode 100644
index a9618f8..0000000
Binary files a/data/Orange_Stained_Glass_Pane_01.png and /dev/null differ
diff --git a/data/Orange_Terracotta_00.png b/data/Orange_Terracotta.png
similarity index 100%
rename from data/Orange_Terracotta_00.png
rename to data/Orange_Terracotta.png
diff --git a/data/Orange_Tulip_00.png b/data/Orange_Tulip.png
similarity index 100%
rename from data/Orange_Tulip_00.png
rename to data/Orange_Tulip.png
diff --git a/data/Orange_Tulip_Flower_Pot_00.png b/data/Orange_Tulip_Flower_Pot.png
similarity index 100%
rename from data/Orange_Tulip_Flower_Pot_00.png
rename to data/Orange_Tulip_Flower_Pot.png
diff --git a/data/Orange_Wool_00.png b/data/Orange_Wool.png
similarity index 100%
rename from data/Orange_Wool_00.png
rename to data/Orange_Wool.png
diff --git a/data/Oxeye_Daisy_00.png b/data/Oxeye_Daisy.png
similarity index 100%
rename from data/Oxeye_Daisy_00.png
rename to data/Oxeye_Daisy.png
diff --git a/data/Oxeye_Daisy_Flower_Pot_00.png b/data/Oxeye_Daisy_Flower_Pot.png
similarity index 100%
rename from data/Oxeye_Daisy_Flower_Pot_00.png
rename to data/Oxeye_Daisy_Flower_Pot.png
diff --git a/data/Packed_Ice_00.png b/data/Packed_Ice.png
similarity index 100%
rename from data/Packed_Ice_00.png
rename to data/Packed_Ice.png
diff --git a/data/Peony_00.png b/data/Peony.png
similarity index 100%
rename from data/Peony_00.png
rename to data/Peony.png
diff --git a/data/Pillar_Quartz_Block_00.png b/data/Pillar_Quartz_Block.png
similarity index 100%
rename from data/Pillar_Quartz_Block_00.png
rename to data/Pillar_Quartz_Block.png
diff --git a/data/Pink_Bed.png b/data/Pink_Bed.png
new file mode 100644
index 0000000..24c469a
Binary files /dev/null and b/data/Pink_Bed.png differ
diff --git a/data/Pink_Bed_00.png b/data/Pink_Bed_00.png
deleted file mode 100644
index ba405fa..0000000
Binary files a/data/Pink_Bed_00.png and /dev/null differ
diff --git a/data/Pink_Bed_01.png b/data/Pink_Bed_01.png
deleted file mode 100644
index 4e240ce..0000000
Binary files a/data/Pink_Bed_01.png and /dev/null differ
diff --git a/data/Pink_Carpet_00.png b/data/Pink_Carpet.png
similarity index 100%
rename from data/Pink_Carpet_00.png
rename to data/Pink_Carpet.png
diff --git a/data/Pink_Concrete_00.png b/data/Pink_Concrete.png
similarity index 100%
rename from data/Pink_Concrete_00.png
rename to data/Pink_Concrete.png
diff --git a/data/Pink_Concrete_Powder_00.png b/data/Pink_Concrete_Powder.png
similarity index 100%
rename from data/Pink_Concrete_Powder_00.png
rename to data/Pink_Concrete_Powder.png
diff --git a/data/Pink_Concrete_Slab_00.png b/data/Pink_Concrete_Slab.png
similarity index 100%
rename from data/Pink_Concrete_Slab_00.png
rename to data/Pink_Concrete_Slab.png
diff --git a/data/Pink_Concrete_Stair.png b/data/Pink_Concrete_Stair.png
new file mode 100644
index 0000000..adc411b
Binary files /dev/null and b/data/Pink_Concrete_Stair.png differ
diff --git a/data/Pink_Concrete_Stair_00.png b/data/Pink_Concrete_Stair_00.png
deleted file mode 100644
index 9e5c7c7..0000000
Binary files a/data/Pink_Concrete_Stair_00.png and /dev/null differ
diff --git a/data/Pink_Concrete_Stair_01.png b/data/Pink_Concrete_Stair_01.png
deleted file mode 100644
index 43f7d52..0000000
Binary files a/data/Pink_Concrete_Stair_01.png and /dev/null differ
diff --git a/data/Pink_Concrete_Stair_02.png b/data/Pink_Concrete_Stair_02.png
deleted file mode 100644
index 890d145..0000000
Binary files a/data/Pink_Concrete_Stair_02.png and /dev/null differ
diff --git a/data/Pink_Concrete_Stair_03.png b/data/Pink_Concrete_Stair_03.png
deleted file mode 100644
index 1831bc4..0000000
Binary files a/data/Pink_Concrete_Stair_03.png and /dev/null differ
diff --git a/data/Pink_Glazed_Terracotta_00.png b/data/Pink_Glazed_Terracotta.png
similarity index 100%
rename from data/Pink_Glazed_Terracotta_00.png
rename to data/Pink_Glazed_Terracotta.png
diff --git a/data/Pink_Shulker_Box_00.png b/data/Pink_Shulker_Box.png
similarity index 100%
rename from data/Pink_Shulker_Box_00.png
rename to data/Pink_Shulker_Box.png
diff --git a/data/Pink_Stained_Glass_00.png b/data/Pink_Stained_Glass.png
similarity index 100%
rename from data/Pink_Stained_Glass_00.png
rename to data/Pink_Stained_Glass.png
diff --git a/data/Pink_Stained_Glass_Pane.png b/data/Pink_Stained_Glass_Pane.png
new file mode 100644
index 0000000..710f22f
Binary files /dev/null and b/data/Pink_Stained_Glass_Pane.png differ
diff --git a/data/Pink_Stained_Glass_Pane_00.png b/data/Pink_Stained_Glass_Pane_00.png
deleted file mode 100644
index 5b43dab..0000000
Binary files a/data/Pink_Stained_Glass_Pane_00.png and /dev/null differ
diff --git a/data/Pink_Stained_Glass_Pane_01.png b/data/Pink_Stained_Glass_Pane_01.png
deleted file mode 100644
index f115495..0000000
Binary files a/data/Pink_Stained_Glass_Pane_01.png and /dev/null differ
diff --git a/data/Pink_Terracotta_00.png b/data/Pink_Terracotta.png
similarity index 100%
rename from data/Pink_Terracotta_00.png
rename to data/Pink_Terracotta.png
diff --git a/data/Pink_Tulip_00.png b/data/Pink_Tulip.png
similarity index 100%
rename from data/Pink_Tulip_00.png
rename to data/Pink_Tulip.png
diff --git a/data/Pink_Tulip_Flower_Pot_00.png b/data/Pink_Tulip_Flower_Pot.png
similarity index 100%
rename from data/Pink_Tulip_Flower_Pot_00.png
rename to data/Pink_Tulip_Flower_Pot.png
diff --git a/data/Pink_Wool_00.png b/data/Pink_Wool.png
similarity index 100%
rename from data/Pink_Wool_00.png
rename to data/Pink_Wool.png
diff --git a/data/Piston_00.png b/data/Piston.png
similarity index 100%
rename from data/Piston_00.png
rename to data/Piston.png
diff --git a/data/Podzol_00.png b/data/Podzol.png
similarity index 100%
rename from data/Podzol_00.png
rename to data/Podzol.png
diff --git a/data/Polished_Andesite_00.png b/data/Polished_Andesite.png
similarity index 100%
rename from data/Polished_Andesite_00.png
rename to data/Polished_Andesite.png
diff --git a/data/Polished_Andesite_Slab_00.png b/data/Polished_Andesite_Slab.png
similarity index 100%
rename from data/Polished_Andesite_Slab_00.png
rename to data/Polished_Andesite_Slab.png
diff --git a/data/Polished_Andesite_Stair.png b/data/Polished_Andesite_Stair.png
new file mode 100644
index 0000000..11e2ee5
Binary files /dev/null and b/data/Polished_Andesite_Stair.png differ
diff --git a/data/Polished_Andesite_Stair_00.png b/data/Polished_Andesite_Stair_00.png
deleted file mode 100644
index 98c4d05..0000000
Binary files a/data/Polished_Andesite_Stair_00.png and /dev/null differ
diff --git a/data/Polished_Andesite_Stair_01.png b/data/Polished_Andesite_Stair_01.png
deleted file mode 100644
index 3ada298..0000000
Binary files a/data/Polished_Andesite_Stair_01.png and /dev/null differ
diff --git a/data/Polished_Andesite_Stair_02.png b/data/Polished_Andesite_Stair_02.png
deleted file mode 100644
index 652418d..0000000
Binary files a/data/Polished_Andesite_Stair_02.png and /dev/null differ
diff --git a/data/Polished_Andesite_Stair_03.png b/data/Polished_Andesite_Stair_03.png
deleted file mode 100644
index 07ee8ca..0000000
Binary files a/data/Polished_Andesite_Stair_03.png and /dev/null differ
diff --git a/data/Polished_Diorite_00.png b/data/Polished_Diorite.png
similarity index 100%
rename from data/Polished_Diorite_00.png
rename to data/Polished_Diorite.png
diff --git a/data/Polished_Diorite_Slab_00.png b/data/Polished_Diorite_Slab.png
similarity index 100%
rename from data/Polished_Diorite_Slab_00.png
rename to data/Polished_Diorite_Slab.png
diff --git a/data/Polished_Diorite_Stair.png b/data/Polished_Diorite_Stair.png
new file mode 100644
index 0000000..0d5437b
Binary files /dev/null and b/data/Polished_Diorite_Stair.png differ
diff --git a/data/Polished_Diorite_Stair_00.png b/data/Polished_Diorite_Stair_00.png
deleted file mode 100644
index e463340..0000000
Binary files a/data/Polished_Diorite_Stair_00.png and /dev/null differ
diff --git a/data/Polished_Diorite_Stair_01.png b/data/Polished_Diorite_Stair_01.png
deleted file mode 100644
index 03dd119..0000000
Binary files a/data/Polished_Diorite_Stair_01.png and /dev/null differ
diff --git a/data/Polished_Diorite_Stair_02.png b/data/Polished_Diorite_Stair_02.png
deleted file mode 100644
index 1353877..0000000
Binary files a/data/Polished_Diorite_Stair_02.png and /dev/null differ
diff --git a/data/Polished_Diorite_Stair_03.png b/data/Polished_Diorite_Stair_03.png
deleted file mode 100644
index 28324eb..0000000
Binary files a/data/Polished_Diorite_Stair_03.png and /dev/null differ
diff --git a/data/Polished_Granite_00.png b/data/Polished_Granite.png
similarity index 100%
rename from data/Polished_Granite_00.png
rename to data/Polished_Granite.png
diff --git a/data/Polished_Granite_Slab_00.png b/data/Polished_Granite_Slab.png
similarity index 100%
rename from data/Polished_Granite_Slab_00.png
rename to data/Polished_Granite_Slab.png
diff --git a/data/Polished_Granite_Stair.png b/data/Polished_Granite_Stair.png
new file mode 100644
index 0000000..3eae76d
Binary files /dev/null and b/data/Polished_Granite_Stair.png differ
diff --git a/data/Polished_Granite_Stair_00.png b/data/Polished_Granite_Stair_00.png
deleted file mode 100644
index 5a8d42b..0000000
Binary files a/data/Polished_Granite_Stair_00.png and /dev/null differ
diff --git a/data/Polished_Granite_Stair_01.png b/data/Polished_Granite_Stair_01.png
deleted file mode 100644
index ad806b9..0000000
Binary files a/data/Polished_Granite_Stair_01.png and /dev/null differ
diff --git a/data/Polished_Granite_Stair_02.png b/data/Polished_Granite_Stair_02.png
deleted file mode 100644
index a7dd548..0000000
Binary files a/data/Polished_Granite_Stair_02.png and /dev/null differ
diff --git a/data/Polished_Granite_Stair_03.png b/data/Polished_Granite_Stair_03.png
deleted file mode 100644
index 5d3e7e5..0000000
Binary files a/data/Polished_Granite_Stair_03.png and /dev/null differ
diff --git a/data/Polished_Stone_00.png b/data/Polished_Stone.png
similarity index 100%
rename from data/Polished_Stone_00.png
rename to data/Polished_Stone.png
diff --git a/data/Poppy_00.png b/data/Poppy.png
similarity index 100%
rename from data/Poppy_00.png
rename to data/Poppy.png
diff --git a/data/Poppy_Flower_Pot_00.png b/data/Poppy_Flower_Pot.png
similarity index 100%
rename from data/Poppy_Flower_Pot_00.png
rename to data/Poppy_Flower_Pot.png
diff --git a/data/Powered_Rail_00.png b/data/Powered_Rail.png
similarity index 55%
rename from data/Powered_Rail_00.png
rename to data/Powered_Rail.png
index 7f1ca62..f1a3d5b 100644
Binary files a/data/Powered_Rail_00.png and b/data/Powered_Rail.png differ
diff --git a/data/Powered_Rail_01.png b/data/Powered_Rail_01.png
deleted file mode 100644
index a90463f..0000000
Binary files a/data/Powered_Rail_01.png and /dev/null differ
diff --git a/data/Prismarine_00.png b/data/Prismarine.png
similarity index 100%
rename from data/Prismarine_00.png
rename to data/Prismarine.png
diff --git a/data/Prismarine_Brick_00.png b/data/Prismarine_Brick.png
similarity index 100%
rename from data/Prismarine_Brick_00.png
rename to data/Prismarine_Brick.png
diff --git a/data/Prismarine_Brick_Slab_00.png b/data/Prismarine_Brick_Slab.png
similarity index 100%
rename from data/Prismarine_Brick_Slab_00.png
rename to data/Prismarine_Brick_Slab.png
diff --git a/data/Prismarine_Brick_Stair.png b/data/Prismarine_Brick_Stair.png
new file mode 100644
index 0000000..d1f0c0c
Binary files /dev/null and b/data/Prismarine_Brick_Stair.png differ
diff --git a/data/Prismarine_Brick_Stair_00.png b/data/Prismarine_Brick_Stair_00.png
deleted file mode 100644
index d47766a..0000000
Binary files a/data/Prismarine_Brick_Stair_00.png and /dev/null differ
diff --git a/data/Prismarine_Brick_Stair_01.png b/data/Prismarine_Brick_Stair_01.png
deleted file mode 100644
index 1714476..0000000
Binary files a/data/Prismarine_Brick_Stair_01.png and /dev/null differ
diff --git a/data/Prismarine_Brick_Stair_02.png b/data/Prismarine_Brick_Stair_02.png
deleted file mode 100644
index 1fdca89..0000000
Binary files a/data/Prismarine_Brick_Stair_02.png and /dev/null differ
diff --git a/data/Prismarine_Brick_Stair_03.png b/data/Prismarine_Brick_Stair_03.png
deleted file mode 100644
index b957b04..0000000
Binary files a/data/Prismarine_Brick_Stair_03.png and /dev/null differ
diff --git a/data/Prismarine_Dark_00.png b/data/Prismarine_Dark.png
similarity index 100%
rename from data/Prismarine_Dark_00.png
rename to data/Prismarine_Dark.png
diff --git a/data/Prismarine_Slab_00.png b/data/Prismarine_Slab.png
similarity index 100%
rename from data/Prismarine_Slab_00.png
rename to data/Prismarine_Slab.png
diff --git a/data/Prismarine_Stair.png b/data/Prismarine_Stair.png
new file mode 100644
index 0000000..024782d
Binary files /dev/null and b/data/Prismarine_Stair.png differ
diff --git a/data/Prismarine_Stair_00.png b/data/Prismarine_Stair_00.png
deleted file mode 100644
index 23f1ae3..0000000
Binary files a/data/Prismarine_Stair_00.png and /dev/null differ
diff --git a/data/Prismarine_Stair_01.png b/data/Prismarine_Stair_01.png
deleted file mode 100644
index 8efbe35..0000000
Binary files a/data/Prismarine_Stair_01.png and /dev/null differ
diff --git a/data/Prismarine_Stair_02.png b/data/Prismarine_Stair_02.png
deleted file mode 100644
index 57a815c..0000000
Binary files a/data/Prismarine_Stair_02.png and /dev/null differ
diff --git a/data/Prismarine_Stair_03.png b/data/Prismarine_Stair_03.png
deleted file mode 100644
index c860089..0000000
Binary files a/data/Prismarine_Stair_03.png and /dev/null differ
diff --git a/data/Prismarine_Wall.png b/data/Prismarine_Wall.png
new file mode 100644
index 0000000..bf912dd
Binary files /dev/null and b/data/Prismarine_Wall.png differ
diff --git a/data/Prismarine_Wall_00.png b/data/Prismarine_Wall_00.png
deleted file mode 100644
index 9fc40cb..0000000
Binary files a/data/Prismarine_Wall_00.png and /dev/null differ
diff --git a/data/Prismarine_Wall_01.png b/data/Prismarine_Wall_01.png
deleted file mode 100644
index da444fa..0000000
Binary files a/data/Prismarine_Wall_01.png and /dev/null differ
diff --git a/data/Pumpkin_00.png b/data/Pumpkin.png
similarity index 100%
rename from data/Pumpkin_00.png
rename to data/Pumpkin.png
diff --git a/data/Purple_Bed.png b/data/Purple_Bed.png
new file mode 100644
index 0000000..f23948e
Binary files /dev/null and b/data/Purple_Bed.png differ
diff --git a/data/Purple_Bed_00.png b/data/Purple_Bed_00.png
deleted file mode 100644
index d300c1a..0000000
Binary files a/data/Purple_Bed_00.png and /dev/null differ
diff --git a/data/Purple_Bed_01.png b/data/Purple_Bed_01.png
deleted file mode 100644
index f42c906..0000000
Binary files a/data/Purple_Bed_01.png and /dev/null differ
diff --git a/data/Purple_Carpet_00.png b/data/Purple_Carpet.png
similarity index 100%
rename from data/Purple_Carpet_00.png
rename to data/Purple_Carpet.png
diff --git a/data/Purple_Concrete_00.png b/data/Purple_Concrete.png
similarity index 100%
rename from data/Purple_Concrete_00.png
rename to data/Purple_Concrete.png
diff --git a/data/Purple_Concrete_Powder_00.png b/data/Purple_Concrete_Powder.png
similarity index 100%
rename from data/Purple_Concrete_Powder_00.png
rename to data/Purple_Concrete_Powder.png
diff --git a/data/Purple_Concrete_Slab_00.png b/data/Purple_Concrete_Slab.png
similarity index 100%
rename from data/Purple_Concrete_Slab_00.png
rename to data/Purple_Concrete_Slab.png
diff --git a/data/Purple_Concrete_Stair.png b/data/Purple_Concrete_Stair.png
new file mode 100644
index 0000000..1b42a67
Binary files /dev/null and b/data/Purple_Concrete_Stair.png differ
diff --git a/data/Purple_Concrete_Stair_00.png b/data/Purple_Concrete_Stair_00.png
deleted file mode 100644
index d6e2683..0000000
Binary files a/data/Purple_Concrete_Stair_00.png and /dev/null differ
diff --git a/data/Purple_Concrete_Stair_01.png b/data/Purple_Concrete_Stair_01.png
deleted file mode 100644
index d36efee..0000000
Binary files a/data/Purple_Concrete_Stair_01.png and /dev/null differ
diff --git a/data/Purple_Concrete_Stair_02.png b/data/Purple_Concrete_Stair_02.png
deleted file mode 100644
index be9589b..0000000
Binary files a/data/Purple_Concrete_Stair_02.png and /dev/null differ
diff --git a/data/Purple_Concrete_Stair_03.png b/data/Purple_Concrete_Stair_03.png
deleted file mode 100644
index 6dddc20..0000000
Binary files a/data/Purple_Concrete_Stair_03.png and /dev/null differ
diff --git a/data/Purple_Glazed_Terracotta_00.png b/data/Purple_Glazed_Terracotta.png
similarity index 100%
rename from data/Purple_Glazed_Terracotta_00.png
rename to data/Purple_Glazed_Terracotta.png
diff --git a/data/Purple_Shulker_Box_00.png b/data/Purple_Shulker_Box.png
similarity index 100%
rename from data/Purple_Shulker_Box_00.png
rename to data/Purple_Shulker_Box.png
diff --git a/data/Purple_Stained_Glass_00.png b/data/Purple_Stained_Glass.png
similarity index 100%
rename from data/Purple_Stained_Glass_00.png
rename to data/Purple_Stained_Glass.png
diff --git a/data/Purple_Stained_Glass_Pane.png b/data/Purple_Stained_Glass_Pane.png
new file mode 100644
index 0000000..f80f587
Binary files /dev/null and b/data/Purple_Stained_Glass_Pane.png differ
diff --git a/data/Purple_Stained_Glass_Pane_00.png b/data/Purple_Stained_Glass_Pane_00.png
deleted file mode 100644
index f10f91c..0000000
Binary files a/data/Purple_Stained_Glass_Pane_00.png and /dev/null differ
diff --git a/data/Purple_Stained_Glass_Pane_01.png b/data/Purple_Stained_Glass_Pane_01.png
deleted file mode 100644
index 88a05c9..0000000
Binary files a/data/Purple_Stained_Glass_Pane_01.png and /dev/null differ
diff --git a/data/Purple_Terracotta_00.png b/data/Purple_Terracotta.png
similarity index 100%
rename from data/Purple_Terracotta_00.png
rename to data/Purple_Terracotta.png
diff --git a/data/Purple_Wool_00.png b/data/Purple_Wool.png
similarity index 100%
rename from data/Purple_Wool_00.png
rename to data/Purple_Wool.png
diff --git a/data/Purpur_Block_00.png b/data/Purpur_Block.png
similarity index 100%
rename from data/Purpur_Block_00.png
rename to data/Purpur_Block.png
diff --git a/data/Purpur_Pillar_00.png b/data/Purpur_Pillar.png
similarity index 100%
rename from data/Purpur_Pillar_00.png
rename to data/Purpur_Pillar.png
diff --git a/data/Purpur_Slab_00.png b/data/Purpur_Slab.png
similarity index 100%
rename from data/Purpur_Slab_00.png
rename to data/Purpur_Slab.png
diff --git a/data/Purpur_Stair.png b/data/Purpur_Stair.png
new file mode 100644
index 0000000..f98285e
Binary files /dev/null and b/data/Purpur_Stair.png differ
diff --git a/data/Purpur_Stair_00.png b/data/Purpur_Stair_00.png
deleted file mode 100644
index a613c65..0000000
Binary files a/data/Purpur_Stair_00.png and /dev/null differ
diff --git a/data/Purpur_Stair_01.png b/data/Purpur_Stair_01.png
deleted file mode 100644
index 97b1741..0000000
Binary files a/data/Purpur_Stair_01.png and /dev/null differ
diff --git a/data/Purpur_Stair_02.png b/data/Purpur_Stair_02.png
deleted file mode 100644
index 3c653be..0000000
Binary files a/data/Purpur_Stair_02.png and /dev/null differ
diff --git a/data/Purpur_Stair_03.png b/data/Purpur_Stair_03.png
deleted file mode 100644
index 69f2b6e..0000000
Binary files a/data/Purpur_Stair_03.png and /dev/null differ
diff --git a/data/Quartz_Block_00.png b/data/Quartz_Block.png
similarity index 100%
rename from data/Quartz_Block_00.png
rename to data/Quartz_Block.png
diff --git a/data/Quartz_Slab_00.png b/data/Quartz_Slab.png
similarity index 100%
rename from data/Quartz_Slab_00.png
rename to data/Quartz_Slab.png
diff --git a/data/Quartz_Stair.png b/data/Quartz_Stair.png
new file mode 100644
index 0000000..f2c283c
Binary files /dev/null and b/data/Quartz_Stair.png differ
diff --git a/data/Quartz_Stair_00.png b/data/Quartz_Stair_00.png
deleted file mode 100644
index 695ea0f..0000000
Binary files a/data/Quartz_Stair_00.png and /dev/null differ
diff --git a/data/Quartz_Stair_01.png b/data/Quartz_Stair_01.png
deleted file mode 100644
index c714828..0000000
Binary files a/data/Quartz_Stair_01.png and /dev/null differ
diff --git a/data/Quartz_Stair_02.png b/data/Quartz_Stair_02.png
deleted file mode 100644
index 8079ecd..0000000
Binary files a/data/Quartz_Stair_02.png and /dev/null differ
diff --git a/data/Quartz_Stair_03.png b/data/Quartz_Stair_03.png
deleted file mode 100644
index 2a9d74c..0000000
Binary files a/data/Quartz_Stair_03.png and /dev/null differ
diff --git a/data/Rail.png b/data/Rail.png
new file mode 100644
index 0000000..309e3d0
Binary files /dev/null and b/data/Rail.png differ
diff --git a/data/Rail_00.png b/data/Rail_00.png
deleted file mode 100644
index c79e68b..0000000
Binary files a/data/Rail_00.png and /dev/null differ
diff --git a/data/Rail_01.png b/data/Rail_01.png
deleted file mode 100644
index 9345fdb..0000000
Binary files a/data/Rail_01.png and /dev/null differ
diff --git a/data/Realm_Barrier_00.png b/data/Realm_Barrier.png
similarity index 100%
rename from data/Realm_Barrier_00.png
rename to data/Realm_Barrier.png
diff --git a/data/Red_Bed.png b/data/Red_Bed.png
new file mode 100644
index 0000000..73de5f7
Binary files /dev/null and b/data/Red_Bed.png differ
diff --git a/data/Red_Bed_00.png b/data/Red_Bed_00.png
deleted file mode 100644
index fa9fea9..0000000
Binary files a/data/Red_Bed_00.png and /dev/null differ
diff --git a/data/Red_Bed_01.png b/data/Red_Bed_01.png
deleted file mode 100644
index c410ba6..0000000
Binary files a/data/Red_Bed_01.png and /dev/null differ
diff --git a/data/Red_Carpet_00.png b/data/Red_Carpet.png
similarity index 100%
rename from data/Red_Carpet_00.png
rename to data/Red_Carpet.png
diff --git a/data/Red_Concrete_00.png b/data/Red_Concrete.png
similarity index 100%
rename from data/Red_Concrete_00.png
rename to data/Red_Concrete.png
diff --git a/data/Red_Concrete_Powder_00.png b/data/Red_Concrete_Powder.png
similarity index 100%
rename from data/Red_Concrete_Powder_00.png
rename to data/Red_Concrete_Powder.png
diff --git a/data/Red_Concrete_Slab_00.png b/data/Red_Concrete_Slab.png
similarity index 100%
rename from data/Red_Concrete_Slab_00.png
rename to data/Red_Concrete_Slab.png
diff --git a/data/Red_Concrete_Stair.png b/data/Red_Concrete_Stair.png
new file mode 100644
index 0000000..c6e37d0
Binary files /dev/null and b/data/Red_Concrete_Stair.png differ
diff --git a/data/Red_Concrete_Stair_00.png b/data/Red_Concrete_Stair_00.png
deleted file mode 100644
index 7b0c630..0000000
Binary files a/data/Red_Concrete_Stair_00.png and /dev/null differ
diff --git a/data/Red_Concrete_Stair_01.png b/data/Red_Concrete_Stair_01.png
deleted file mode 100644
index 4554e73..0000000
Binary files a/data/Red_Concrete_Stair_01.png and /dev/null differ
diff --git a/data/Red_Concrete_Stair_02.png b/data/Red_Concrete_Stair_02.png
deleted file mode 100644
index 24f66b0..0000000
Binary files a/data/Red_Concrete_Stair_02.png and /dev/null differ
diff --git a/data/Red_Concrete_Stair_03.png b/data/Red_Concrete_Stair_03.png
deleted file mode 100644
index f2da66d..0000000
Binary files a/data/Red_Concrete_Stair_03.png and /dev/null differ
diff --git a/data/Red_Glazed_Terracotta_00.png b/data/Red_Glazed_Terracotta.png
similarity index 100%
rename from data/Red_Glazed_Terracotta_00.png
rename to data/Red_Glazed_Terracotta.png
diff --git a/data/Red_Mushroom_00.png b/data/Red_Mushroom.png
similarity index 100%
rename from data/Red_Mushroom_00.png
rename to data/Red_Mushroom.png
diff --git a/data/Red_Mushroom_Flower_Pot_00.png b/data/Red_Mushroom_Flower_Pot.png
similarity index 100%
rename from data/Red_Mushroom_Flower_Pot_00.png
rename to data/Red_Mushroom_Flower_Pot.png
diff --git a/data/Red_Nether_Brick_Block_00.png b/data/Red_Nether_Brick_Block.png
similarity index 100%
rename from data/Red_Nether_Brick_Block_00.png
rename to data/Red_Nether_Brick_Block.png
diff --git a/data/Red_Nether_Brick_Fence.png b/data/Red_Nether_Brick_Fence.png
new file mode 100644
index 0000000..88eb1c5
Binary files /dev/null and b/data/Red_Nether_Brick_Fence.png differ
diff --git a/data/Red_Nether_Brick_Fence_00.png b/data/Red_Nether_Brick_Fence_00.png
deleted file mode 100644
index 54ae36f..0000000
Binary files a/data/Red_Nether_Brick_Fence_00.png and /dev/null differ
diff --git a/data/Red_Nether_Brick_Fence_01.png b/data/Red_Nether_Brick_Fence_01.png
deleted file mode 100644
index c9745e5..0000000
Binary files a/data/Red_Nether_Brick_Fence_01.png and /dev/null differ
diff --git a/data/Nether_Brick_Fence_Gate_00.png b/data/Red_Nether_Brick_Fence_Gate.png
similarity index 69%
rename from data/Nether_Brick_Fence_Gate_00.png
rename to data/Red_Nether_Brick_Fence_Gate.png
index 72236a8..60b6f68 100644
Binary files a/data/Nether_Brick_Fence_Gate_00.png and b/data/Red_Nether_Brick_Fence_Gate.png differ
diff --git a/data/Red_Nether_Brick_Fence_Gate_01.png b/data/Red_Nether_Brick_Fence_Gate_01.png
deleted file mode 100644
index 33256ce..0000000
Binary files a/data/Red_Nether_Brick_Fence_Gate_01.png and /dev/null differ
diff --git a/data/Red_Nether_Brick_Slab_00.png b/data/Red_Nether_Brick_Slab.png
similarity index 100%
rename from data/Red_Nether_Brick_Slab_00.png
rename to data/Red_Nether_Brick_Slab.png
diff --git a/data/Red_Nether_Brick_Stair.png b/data/Red_Nether_Brick_Stair.png
new file mode 100644
index 0000000..f109680
Binary files /dev/null and b/data/Red_Nether_Brick_Stair.png differ
diff --git a/data/Red_Nether_Brick_Stair_00.png b/data/Red_Nether_Brick_Stair_00.png
deleted file mode 100644
index 873a899..0000000
Binary files a/data/Red_Nether_Brick_Stair_00.png and /dev/null differ
diff --git a/data/Red_Nether_Brick_Stair_01.png b/data/Red_Nether_Brick_Stair_01.png
deleted file mode 100644
index 75c3dd7..0000000
Binary files a/data/Red_Nether_Brick_Stair_01.png and /dev/null differ
diff --git a/data/Red_Nether_Brick_Stair_02.png b/data/Red_Nether_Brick_Stair_02.png
deleted file mode 100644
index bac3277..0000000
Binary files a/data/Red_Nether_Brick_Stair_02.png and /dev/null differ
diff --git a/data/Red_Nether_Brick_Stair_03.png b/data/Red_Nether_Brick_Stair_03.png
deleted file mode 100644
index 230e1d1..0000000
Binary files a/data/Red_Nether_Brick_Stair_03.png and /dev/null differ
diff --git a/data/Red_Nether_Brick_Wall.png b/data/Red_Nether_Brick_Wall.png
new file mode 100644
index 0000000..9f314db
Binary files /dev/null and b/data/Red_Nether_Brick_Wall.png differ
diff --git a/data/Red_Nether_Brick_Wall_00.png b/data/Red_Nether_Brick_Wall_00.png
deleted file mode 100644
index 6436f30..0000000
Binary files a/data/Red_Nether_Brick_Wall_00.png and /dev/null differ
diff --git a/data/Red_Nether_Brick_Wall_01.png b/data/Red_Nether_Brick_Wall_01.png
deleted file mode 100644
index 584464e..0000000
Binary files a/data/Red_Nether_Brick_Wall_01.png and /dev/null differ
diff --git a/data/Red_Sand_00.png b/data/Red_Sand.png
similarity index 100%
rename from data/Red_Sand_00.png
rename to data/Red_Sand.png
diff --git a/data/Red_Sandstone_00.png b/data/Red_Sandstone.png
similarity index 100%
rename from data/Red_Sandstone_00.png
rename to data/Red_Sandstone.png
diff --git a/data/Red_Sandstone_Slab_00.png b/data/Red_Sandstone_Slab.png
similarity index 100%
rename from data/Red_Sandstone_Slab_00.png
rename to data/Red_Sandstone_Slab.png
diff --git a/data/Red_Sandstone_Stair.png b/data/Red_Sandstone_Stair.png
new file mode 100644
index 0000000..cb5aefa
Binary files /dev/null and b/data/Red_Sandstone_Stair.png differ
diff --git a/data/Red_Sandstone_Stair_00.png b/data/Red_Sandstone_Stair_00.png
deleted file mode 100644
index 10df6da..0000000
Binary files a/data/Red_Sandstone_Stair_00.png and /dev/null differ
diff --git a/data/Red_Sandstone_Stair_01.png b/data/Red_Sandstone_Stair_01.png
deleted file mode 100644
index da4928c..0000000
Binary files a/data/Red_Sandstone_Stair_01.png and /dev/null differ
diff --git a/data/Red_Sandstone_Stair_02.png b/data/Red_Sandstone_Stair_02.png
deleted file mode 100644
index 8476976..0000000
Binary files a/data/Red_Sandstone_Stair_02.png and /dev/null differ
diff --git a/data/Red_Sandstone_Stair_03.png b/data/Red_Sandstone_Stair_03.png
deleted file mode 100644
index 8db0fad..0000000
Binary files a/data/Red_Sandstone_Stair_03.png and /dev/null differ
diff --git a/data/Red_Sandstone_Wall.png b/data/Red_Sandstone_Wall.png
new file mode 100644
index 0000000..8b65697
Binary files /dev/null and b/data/Red_Sandstone_Wall.png differ
diff --git a/data/Red_Sandstone_Wall_00.png b/data/Red_Sandstone_Wall_00.png
deleted file mode 100644
index 2c1650b..0000000
Binary files a/data/Red_Sandstone_Wall_00.png and /dev/null differ
diff --git a/data/Red_Sandstone_Wall_01.png b/data/Red_Sandstone_Wall_01.png
deleted file mode 100644
index a74f419..0000000
Binary files a/data/Red_Sandstone_Wall_01.png and /dev/null differ
diff --git a/data/Red_Shulker_Box_00.png b/data/Red_Shulker_Box.png
similarity index 100%
rename from data/Red_Shulker_Box_00.png
rename to data/Red_Shulker_Box.png
diff --git a/data/Red_Stained_Glass_00.png b/data/Red_Stained_Glass.png
similarity index 100%
rename from data/Red_Stained_Glass_00.png
rename to data/Red_Stained_Glass.png
diff --git a/data/Red_Stained_Glass_Pane.png b/data/Red_Stained_Glass_Pane.png
new file mode 100644
index 0000000..f72b5ef
Binary files /dev/null and b/data/Red_Stained_Glass_Pane.png differ
diff --git a/data/Red_Stained_Glass_Pane_00.png b/data/Red_Stained_Glass_Pane_00.png
deleted file mode 100644
index 0488d24..0000000
Binary files a/data/Red_Stained_Glass_Pane_00.png and /dev/null differ
diff --git a/data/Red_Stained_Glass_Pane_01.png b/data/Red_Stained_Glass_Pane_01.png
deleted file mode 100644
index 1492e76..0000000
Binary files a/data/Red_Stained_Glass_Pane_01.png and /dev/null differ
diff --git a/data/Red_Terracotta_00.png b/data/Red_Terracotta.png
similarity index 100%
rename from data/Red_Terracotta_00.png
rename to data/Red_Terracotta.png
diff --git a/data/Red_Tulip_00.png b/data/Red_Tulip.png
similarity index 100%
rename from data/Red_Tulip_00.png
rename to data/Red_Tulip.png
diff --git a/data/Red_Tulip_Flower_Pot_00.png b/data/Red_Tulip_Flower_Pot.png
similarity index 100%
rename from data/Red_Tulip_Flower_Pot_00.png
rename to data/Red_Tulip_Flower_Pot.png
diff --git a/data/Red_Wool_00.png b/data/Red_Wool.png
similarity index 100%
rename from data/Red_Wool_00.png
rename to data/Red_Wool.png
diff --git a/data/Redstone_00.png b/data/Redstone.png
similarity index 100%
rename from data/Redstone_00.png
rename to data/Redstone.png
diff --git a/data/Redstone_Block_00.png b/data/Redstone_Block.png
similarity index 100%
rename from data/Redstone_Block_00.png
rename to data/Redstone_Block.png
diff --git a/data/Redstone_Comparator_(Off)_00.png b/data/Redstone_Comparator_(Off).png
similarity index 100%
rename from data/Redstone_Comparator_(Off)_00.png
rename to data/Redstone_Comparator_(Off).png
diff --git a/data/Redstone_Comparator_(On)_00.png b/data/Redstone_Comparator_(On).png
similarity index 100%
rename from data/Redstone_Comparator_(On)_00.png
rename to data/Redstone_Comparator_(On).png
diff --git a/data/Redstone_Lamp_00.png b/data/Redstone_Lamp.png
similarity index 100%
rename from data/Redstone_Lamp_00.png
rename to data/Redstone_Lamp.png
diff --git a/data/Redstone_Ore_00.png b/data/Redstone_Ore.png
similarity index 100%
rename from data/Redstone_Ore_00.png
rename to data/Redstone_Ore.png
diff --git a/data/Redstone_Repeater_00.png b/data/Redstone_Repeater.png
similarity index 100%
rename from data/Redstone_Repeater_00.png
rename to data/Redstone_Repeater.png
diff --git a/data/Redstone_Repeater_(Powered)_00.png b/data/Redstone_Repeater_(Powered).png
similarity index 100%
rename from data/Redstone_Repeater_(Powered)_00.png
rename to data/Redstone_Repeater_(Powered).png
diff --git a/data/Redstone_Torch_00.png b/data/Redstone_Torch.png
similarity index 100%
rename from data/Redstone_Torch_00.png
rename to data/Redstone_Torch.png
diff --git a/data/Redstone_Torch_(off)_00.png b/data/Redstone_Torch_(off).png
similarity index 100%
rename from data/Redstone_Torch_(off)_00.png
rename to data/Redstone_Torch_(off).png
diff --git a/data/River_Water_Source_00.png b/data/River_Water_Source.png
similarity index 100%
rename from data/River_Water_Source_00.png
rename to data/River_Water_Source.png
diff --git a/data/Riverwaterlogged_Sponge_00.png b/data/Riverwaterlogged_Sponge.png
similarity index 100%
rename from data/Riverwaterlogged_Sponge_00.png
rename to data/Riverwaterlogged_Sponge.png
diff --git a/data/Rose_Bush_00.png b/data/Rose_Bush.png
similarity index 100%
rename from data/Rose_Bush_00.png
rename to data/Rose_Bush.png
diff --git a/data/Sand_00.png b/data/Sand.png
similarity index 100%
rename from data/Sand_00.png
rename to data/Sand.png
diff --git a/data/Sandstone_00.png b/data/Sandstone.png
similarity index 100%
rename from data/Sandstone_00.png
rename to data/Sandstone.png
diff --git a/data/Sandstone_Carved_00.png b/data/Sandstone_Carved.png
similarity index 100%
rename from data/Sandstone_Carved_00.png
rename to data/Sandstone_Carved.png
diff --git a/data/Sandstone_Slab_00.png b/data/Sandstone_Slab.png
similarity index 100%
rename from data/Sandstone_Slab_00.png
rename to data/Sandstone_Slab.png
diff --git a/data/Sandstone_Stair.png b/data/Sandstone_Stair.png
new file mode 100644
index 0000000..f093e5e
Binary files /dev/null and b/data/Sandstone_Stair.png differ
diff --git a/data/Sandstone_Stair_00.png b/data/Sandstone_Stair_00.png
deleted file mode 100644
index ff58c68..0000000
Binary files a/data/Sandstone_Stair_00.png and /dev/null differ
diff --git a/data/Sandstone_Stair_01.png b/data/Sandstone_Stair_01.png
deleted file mode 100644
index c3a517d..0000000
Binary files a/data/Sandstone_Stair_01.png and /dev/null differ
diff --git a/data/Sandstone_Stair_02.png b/data/Sandstone_Stair_02.png
deleted file mode 100644
index 24cc321..0000000
Binary files a/data/Sandstone_Stair_02.png and /dev/null differ
diff --git a/data/Sandstone_Stair_03.png b/data/Sandstone_Stair_03.png
deleted file mode 100644
index fed9784..0000000
Binary files a/data/Sandstone_Stair_03.png and /dev/null differ
diff --git a/data/Sandstone_Wall_00.png b/data/Sandstone_Wall.png
similarity index 100%
rename from data/Sandstone_Wall_00.png
rename to data/Sandstone_Wall.png
diff --git a/data/Sea_Lantern_00.png b/data/Sea_Lantern.png
similarity index 100%
rename from data/Sea_Lantern_00.png
rename to data/Sea_Lantern.png
diff --git a/data/Side_Hopper_00.png b/data/Side_Hopper.png
similarity index 100%
rename from data/Side_Hopper_00.png
rename to data/Side_Hopper.png
diff --git a/data/Skeleton_Skull.png b/data/Skeleton_Skull.png
new file mode 100644
index 0000000..10324b2
Binary files /dev/null and b/data/Skeleton_Skull.png differ
diff --git a/data/Skeleton_Skull_00.png b/data/Skeleton_Skull_00.png
deleted file mode 100644
index a827daf..0000000
Binary files a/data/Skeleton_Skull_00.png and /dev/null differ
diff --git a/data/Skeleton_Skull_01.png b/data/Skeleton_Skull_01.png
deleted file mode 100644
index 59de94b..0000000
Binary files a/data/Skeleton_Skull_01.png and /dev/null differ
diff --git a/data/Slime_Block_00.png b/data/Slime_Block.png
similarity index 100%
rename from data/Slime_Block_00.png
rename to data/Slime_Block.png
diff --git a/data/Smooth_Quartz_00.png b/data/Smooth_Quartz.png
similarity index 100%
rename from data/Smooth_Quartz_00.png
rename to data/Smooth_Quartz.png
diff --git a/data/Smooth_Quartz_Slab_00.png b/data/Smooth_Quartz_Slab.png
similarity index 100%
rename from data/Smooth_Quartz_Slab_00.png
rename to data/Smooth_Quartz_Slab.png
diff --git a/data/Smooth_Quartz_Stair.png b/data/Smooth_Quartz_Stair.png
new file mode 100644
index 0000000..4264e8f
Binary files /dev/null and b/data/Smooth_Quartz_Stair.png differ
diff --git a/data/Smooth_Quartz_Stair_00.png b/data/Smooth_Quartz_Stair_00.png
deleted file mode 100644
index 00e2bcd..0000000
Binary files a/data/Smooth_Quartz_Stair_00.png and /dev/null differ
diff --git a/data/Smooth_Quartz_Stair_01.png b/data/Smooth_Quartz_Stair_01.png
deleted file mode 100644
index f664741..0000000
Binary files a/data/Smooth_Quartz_Stair_01.png and /dev/null differ
diff --git a/data/Smooth_Quartz_Stair_02.png b/data/Smooth_Quartz_Stair_02.png
deleted file mode 100644
index 68d1ac2..0000000
Binary files a/data/Smooth_Quartz_Stair_02.png and /dev/null differ
diff --git a/data/Smooth_Quartz_Stair_03.png b/data/Smooth_Quartz_Stair_03.png
deleted file mode 100644
index def410e..0000000
Binary files a/data/Smooth_Quartz_Stair_03.png and /dev/null differ
diff --git a/data/Smooth_Red_Sandstone_00.png b/data/Smooth_Red_Sandstone.png
similarity index 100%
rename from data/Smooth_Red_Sandstone_00.png
rename to data/Smooth_Red_Sandstone.png
diff --git a/data/Smooth_Red_Sandstone_Slab_00.png b/data/Smooth_Red_Sandstone_Slab.png
similarity index 100%
rename from data/Smooth_Red_Sandstone_Slab_00.png
rename to data/Smooth_Red_Sandstone_Slab.png
diff --git a/data/Smooth_Red_Sandstone_Stair.png b/data/Smooth_Red_Sandstone_Stair.png
new file mode 100644
index 0000000..d4f6e4a
Binary files /dev/null and b/data/Smooth_Red_Sandstone_Stair.png differ
diff --git a/data/Smooth_Red_Sandstone_Stair_00.png b/data/Smooth_Red_Sandstone_Stair_00.png
deleted file mode 100644
index 0d0f91e..0000000
Binary files a/data/Smooth_Red_Sandstone_Stair_00.png and /dev/null differ
diff --git a/data/Smooth_Red_Sandstone_Stair_01.png b/data/Smooth_Red_Sandstone_Stair_01.png
deleted file mode 100644
index 45ea4f8..0000000
Binary files a/data/Smooth_Red_Sandstone_Stair_01.png and /dev/null differ
diff --git a/data/Smooth_Red_Sandstone_Stair_02.png b/data/Smooth_Red_Sandstone_Stair_02.png
deleted file mode 100644
index 5ca3992..0000000
Binary files a/data/Smooth_Red_Sandstone_Stair_02.png and /dev/null differ
diff --git a/data/Smooth_Red_Sandstone_Stair_03.png b/data/Smooth_Red_Sandstone_Stair_03.png
deleted file mode 100644
index d192f3e..0000000
Binary files a/data/Smooth_Red_Sandstone_Stair_03.png and /dev/null differ
diff --git a/data/Smooth_Sandstone_00.png b/data/Smooth_Sandstone.png
similarity index 100%
rename from data/Smooth_Sandstone_00.png
rename to data/Smooth_Sandstone.png
diff --git a/data/Smooth_Sandstone_Slab_00.png b/data/Smooth_Sandstone_Slab.png
similarity index 100%
rename from data/Smooth_Sandstone_Slab_00.png
rename to data/Smooth_Sandstone_Slab.png
diff --git a/data/Smooth_Sandstone_Stair.png b/data/Smooth_Sandstone_Stair.png
new file mode 100644
index 0000000..7bf7076
Binary files /dev/null and b/data/Smooth_Sandstone_Stair.png differ
diff --git a/data/Smooth_Sandstone_Stair_00.png b/data/Smooth_Sandstone_Stair_00.png
deleted file mode 100644
index 6f6e7b4..0000000
Binary files a/data/Smooth_Sandstone_Stair_00.png and /dev/null differ
diff --git a/data/Smooth_Sandstone_Stair_01.png b/data/Smooth_Sandstone_Stair_01.png
deleted file mode 100644
index adbc0e1..0000000
Binary files a/data/Smooth_Sandstone_Stair_01.png and /dev/null differ
diff --git a/data/Smooth_Sandstone_Stair_02.png b/data/Smooth_Sandstone_Stair_02.png
deleted file mode 100644
index 365b9b4..0000000
Binary files a/data/Smooth_Sandstone_Stair_02.png and /dev/null differ
diff --git a/data/Smooth_Sandstone_Stair_03.png b/data/Smooth_Sandstone_Stair_03.png
deleted file mode 100644
index 25561d5..0000000
Binary files a/data/Smooth_Sandstone_Stair_03.png and /dev/null differ
diff --git a/data/Snow_Block_00.png b/data/Snow_Block.png
similarity index 100%
rename from data/Snow_Block_00.png
rename to data/Snow_Block.png
diff --git a/data/Snow_Layer_00.png b/data/Snow_Layer.png
similarity index 100%
rename from data/Snow_Layer_00.png
rename to data/Snow_Layer.png
diff --git a/data/Soul_Sand_00.png b/data/Soul_Sand.png
similarity index 100%
rename from data/Soul_Sand_00.png
rename to data/Soul_Sand.png
diff --git a/data/Sponge_00.png b/data/Sponge.png
similarity index 100%
rename from data/Sponge_00.png
rename to data/Sponge.png
diff --git a/data/Spruce_00.png b/data/Spruce.png
similarity index 100%
rename from data/Spruce_00.png
rename to data/Spruce.png
diff --git a/data/Spruce_Bark_00.png b/data/Spruce_Bark.png
similarity index 100%
rename from data/Spruce_Bark_00.png
rename to data/Spruce_Bark.png
diff --git a/data/Spruce_Bark_Slab_00.png b/data/Spruce_Bark_Slab.png
similarity index 100%
rename from data/Spruce_Bark_Slab_00.png
rename to data/Spruce_Bark_Slab.png
diff --git a/data/Spruce_Bark_Stair.png b/data/Spruce_Bark_Stair.png
new file mode 100644
index 0000000..8653b72
Binary files /dev/null and b/data/Spruce_Bark_Stair.png differ
diff --git a/data/Spruce_Bark_Stair_00.png b/data/Spruce_Bark_Stair_00.png
deleted file mode 100644
index 09ca58d..0000000
Binary files a/data/Spruce_Bark_Stair_00.png and /dev/null differ
diff --git a/data/Spruce_Bark_Stair_01.png b/data/Spruce_Bark_Stair_01.png
deleted file mode 100644
index f2e5144..0000000
Binary files a/data/Spruce_Bark_Stair_01.png and /dev/null differ
diff --git a/data/Spruce_Bark_Stair_02.png b/data/Spruce_Bark_Stair_02.png
deleted file mode 100644
index d111877..0000000
Binary files a/data/Spruce_Bark_Stair_02.png and /dev/null differ
diff --git a/data/Spruce_Bark_Stair_03.png b/data/Spruce_Bark_Stair_03.png
deleted file mode 100644
index 6080b38..0000000
Binary files a/data/Spruce_Bark_Stair_03.png and /dev/null differ
diff --git a/data/Spruce_Button.png b/data/Spruce_Button.png
new file mode 100644
index 0000000..60a66af
Binary files /dev/null and b/data/Spruce_Button.png differ
diff --git a/data/Spruce_Button_00.png b/data/Spruce_Button_00.png
deleted file mode 100644
index 3a020f2..0000000
Binary files a/data/Spruce_Button_00.png and /dev/null differ
diff --git a/data/Spruce_Button_01.png b/data/Spruce_Button_01.png
deleted file mode 100644
index ad7bf4f..0000000
Binary files a/data/Spruce_Button_01.png and /dev/null differ
diff --git a/data/Spruce_Fence.png b/data/Spruce_Fence.png
new file mode 100644
index 0000000..c5a12a8
Binary files /dev/null and b/data/Spruce_Fence.png differ
diff --git a/data/Spruce_Fence_00.png b/data/Spruce_Fence_00.png
deleted file mode 100644
index 2be6e90..0000000
Binary files a/data/Spruce_Fence_00.png and /dev/null differ
diff --git a/data/Spruce_Fence_01.png b/data/Spruce_Fence_01.png
deleted file mode 100644
index d60e07e..0000000
Binary files a/data/Spruce_Fence_01.png and /dev/null differ
diff --git a/data/Spruce_Fence_Gate_00.png b/data/Spruce_Fence_Gate.png
similarity index 67%
rename from data/Spruce_Fence_Gate_00.png
rename to data/Spruce_Fence_Gate.png
index ea73c06..d76bd62 100644
Binary files a/data/Spruce_Fence_Gate_00.png and b/data/Spruce_Fence_Gate.png differ
diff --git a/data/Spruce_Fence_Gate_01.png b/data/Spruce_Fence_Gate_01.png
deleted file mode 100644
index d5d1764..0000000
Binary files a/data/Spruce_Fence_Gate_01.png and /dev/null differ
diff --git a/data/Spruce_Leaves_00.png b/data/Spruce_Leaves.png
similarity index 100%
rename from data/Spruce_Leaves_00.png
rename to data/Spruce_Leaves.png
diff --git a/data/Spruce_Log_00.png b/data/Spruce_Log.png
similarity index 100%
rename from data/Spruce_Log_00.png
rename to data/Spruce_Log.png
diff --git a/data/Spruce_Pressure_Plate_00.png b/data/Spruce_Pressure_Plate.png
similarity index 100%
rename from data/Spruce_Pressure_Plate_00.png
rename to data/Spruce_Pressure_Plate.png
diff --git a/data/Spruce_Sapling_00.png b/data/Spruce_Sapling.png
similarity index 100%
rename from data/Spruce_Sapling_00.png
rename to data/Spruce_Sapling.png
diff --git a/data/Spruce_Sapling_Flower_Pot_00.png b/data/Spruce_Sapling_Flower_Pot.png
similarity index 100%
rename from data/Spruce_Sapling_Flower_Pot_00.png
rename to data/Spruce_Sapling_Flower_Pot.png
diff --git a/data/Spruce_Slab_00.png b/data/Spruce_Slab.png
similarity index 100%
rename from data/Spruce_Slab_00.png
rename to data/Spruce_Slab.png
diff --git a/data/Spruce_Stair.png b/data/Spruce_Stair.png
new file mode 100644
index 0000000..859f53c
Binary files /dev/null and b/data/Spruce_Stair.png differ
diff --git a/data/Spruce_Stair_00.png b/data/Spruce_Stair_00.png
deleted file mode 100644
index 5ab4df6..0000000
Binary files a/data/Spruce_Stair_00.png and /dev/null differ
diff --git a/data/Spruce_Stair_01.png b/data/Spruce_Stair_01.png
deleted file mode 100644
index 56090cc..0000000
Binary files a/data/Spruce_Stair_01.png and /dev/null differ
diff --git a/data/Spruce_Stair_02.png b/data/Spruce_Stair_02.png
deleted file mode 100644
index 8ad3a6a..0000000
Binary files a/data/Spruce_Stair_02.png and /dev/null differ
diff --git a/data/Spruce_Stair_03.png b/data/Spruce_Stair_03.png
deleted file mode 100644
index 64f963e..0000000
Binary files a/data/Spruce_Stair_03.png and /dev/null differ
diff --git a/data/Spruce_Trapdoor_00.png b/data/Spruce_Trapdoor.png
similarity index 100%
rename from data/Spruce_Trapdoor_00.png
rename to data/Spruce_Trapdoor.png
diff --git a/data/Sticky_Piston_00.png b/data/Sticky_Piston.png
similarity index 100%
rename from data/Sticky_Piston_00.png
rename to data/Sticky_Piston.png
diff --git a/data/Stone_00.png b/data/Stone.png
similarity index 100%
rename from data/Stone_00.png
rename to data/Stone.png
diff --git a/data/Stone_01.png b/data/Stone_01.png
deleted file mode 100644
index c1e457e..0000000
Binary files a/data/Stone_01.png and /dev/null differ
diff --git a/data/Stone_Brick_00.png b/data/Stone_Brick.png
similarity index 100%
rename from data/Stone_Brick_00.png
rename to data/Stone_Brick.png
diff --git a/data/Stone_Brick_Carved_00.png b/data/Stone_Brick_Carved.png
similarity index 100%
rename from data/Stone_Brick_Carved_00.png
rename to data/Stone_Brick_Carved.png
diff --git a/data/Stone_Brick_Cracked_00.png b/data/Stone_Brick_Cracked.png
similarity index 100%
rename from data/Stone_Brick_Cracked_00.png
rename to data/Stone_Brick_Cracked.png
diff --git a/data/Stone_Brick_Slab_00.png b/data/Stone_Brick_Slab.png
similarity index 100%
rename from data/Stone_Brick_Slab_00.png
rename to data/Stone_Brick_Slab.png
diff --git a/data/Stone_Brick_Stair.png b/data/Stone_Brick_Stair.png
new file mode 100644
index 0000000..32dba9c
Binary files /dev/null and b/data/Stone_Brick_Stair.png differ
diff --git a/data/Stone_Brick_Stair_00.png b/data/Stone_Brick_Stair_00.png
deleted file mode 100644
index 4a66f92..0000000
Binary files a/data/Stone_Brick_Stair_00.png and /dev/null differ
diff --git a/data/Stone_Brick_Stair_01.png b/data/Stone_Brick_Stair_01.png
deleted file mode 100644
index 7427722..0000000
Binary files a/data/Stone_Brick_Stair_01.png and /dev/null differ
diff --git a/data/Stone_Brick_Stair_02.png b/data/Stone_Brick_Stair_02.png
deleted file mode 100644
index ca462ae..0000000
Binary files a/data/Stone_Brick_Stair_02.png and /dev/null differ
diff --git a/data/Stone_Brick_Stair_03.png b/data/Stone_Brick_Stair_03.png
deleted file mode 100644
index 08f5eec..0000000
Binary files a/data/Stone_Brick_Stair_03.png and /dev/null differ
diff --git a/data/Stone_Brick_Wall_00.png b/data/Stone_Brick_Wall.png
similarity index 100%
rename from data/Stone_Brick_Wall_00.png
rename to data/Stone_Brick_Wall.png
diff --git a/data/Stone_Button.png b/data/Stone_Button.png
new file mode 100644
index 0000000..3077c96
Binary files /dev/null and b/data/Stone_Button.png differ
diff --git a/data/Stone_Button_00.png b/data/Stone_Button_00.png
deleted file mode 100644
index fbb9f56..0000000
Binary files a/data/Stone_Button_00.png and /dev/null differ
diff --git a/data/Stone_Button_01.png b/data/Stone_Button_01.png
deleted file mode 100644
index 430d838..0000000
Binary files a/data/Stone_Button_01.png and /dev/null differ
diff --git a/data/Stone_Pressure_Plate_00.png b/data/Stone_Pressure_Plate.png
similarity index 100%
rename from data/Stone_Pressure_Plate_00.png
rename to data/Stone_Pressure_Plate.png
diff --git a/data/Stone_Slab_00.png b/data/Stone_Slab.png
similarity index 100%
rename from data/Stone_Slab_00.png
rename to data/Stone_Slab.png
diff --git a/data/Stone_Stair.png b/data/Stone_Stair.png
new file mode 100644
index 0000000..61d8d4c
Binary files /dev/null and b/data/Stone_Stair.png differ
diff --git a/data/Stone_Stair_00.png b/data/Stone_Stair_00.png
deleted file mode 100644
index 9a8875d..0000000
Binary files a/data/Stone_Stair_00.png and /dev/null differ
diff --git a/data/Stone_Stair_01.png b/data/Stone_Stair_01.png
deleted file mode 100644
index 1cf0634..0000000
Binary files a/data/Stone_Stair_01.png and /dev/null differ
diff --git a/data/Stone_Stair_02.png b/data/Stone_Stair_02.png
deleted file mode 100644
index b8de57d..0000000
Binary files a/data/Stone_Stair_02.png and /dev/null differ
diff --git a/data/Stone_Stair_03.png b/data/Stone_Stair_03.png
deleted file mode 100644
index 767245a..0000000
Binary files a/data/Stone_Stair_03.png and /dev/null differ
diff --git a/data/Sugar_Canes.png b/data/Sugar_Canes.png
new file mode 100644
index 0000000..03e916f
Binary files /dev/null and b/data/Sugar_Canes.png differ
diff --git a/data/Sugar_Canes_00.png b/data/Sugar_Canes_00.png
deleted file mode 100644
index c6de5ad..0000000
Binary files a/data/Sugar_Canes_00.png and /dev/null differ
diff --git a/data/Sugar_Canes_01.png b/data/Sugar_Canes_01.png
deleted file mode 100644
index 32e5745..0000000
Binary files a/data/Sugar_Canes_01.png and /dev/null differ
diff --git a/data/Sunflower_00.png b/data/Sunflower.png
similarity index 100%
rename from data/Sunflower_00.png
rename to data/Sunflower.png
diff --git a/data/TNT_00.png b/data/TNT.png
similarity index 100%
rename from data/TNT_00.png
rename to data/TNT.png
diff --git a/data/Tall_Grass_00.png b/data/Tall_Grass.png
similarity index 100%
rename from data/Tall_Grass_00.png
rename to data/Tall_Grass.png
diff --git a/data/Terracotta_00.png b/data/Terracotta.png
similarity index 100%
rename from data/Terracotta_00.png
rename to data/Terracotta.png
diff --git a/data/Torch_00.png b/data/Torch.png
similarity index 100%
rename from data/Torch_00.png
rename to data/Torch.png
diff --git a/data/Trapdoor_00.png b/data/Trapdoor.png
similarity index 100%
rename from data/Trapdoor_00.png
rename to data/Trapdoor.png
diff --git a/data/Trapped_Chest.png b/data/Trapped_Chest.png
new file mode 100644
index 0000000..f01854c
Binary files /dev/null and b/data/Trapped_Chest.png differ
diff --git a/data/Trapped_Chest_00.png b/data/Trapped_Chest_00.png
deleted file mode 100644
index 015caaa..0000000
Binary files a/data/Trapped_Chest_00.png and /dev/null differ
diff --git a/data/Trapped_Chest_01.png b/data/Trapped_Chest_01.png
deleted file mode 100644
index 8219502..0000000
Binary files a/data/Trapped_Chest_01.png and /dev/null differ
diff --git a/data/Vines_00.png b/data/Vines.png
similarity index 100%
rename from data/Vines_00.png
rename to data/Vines.png
diff --git a/data/Void_00.png b/data/Void.png
similarity index 100%
rename from data/Void_00.png
rename to data/Void.png
diff --git a/data/Water_Source_00.png b/data/Water_Source.png
similarity index 100%
rename from data/Water_Source_00.png
rename to data/Water_Source.png
diff --git a/data/Waterlily_00.png b/data/Waterlily.png
similarity index 100%
rename from data/Waterlily_00.png
rename to data/Waterlily.png
diff --git a/data/Waterlogged_Sponge_00.png b/data/Waterlogged_Sponge.png
similarity index 100%
rename from data/Waterlogged_Sponge_00.png
rename to data/Waterlogged_Sponge.png
diff --git a/data/White_Bed.png b/data/White_Bed.png
new file mode 100644
index 0000000..1f1029a
Binary files /dev/null and b/data/White_Bed.png differ
diff --git a/data/White_Bed_00.png b/data/White_Bed_00.png
deleted file mode 100644
index b48f19b..0000000
Binary files a/data/White_Bed_00.png and /dev/null differ
diff --git a/data/White_Bed_01.png b/data/White_Bed_01.png
deleted file mode 100644
index 0176c99..0000000
Binary files a/data/White_Bed_01.png and /dev/null differ
diff --git a/data/White_Carpet_00.png b/data/White_Carpet.png
similarity index 100%
rename from data/White_Carpet_00.png
rename to data/White_Carpet.png
diff --git a/data/White_Concrete_00.png b/data/White_Concrete.png
similarity index 100%
rename from data/White_Concrete_00.png
rename to data/White_Concrete.png
diff --git a/data/White_Concrete_Powder_00.png b/data/White_Concrete_Powder.png
similarity index 100%
rename from data/White_Concrete_Powder_00.png
rename to data/White_Concrete_Powder.png
diff --git a/data/White_Concrete_Slab_00.png b/data/White_Concrete_Slab.png
similarity index 100%
rename from data/White_Concrete_Slab_00.png
rename to data/White_Concrete_Slab.png
diff --git a/data/White_Concrete_Stair.png b/data/White_Concrete_Stair.png
new file mode 100644
index 0000000..fd798b2
Binary files /dev/null and b/data/White_Concrete_Stair.png differ
diff --git a/data/White_Concrete_Stair_00.png b/data/White_Concrete_Stair_00.png
deleted file mode 100644
index 4d277db..0000000
Binary files a/data/White_Concrete_Stair_00.png and /dev/null differ
diff --git a/data/White_Concrete_Stair_01.png b/data/White_Concrete_Stair_01.png
deleted file mode 100644
index 878a0ec..0000000
Binary files a/data/White_Concrete_Stair_01.png and /dev/null differ
diff --git a/data/White_Concrete_Stair_02.png b/data/White_Concrete_Stair_02.png
deleted file mode 100644
index e3abc81..0000000
Binary files a/data/White_Concrete_Stair_02.png and /dev/null differ
diff --git a/data/White_Concrete_Stair_03.png b/data/White_Concrete_Stair_03.png
deleted file mode 100644
index 73e9cee..0000000
Binary files a/data/White_Concrete_Stair_03.png and /dev/null differ
diff --git a/data/White_Glass_Pane.png b/data/White_Glass_Pane.png
new file mode 100644
index 0000000..633bda0
Binary files /dev/null and b/data/White_Glass_Pane.png differ
diff --git a/data/White_Glass_Pane_00.png b/data/White_Glass_Pane_00.png
deleted file mode 100644
index 967ab5a..0000000
Binary files a/data/White_Glass_Pane_00.png and /dev/null differ
diff --git a/data/White_Glass_Pane_01.png b/data/White_Glass_Pane_01.png
deleted file mode 100644
index eed7da4..0000000
Binary files a/data/White_Glass_Pane_01.png and /dev/null differ
diff --git a/data/White_Glazed_Terracotta_00.png b/data/White_Glazed_Terracotta.png
similarity index 100%
rename from data/White_Glazed_Terracotta_00.png
rename to data/White_Glazed_Terracotta.png
diff --git a/data/White_Shulker_Box_00.png b/data/White_Shulker_Box.png
similarity index 100%
rename from data/White_Shulker_Box_00.png
rename to data/White_Shulker_Box.png
diff --git a/data/White_Stained_Glass_00.png b/data/White_Stained_Glass.png
similarity index 100%
rename from data/White_Stained_Glass_00.png
rename to data/White_Stained_Glass.png
diff --git a/data/White_Stained_Glass_Pane.png b/data/White_Stained_Glass_Pane.png
new file mode 100644
index 0000000..4bb19a5
Binary files /dev/null and b/data/White_Stained_Glass_Pane.png differ
diff --git a/data/White_Stained_Glass_Pane_00.png b/data/White_Stained_Glass_Pane_00.png
deleted file mode 100644
index 4b29c49..0000000
Binary files a/data/White_Stained_Glass_Pane_00.png and /dev/null differ
diff --git a/data/White_Stained_Glass_Pane_01.png b/data/White_Stained_Glass_Pane_01.png
deleted file mode 100644
index 25fb937..0000000
Binary files a/data/White_Stained_Glass_Pane_01.png and /dev/null differ
diff --git a/data/White_Terracotta_00.png b/data/White_Terracotta.png
similarity index 100%
rename from data/White_Terracotta_00.png
rename to data/White_Terracotta.png
diff --git a/data/White_Tulip_00.png b/data/White_Tulip.png
similarity index 100%
rename from data/White_Tulip_00.png
rename to data/White_Tulip.png
diff --git a/data/White_Tulip_Flower_Pot_00.png b/data/White_Tulip_Flower_Pot.png
similarity index 100%
rename from data/White_Tulip_Flower_Pot_00.png
rename to data/White_Tulip_Flower_Pot.png
diff --git a/data/Wither_Skeleton_Skull.png b/data/Wither_Skeleton_Skull.png
new file mode 100644
index 0000000..21b4c1c
Binary files /dev/null and b/data/Wither_Skeleton_Skull.png differ
diff --git a/data/Wither_Skeleton_Skull_00.png b/data/Wither_Skeleton_Skull_00.png
deleted file mode 100644
index 7fbe270..0000000
Binary files a/data/Wither_Skeleton_Skull_00.png and /dev/null differ
diff --git a/data/Wither_Skeleton_Skull_01.png b/data/Wither_Skeleton_Skull_01.png
deleted file mode 100644
index 405b2ee..0000000
Binary files a/data/Wither_Skeleton_Skull_01.png and /dev/null differ
diff --git a/data/Wool_00.png b/data/Wool.png
similarity index 100%
rename from data/Wool_00.png
rename to data/Wool.png
diff --git a/data/Yellow_Bed.png b/data/Yellow_Bed.png
new file mode 100644
index 0000000..c2b699d
Binary files /dev/null and b/data/Yellow_Bed.png differ
diff --git a/data/Yellow_Bed_00.png b/data/Yellow_Bed_00.png
deleted file mode 100644
index 4d13b0b..0000000
Binary files a/data/Yellow_Bed_00.png and /dev/null differ
diff --git a/data/Yellow_Bed_01.png b/data/Yellow_Bed_01.png
deleted file mode 100644
index 5d5fde5..0000000
Binary files a/data/Yellow_Bed_01.png and /dev/null differ
diff --git a/data/Yellow_Carpet_00.png b/data/Yellow_Carpet.png
similarity index 100%
rename from data/Yellow_Carpet_00.png
rename to data/Yellow_Carpet.png
diff --git a/data/Yellow_Concrete_00.png b/data/Yellow_Concrete.png
similarity index 100%
rename from data/Yellow_Concrete_00.png
rename to data/Yellow_Concrete.png
diff --git a/data/Yellow_Concrete_Powder_00.png b/data/Yellow_Concrete_Powder.png
similarity index 100%
rename from data/Yellow_Concrete_Powder_00.png
rename to data/Yellow_Concrete_Powder.png
diff --git a/data/Yellow_Concrete_Slab_00.png b/data/Yellow_Concrete_Slab.png
similarity index 100%
rename from data/Yellow_Concrete_Slab_00.png
rename to data/Yellow_Concrete_Slab.png
diff --git a/data/Yellow_Concrete_Stair.png b/data/Yellow_Concrete_Stair.png
new file mode 100644
index 0000000..9a4b0d1
Binary files /dev/null and b/data/Yellow_Concrete_Stair.png differ
diff --git a/data/Yellow_Concrete_Stair_00.png b/data/Yellow_Concrete_Stair_00.png
deleted file mode 100644
index b8b9d55..0000000
Binary files a/data/Yellow_Concrete_Stair_00.png and /dev/null differ
diff --git a/data/Yellow_Concrete_Stair_01.png b/data/Yellow_Concrete_Stair_01.png
deleted file mode 100644
index cb0e65b..0000000
Binary files a/data/Yellow_Concrete_Stair_01.png and /dev/null differ
diff --git a/data/Yellow_Concrete_Stair_02.png b/data/Yellow_Concrete_Stair_02.png
deleted file mode 100644
index 2abbf91..0000000
Binary files a/data/Yellow_Concrete_Stair_02.png and /dev/null differ
diff --git a/data/Yellow_Concrete_Stair_03.png b/data/Yellow_Concrete_Stair_03.png
deleted file mode 100644
index 3c5c51c..0000000
Binary files a/data/Yellow_Concrete_Stair_03.png and /dev/null differ
diff --git a/data/Yellow_Glazed_Terracotta_00.png b/data/Yellow_Glazed_Terracotta.png
similarity index 100%
rename from data/Yellow_Glazed_Terracotta_00.png
rename to data/Yellow_Glazed_Terracotta.png
diff --git a/data/Yellow_Shulker_Box_00.png b/data/Yellow_Shulker_Box.png
similarity index 100%
rename from data/Yellow_Shulker_Box_00.png
rename to data/Yellow_Shulker_Box.png
diff --git a/data/Yellow_Stained_Glass_00.png b/data/Yellow_Stained_Glass.png
similarity index 100%
rename from data/Yellow_Stained_Glass_00.png
rename to data/Yellow_Stained_Glass.png
diff --git a/data/Yellow_Stained_Glass_Pane.png b/data/Yellow_Stained_Glass_Pane.png
new file mode 100644
index 0000000..a5a9937
Binary files /dev/null and b/data/Yellow_Stained_Glass_Pane.png differ
diff --git a/data/Yellow_Stained_Glass_Pane_00.png b/data/Yellow_Stained_Glass_Pane_00.png
deleted file mode 100644
index 7d8587e..0000000
Binary files a/data/Yellow_Stained_Glass_Pane_00.png and /dev/null differ
diff --git a/data/Yellow_Stained_Glass_Pane_01.png b/data/Yellow_Stained_Glass_Pane_01.png
deleted file mode 100644
index e696ef8..0000000
Binary files a/data/Yellow_Stained_Glass_Pane_01.png and /dev/null differ
diff --git a/data/Yellow_Terracotta_00.png b/data/Yellow_Terracotta.png
similarity index 100%
rename from data/Yellow_Terracotta_00.png
rename to data/Yellow_Terracotta.png
diff --git a/data/Yellow_Wool_00.png b/data/Yellow_Wool.png
similarity index 100%
rename from data/Yellow_Wool_00.png
rename to data/Yellow_Wool.png
diff --git a/data/Zombie_Head.png b/data/Zombie_Head.png
new file mode 100644
index 0000000..8fc01ba
Binary files /dev/null and b/data/Zombie_Head.png differ
diff --git a/data/Zombie_Head_00.png b/data/Zombie_Head_00.png
deleted file mode 100644
index 4dcea4b..0000000
Binary files a/data/Zombie_Head_00.png and /dev/null differ
diff --git a/data/Zombie_Head_01.png b/data/Zombie_Head_01.png
deleted file mode 100644
index 1c1c210..0000000
Binary files a/data/Zombie_Head_01.png and /dev/null differ
diff --git a/docs/batch.md b/docs/batch.md
index e8f8bd0..7b9eaa3 100644
--- a/docs/batch.md
+++ b/docs/batch.md
@@ -62,7 +62,7 @@ You can also use numbers, starting from 1 (which means the 5th coloumn, as the f
This will save a file by the same name as the MTS but with ".png" extension, like "somedir/structure.png".
```
-./mtsedit -P structure.mts
+./mtsedit -P somedir/structure.mts
```
With uppercase "P", you can cut the structure in half to peek inside.
@@ -72,12 +72,11 @@ This wasn't a planned feature, but I needed quick and dirty tool to generate dif
a cube block node image.
```
-./mtsedit -g Gold_Block_00.png
+./mtsedit -g Gold_Block.png
```
-This will save "Gold_Block_Slab_00.png", "Double_Gold_Block_Slab_00.png", "Gold_Block_Stair_00.png", "Gold_Block_Stair_01.png",
-"Gold_Block_Stair_02.png" and "Gold_Block_Stair_03.png". Also saves a mirrored image by the name "Gold_Block_01.png". If you
-dont' need this, just delete it. Mirroring does not look good because of the wrong direction of the shadow, but better than nothing
-for nodes like furnace. For a proper solution, generate block images from textures.
+This will save "Gold_Block_Slab.png", "Double_Gold_Block_Slab.png" and "Gold_Block_Stair.png". Also saves a mirrored image added
+to "Gold_Block.png" if it's height is 32. Mirroring does not look good because of the wrong direction of the shadow, but better
+than nothing for nodes like furnace. For a proper solution, generate block images from textures.
### Generate Block Images from Textures
@@ -93,8 +92,8 @@ specify a block id (canonical name) and only that particular block's images will
```
./mtsedit -t ~/.minetest/worlds/MyWorld/blockimgs.csv Crafting_Table
```
-If you specify a block node (drawing type normal) then its slab, double slab and stair variants will be generated too, if they
+If you specify a block node (drawing type normal) then its slab, double slab and stair variants will be generated too if they
are defined in the blockimgs.csv. There's no need to call `-t` with "Cobblestone_Stair" for example, just with "Cobblestone".
-In order to work, the block types must be named like this: ends with "_Slab"; starts with "Double_" and ends with "_Slab"; or
-ends with "_Stair".
+In order to work, the block types must be named like this: ends with "\_Slab"; starts with "Double\_" and ends with "\_Slab"; or
+ends with "\_Stair".
diff --git a/docs/blocks.md b/docs/blocks.md
index 124f1d1..48c28cb 100644
--- a/docs/blocks.md
+++ b/docs/blocks.md
@@ -27,7 +27,7 @@ from within the game (with all your desired mods enabled).
### Header
The first row is special, it defines the coloumn names. The first 4 coloumns are irrelevant and not parsed, others
-define the name of the block mapping.
+define the name of the block mapping (each coloumn is one mapping).
### Coloumns
@@ -36,24 +36,24 @@ define the name of the block mapping.
| 1st | string | block id, canonical name of the block (also used to identify block images) |
| 2nd | intlist | list of slash '/' separated integer numbers, the Minecraft BlockID in schematic files |
| 3rd | string | an optional biome specific name for the block (like "biome:node_stone") |
-| 4th | string | an optional mapgen alias name for the block |
+| 4th | string | an optional mapgen alias name for the block (like "mapgen_stone") |
| 5th+ | string | block's name in the mapping (this coloumn may be repated as many times as you like) |
-Block mapping are also referenced as palette.
+Block mapping are sometimes referenced as node palette.
Block Images
------------
-Each block type may have more, but must have at least one image in the `data` directory. These are named as:
+Each block type should have one image in the `data` directory. These are named as:
```
-(block id)_(param2).png
+(block id).png
```
-The first part "block type" cames from the canonical name (1st coloumn), but with spaces converted to underscores '\_'. The
-second part, "param2" is a hexa-decimal value and represents the orientation. If the block has only one image, then it must be
-"00", meaning block's image when the block is facing North. Other values are: "01" rotated by 90 degrees clockwise (facing East),
-"02" rotated by 180 degrees (faces South), "03" rotated by 90 degrees counter-clockwise (faces West). Values "04"-"1F"
-are only used for blocks that can be rotated upside-down too, like stairs, but I honestly have no clue how. MTSEdit wouldn't
-care, it will simply allow all rotations for which there's an image.
+The "block id" cames from the canonical name (1st coloumn), but with spaces converted to underscores '\_'. This image must be
+32 pixels wide, and its height must be multiple of 32. How many 32 x 32 icons it contains specifies how many `param2` values
+are shown (regardless you can set all param2 values). When there are more block icons, then their positions are as follows:
+y = 0: the block is facing North, y = 32: rotated by 90 degrees clockwise (facing East), y = 64: rotated by 180 degrees (faces
+South), y = 96: rotated by 90 degrees counter-clockwise (faces West). If they exists, icons for param values 04-1F are shown
+too, otherwise the existing icons are repeated.
Hint: the MTSEdit tool can generate slab and stair images from block pictures using the `-g` option. This will only generate the
first 4 orientation, a slab, and a mirrored verion of the original block. The `-t` uses the textures from the game, and it can
diff --git a/docs/mts_format.md b/docs/mts_format.md
index 233f00c..45aec31 100644
--- a/docs/mts_format.md
+++ b/docs/mts_format.md
@@ -75,8 +75,8 @@ force placement, but I haven't seen any MTS files yet with that bit set. MTSEdit
Rotation information is stored in `param2`. This is the worst documented part of the MTS files. It sometimes has large values,
what I could make out from C++ source, orentation is as follows: 0 means normal orientation (block faces North), 1 means rotated
by 90 degrees (faces East), 2 means rotated by 180 degrees (faces South), and 3 means rotated by 90 degrees counter clock-wise
-(faces West). I have absoultely no idea what 4-31 supposed to mean, but MTSEdit will allow those if you provide images for those
-rotations.
+(faces West). I have absoultely no idea what 4-31 supposed to mean, but MTSEdit will allow those too. If you provide images with
+more than 4 icons, they will be shown for those rotations.
#### Addition to the MTS Specification
diff --git a/docs/usage.md b/docs/usage.md
index fcaefd4..a4dc993 100644
--- a/docs/usage.md
+++ b/docs/usage.md
@@ -26,7 +26,7 @@ environment variable, or add `-l` to command line. Supported languages:
- "fr" Français
- "de" Deutch
- "pl" Polski
- - "ru" русский
+ - "ru" Русский
```
LANG=hu ./mtsedit monkeyisland.mts
@@ -69,7 +69,12 @@ On the bottom left corner, you find the Layer-related options `C`:
5. Current Layer's Probability
The bottom line is the status bar `D`. You'll see the block names here as you hover over them. Messages like file saved also shown
-here. On the right, you see the current zoom ratio, and the brush's height and shape.
+here. On the right, you see:
+
+1. current block's rotation (00 - 1F)
+2. current block's force placement indicator icon
+3. the current zoom ratio, and
+4. the brush's height and shape.
Everything else on the screen is the main editor area `E`.
@@ -126,6 +131,7 @@ Main editor window:
| Ctrl + V | remove current Z layer |
| B | select brush (use geometric objects) |
| N | toggle grid |
+| A | toggle show all / show current layer only |
| M / Tab | open block map, search all available blocks |
| , / < | zoom out |
| . / > | zoom in |
diff --git a/mtsedit-i686-win.zip b/mtsedit-i686-win.zip
index 7741427..c2cfd44 100644
Binary files a/mtsedit-i686-win.zip and b/mtsedit-i686-win.zip differ
diff --git a/mtsedit-x86_64-linux.tgz b/mtsedit-x86_64-linux.tgz
index 3e4bd83..498ae5a 100644
Binary files a/mtsedit-x86_64-linux.tgz and b/mtsedit-x86_64-linux.tgz differ
diff --git a/src/Makefile b/src/Makefile
index 49f12d9..c820876 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -8,7 +8,7 @@ TARGET = mtsedit
SRCS = $(filter-out bin2h.c,$(wildcard *.c))
OBJS = $(SRCS:.c=.o)
-CFLAGS = -Wall -Wextra -ansi -pedantic -g
+CFLAGS = -Wall -Wextra -ansi -pedantic
# MacOSX
ifneq ("$(wildcard $(MACSDL)/SDL.h)","")
diff --git a/src/blocks.c b/src/blocks.c
index 64bfeca..3f8afbb 100644
--- a/src/blocks.c
+++ b/src/blocks.c
@@ -234,43 +234,42 @@ void blocks_parse()
blocks[j].name[i] = t[i] == '_' ? ' ' : t[i];
blocks[j].name[i] = 0;
/* get block images and possible param2 values */
- memset(blocks[j].img, 0, sizeof(blocks[j].img));
for(i = 0, l = 0; i < numfiles; i++) {
- if((int)strlen(files[i]) == (int)(e - s + 7) && !memcmp(files[i], s, e - s)) {
+ if((int)strlen(files[i]) == (int)(e - s + 4) && !memcmp(files[i], s, e - s)) {
used[i] = 1;
img = readfile(files[i], &size);
if(img && size) {
- k = ahtoi(strrchr(files[i], '_') + 1) & 0x1F;
sc.read_from_callbacks = 0;
sc.img_buffer = sc.img_buffer_original = img;
sc.img_buffer_end = sc.img_buffer_original_end = img + size;
ri.bits_per_channel = 8;
- blocks[j].img[k] = (unsigned char*)stbi__png_load(&sc, &w, &h, &r, 0, &ri);
- if(blocks[j].img[k]) {
+ blocks[j].img = (unsigned char*)stbi__png_load(&sc, &w, &h, &r, 0, &ri);
+ if(blocks[j].img) {
+ blocks[j].numpar2 = (h >> 5) & PARAM2_MAX;
if(r != 4) {
- tmp = (unsigned int *)malloc(32 * 32 * 4);
+ tmp = (unsigned int *)malloc(w * h * 4);
if(!tmp) error(lang[ERR_MEM]);
- for(m = 0; m < 32 * 32; m++)
+ for(m = 0; (int)m < w * h; m++)
switch(r) {
case 1:
- tmp[m] = 0xFF000000 | (blocks[j].img[k][m] << 16) | (blocks[j].img[k][m] << 8)
- | (blocks[j].img[k][m]);
+ tmp[m] = 0xFF000000 | (blocks[j].img[m] << 16) | (blocks[j].img[m] << 8)
+ | (blocks[j].img[m]);
break;
case 2:
- tmp[m] = (blocks[j].img[k][(m<<1)+1] << 24) | (blocks[j].img[k][m<<1] << 16) |
- (blocks[j].img[k][m<<1] << 8) | (blocks[j].img[k][m<<1]);
+ tmp[m] = (blocks[j].img[(m<<1)+1] << 24) | (blocks[j].img[m<<1] << 16) |
+ (blocks[j].img[m<<1] << 8) | (blocks[j].img[m<<1]);
break;
case 3:
- tmp[m] = 0xFF000000 | (blocks[j].img[k][m*3+2] << 16) | (blocks[j].img[k][m*3+1] << 8)
- | (blocks[j].img[k][m*3]);
+ tmp[m] = 0xFF000000 | (blocks[j].img[m*3+2] << 16) | (blocks[j].img[m*3+1] << 8)
+ | (blocks[j].img[m*3]);
break;
}
- free(blocks[j].img[k]);
- blocks[j].img[k] = (unsigned char*)tmp;
+ free(blocks[j].img);
+ blocks[j].img = (unsigned char*)tmp;
}
l++;
if(!dx || !dz || (!memcmp(s, "Cobblestone", 11) && s[11] != '_' && s[11] != ' ')) {
- detcube(32, 32, blocks[j].img[k]);
+ detcube(32, 32, blocks[j].img);
dx = x1 - x0;
dz = y1 - y0;
}
@@ -351,11 +350,9 @@ void blocks_free()
if(blocks[i].blocknames[j]) free(blocks[i].blocknames[j]);
free(blocks[i].blocknames);
}
- for(j = 0; j < 32; j++) {
- if(blocks[i].img[j]) free(blocks[i].img[j]);
- if(blocks[i].dr[j]) free(blocks[i].dr[j]);
- if(blocks[i].tr[j]) free(blocks[i].tr[j]);
- }
+ if(blocks[i].img) free(blocks[i].img);
+ if(blocks[i].dr) free(blocks[i].dr);
+ if(blocks[i].tr) free(blocks[i].tr);
}
free(results);
free(blocks);
diff --git a/src/edit.c b/src/edit.c
index bbf0f62..b196900 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -29,7 +29,7 @@
#include "main.h"
-int dx = 0, dz = 0, cx = 0, cz = 0, ox = 0, oy = 0, up = 0, zoom = 128, zz = 0, zx = 0, zs = 0, grid = 1;
+int dx = 0, dz = 0, cx = 0, cz = 0, ox = 0, oy = 0, up = 0, zoom = 128, zz = 0, zx = 0, zs = 0, grid = 1, curronly = 0;
char dstr[32];
/**
@@ -87,7 +87,7 @@ int edit_zoomout()
*/
void edit_redraw(int full)
{
- int i, j, k = 160, l, X, Z, x, y, z, sx, sy, mx, zl;
+ int i, j, k = 160, l, X, Z, x, y, z, sx, sy, mx, zl, s;
unsigned char *b = (uint8_t*)&theme[THEME_TABBG];
SDL_Rect dst, src;
@@ -107,36 +107,46 @@ void edit_redraw(int full)
src.x = 0; src.y = 4 * 32; dst.x = bg->w - 32; dst.y = bg->h - 32;
src.w = src.h = dst.w = dst.h = 32;
SDL_BlitSurface(icons, &src, bg, &dst);
- src.x = src.y = 0;
- /* background, layers below */
- for(y = mx > currlayer ? 0 : currlayer - mx; y < currlayer; y++) {
- for(z = -mx; z < mx; z++) {
- for(x = -mx; x < mx; x++) {
- dst.w = dst.h = zs;
- dst.x = sx + zx * (x - z);
- dst.y = sy + zz * (z + x) + zl * (currlayer - y);
- X = 127 + x + oy + ox;
- Z = 127 + z + oy - ox;
- if(X < 0 || X > 255 || Z < 0 || Z > 255 || dst.x < 0 || dst.x > bg->w || dst.y < 0 || dst.y > bg->h) continue;
- i = nodes[y][Z][X].param0;
- j = nodes[y][Z][X].param2 & 0x1F;
- if(i) {
- if(!blocks[i].dr[j]) {
- blocks[i].dr[j] = (unsigned char *)malloc(32 * 32 * 4);
- if(!blocks[i].dr[j]) error(lang[ERR_MEM]);
- memcpy(blocks[i].dr[j], blocks[i].img[j] ? blocks[i].img[j] : (blocks[i].img[0] ? blocks[i].img[0] :
- (uint8_t*)icons->pixels + 32 * icons->pitch), 32 * 32 * 4);
- for(l = 0; l < 32 * 32 * 4; l += 4) {
- blocks[i].dr[j][l+0] = (b[0]*k + (256 - k)*blocks[i].dr[j][l+0])>>8;
- blocks[i].dr[j][l+1] = (b[1]*k + (256 - k)*blocks[i].dr[j][l+1])>>8;
- blocks[i].dr[j][l+2] = (b[2]*k + (256 - k)*blocks[i].dr[j][l+2])>>8;
+ if(!curronly) {
+ src.x = src.y = 0;
+ /* background, layers below */
+ for(y = mx > currlayer ? 0 : currlayer - mx; y < currlayer; y++) {
+ for(z = -mx; z < mx; z++) {
+ for(x = -mx; x < mx; x++) {
+ dst.w = dst.h = zs;
+ dst.x = sx + zx * (x - z);
+ dst.y = sy + zz * (z + x) + zl * (currlayer - y);
+ X = 127 + x + oy + ox;
+ Z = 127 + z + oy - ox;
+ if(X < 0 || X > 255 || Z < 0 || Z > 255 || dst.x < 0 || dst.x > bg->w || dst.y < 0 || dst.y > bg->h)
+ continue;
+ i = nodes[y][Z][X].param0;
+ if(i) {
+ j = nodes[y][Z][X].param2 & PARAM2_MAX;
+ j %= blocks[i].numpar2;
+ s = 32 * blocks[i].numpar2*32 * 4;
+ if(!blocks[i].dr) {
+ blocks[i].dr = (unsigned char *)malloc(s);
+ if(!blocks[i].dr) error(lang[ERR_MEM]);
+ if(blocks[i].img)
+ memcpy(blocks[i].dr, blocks[i].img, s);
+ else {
+ for(l = 0; l < blocks[i].numpar2; l++)
+ memcpy(blocks[i].tr + l * 32 * 32 * 4, (uint8_t*)icons->pixels + 32 * icons->pitch,
+ 32 * 32 * 4);
+ }
+ for(l = 0; l < s; l += 4) {
+ blocks[i].dr[l+0] = (b[0]*k + (256 - k)*blocks[i].dr[l+0])>>8;
+ blocks[i].dr[l+1] = (b[1]*k + (256 - k)*blocks[i].dr[l+1])>>8;
+ blocks[i].dr[l+2] = (b[2]*k + (256 - k)*blocks[i].dr[l+2])>>8;
+ }
}
+ blk->pixels = blocks[i].dr + j * 32 * 32 * 4;
+ if(dst.w == src.w)
+ SDL_BlitSurface(blk, &src, bg, &dst);
+ else
+ SDL_BlitScaled(blk, &src, bg, &dst);
}
- blk->pixels = blocks[i].dr[j];
- if(dst.w == src.w)
- SDL_BlitSurface(blk, &src, bg, &dst);
- else
- SDL_BlitScaled(blk, &src, bg, &dst);
}
}
}
@@ -159,40 +169,49 @@ void edit_redraw(int full)
}
}
}
- /* foreground, layers above */
- memset(fg->pixels, 0, fg->pitch * fg->h);
- mts_getbounds(0, NULL, NULL);
- k = ((max - mix) + (maz - miz) + 1) / 2;
- if(up > k) up = k;
- for(y = currlayer + 1; y < (currlayer + mx < 255 ? currlayer + mx : 255); y++) {
- for(z = -mx; z < mx; z++) {
- for(x = -mx; x < mx; x++) {
- dst.w = dst.h = zs;
- dst.x = sx + zx * (x - z);
- dst.y = sy + zz * (z + x - k + up) + zl * ((currlayer - y));
- X = 127 + x + oy + ox;
- Z = 127 + z + oy - ox;
- if(X < 0 || X > 255 || Z < 0 || Z > 255 || dst.x < 0 || dst.x > fg->w || dst.y < 0 || dst.y > fg->h) continue;
- i = nodes[y][Z][X].param0;
- j = nodes[y][Z][X].param2 & 0x1F;
- if(i) {
- if(!blocks[i].tr[j]) {
- blocks[i].tr[j] = (unsigned char *)malloc(32 * 32 *4);
- if(!blocks[i].tr[j]) error(lang[ERR_MEM]);
- memcpy(blocks[i].tr[j], blocks[i].img[j] ? blocks[i].img[j] : (blocks[i].img[0] ? blocks[i].img[0] :
- (uint8_t*)icons->pixels + 32 * icons->pitch), 32 * 32 * 4);
- for(l = 0; l < 32 * 32 * 4; l += 4) blocks[i].tr[j][l+3] >>= 2;
+ if(!curronly) {
+ /* foreground, layers above */
+ memset(fg->pixels, 0, fg->pitch * fg->h);
+ mts_getbounds(0, NULL, NULL);
+ k = ((max - mix) + (maz - miz) + 1) / 2;
+ if(up > k) up = k;
+ for(y = currlayer + 1; y < (currlayer + mx < 255 ? currlayer + mx : 255); y++) {
+ for(z = -mx; z < mx; z++) {
+ for(x = -mx; x < mx; x++) {
+ dst.w = dst.h = zs;
+ dst.x = sx + zx * (x - z);
+ dst.y = sy + zz * (z + x - k + up) + zl * ((currlayer - y));
+ X = 127 + x + oy + ox;
+ Z = 127 + z + oy - ox;
+ if(X < 0 || X > 255 || Z < 0 || Z > 255 || dst.x < 0 || dst.x > fg->w || dst.y < 0 || dst.y > fg->h)
+ continue;
+ i = nodes[y][Z][X].param0;
+ if(i) {
+ j = nodes[y][Z][X].param2 & PARAM2_MAX;
+ j %= (int)blocks[i].numpar2;
+ if(!blocks[i].tr) {
+ s = 32 * blocks[i].numpar2*32 * 4;
+ blocks[i].tr = (unsigned char *)malloc(s);
+ if(!blocks[i].tr) error(lang[ERR_MEM]);
+ if(blocks[i].img)
+ memcpy(blocks[i].tr, blocks[i].img, s);
+ else {
+ for(l = 0; l < blocks[i].numpar2; l++)
+ memcpy(blocks[i].tr + l * 32 * 32 * 4, (uint8_t*)icons->pixels + 32 * icons->pitch,
+ 32 * 32 * 4);
+ }
+ for(l = 0; l < s; l += 4) blocks[i].tr[l+3] >>= 3;
+ }
+ blk->pixels = blocks[i].tr + j * 32 * 32 * 4;
+ if(dst.w == src.w)
+ SDL_BlitSurface(blk, &src, fg, &dst);
+ else
+ SDL_BlitScaled(blk, &src, fg, &dst);
}
- blk->pixels = blocks[i].tr[j];
- if(dst.w == src.w)
- SDL_BlitSurface(blk, &src, fg, &dst);
- else
- SDL_BlitScaled(blk, &src, fg, &dst);
}
}
}
}
- for(i = 0; i < fg->pitch * fg->h; i += 4) ((uint8_t*)fg->pixels)[i + 3] >>= 1;
}
/* current layer */
memset(cl->pixels, 0, cl->pitch * cl->h);
@@ -205,7 +224,6 @@ void edit_redraw(int full)
Z = 127 + z + oy - ox;
if(X < 0 || X > 255 || Z < 0 || Z > 255 || dst.x < 0 || dst.x > cl->w || dst.y < 0 || dst.y > cl->h) continue;
i = nodes[currlayer][Z][X].param0;
- j = nodes[currlayer][Z][X].param2 & 0x1F;
if((X == cx && Z == cz) || brush_selected(X, Z)) {
blk->pixels = (uint8_t*)icons->pixels + 64 * icons->pitch;
if(dst.w == src.w)
@@ -214,16 +232,17 @@ void edit_redraw(int full)
SDL_BlitScaled(blk, &src, cl, &dst);
}
if(i) {
+ j = nodes[currlayer][Z][X].param2 & PARAM2_MAX;
+ j %= (int)blocks[i].numpar2;
if(nodes[currlayer][Z][X].param1 & 0x80) {
- memcpy(tmpblk, blocks[i].img[j] ? blocks[i].img[j] : (blocks[i].img[0] ? blocks[i].img[0] :
- (uint8_t*)icons->pixels + 32 * icons->pitch), 32 * 32 * 4);
+ memcpy(tmpblk, blocks[i].img ? blocks[i].img + j * 32 * 32 * 4 : (uint8_t*)icons->pixels + 32 * icons->pitch,
+ 32 * 32 * 4);
for(k = 0; k < 32 * 32 * 4; k += 4)
if(tmpblk[k + 3])
tmpblk[k] = (255*64 + (256 - 64)*tmpblk[k])>>8;
blk->pixels = tmpblk;
} else {
- blk->pixels = blocks[i].img[j] ? blocks[i].img[j] : (blocks[i].img[0] ? blocks[i].img[0] :
- (uint8_t*)icons->pixels + 32 * icons->pitch);
+ blk->pixels = blocks[i].img ? blocks[i].img + j * 32 * 32 * 4 : (uint8_t*)icons->pixels + 32 * icons->pitch;
}
if(dst.w == src.w)
SDL_BlitSurface(blk, &src, cl, &dst);
@@ -242,7 +261,7 @@ void edit_redraw(int full)
src.x = src.y = 32; dst.y = 0; dst.x = 36; src.w = dst.w = bg->w; src.h = dst.h = bg->h;
SDL_BlitSurface(bg, &src, screen, &dst);
SDL_BlitSurface(cl, &src, screen, &dst);
- SDL_BlitSurface(fg, &src, screen, &dst);
+ if(!curronly) SDL_BlitSurface(fg, &src, screen, &dst);
}
/**
@@ -330,6 +349,7 @@ void edit_key(SDL_Event *event)
}
break;
case SDLK_n: grid ^= 1; break;
+ case SDLK_a: curronly ^= 1; break;
case SDLK_PLUS: case SDLK_EQUALS: mts_layerprob(+1); break;
case SDLK_MINUS: mts_layerprob(-1); break;
case SDLK_PAGEUP: if(currlayer < 255) currlayer++; break;
@@ -413,17 +433,16 @@ void edit_rotate(int y, int z, int x, int ccw)
if(!nodes[y][z][x].param0) return;
if(ccw) {
- if(nodes[y][z][x].param2 >= 31)
+ nodes[y][z][x].param2++;
+ if(nodes[y][z][x].param2 > 31)
nodes[y][z][x].param2 = 0;
- else
- nodes[y][z][x].param2++;
} else {
if(nodes[y][z][x].param2 > 0) nodes[y][z][x].param2--;
- else for(nodes[y][z][x].param2 = 31; nodes[y][z][x].param2 && !blocks[nodes[y][z][x].param0].img[nodes[y][z][x].param2];
- nodes[y][z][x].param2--);
+ else nodes[y][z][x].param2 = 31;
+ }
+ if(oldparam2 != nodes[y][z][x].param2) {
+ hist_prepare(HIST_NODE, 0);
+ hist_add(y, z, x, nodes[y][z][x].param0, oldparam2, nodes[y][z][x].param0, nodes[y][z][x].param2);
+ hist_commit();
}
- if(!blocks[nodes[y][z][x].param0].img[nodes[y][z][x].param2])
- nodes[y][z][x].param2 = nodes[y][z][x].param2 == 3 && blocks[nodes[y][z][x].param0].img[1] ? 1 : 0;
- if(oldparam2 != nodes[y][z][x].param2)
- hist_add(y, x, z, nodes[y][z][x].param0, oldparam2, nodes[y][z][x].param0, nodes[y][z][x].param2);
}
diff --git a/src/hist.c b/src/hist.c
index 075f321..70c450d 100644
--- a/src/hist.c
+++ b/src/hist.c
@@ -153,6 +153,15 @@ void hist_commit()
memset(&histcurr, 0, sizeof(histlist_t));
return;
}
+ if(histcurr.type == HIST_NODE && histcurr.type == HIST_NODE && histcurr.x == history[histtop].x &&
+ histcurr.y == history[histtop].y && histcurr.z == history[histtop].z &&
+ histcurr.data.node.oldparam0 == history[histtop].data.node.oldparam0 &&
+ histcurr.data.node.newparam0 == history[histtop].data.node.oldparam0 &&
+ histcurr.data.node.newparam0 == history[histtop].data.node.newparam0) {
+ history[histtop].data.node.newparam2 = histcurr.data.node.newparam2;
+ memset(&histcurr, 0, sizeof(histlist_t));
+ return;
+ }
if(histcurr.type == HIST_ADDY) {
for(i = j = 0, z = miz; z <= maz; z++)
for(x = mix; x <= max; x++, i++)
diff --git a/src/main.c b/src/main.c
index fdc683e..ae28af4 100644
--- a/src/main.c
+++ b/src/main.c
@@ -211,7 +211,7 @@ usage: printf("MineTest Schematics Editor by bzt Copyright (C) 2019 MIT license
mts_x = mts_y = mts_z = 0;
if(i+1 <= argc && argv[i+1] && !opt) opt = 7;
- if(opt && (opt < 5 || opt == 7)) {
+ if(opt && (opt < 4 || opt == 7)) {
blocks_parse();
readschem();
if(!mts_y || !mts_y || !mts_x)
diff --git a/src/main.h b/src/main.h
index 2a19130..33bef95 100644
--- a/src/main.h
+++ b/src/main.h
@@ -42,6 +42,8 @@
#define _register
#endif
+#define PARAM2_MAX 0x1F /* must be 2^n - 1 */
+
#define THEME_INPUT 0
#define THEME_TABA 1
#define THEME_FG 2
@@ -92,11 +94,12 @@ typedef struct {
char *name;
char **blocknames;
int numref;
+ char numpar2;
char dobiome;
unsigned char blockids[8];
- unsigned char *img[32];
- unsigned char *dr[32];
- unsigned char *tr[32];
+ unsigned char *img;
+ unsigned char *dr;
+ unsigned char *tr;
} mtsblock_t;
extern int numpalettes, lenpalettes, palette[16], strmaxw, strsep, savelen, savepos, savepal, savemapgen, savebiome;
@@ -180,7 +183,6 @@ void readschem();
void error(char *msg);
void errorcsv(int line);
int mbstrlen(char *s);
-unsigned char ahtoi(char *s);
int isdir(char *path);
int listdir(char *path, char ***files, int type);
void freedir(int n, char ***files);
diff --git a/src/mts.c b/src/mts.c
index c9fd7b1..90bbaab 100644
--- a/src/mts.c
+++ b/src/mts.c
@@ -347,10 +347,10 @@ int mts_view(int type)
dst.x = dx * ((x-mix) - (z-miz)) + (maz-miz) * dx;
dst.y = h - lh + dz * ((z-miz) + (x-mix)) - (y-miy) * l;
i = nodes[y][z][x].param0;
- j = nodes[y][z][x].param2 & 0x1F;
- if(i && !blocks[i].img[j]) j = 0;
- if(i && blocks[i].img[j]) {
- memcpy(tmpblk, blocks[i].img[j], 32 * 32 * 4);
+ if(i && blocks[i].img) {
+ j = nodes[y][z][x].param2 & PARAM2_MAX;
+ j %= (int)blocks[i].numpar2;
+ memcpy(tmpblk, blocks[i].img + j * 32 * 32 * 4, 32 * 32 * 4);
for(j = 0; j < 32 * 32 * 4; j += 4) {
k = (int)(tmpblk[j+0]) * ((x-mix)+(z-miz)) / n;
tmpblk[j+0] = k > 255 ? 255 : (k > tmpblk[j+0] / 2 ? k : tmpblk[j+0] / 2);
diff --git a/src/sdl.c b/src/sdl.c
index f04941f..baa5a2e 100644
--- a/src/sdl.c
+++ b/src/sdl.c
@@ -201,7 +201,7 @@ void sdltoolbar()
for(i = 1; i < 16 && palette[i] && dst.y < m; dst.y += 32, i++) {
if(dst.y + dst.h > m) dst.h = src.h = m - dst.y;
SDL_FillRect(screen, &dst, theme[i == activeblock ? THEME_INACT : (i == overblock ? THEME_INPBG : THEME_TABBG)]);
- blk->pixels = blocks[palette[i]].img[0] ? blocks[palette[i]].img[0] : (uint8_t*)icons->pixels + 32 * icons->pitch;
+ blk->pixels = blocks[palette[i]].img ? blocks[palette[i]].img : (uint8_t*)icons->pixels + 32 * icons->pitch;
SDL_BlitSurface(blk, &src, screen, &dst);
}
dst.x = 36; dst.y = screen->h - font->height; dst.w = screen->w - 36; dst.h = font->height;
@@ -224,31 +224,45 @@ void sdltoolbar()
sprintf(str, "%3d%%", layerprob[currlayer] * 100 / 127);
sdlprint(2, screen->h - font->height, THEME_INACT, THEME_BG, str);
/* status bar */
- src.x = 16; src.y = 8 * 32 + 80; dst.x = screen->w - 11 * font->width - 9 - 56; dst.y = screen->h - font->height / 2 - 8;
- if(nodes[currlayer][cz][cx].param1 & 0x80) {
+ src.x = 16; src.y = 8 * 32 + 80; dst.x = screen->w - 13 * font->width - 11 - 60; dst.y = screen->h - font->height / 2 - 8;
+ if(nodes[currlayer][cz][cx].param0 && dst.x >= 0) {
+ sprintf(str, "%02X", nodes[currlayer][cz][cx].param2 & PARAM2_MAX);
+ sdlprint(dst.x, screen->h - font->height, THEME_FG, THEME_BG, str);
+ }
+ dst.x += 2*font->width + 6;
+ if((nodes[currlayer][cz][cx].param1 & 0x80) && dst.x >= 0) {
strsep = 0;
sdlprint(dst.x, screen->h - font->height, THEME_FG, THEME_BG, "\004\005");
strsep = 1;
}
dst.x += 2*font->width + 4;
- src.w = src.h = dst.w = dst.h = 16;
- SDL_BlitSurface(icons, &src, screen, &dst);
+ if(dst.x >= 0) {
+ src.w = src.h = dst.w = dst.h = 16;
+ SDL_BlitSurface(icons, &src, screen, &dst);
+ }
dst.x += 20;
- sprintf(str, "%3d%%", zoom * 100 / 128);
- sdlprint(dst.x, screen->h - font->height, THEME_FG, THEME_BG, str);
+ if(dst.x >= 0) {
+ sprintf(str, "%3d%%", zoom * 100 / 128);
+ sdlprint(dst.x, screen->h - font->height, THEME_FG, THEME_BG, str);
+ }
dst.x += 4 * (font->width+2);
src.x = 0;
- SDL_BlitSurface(icons, &src, screen, &dst);
+ if(dst.x >= 0)
+ SDL_BlitSurface(icons, &src, screen, &dst);
dst.x += 24;
- sprintf(str, "%3d", brush_height());
- sdlprint(dst.x, screen->h - font->height, THEME_FG, THEME_BG, str);
+ if(dst.x >= 0) {
+ sprintf(str, "%3d", brush_height());
+ sdlprint(dst.x, screen->h - font->height, THEME_FG, THEME_BG, str);
+ }
dst.x += 3 * (font->width+1);
- memcpy(str, "\xC2\x80\xC2\x80", 5);
- strsep = 0;
- str[1] = 0x80 + (4*brush_type) + (2*brush_hollow);
- str[3] = 0x81 + (4*brush_type) + (2*brush_hollow);
- sdlprint(dst.x, screen->h - font->height, THEME_FG, THEME_BG, str);
- strsep = 1;
+ if(dst.x >= 0) {
+ memcpy(str, "\xC2\x80\xC2\x80", 5);
+ strsep = 0;
+ str[1] = 0x80 + (4*brush_type) + (2*brush_hollow);
+ str[3] = 0x81 + (4*brush_type) + (2*brush_hollow);
+ sdlprint(dst.x, screen->h - font->height, THEME_FG, THEME_BG, str);
+ strsep = 1;
+ }
if(s)
sdlprint(42, screen->h - font->height, THEME_FG, THEME_BG, s);
}
diff --git a/src/search.c b/src/search.c
index 1c0c7a9..d53472d 100644
--- a/src/search.c
+++ b/src/search.c
@@ -62,7 +62,7 @@ void search_redraw()
for(i = searchscr * line; i < numresults && rect.y + 32 < (int)(screen->h - font->height); i++, rect.x += 32) {
if(rect.x + 32 > screen->w - 5) { rect.x = 42; rect.y += 32; }
if(rect.y + 32 > (int)(screen->h - font->height)) rect.h = screen->h - font->height - rect.y;
- blk->pixels = results[i] > 0 && results[i] < numblocks && blocks[results[i]].img[0] ? blocks[results[i]].img[0] :
+ blk->pixels = results[i] > 0 && results[i] < numblocks && blocks[results[i]].img ? blocks[results[i]].img :
(uint8_t*)icons->pixels + 32 * icons->pitch;
SDL_FillRect(screen, &rect, theme[i == overblk ? THEME_INACT : THEME_BG]);
SDL_BlitSurface(blk, NULL, screen, &rect);
diff --git a/src/util.c b/src/util.c
index f5a0399..004f7e0 100644
--- a/src/util.c
+++ b/src/util.c
@@ -123,15 +123,13 @@ void readschem()
/* Could be a Minecraft NBT */
if(!memcmp(data + 3, "Schematic", 9)) schem_load(data, size);
- /* make sure that all non-air blocks have their probability set, and we have only rotations with image */
+ /* make sure that all non-air blocks have their probability set */
for(y = 0; y < 256; y++)
for(z = 0; z < 256; z++)
for(x = 0; x < 256; x++)
if(nodes[y][z][x].param0) {
if(!(nodes[y][z][x].param1 & 0x7F)) nodes[y][z][x].param1 |= 127;
- if(!blocks[nodes[y][z][x].param0].img[nodes[y][z][x].param2])
- nodes[y][z][x].param2 = !blocks[nodes[y][z][x].param0].img[nodes[y][z][x].param2 & 1] ? 0 :
- nodes[y][z][x].param2 & 1;
+ nodes[y][z][x].param2 &= PARAM2_MAX;
}
}
if(data) free(data);
@@ -184,21 +182,6 @@ int mbstrlen(char *s)
return r;
}
-/**
- * Convert an ascii hex value int integer
- */
-unsigned char ahtoi(char *s)
-{
- int r = 0;
- for(; *s; s++) {
- if(*s >= '0' && *s <= '9') { r <<= 4; r += (uint32_t)(*s-'0'); }
- else if(*s >= 'a' && *s <= 'f') { r <<= 4; r += (uint32_t)(*s-'a'+10); }
- else if(*s >= 'A' && *s <= 'F') { r <<= 4; r += (uint32_t)(*s-'A'+10); }
- else break;
- }
- return (unsigned char)r;
-}
-
/**
* Returns true if argument is a directory
*/
@@ -238,7 +221,7 @@ int listdir(char *path, char ***files, int type)
c = 0;
switch(type) {
case 0:
- if(!(i > 8 && !strcmp(de->d_name + i - 4, ".png") && de->d_name[i-7] == '_')) continue;
+ if(!(i > 5 && !strcmp(de->d_name + i - 4, ".png"))) continue;
break;
case 1:
strcpy(fn, de->d_name);
@@ -403,13 +386,13 @@ int stairgen()
block = (unsigned char*)stbi__png_load(&sc, &w, &h, &l, 0, &ri);
free(data);
if(!block) return 1;
- slab = (unsigned char *)malloc(w * h * 4);
+ slab = (unsigned char *)malloc(w * w * 4);
if(!slab) error(lang[ERR_MEM]);
- memset(slab, 0, w * h * 4);
- stair = (unsigned char *)malloc(w * h * 4);
+ memset(slab, 0, w * w * 4);
+ stair = (unsigned char *)malloc(4 * w * w * 4);
if(!stair) error(lang[ERR_MEM]);
/* detect cube edges */
- detcube(w, h, block);
+ detcube(w, w, block);
#if DEBUG
*((uint32_t*)(slab + y0*w*4 + x1*4)) = 0xFF0000FF;
*((uint32_t*)(slab + y1*w*4 + x0*4)) = 0xFF0000FF;
@@ -420,60 +403,64 @@ int stairgen()
*((uint32_t*)(slab + y4*w*4 + x1*4)) = 0xFF00FF00;
#endif
- /* rotated block */
- for(i = x0; i <= x2+1; i++) {
- for(j = y0; j <= y4; j++)
- *((uint32_t*)(slab + j*w*4 + (x2 - i + x0 + (x0 & 1))*4)) = *((uint32_t*)(block + j*w*4 + i*4));
- }
- data = (unsigned char *)stbi_write_png_to_mem(slab, w*4, w, h, 4, &l);
- if(data) {
- strcpy(c, "_01.png");
- f = fopen(mtsfile,"wb");
- if(f) { fwrite(data, l, 1, f); fclose(f); }
- free(data);
+ /* add rotated block to the bottom of the image */
+ if(w == h) {
+ block = (unsigned char*)realloc(block, 2 * w * w * 4);
+ if(!block) return 1;
+ memset(block + w * w * 4, 0, w * w * 4);
+ for(i = x0; i <= x2+1; i++) {
+ for(j = y0; j <= y4; j++)
+ *((uint32_t*)(block + (32+j)*w*4 + (x2 - i + x0 + (x0 & 1))*4)) = *((uint32_t*)(block + j*w*4 + i*4));
+ }
+ data = (unsigned char *)stbi_write_png_to_mem(block, w*4, w, 2*w, 4, &l);
+ if(data) {
+ f = fopen(mtsfile,"wb");
+ if(f) { fwrite(data, l, 1, f); fclose(f); }
+ free(data);
+ }
}
/* slab */
- memset(slab, 0, w * h * 4);
+ memset(slab, 0, w * w * 4);
for(i = x0; i <= x1; i++) {
l = (y1 - y0) * (i - x0) / (x1 - x0);
for(j = y0; j < y1 + (y3 - y1)/2 + l; j++)
*((uint32_t*)(slab + (j+(y3 - y1)/2+1)*w*4 + i*4)) = *((uint32_t*)(block + j*w*4 + i*4));
- for(j = y3 + l; j < h; j++)
+ for(j = y3 + l; j < w; j++)
*((uint32_t*)(slab + j*w*4 + i*4)) = *((uint32_t*)(block + j*w*4 + i*4));
}
for(i = x1+1; i <= x2; i++) {
l = (y1 - y0) * ((x2-i+1) - x1) / (x2 - x1);
for(j = y0; j < y2 + (y3 - y1)/2 + l; j++)
*((uint32_t*)(slab + (j+(y3 - y1)/2+1)*w*4 + i*4)) = *((uint32_t*)(block + j*w*4 + i*4));
- for(j = y4 + l; j < h; j++)
+ for(j = y4 + l; j < w; j++)
*((uint32_t*)(slab + j*w*4 + i*4)) = *((uint32_t*)(block + j*w*4 + i*4));
}
- data = (unsigned char *)stbi_write_png_to_mem(slab, w*4, w, h, 4, &l);
+ data = (unsigned char *)stbi_write_png_to_mem(slab, w*4, w, w, 4, &l);
if(data) {
- strcpy(c, "_Slab_00.png");
+ strcpy(c, "_Slab.png");
f = fopen(mtsfile,"wb");
if(f) { fwrite(data, l, 1, f); fclose(f); }
free(data);
}
/* double slab */
- memset(stair, 0, w * h * 4);
+ memset(stair, 0, w * w * 4);
for(i = x0; i <= x1; i++) {
l = (y1 - y0) * (i - x0) / (x1 - x0);
for(j = y0; j < y1 + (y3 - y1)*3/4 + l; j++)
*((uint32_t*)(stair + (j+(y3 - y1)/4+1)*w*4 + i*4)) = *((uint32_t*)(block + j*w*4 + i*4));
- for(j = y3 + l; j < h; j++)
+ for(j = y3 + l; j < w; j++)
*((uint32_t*)(stair + j*w*4 + i*4)) = *((uint32_t*)(block + j*w*4 + i*4));
}
for(i = x1+1; i <= x2; i++) {
l = (y1 - y0) * ((x2-i+1) - x1) / (x2 - x1);
for(j = y0; j < y2 + (y3 - y1)*3/4 + l; j++)
*((uint32_t*)(stair + (j+(y3 - y1)/4+1)*w*4 + i*4)) = *((uint32_t*)(block + j*w*4 + i*4));
- for(j = y4 + l; j < h; j++)
+ for(j = y4 + l; j < w; j++)
*((uint32_t*)(stair + j*w*4 + i*4)) = *((uint32_t*)(block + j*w*4 + i*4));
}
- data = (unsigned char *)stbi_write_png_to_mem(stair, w*4, w, h, 4, &l);
+ data = (unsigned char *)stbi_write_png_to_mem(stair, w*4, w, w, 4, &l);
if(data) {
strcpy(fn, mtsfile);
d = strrchr(mtsfile, DIRSEP);
@@ -482,52 +469,14 @@ int stairgen()
e = fn + (int)(d - mtsfile);
strcpy(e, "Double_"); e += 7;
memcpy(e, d, (int)(c - d)); e += (int)(c - d);
- strcpy(e, "_Slab_00.png");
+ strcpy(e, "_Slab.png");
f = fopen(fn,"wb");
if(f) { fwrite(data, l, 1, f); fclose(f); }
free(data);
}
/* rotated stairs */
- memcpy(stair, slab, w * h * 4);
- for(i = x0; i <= x1 + (x2 - x1)/2; i++) {
- l = (y1 - y0) * (i - x0) / (x1 - x0);
- for(j = y0 + l; j < y4; j++)
- *((uint32_t*)(stair + j*w*4 + i*4)) = *((uint32_t*)(block + j*w*4 + i*4));
- }
- for(i = x1; i <= x2; i++) {
- l = (y1 - y0) * (i - x1) / (x1 - x0);
- for(j = y0 + l; j <= y0 + l + 1; j++)
- *((uint32_t*)(stair + (j+(y1-y0)/2)*w*4 + (i - (x1 - x0)/2)*4)) = *((uint32_t*)(block + j*w*4 + i*4));
- }
- data = (unsigned char *)stbi_write_png_to_mem(stair, w*4, w, h, 4, &l);
- if(data) {
- strcpy(c, "_Stair_00.png");
- f = fopen(mtsfile,"wb");
- if(f) { fwrite(data, l, 1, f); fclose(f); }
- free(data);
- }
-
- memcpy(stair, slab, w * h * 4);
- for(i = x0 + (x1 - x0)/2; i <= x2; i++) {
- l = (y1 - y0) * ((x2-i+1) - x1) / (x2 - x1);
- for(j = y1 + l; j < y4; j++)
- *((uint32_t*)(stair + j*w*4 + i*4)) = *((uint32_t*)(block + j*w*4 + i*4));
- }
- for(i = x0; i <= x1; i++) {
- l = (y1 - y0) * ((x1-i+1) - x1) / (x1 - x0);
- for(j = y1 + l; j <= y2 + l; j++)
- *((uint32_t*)(stair + (j+(y1-y0)/2)*w*4 + (i+(x1 - x0)/2)*4)) = *((uint32_t*)(block + j*w*4 + i*4));
- }
- data = (unsigned char *)stbi_write_png_to_mem(stair, w*4, w, h, 4, &l);
- if(data) {
- strcpy(c, "_Stair_01.png");
- f = fopen(mtsfile,"wb");
- if(f) { fwrite(data, l, 1, f); fclose(f); }
- free(data);
- }
-
- memcpy(stair, slab, w * h * 4);
+ memcpy(stair, slab, w * w * 4);
for(i = x0 + (x1 - x0)/2; i <= x1 + (x2 - x1)/2; i++) {
l = (y1 - y0) * (i - x0) / (x1 - x0);
for(j = y0; j <= y0 + l; j++)
@@ -542,32 +491,49 @@ int stairgen()
for(j = y1 + l - 1; j <= y1 + (y3 - y1)/2 + l; j++)
*((uint32_t*)(stair + (j-(y1-y0)/2)*w*4 + (i + (x1 - x0)/2)*4)) = *((uint32_t*)(block + j*w*4 + i*4));
}
- data = (unsigned char *)stbi_write_png_to_mem(stair, w*4, w, h, 4, &l);
- if(data) {
- strcpy(c, "_Stair_02.png");
- f = fopen(mtsfile,"wb");
- if(f) { fwrite(data, l, 1, f); fclose(f); }
- free(data);
+
+ memcpy(stair + w*w*4, slab, w * w * 4);
+ for(i = x0 + (x1 - x0)/2; i <= x2; i++) {
+ l = (y1 - y0) * ((x2-i+1) - x1) / (x2 - x1);
+ for(j = y1 + l; j < y4; j++)
+ *((uint32_t*)(stair + (w+j)*w*4 + i*4)) = *((uint32_t*)(block + j*w*4 + i*4));
+ }
+ for(i = x0; i <= x1; i++) {
+ l = (y1 - y0) * ((x1-i+1) - x1) / (x1 - x0);
+ for(j = y1 + l; j <= y2 + l; j++)
+ *((uint32_t*)(stair + (w+j+(y1-y0)/2)*w*4 + (i+(x1 - x0)/2)*4)) = *((uint32_t*)(block + j*w*4 + i*4));
}
- memcpy(stair, slab, w * h * 4);
+ memcpy(stair + 2*w*w*4, slab, w * w * 4);
+ for(i = x0; i <= x1 + (x2 - x1)/2; i++) {
+ l = (y1 - y0) * (i - x0) / (x1 - x0);
+ for(j = y0 + l; j < y4; j++)
+ *((uint32_t*)(stair + (2*w+j)*w*4 + i*4)) = *((uint32_t*)(block + j*w*4 + i*4));
+ }
+ for(i = x1; i <= x2; i++) {
+ l = (y1 - y0) * (i - x1) / (x1 - x0);
+ for(j = y0 + l; j <= y0 + l + 1; j++)
+ *((uint32_t*)(stair + (2*w+(j+(y1-y0)/2))*w*4 + (i - (x1 - x0)/2)*4)) = *((uint32_t*)(block + j*w*4 + i*4));
+ }
+
+ memcpy(stair + 3*w*w*4, slab, w * w * 4);
for(i = x0; i <= x0 + (x1 - x0)/2 +1; i++) {
for(j = y0; j <= y4; j++)
- *((uint32_t*)(stair + j*w*4 + i*4)) = *((uint32_t*)(block + j*w*4 + i*4));
+ *((uint32_t*)(stair + (3*w+j)*w*4 + i*4)) = *((uint32_t*)(block + j*w*4 + i*4));
}
for(; i <= x2; i++) {
l = (y1 - y0) * (i - (x0 + (x1 - x0)/2)) / (x2 - x1);
for(j = y0; j <= y1 + (y2 - y1)/2 - l; j++)
- *((uint32_t*)(stair + j*w*4 + i*4)) = *((uint32_t*)(block + j*w*4 + i*4));
+ *((uint32_t*)(stair + (3*w+j)*w*4 + i*4)) = *((uint32_t*)(block + j*w*4 + i*4));
}
for(i = x1+1; i <= x2; i++) {
l = (y1 - y0) * ((x2-i+1) - x1) / (x2 - x1);
for(j = y2 + l - 1; j <= y2 + (y3 - y1)/2 + l; j++)
- *((uint32_t*)(stair + (j-(y1-y0)/2)*w*4 + (i-(x1-x0)/2)*4)) = *((uint32_t*)(block + j*w*4 + i*4));
+ *((uint32_t*)(stair + (3*w+(j-(y1-y0)/2))*w*4 + (i-(x1-x0)/2)*4)) = *((uint32_t*)(block + j*w*4 + i*4));
}
- data = (unsigned char *)stbi_write_png_to_mem(stair, w*4, w, h, 4, &l);
+ data = (unsigned char *)stbi_write_png_to_mem(stair, w*4, w, 4*w, 4, &l);
if(data) {
- strcpy(c, "_Stair_03.png");
+ strcpy(c, "_Stair.png");
f = fopen(mtsfile,"wb");
if(f) { fwrite(data, l, 1, f); fclose(f); }
free(data);
@@ -588,23 +554,23 @@ typedef struct tColorRGBA {
Uint8 b;
Uint8 a;
} tColorRGBA;
-int savepng(char *name, int num, SDL_Surface *src)
+int savepng(char *name, int siz, SDL_Surface *src)
{
int x, y, sx, sy, *sax, *say, *csax, *csay, csx, csy, ex, ey, t1, t2, sstep, lx, ly, dgap, l;
tColorRGBA *c00, *c01, *c10, *c11, *csp, *dp;
unsigned char *img;
char path[MAXPATHLEN];
FILE *f;
- SDL_Surface *dst = SDL_CreateRGBSurface(0, 32, 32, 32, 0xFF, 0xFF00, 0xFF0000, 0xFF000000);
+ SDL_Surface *dst = SDL_CreateRGBSurface(0, 32, 32 * siz, 32, 0xFF, 0xFF00, 0xFF0000, 0xFF000000);
/* resample */
+ src->h = siz*(TMPSIZE+8);
/**
* This is from SDL_gfx, but I don't wanted to introduce a new dependency just because
* of a single function. Heavily optimized, all non-used code-paths removed, plus I hate
* that I can't give exact destination dimensions to zoomSurfaceRGBA()
*/
- sx = (int) (65536.0 * (float) (src->w - 1) / (float) dst->w);
- sy = (int) (65536.0 * (float) (src->h - 1) / (float) dst->h);
+ sx = sy = (int) (65536.0 * (float) (src->w - 1) / (float) dst->w);
if ((sax = (int *) malloc((dst->w + 1) * sizeof(Uint32))) == NULL) error(lang[ERR_MEM]);
if ((say = (int *) malloc((dst->h + 1) * sizeof(Uint32))) == NULL) {
@@ -626,6 +592,7 @@ int savepng(char *name, int num, SDL_Surface *src)
csy = 0;
csay = say;
for (y = 0; y <= dst->h; y++) {
+ if(!(y & 0x1F)) csy = 0;
*csay = csy;
csay++;
csy &= 0xffff;
@@ -636,7 +603,12 @@ int savepng(char *name, int num, SDL_Surface *src)
csay = say;
ly = 0;
- for (y = 0; y < dst->h; y++) {
+ for (y = l = 0; y < dst->h; y++) {
+ if(!(y & 0x1F)) {
+ csay = say;
+ csp = (tColorRGBA *) ((uint8_t*)src->pixels + l*(TMPSIZE+8)*src->pitch);
+ l++;
+ }
c00 = csp;
c01 = csp;
c01++;
@@ -704,7 +676,7 @@ int savepng(char *name, int num, SDL_Surface *src)
#endif
SDL_FreeSurface(dst);
if(img) {
- sprintf(path, "%s_%02X.png",name,num);
+ sprintf(path, "%s.png",name);
if(verbose)
printf("mtsedit: %s\r\n", path);
f = fopen(path,"wb");
@@ -721,9 +693,9 @@ int savepng(char *name, int num, SDL_Surface *src)
void mixpixel(unsigned char *a, unsigned char *b, unsigned int i)
{
unsigned int c[4];
- c[0] = b[0] * i / 255; if(c[0] > 255) c[0] = 255;
- c[1] = b[1] * i / 255; if(c[1] > 255) c[1] = 255;
- c[2] = b[2] * i / 255; if(c[2] > 255) c[2] = 255;
+ c[0] = (unsigned int)b[0] * i / 255; if(c[0] > 255) c[0] = 255;
+ c[1] = (unsigned int)b[1] * i / 255; if(c[1] > 255) c[1] = 255;
+ c[2] = (unsigned int)b[2] * i / 255; if(c[2] > 255) c[2] = 255;
a[0] = (c[0]*b[3] + (256 - a[3])*a[0])>>8;
a[1] = (c[1]*b[3] + (256 - a[3])*a[1])>>8;
a[2] = (c[2]*b[3] + (256 - a[3])*a[2])>>8;
@@ -733,11 +705,11 @@ void mixpixel(unsigned char *a, unsigned char *b, unsigned int i)
/**
* Isometric blit
*/
-void blitiso(unsigned char *from, int quadrant, unsigned char *to, int rotation, int x, int y)
+void blitiso(unsigned char *from, int quadrant, unsigned char *to, int rotation, int x, int y, int blk)
{
int i, j, ox, oy, sx, sy;
- x += 8; y += 4;
+ x += 8; y += 4 + blk*(TMPSIZE+8);
switch(quadrant) {
/* XX
* XX (full) */
@@ -766,13 +738,13 @@ void blitiso(unsigned char *from, int quadrant, unsigned char *to, int rotation,
case 0:
for(j = 0; j < sy; j++)
for(i = 0; i <= j; i++) {
- mixpixel(to + (y+j/2)*TMPSIZE*4 + (x+2*i+sx-j-1)*4, from + (oy+j-i)*32*4 + (ox+i)*4, 383);
- mixpixel(to + (y+j/2)*TMPSIZE*4 + (x+2*i+sx-j)*4, from + (oy+j-i)*32*4 + (ox+i)*4, 383);
+ mixpixel(to + (y+j/2)*TMPSIZE*4 + (x+2*i+sx-j-1)*4, from + (oy+j-i)*32*4 + (ox+i)*4, 287);
+ mixpixel(to + (y+j/2)*TMPSIZE*4 + (x+2*i+sx-j)*4, from + (oy+j-i)*32*4 + (ox+i)*4, 287);
}
for(j = 0; j < sy; j++)
for(i = 0; i <= j; i++) {
- mixpixel(to + (y+sy-j/2-1)*TMPSIZE*4+(x+2*sx-(2*i+sx-j)-1)*4, from + (oy+sy-j-1+i)*32*4+(ox+sx-i-1)*4, 383);
- mixpixel(to + (y+sy-j/2-1)*TMPSIZE*4+(x+2*sx-(2*i+sx-j))*4, from + (oy+sy-j-1+i)*32*4+(ox+sx-i-1)*4, 383);
+ mixpixel(to + (y+sy-j/2-1)*TMPSIZE*4+(x+2*sx-(2*i+sx-j)-1)*4, from + (oy+sy-j-1+i)*32*4+(ox+sx-i-1)*4, 287);
+ mixpixel(to + (y+sy-j/2-1)*TMPSIZE*4+(x+2*sx-(2*i+sx-j))*4, from + (oy+sy-j-1+i)*32*4+(ox+sx-i-1)*4, 287);
}
break;
/* .X.
@@ -781,13 +753,13 @@ void blitiso(unsigned char *from, int quadrant, unsigned char *to, int rotation,
case 1:
for(j = 0; j < sy; j++)
for(i = 0; i <= j; i++) {
- mixpixel(to + (y+j/2)*TMPSIZE*4 + (x+2*i+sx-j-1)*4, from + (oy+sy-i-1)*32*4 + (ox+j-i)*4, 383);
- mixpixel(to + (y+j/2)*TMPSIZE*4 + (x+2*i+sx-j)*4, from + (oy+sy-i-1)*32*4 + (ox+j-i)*4, 383);
+ mixpixel(to + (y+j/2)*TMPSIZE*4 + (x+2*i+sx-j-1)*4, from + (oy+sy-i-1)*32*4 + (ox+j-i)*4, 287);
+ mixpixel(to + (y+j/2)*TMPSIZE*4 + (x+2*i+sx-j)*4, from + (oy+sy-i-1)*32*4 + (ox+j-i)*4, 287);
}
for(j = 0; j < sy; j++)
for(i = 0; i <= j; i++) {
- mixpixel(to + (y+sy-j/2-1)*TMPSIZE*4 + (x+2*sx-(2*i+sx-j)-1)*4, from + (oy+i)*32*4 + (ox+sx-(j-i)-1)*4, 383);
- mixpixel(to + (y+sy-j/2-1)*TMPSIZE*4 + (x+2*sx-(2*i+sx-j))*4, from + (oy+i)*32*4 + (ox+sx-(j-i)-1)*4, 383);
+ mixpixel(to + (y+sy-j/2-1)*TMPSIZE*4 + (x+2*sx-(2*i+sx-j)-1)*4, from + (oy+i)*32*4 + (ox+sx-(j-i)-1)*4, 287);
+ mixpixel(to + (y+sy-j/2-1)*TMPSIZE*4 + (x+2*sx-(2*i+sx-j))*4, from + (oy+i)*32*4 + (ox+sx-(j-i)-1)*4, 287);
}
break;
/* .X.
@@ -796,13 +768,13 @@ void blitiso(unsigned char *from, int quadrant, unsigned char *to, int rotation,
case 2:
for(j = 0; j < sy; j++)
for(i = 0; i <= j; i++) {
- mixpixel(to + (y+j/2)*TMPSIZE*4 + (x+2*i+sx-j-1)*4, from + (oy+sy-j+i-1)*32*4 + (ox+sx-i-1)*4, 383);
- mixpixel(to + (y+j/2)*TMPSIZE*4 + (x+2*i+sx-j)*4, from + (oy+sy-j+i-1)*32*4 + (ox+sx-i-1)*4, 383);
+ mixpixel(to + (y+j/2)*TMPSIZE*4 + (x+2*i+sx-j-1)*4, from + (oy+sy-j+i-1)*32*4 + (ox+sx-i-1)*4, 287);
+ mixpixel(to + (y+j/2)*TMPSIZE*4 + (x+2*i+sx-j)*4, from + (oy+sy-j+i-1)*32*4 + (ox+sx-i-1)*4, 287);
}
for(j = 0; j < sy; j++)
for(i = 0; i <= j; i++) {
- mixpixel(to + (y+sy-j/2-1)*TMPSIZE*4 + (x+2*sx-(2*i+sx-j)-1)*4, from + (oy+j-i)*32*4 + (ox+i)*4, 383);
- mixpixel(to + (y+sy-j/2-1)*TMPSIZE*4 + (x+2*sx-(2*i+sx-j))*4, from + (oy+j-i)*32*4 + (ox+i)*4, 383);
+ mixpixel(to + (y+sy-j/2-1)*TMPSIZE*4 + (x+2*sx-(2*i+sx-j)-1)*4, from + (oy+j-i)*32*4 + (ox+i)*4, 287);
+ mixpixel(to + (y+sy-j/2-1)*TMPSIZE*4 + (x+2*sx-(2*i+sx-j))*4, from + (oy+j-i)*32*4 + (ox+i)*4, 287);
}
break;
/* .N.
@@ -811,13 +783,13 @@ void blitiso(unsigned char *from, int quadrant, unsigned char *to, int rotation,
case 3:
for(j = 0; j < sy; j++)
for(i = 0; i <= j; i++) {
- mixpixel(to + (y+j/2)*TMPSIZE*4 + (x+2*i+sx-j-1)*4, from + (oy+i)*32*4 + (ox+sx-(j-i)-1)*4, 383);
- mixpixel(to + (y+j/2)*TMPSIZE*4 + (x+2*i+sx-j)*4, from + (oy+i)*32*4 + (ox+sx-(j-i)-1)*4, 383);
+ mixpixel(to + (y+j/2)*TMPSIZE*4 + (x+2*i+sx-j-1)*4, from + (oy+i)*32*4 + (ox+sx-(j-i)-1)*4, 287);
+ mixpixel(to + (y+j/2)*TMPSIZE*4 + (x+2*i+sx-j)*4, from + (oy+i)*32*4 + (ox+sx-(j-i)-1)*4, 287);
}
for(j = 0; j < sy; j++)
for(i = 0; i <= j; i++) {
- mixpixel(to + (y+sy-j/2-1)*TMPSIZE*4 + (x+2*sx-(2*i+sx-j)-1)*4, from + (oy+sy-i-1)*32*4 + (ox+j-i)*4, 383);
- mixpixel(to + (y+sy-j/2-1)*TMPSIZE*4 + (x+2*sx-(2*i+sx-j))*4, from + (oy+sy-i-1)*32*4 + (ox+j-i)*4, 383);
+ mixpixel(to + (y+sy-j/2-1)*TMPSIZE*4 + (x+2*sx-(2*i+sx-j)-1)*4, from + (oy+sy-i-1)*32*4 + (ox+j-i)*4, 287);
+ mixpixel(to + (y+sy-j/2-1)*TMPSIZE*4 + (x+2*sx-(2*i+sx-j))*4, from + (oy+sy-i-1)*32*4 + (ox+j-i)*4, 287);
}
break;
/* X.
@@ -840,8 +812,12 @@ void blitiso(unsigned char *from, int quadrant, unsigned char *to, int rotation,
* XX */
default:
for(j = 0; j < sy; j++)
- for(i = 0; i < sx; i++)
- mixpixel(to + (y+j)*TMPSIZE*4 + (x+i)*4, from + (oy+j)*32*4 + (ox+i)*4, 255);
+ for(i = 0; i < sx; i++) {
+ mixpixel(to + (y+2*j)*TMPSIZE*4 + (x+2*i)*4, from + (oy+j)*32*4 + (ox+i)*4, 255);
+ mixpixel(to + (y+2*j)*TMPSIZE*4 + (x+2*i+1)*4, from + (oy+j)*32*4 + (ox+i)*4, 255);
+ mixpixel(to + (y+2*j+1)*TMPSIZE*4 + (x+2*i)*4, from + (oy+j)*32*4 + (ox+i)*4, 255);
+ mixpixel(to + (y+2*j+1)*TMPSIZE*4 + (x+2*i+1)*4, from + (oy+j)*32*4 + (ox+i)*4, 255);
+ }
break;
}
}
@@ -854,7 +830,7 @@ int blockgen(char *blockid)
stbi__context sc;
stbi__result_info ri;
FILE *f;
- unsigned char *img, *raw, *top, *bottom, *north, *south, *west, *east, out[TMPSIZE * (TMPSIZE+16) * 4];
+ unsigned char *img, *raw, *top, *bottom, *north, *south, *west, *east, out[32 * TMPSIZE * (TMPSIZE+8) * 4];
unsigned int size, *tmp;
char *data, c, *s, *e, **paths = NULL, path[MAXPATHLEN];
int w, h, l, r, p = 0, np = 0, i, j = 0, k = 0, o = 0, sl, ds, st;
@@ -982,7 +958,7 @@ int blockgen(char *blockid)
/* get tiles */
for(k = 0; k < 6; k++) {
if(blocks[i].blocknames[k + 4] && blocks[i].blocknames[k + 4][0])
- for(l = 0; l < np && !blocks[i].img[k]; l++) {
+ for(l = r = 0; l < np && !r; l++) {
strcpy(path, paths[l]);
strcat(path, blocks[i].blocknames[k + 4]);
f = fopen(path, "rb");
@@ -1015,23 +991,25 @@ int blockgen(char *blockid)
raw = (unsigned char*)tmp;
}
/* rescale to 32x32 */
- fg->pixels = (unsigned char *)malloc(32 * 32 * 4);
- if(!fg->pixels) error(lang[ERR_MEM]);
- memset(fg->pixels, 0, 32 * 32 * 4);
+ if(!blocks[i].img) {
+ blocks[i].img = (unsigned char *)malloc(6 * 32 * 32 * 4);
+ if(!blocks[i].img) error(lang[ERR_MEM]);
+ memset(blocks[i].img, 0, 6 * 32 * 32 * 4);
+ }
+ fg->pixels = blocks[i].img + k * 32 * 32 * 4;
blk = SDL_CreateRGBSurfaceFrom(raw, w, h, 32, w*4, 0xFF, 0xFF00, 0xFF0000, 0xFF000000);
src.w = w; src.h = h;
SDL_BlitScaled(blk, &src, fg, &dst);
SDL_FreeSurface(blk);
free(raw);
- blocks[i].img[k] = (unsigned char *)fg->pixels;
- blocks[i].numref++;
- }
+ blocks[i].numpar2++;
+ } else r = 0;
free(img);
}
}
/* get overlays */
- if(blocks[i].img[k] && blocks[i].blocknames[k + 10] && blocks[i].blocknames[k + 10][0])
- for(l = o = 0; l < np && !o; l++) {
+ if(blocks[i].img && blocks[i].blocknames[k + 10] && blocks[i].blocknames[k + 10][0])
+ for(l = r = 0; l < np && !r; l++) {
strcpy(path, paths[l]);
strcat(path, blocks[i].blocknames[k + 10]);
f = fopen(path, "rb");
@@ -1063,22 +1041,22 @@ int blockgen(char *blockid)
raw = (unsigned char*)tmp;
}
/* rescale to 32x32 */
+ fg->pixels = blocks[i].img + k * 32 * 32 * 4;
blk = SDL_CreateRGBSurfaceFrom(raw, w, h, 32, w*4, 0xFF, 0xFF00, 0xFF0000, 0xFF000000);
src.w = w; src.h = h;
/* blit overlay to original texture */
SDL_BlitScaled(blk, &src, fg, &dst);
SDL_FreeSurface(blk);
free(raw);
- o = 1;
- }
+ } else r = 0;
free(img);
}
}
}
- if(blocks[i].img[0]) p++;
+ if(blocks[i].img) p++;
}
SDL_FreeSurface(fg);
- blk = SDL_CreateRGBSurfaceFrom(out, TMPSIZE, TMPSIZE, 32, TMPSIZE*4, 0xFF, 0xFF00, 0xFF0000, 0xFF000000);
+ blk = SDL_CreateRGBSurfaceFrom(out, TMPSIZE, 32*TMPSIZE, 32, TMPSIZE*4, 0xFF, 0xFF00, 0xFF0000, 0xFF000000);
/* ok, now we have all the textures loaded. The blocks array looks like this:
* name = canonical block id name (like "Acacia_Bark_Stair")
* blocknames[0] = block's technical name (like "mcl_core:bedrock")
@@ -1088,9 +1066,9 @@ int blockgen(char *blockid)
* blocknames[4] - [9] = tile names (like "acacia.png^[transformR90")
* blocknames[10] - [15] = overlay tile names
* img[0] - img[5] = uncompressed tiles, scaled to 32x32 RGBA, overlay images applied
- * numref = number of textures */
+ * numpar2 = number of textures */
for(i = k = o = 0; i < j; i++) {
- if(!blocks[i].img[0]) continue;
+ if(!blocks[i].img) continue;
if(!verbose) {
k++;
printf("%3d%% %s \r", k*100/p, blocks[i].name);
@@ -1098,63 +1076,58 @@ int blockgen(char *blockid)
/* construct block images */
memset(out, 0, sizeof(out));
if(!strcmp(blocks[i].blocknames[1], "plantlike") || !strcmp(blocks[i].blocknames[1], "firelike")) {
- blitiso(blocks[i].img[0], 0, out, 4, 16,8);
- blitiso(blocks[i].img[0], 0, out, 5, 16,8);
- o += savepng(blocks[i].name,0,blk);
+ blitiso(blocks[i].img, 0, out, 6, 0,0, 0);
+ o += savepng(blocks[i].name,1,blk);
} else
if(!strcmp(blocks[i].blocknames[1], "raillike")) {
- blitiso(blocks[i].img[0], 0, out, 0, 0,40);
- o += savepng(blocks[i].name,0,blk);
- memset(out, 0, sizeof(out));
- blitiso(blocks[i].img[0], 0, out, 1, 0,40);
- o += savepng(blocks[i].name,1,blk);
+ blitiso(blocks[i].img, 0, out, 0, 0,40, 0);
+ blitiso(blocks[i].img, 0, out, 1, 0,40, 1);
+ o += savepng(blocks[i].name,2,blk);
} else
if(!strcmp(blocks[i].blocknames[1], "normal") || !strcmp(blocks[i].blocknames[1], "glasslike")) {
/* get side textures */
- top = blocks[i].img[0];
- bottom = blocks[i].img[1] ? blocks[i].img[1] : blocks[i].img[0];
- west = blocks[i].img[2] ? blocks[i].img[2] : blocks[i].img[0];
- east = blocks[i].img[3] ? blocks[i].img[3] : west;
- north = blocks[i].img[4] ? blocks[i].img[4] : west;
- south = blocks[i].img[5] ? blocks[i].img[5] : west;
+ top = blocks[i].img;
+ bottom = blocks[i].numpar2 > 1 ? blocks[i].img + 32 * 32 * 4 : blocks[i].img;
+ west = blocks[i].numpar2 > 2 ? blocks[i].img + 2 * 32 * 32 * 4 : blocks[i].img;
+ east = blocks[i].numpar2 > 3 ? blocks[i].img + 3 * 32 * 32 * 4 : west;
+ north = blocks[i].numpar2 > 4 ? blocks[i].img + 4 * 32 * 32 * 4 : west;
+ south = blocks[i].numpar2 > 5 ? blocks[i].img + 5 * 32 * 32 * 4 : west;
/* faces south */
- blitiso(bottom, 0, out, 0, 0,39);
- blitiso(west, 0, out, 5, 0,0);
- blitiso(north, 0, out, 4, 32,0);
- blitiso(east, 0, out, 5, 32,16);
- blitiso(south, 0, out, 4, 0,16);
- blitiso(top, 0, out, 0, 0,0);
- o += savepng(blocks[i].name,0,blk);
- if(blocks[i].numref > 1) {
+ blitiso(bottom, 0, out, 0, 0,39, 0);
+ blitiso(west, 0, out, 5, 0,0, 0);
+ blitiso(north, 0, out, 4, 32,0, 0);
+ blitiso(east, 0, out, 5, 32,16, 0);
+ blitiso(south, 0, out, 4, 0,16, 0);
+ blitiso(top, 0, out, 0, 0,0, 0);
+ l = 1;
+ if(blocks[i].numpar2 > 1) {
/* faces east */
- memset(out, 0, sizeof(out));
- blitiso(bottom, 0, out, 1, 0,39);
- blitiso(south, 0, out, 5, 0,0);
- blitiso(west, 0, out, 4, 32,0);
- blitiso(north, 0, out, 5, 32,16);
- blitiso(east, 0, out, 4, 0,16);
- blitiso(top, 0, out, 1, 0,0);
- o += savepng(blocks[i].name,1,blk);
+ blitiso(bottom, 0, out, 1, 0,39, 1);
+ blitiso(south, 0, out, 5, 0,0, 1);
+ blitiso(west, 0, out, 4, 32,0, 1);
+ blitiso(north, 0, out, 5, 32,16, 1);
+ blitiso(east, 0, out, 4, 0,16, 1);
+ blitiso(top, 0, out, 1, 0,0, 1);
+ l++;
/* faces north */
- memset(out, 0, sizeof(out));
- blitiso(bottom, 0, out, 2, 0,39);
- blitiso(east, 0, out, 5, 0,0);
- blitiso(south, 0, out, 4, 32,0);
- blitiso(west, 0, out, 5, 32,16);
- blitiso(north, 0, out, 4, 0,16);
- blitiso(top, 0, out, 2, 0,0);
- o += savepng(blocks[i].name,2,blk);
+ blitiso(bottom, 0, out, 2, 0,39, 2);
+ blitiso(east, 0, out, 5, 0,0, 2);
+ blitiso(south, 0, out, 4, 32,0, 2);
+ blitiso(west, 0, out, 5, 32,16, 2);
+ blitiso(north, 0, out, 4, 0,16, 2);
+ blitiso(top, 0, out, 2, 0,0, 2);
+ l++;
/* faces west */
- memset(out, 0, sizeof(out));
- blitiso(bottom, 0, out, 3, 0,39);
- blitiso(north, 0, out, 5, 0,0);
- blitiso(east, 0, out, 4, 32,0);
- blitiso(south, 0, out, 5, 32,16);
- blitiso(west, 0, out, 4, 0,16);
- blitiso(top, 0, out, 3, 0,0);
- o += savepng(blocks[i].name,3,blk);
+ blitiso(bottom, 0, out, 3, 0,39, 3);
+ blitiso(north, 0, out, 5, 0,0, 3);
+ blitiso(east, 0, out, 4, 32,0, 3);
+ blitiso(south, 0, out, 5, 32,16, 3);
+ blitiso(west, 0, out, 4, 0,16, 3);
+ blitiso(top, 0, out, 3, 0,0, 3);
+ l++;
}
- /* check if we need togenerate slabs and stairs for this block */
+ o += savepng(blocks[i].name,l,blk);
+ /* check if we need to generate slabs and stairs for this block */
/* FIXME: this assumes no block ids are longer than 255 bytes, hopefully true */
sprintf(path, "%s_Slab", blocks[i].name);
sprintf(path+256, "Double_%s_Slab", blocks[i].name);
@@ -1167,120 +1140,113 @@ int blockgen(char *blockid)
if(sl) {
/* slab */
memset(out, 0, sizeof(out));
- blitiso(bottom, 0, out, 0, 0,39);
- blitiso(west, 5, out, 5, 0,41);
- blitiso(north, 5, out, 4, 32,30);
- blitiso(east, 5, out, 5, 32,58);
- blitiso(south, 5, out, 4, 0,46);
- blitiso(top, 0, out, 0, 0,29);
- o += savepng(path,0,blk);
+ blitiso(bottom, 0, out, 0, 0,39, 0);
+ blitiso(west, 5, out, 5, 0,41, 0);
+ blitiso(north, 5, out, 4, 32,30, 0);
+ blitiso(east, 5, out, 5, 32,58, 0);
+ blitiso(south, 5, out, 4, 0,46, 0);
+ blitiso(top, 0, out, 0, 0,29, 0);
+ o += savepng(path,1,blk);
}
if(ds) {
/* double slab */
memset(out, 0, sizeof(out));
- blitiso(bottom, 0, out, 0, 0,39);
- blitiso(west, 3, out, 5, 0,28);
- blitiso(west, 4, out, 5, 16,20);
- blitiso(north, 3, out, 4, 32,20);
- blitiso(north, 4, out, 4, 48,28);
- blitiso(east, 4, out, 5, 48,36);
- blitiso(east, 3, out, 5, 32,44);
- blitiso(south, 4, out, 4, 16,44);
- blitiso(south, 3, out, 4, 0,36);
- blitiso(top, 0, out, 0, 0,20);
- o += savepng(path+256,0,blk);
+ blitiso(bottom, 0, out, 0, 0,39, 0);
+ blitiso(west, 3, out, 5, 0,28, 0);
+ blitiso(west, 4, out, 5, 16,20, 0);
+ blitiso(north, 3, out, 4, 32,20, 0);
+ blitiso(north, 4, out, 4, 48,28, 0);
+ blitiso(east, 4, out, 5, 48,36, 0);
+ blitiso(east, 3, out, 5, 32,44, 0);
+ blitiso(south, 4, out, 4, 16,44, 0);
+ blitiso(south, 3, out, 4, 0,36, 0);
+ blitiso(top, 0, out, 0, 0,20, 0);
+ o += savepng(path+256,1,blk);
}
if(st) {
/* stairs */
memset(out, 0, sizeof(out));
/* north */
- memset(out, 0, sizeof(out));
- blitiso(bottom, 0, out, 0, 0,39);
- blitiso(west, 3, out, 5, 0,28);
- blitiso(west, 4, out, 5, 16,20);
- blitiso(north, 3, out, 4, 32,20);
- blitiso(north, 4, out, 4, 48,28);
- blitiso(east, 4, out, 5, 48,36);
- blitiso(east, 3, out, 5, 32,44);
- blitiso(south, 4, out, 4, 16,44);
- blitiso(south, 3, out, 4, 0,36);
- blitiso(top, 1, out, 0, 16,36);
- blitiso(top, 2, out, 0, 0,28);
- blitiso(west, 2, out, 5, 16,1);
- blitiso(north, 1, out, 4, 32,1);
- blitiso(north, 2, out, 4, 48,9);
- blitiso(east, 2, out, 5, 48,17);
- blitiso(south, 2, out, 4, 32,17);
- blitiso(south, 1, out, 4, 16,9);
- blitiso(top, 4, out, 0, 16,0);
- blitiso(top, 3, out, 0, 32,8);
- o += savepng(path+512,0,blk);
+ blitiso(bottom, 0, out, 0, 0,39, 0);
+ blitiso(west, 3, out, 5, 0,28, 0);
+ blitiso(west, 4, out, 5, 16,20, 0);
+ blitiso(north, 3, out, 4, 32,20, 0);
+ blitiso(north, 4, out, 4, 48,28, 0);
+ blitiso(east, 4, out, 5, 48,36, 0);
+ blitiso(east, 3, out, 5, 32,44, 0);
+ blitiso(south, 4, out, 4, 16,44, 0);
+ blitiso(south, 3, out, 4, 0,36, 0);
+ blitiso(top, 1, out, 0, 16,36, 0);
+ blitiso(top, 2, out, 0, 0,28, 0);
+ blitiso(west, 2, out, 5, 16,1, 0);
+ blitiso(north, 1, out, 4, 32,1, 0);
+ blitiso(north, 2, out, 4, 48,9, 0);
+ blitiso(east, 2, out, 5, 48,17, 0);
+ blitiso(south, 2, out, 4, 32,17, 0);
+ blitiso(south, 1, out, 4, 16,9, 0);
+ blitiso(top, 4, out, 0, 16,0, 0);
+ blitiso(top, 3, out, 0, 32,8, 0);
/* east */
- memset(out, 0, sizeof(out));
- blitiso(bottom, 0, out, 1, 0,39);
- blitiso(south, 3, out, 5, 0,28);
- blitiso(south, 4, out, 5, 16,20);
- blitiso(west, 3, out, 4, 32,20);
- blitiso(west, 4, out, 4, 48,28);
- blitiso(north, 4, out, 5, 48,36);
- blitiso(north, 3, out, 5, 32,44);
- blitiso(east, 4, out, 4, 16,44);
- blitiso(east, 3, out, 4, 0,36);
- blitiso(top, 3, out, 1, 16,20);
- blitiso(top, 4, out, 1, 0,28);
- blitiso(south, 1, out, 5, 32,9);
- blitiso(south, 2, out, 5, 16,17);
- blitiso(west, 2, out, 4, 48,9);
- blitiso(north, 2, out, 5, 48,18);
- blitiso(north, 1, out, 5, 32,26);
- blitiso(east, 2, out, 4, 16,26);
- blitiso(top, 1, out, 1, 32,8);
- blitiso(top, 2, out, 1, 16,16);
- o += savepng(path+512,1,blk);
+ blitiso(bottom, 0, out, 1, 0,39, 1);
+ blitiso(south, 3, out, 5, 0,28, 1);
+ blitiso(south, 4, out, 5, 16,20, 1);
+ blitiso(west, 3, out, 4, 32,20, 1);
+ blitiso(west, 4, out, 4, 48,28, 1);
+ blitiso(north, 4, out, 5, 48,36, 1);
+ blitiso(north, 3, out, 5, 32,44, 1);
+ blitiso(east, 4, out, 4, 16,44, 1);
+ blitiso(east, 3, out, 4, 0,36, 1);
+ blitiso(top, 3, out, 1, 16,20, 1);
+ blitiso(top, 4, out, 1, 0,28, 1);
+ blitiso(south, 1, out, 5, 32,9, 1);
+ blitiso(south, 2, out, 5, 16,17, 1);
+ blitiso(west, 2, out, 4, 48,9, 1);
+ blitiso(north, 2, out, 5, 48,18, 1);
+ blitiso(north, 1, out, 5, 32,26, 1);
+ blitiso(east, 2, out, 4, 16,26, 1);
+ blitiso(top, 1, out, 1, 32,8, 1);
+ blitiso(top, 2, out, 1, 16,16, 1);
/* south */
- memset(out, 0, sizeof(out));
- blitiso(bottom, 0, out, 2, 0,39);
- blitiso(east, 3, out, 5, 0,28);
- blitiso(east, 4, out, 5, 16,20);
- blitiso(south, 3, out, 4, 32,20);
- blitiso(south, 4, out, 4, 48,28);
- blitiso(west, 4, out, 5, 48,36);
- blitiso(west, 3, out, 5, 32,44);
- blitiso(north, 4, out, 4, 16,44);
- blitiso(north, 3, out, 4, 0,36);
- blitiso(top, 1, out, 2, 16,20);
- blitiso(top, 2, out, 2, 32,28);
- blitiso(east, 1, out, 5, 0,9);
- blitiso(south, 1, out, 4, 16,9);
- blitiso(south, 2, out, 4, 32,17);
- blitiso(west, 1, out, 5, 32,25);
- blitiso(north, 2, out, 4, 16,25);
- blitiso(north, 1, out, 4, 0,17);
- blitiso(top, 3, out, 2, 0,8);
- blitiso(top, 4, out, 2, 16,16);
- o += savepng(path+512,2,blk);
+ blitiso(bottom, 0, out, 2, 0,39, 2);
+ blitiso(east, 3, out, 5, 0,28, 2);
+ blitiso(east, 4, out, 5, 16,20, 2);
+ blitiso(south, 3, out, 4, 32,20, 2);
+ blitiso(south, 4, out, 4, 48,28, 2);
+ blitiso(west, 4, out, 5, 48,36, 2);
+ blitiso(west, 3, out, 5, 32,44, 2);
+ blitiso(north, 4, out, 4, 16,44, 2);
+ blitiso(north, 3, out, 4, 0,36, 2);
+ blitiso(top, 1, out, 2, 16,20, 2);
+ blitiso(top, 2, out, 2, 32,28, 2);
+ blitiso(east, 1, out, 5, 0,9, 2);
+ blitiso(south, 1, out, 4, 16,9, 2);
+ blitiso(south, 2, out, 4, 32,17, 2);
+ blitiso(west, 1, out, 5, 32,25, 2);
+ blitiso(north, 2, out, 4, 16,25, 2);
+ blitiso(north, 1, out, 4, 0,17, 2);
+ blitiso(top, 3, out, 2, 0,8, 2);
+ blitiso(top, 4, out, 2, 16,16, 2);
/* west */
- memset(out, 0, sizeof(out));
- blitiso(bottom, 0, out, 3, 0,39);
- blitiso(north, 3, out, 5, 0,28);
- blitiso(north, 4, out, 5, 16,20);
- blitiso(east, 3, out, 4, 32,20);
- blitiso(east, 4, out, 4, 48,28);
- blitiso(south, 4, out, 5, 48,36);
- blitiso(south, 3, out, 5, 32,44);
- blitiso(west, 4, out, 4, 16,44);
- blitiso(west, 3, out, 4, 0,36);
- blitiso(top, 1, out, 3, 32,28);
- blitiso(top, 2, out, 3, 16,36);
- blitiso(north, 1, out, 5, 0,9);
- blitiso(north, 2, out, 5, 16,1);
- blitiso(east, 1, out, 4, 32,1);
- blitiso(south, 2, out, 5, 32,9);
- blitiso(south, 1, out, 5, 16,17);
- blitiso(west, 1, out, 4, 0,17);
- blitiso(top, 3, out, 3, 0,8);
- blitiso(top, 4, out, 3, 16,0);
- o += savepng(path+512,3,blk);
+ blitiso(bottom, 0, out, 3, 0,39, 3);
+ blitiso(north, 3, out, 5, 0,28, 3);
+ blitiso(north, 4, out, 5, 16,20, 3);
+ blitiso(east, 3, out, 4, 32,20, 3);
+ blitiso(east, 4, out, 4, 48,28, 3);
+ blitiso(south, 4, out, 5, 48,36, 3);
+ blitiso(south, 3, out, 5, 32,44, 3);
+ blitiso(west, 4, out, 4, 16,44, 3);
+ blitiso(west, 3, out, 4, 0,36, 3);
+ blitiso(top, 1, out, 3, 32,28, 3);
+ blitiso(top, 2, out, 3, 16,36, 3);
+ blitiso(north, 1, out, 5, 0,9, 3);
+ blitiso(north, 2, out, 5, 16,1, 3);
+ blitiso(east, 1, out, 4, 32,1, 3);
+ blitiso(south, 2, out, 5, 32,9, 3);
+ blitiso(south, 1, out, 5, 16,17, 3);
+ blitiso(west, 1, out, 4, 0,17, 3);
+ blitiso(top, 3, out, 3, 0,8, 3);
+ blitiso(top, 4, out, 3, 16,0, 3);
+ o += savepng(path+512,4,blk);
}
}
}