merge from MTCORE

2016-03-04 21:01:38 +01:00 · 2016-03-04 21:01:38 +01:00 · cfefdda617
parent e8004b94e9
commit cfefdda617
115 changed files with 18 additions and 5 deletions
--- a/23
+++ b/23
@ -31,6 +31,7 @@ Created by celeron55 (CC BY-SA 3.0) :
  door_glass_b.png

 Created by Cisoun (WTFPL) :
+  default_aspen_tree_top.png (alternates folder)
  default_jungletree.png
  default_lava.png
  default_leaves.png
@ -147,6 +148,9 @@ sofar (CC BY-SA 3.0):
  default_aspen_tree
  default_aspen_tree_top, derived from default_pine_tree_top (by paramat)
  default_aspen_wood, derived from default_pine_wood (by paramat)
+  default_chest_wood.png
+  default_chest_wood_locked.png
+

 Created by Neuromancer (CC BY-SA 2.0) :
  default_cobble.png, based on texture by Brane praefect
@ -156,11 +160,12 @@ Created by Neuromancer (CC BY-SA 3.0) :
  default_dirt.png
  default_furnace_*.png

+Created by Kilbith/jp ??? (WTFPL) :
+  trash_icon.png
+
 Created by Gambit (WTFPL) :
-  bubble.png
-  bucket_*.png
  coral4.png
-  default_acacia_tree.png
+  default_acacia_tree.png (alternates folder)
  default_bronze_block.png
  default_bronze_ingot.png
  default_clay_lump.png
@ -173,13 +178,18 @@ Created by Gambit (WTFPL) :
  default_gold_ingot.png
  default_gold_lump.png
  default_grass_*.png
+  default_gravel.png
  default_iron_lump.png
  default_mese_block.png
  default_mese_crystal.png
  default_paper.png
-  default_pine_tree.png
+  default_pine_tree.png (alternates folder)
  default_steel_block.png
  default_steel_ingot.png
+  doors_steel.png
+  doors_steel_a.png
+  doors_steel_b.png
+  doors_trapdoor_steel.png
  farming_cotton_*.png
  farming_cotton_seed.png
  farming_flour.png
@ -192,6 +202,8 @@ Created by Gambit (WTFPL) :
  gems_amethyst_block.png
  gems_emerald_block.png
  gems_emerald_gem.png
+  default_mese_block.png (alternates folder)
+  default_mese_crystal.png (alternates folder)
  gems_pearl_block.png
  gems_quartz_block.png
  gems_ruby_block.png
@ -200,7 +212,6 @@ Created by Gambit (WTFPL) :
  gems_shadow_block.png
  heart.png
  hunger.png
-  mobs_bucket_milk.png
  moreores_mithril_block.png
  moreores_mithril_ingot.png
  moreores_silver_block.png
@ -209,6 +220,8 @@ Created by Gambit (WTFPL) :
  moreores_tin_ingot.png
  oresplus_*.png
  screwdriver.png
+  vessels_shelf.png
+  vessels_glass_fragments.png
  vmg_banana_tree.png
  xpanes_bar.png
  xdecor_*.png
--- a/alignedbricks_brick.png
+++ b/alignedbricks_brick.png
--- a/alignedbricks_brick_side.png
+++ b/alignedbricks_brick_side.png
--- a/alignedbricks_brick_top.png
+++ b/alignedbricks_brick_top.png
--- a/alignedbricks_desert_stone_brick.png
+++ b/alignedbricks_desert_stone_brick.png
--- a/alignedbricks_desert_stone_brick_side.png
+++ b/alignedbricks_desert_stone_brick_side.png
--- a/alignedbricks_desert_stone_brick_top.png
+++ b/alignedbricks_desert_stone_brick_top.png
--- a/alignedbricks_obsidian_brick.png
+++ b/alignedbricks_obsidian_brick.png
--- a/alignedbricks_obsidian_brick_side.png
+++ b/alignedbricks_obsidian_brick_side.png
--- a/alignedbricks_obsidian_brick_top.png
+++ b/alignedbricks_obsidian_brick_top.png
--- a/alignedbricks_sandstone_brick.png
+++ b/alignedbricks_sandstone_brick.png
--- a/alignedbricks_sandstone_brick_side.png
+++ b/alignedbricks_sandstone_brick_side.png
--- a/alignedbricks_sandstone_brick_top.png
+++ b/alignedbricks_sandstone_brick_top.png
--- a/alignedbricks_stone_brick.png
+++ b/alignedbricks_stone_brick.png
--- a/alignedbricks_stone_brick_side.png
+++ b/alignedbricks_stone_brick_side.png
--- a/alignedbricks_stone_brick_top.png
+++ b/alignedbricks_stone_brick_top.png
--- a/alternates/building_blocks_hardwood.png
+++ b/alternates/building_blocks_hardwood.png
--- a/alternates/default_steel_ladder.png
+++ b/alternates/default_steel_ladder.png
--- a/alternates/mobs_honey_bottled.png
+++ b/alternates/mobs_honey_bottled.png
--- a/alternates/mobs_honey_jar.png
+++ b/alternates/mobs_honey_jar.png
--- a/alternates/vessels_jar.png
+++ b/alternates/vessels_jar.png
--- a/alternates/xdecor_wood.png
+++ b/alternates/xdecor_wood.png
--- a/building_blocks_BWtile.png
+++ b/building_blocks_BWtile.png
--- a/building_blocks_brobble.png
+++ b/building_blocks_brobble.png
--- a/building_blocks_cast_iron.png
+++ b/building_blocks_cast_iron.png
--- a/building_blocks_cast_iron_fireplace.png
+++ b/building_blocks_cast_iron_fireplace.png
--- a/building_blocks_grate.png
+++ b/building_blocks_grate.png
--- a/building_blocks_grate2.png
+++ b/building_blocks_grate2.png
--- a/building_blocks_hardwood.png
+++ b/building_blocks_hardwood.png
--- a/building_blocks_marble.png
+++ b/building_blocks_marble.png
--- a/building_blocks_sglass.png
+++ b/building_blocks_sglass.png
--- a/building_blocks_tar.png
+++ b/building_blocks_tar.png
--- a/building_blocks_towel.png
+++ b/building_blocks_towel.png
--- a/building_blocks_wglass.png
+++ b/building_blocks_wglass.png
--- a/castle_ironbound_chest_back.png
+++ b/castle_ironbound_chest_back.png
--- a/castle_ironbound_chest_bottom.png
+++ b/castle_ironbound_chest_bottom.png
--- a/castle_ironbound_chest_front.png
+++ b/castle_ironbound_chest_front.png
--- a/castle_ironbound_chest_side.png
+++ b/castle_ironbound_chest_side.png
--- a/castle_ironbound_chest_top.png
+++ b/castle_ironbound_chest_top.png
--- a/clams_algae.png
+++ b/clams_algae.png
--- a/clams_algaeused.png
+++ b/clams_algaeused.png
--- a/cottages_minimal_wood.png
+++ b/cottages_minimal_wood.png
--- a/crack_anylength.png
+++ b/crack_anylength.png
--- a/darkage_mud_lump.png
+++ b/darkage_mud_lump.png
--- a/darkage_silt_lump.png
+++ b/darkage_silt_lump.png
--- a/default_acacia_leaves.png
+++ b/default_acacia_leaves.png
--- a/default_aspen_wood.png
+++ b/default_aspen_wood.png
--- a/default_clay_lump.png
+++ b/default_clay_lump.png
--- a/default_coal_block.png
+++ b/default_coal_block.png
--- a/default_coal_lump.png
+++ b/default_coal_lump.png
--- a/default_gate_overlay.png
+++ b/default_gate_overlay.png
--- a/default_gold_lump.png
+++ b/default_gold_lump.png
--- a/default_gravel.png
+++ b/default_gravel.png
--- a/default_iron_lump.png
+++ b/default_iron_lump.png
--- a/default_tool_steelsword.png
+++ b/default_tool_steelsword.png
--- a/gems_pearl_gem.png
+++ b/gems_pearl_gem.png
--- a/gems_quartz_gem.png
+++ b/gems_quartz_gem.png
--- a/gems_ruby_gem.png
+++ b/gems_ruby_gem.png
--- a/lapis_block.png
+++ b/lapis_block.png
--- a/lapis_brick.png
+++ b/lapis_brick.png
--- a/lapis_brick_side.png
+++ b/lapis_brick_side.png
--- a/lapis_brick_top.png
+++ b/lapis_brick_top.png
--- a/lapis_cobble.png
+++ b/lapis_cobble.png
--- a/lapis_lazurite_block.png
+++ b/lapis_lazurite_block.png
--- a/lapis_lazurite_brick.png
+++ b/lapis_lazurite_brick.png
--- a/lapis_lazurite_brick_side.png
+++ b/lapis_lazurite_brick_side.png
--- a/lapis_lazurite_brick_top.png
+++ b/lapis_lazurite_brick_top.png
--- a/lapis_mineral_pyrite.png
+++ b/lapis_mineral_pyrite.png
--- a/lapis_pyrite_block.png
+++ b/lapis_pyrite_block.png
--- a/lapis_pyrite_ingot.png
+++ b/lapis_pyrite_ingot.png
--- a/lapis_pyrite_nugget.png
+++ b/lapis_pyrite_nugget.png
--- a/lapis_pyrite_sacred.png
+++ b/lapis_pyrite_sacred.png
--- a/lapis_stone.png
+++ b/lapis_stone.png
--- a/lapis_tile.png
+++ b/lapis_tile.png
--- a/moretrees_apple_tree_wood.png
+++ b/moretrees_apple_tree_wood.png
--- a/moretrees_birch_wood.png
+++ b/moretrees_birch_wood.png
--- a/moretrees_fir_wood.png
+++ b/moretrees_fir_wood.png
--- a/moretrees_oak_wood.png
+++ b/moretrees_oak_wood.png
--- a/moretrees_palm_wood.png
+++ b/moretrees_palm_wood.png
--- a/moretrees_rubber_tree_wood.png
+++ b/moretrees_rubber_tree_wood.png
--- a/moretrees_sequoia_wood.png
+++ b/moretrees_sequoia_wood.png
--- a/moretrees_willow_wood.png
+++ b/moretrees_willow_wood.png
--- a/seacobble_seacobble.png
+++ b/seacobble_seacobble.png
--- a/seacobble_seacobble_aqua.png
+++ b/seacobble_seacobble_aqua.png
--- a/seacobble_seacobble_cyan.png
+++ b/seacobble_seacobble_cyan.png
--- a/seacobble_seacobble_lime.png
+++ b/seacobble_seacobble_lime.png
--- a/seacobble_seacobble_magenta.png
+++ b/seacobble_seacobble_magenta.png
--- a/seacobble_seacobble_redviolet.png
+++ b/seacobble_seacobble_redviolet.png
--- a/seacobble_seacobble_skyblue.png
+++ b/seacobble_seacobble_skyblue.png
--- a/seastone_seastone.png
+++ b/seastone_seastone.png
--- a/seastone_seastone_aqua.png
+++ b/seastone_seastone_aqua.png
--- a/seastone_seastone_cyan.png
+++ b/seastone_seastone_cyan.png
--- a/seastone_seastone_lime.png
+++ b/seastone_seastone_lime.png
--- a/seastone_seastone_magenta.png
+++ b/seastone_seastone_magenta.png
--- a/seastone_seastone_redviolet.png
+++ b/seastone_seastone_redviolet.png
--- a/seastone_seastone_skyblue.png
+++ b/seastone_seastone_skyblue.png
--- a/seastonebrick_seastonebrick.png
+++ b/seastonebrick_seastonebrick.png
--- a/seastonebrick_seastonebrick_aqua.png
+++ b/seastonebrick_seastonebrick_aqua.png
--- a/seastonebrick_seastonebrick_cyan.png
+++ b/seastonebrick_seastonebrick_cyan.png
--- a/seastonebrick_seastonebrick_lime.png
+++ b/seastonebrick_seastonebrick_lime.png
--- a/Show More
+++ b/Show More