merged version 020b-fixed

2016-02-18 20:42:27 +01:00 · 2016-02-18 20:42:27 +01:00 · dafe34b8b8
parent bd32e20465
commit dafe34b8b8
122 changed files with 2 additions and 0 deletions
--- a/2
+++ b/2
@ -159,6 +159,7 @@ Created by Neuromancer (CC BY-SA 3.0) :
 Created by Gambit (WTFPL) :
  bubble.png
  bucket_*.png
+  coral4.png
  default_acacia_tree.png
  default_bronze_block.png
  default_bronze_ingot.png
@ -185,6 +186,7 @@ Created by Gambit (WTFPL) :
  farming_wheat.png
  farming_wheat_*.png
  farming_wheat_seed.png
+  fishing_*.png
  flowers_mushroom_*.png
  flowers_waterlily.png
  gems_amethyst_block.png
--- a/castle_door_jail.png
+++ b/castle_door_jail.png
--- a/castle_door_oak.png
+++ b/castle_door_oak.png
--- a/castle_jail_door_bottom.png
+++ b/castle_jail_door_bottom.png
--- a/castle_jail_door_inv.png
+++ b/castle_jail_door_inv.png
--- a/castle_jail_door_top.png
+++ b/castle_jail_door_top.png
--- a/castle_jailbars.png
+++ b/castle_jailbars.png
--- a/castle_jailbars_half.png
+++ b/castle_jailbars_half.png
--- a/castle_oak_door_inv.png
+++ b/castle_oak_door_inv.png
--- a/castle_ropebox_side_1.png
+++ b/castle_ropebox_side_1.png
--- a/castle_ropebox_side_2.png
+++ b/castle_ropebox_side_2.png
--- a/castle_ropebox_top.png
+++ b/castle_ropebox_top.png
--- a/castle_ropes.png
+++ b/castle_ropes.png
--- a/coral2.png
+++ b/coral2.png
--- a/coral3.png
+++ b/coral3.png
--- a/coral4.png
+++ b/coral4.png
--- a/cottages_minimal_wood.png
+++ b/cottages_minimal_wood.png
--- a/cottages_reet.png
+++ b/cottages_reet.png
--- a/darkage_iron_bars.png
+++ b/darkage_iron_bars.png
--- a/darkage_iron_grille.png
+++ b/darkage_iron_grille.png
--- a/darkage_reinforced_wood.png
+++ b/darkage_reinforced_wood.png
--- a/darkage_reinforced_wood_left.png
+++ b/darkage_reinforced_wood_left.png
--- a/darkage_reinforced_wood_right.png
+++ b/darkage_reinforced_wood_right.png
--- a/darkage_wood_bars.png
+++ b/darkage_wood_bars.png
--- a/darkage_wood_frame.png
+++ b/darkage_wood_frame.png
--- a/darkage_wood_grille.png
+++ b/darkage_wood_grille.png
--- a/fish_cooked.png
+++ b/fish_cooked.png
--- a/fish_raw.png
+++ b/fish_raw.png
--- a/fishing_fish_cooked.png
+++ b/fishing_fish_cooked.png
--- a/fishing_fish_raw.png
+++ b/fishing_fish_raw.png
--- a/fishing_rod.png
+++ b/fishing_rod.png
--- a/fishing_rod_baited.png
+++ b/fishing_rod_baited.png
--- a/fishing_rod_wield.png
+++ b/fishing_rod_wield.png
--- a/mob_spawner.png
+++ b/mob_spawner.png
--- a/mobs_honey_inv.png
+++ b/mobs_honey_inv.png
--- a/moreores_tool_silvershovel.png
+++ b/moreores_tool_silvershovel.png
--- a/moretrees_acorn.png
+++ b/moretrees_acorn.png
--- a/moretrees_apple_tree_leaves.png
+++ b/moretrees_apple_tree_leaves.png
--- a/moretrees_apple_tree_trunk.png
+++ b/moretrees_apple_tree_trunk.png
--- a/moretrees_apple_tree_trunk_top.png
+++ b/moretrees_apple_tree_trunk_top.png
--- a/moretrees_apple_tree_wood.png
+++ b/moretrees_apple_tree_wood.png
--- a/moretrees_beech_leaves.png
+++ b/moretrees_beech_leaves.png
--- a/moretrees_beech_trunk.png
+++ b/moretrees_beech_trunk.png
--- a/moretrees_beech_trunk_top.png
+++ b/moretrees_beech_trunk_top.png
--- a/moretrees_beech_wood.png
+++ b/moretrees_beech_wood.png
--- a/moretrees_birch_leaves.png
+++ b/moretrees_birch_leaves.png
--- a/moretrees_birch_trunk.png
+++ b/moretrees_birch_trunk.png
--- a/moretrees_birch_trunk_top.png
+++ b/moretrees_birch_trunk_top.png
--- a/moretrees_birch_wood.png
+++ b/moretrees_birch_wood.png
--- a/moretrees_fir_cone.png
+++ b/moretrees_fir_cone.png
--- a/moretrees_fir_leaves.png
+++ b/moretrees_fir_leaves.png
--- a/moretrees_fir_leaves_bright.png
+++ b/moretrees_fir_leaves_bright.png
--- a/moretrees_fir_trunk.png
+++ b/moretrees_fir_trunk.png
--- a/moretrees_fir_trunk_top.png
+++ b/moretrees_fir_trunk_top.png
--- a/moretrees_fir_wood.png
+++ b/moretrees_fir_wood.png
--- a/moretrees_jungletree_leaves_green.png
+++ b/moretrees_jungletree_leaves_green.png
--- a/moretrees_jungletree_leaves_red.png
+++ b/moretrees_jungletree_leaves_red.png
--- a/moretrees_jungletree_leaves_yellow.png
+++ b/moretrees_jungletree_leaves_yellow.png
--- a/moretrees_oak_leaves.png
+++ b/moretrees_oak_leaves.png
--- a/moretrees_oak_trunk.png
+++ b/moretrees_oak_trunk.png
--- a/moretrees_oak_trunk_top.png
+++ b/moretrees_oak_trunk_top.png
--- a/moretrees_oak_wood.png
+++ b/moretrees_oak_wood.png
--- a/moretrees_palm_leaves.png
+++ b/moretrees_palm_leaves.png
--- a/moretrees_palm_trunk.png
+++ b/moretrees_palm_trunk.png
--- a/moretrees_palm_trunk_top.png
+++ b/moretrees_palm_trunk_top.png
--- a/moretrees_palm_wood.png
+++ b/moretrees_palm_wood.png
--- a/moretrees_pine_cone.png
+++ b/moretrees_pine_cone.png
--- a/moretrees_rubber_tree_leaves.png
+++ b/moretrees_rubber_tree_leaves.png
--- a/moretrees_rubber_tree_trunk.png
+++ b/moretrees_rubber_tree_trunk.png
--- a/moretrees_rubber_tree_trunk_empty.png
+++ b/moretrees_rubber_tree_trunk_empty.png
--- a/moretrees_rubber_tree_trunk_top.png
+++ b/moretrees_rubber_tree_trunk_top.png
--- a/moretrees_rubber_tree_wood.png
+++ b/moretrees_rubber_tree_wood.png
--- a/moretrees_sequoia_leaves.png
+++ b/moretrees_sequoia_leaves.png
--- a/moretrees_sequoia_trunk.png
+++ b/moretrees_sequoia_trunk.png
--- a/moretrees_sequoia_trunk_top.png
+++ b/moretrees_sequoia_trunk_top.png
--- a/moretrees_sequoia_wood.png
+++ b/moretrees_sequoia_wood.png
--- a/moretrees_spruce_cone.png
+++ b/moretrees_spruce_cone.png
--- a/moretrees_spruce_leaves.png
+++ b/moretrees_spruce_leaves.png
--- a/moretrees_spruce_trunk.png
+++ b/moretrees_spruce_trunk.png
--- a/moretrees_spruce_trunk_top.png
+++ b/moretrees_spruce_trunk_top.png
--- a/moretrees_spruce_wood.png
+++ b/moretrees_spruce_wood.png
--- a/moretrees_willow_leaves.png
+++ b/moretrees_willow_leaves.png
--- a/moretrees_willow_trunk.png
+++ b/moretrees_willow_trunk.png
--- a/moretrees_willow_trunk_top.png
+++ b/moretrees_willow_trunk_top.png
--- a/moretrees_willow_wood.png
+++ b/moretrees_willow_wood.png
--- a/vines_item.png
+++ b/vines_item.png
--- a/vines_jungle_end.png
+++ b/vines_jungle_end.png
--- a/vines_jungle_middle.png
+++ b/vines_jungle_middle.png
--- a/vines_root_end.png
+++ b/vines_root_end.png
--- a/vines_root_middle.png
+++ b/vines_root_middle.png
--- a/vines_rope.png
+++ b/vines_rope.png
--- a/vines_rope_end.png
+++ b/vines_rope_end.png
--- a/vines_shears.png
+++ b/vines_shears.png
--- a/vines_side_end.png
+++ b/vines_side_end.png
--- a/vines_side_middle.png
+++ b/vines_side_middle.png
--- a/vines_vine_end.png
+++ b/vines_vine_end.png
--- a/vines_vine_middle.png
+++ b/vines_vine_middle.png
--- a/vines_willow_end.png
+++ b/vines_willow_end.png
--- a/vines_willow_middle.png
+++ b/vines_willow_middle.png
--- a/vmg_banana_wood.png
+++ b/vmg_banana_wood.png
--- a/Show More
+++ b/Show More