summaryrefslogtreecommitdiff
path: root/src/tile.cpp
diff options
context:
space:
mode:
authorteddydestodes <derkomtur@schattengang.net>2011-06-01 14:11:52 +0200
committerteddydestodes <derkomtur@schattengang.net>2011-06-01 14:11:52 +0200
commit4ddf2bc8a2531e158d63e92325319f21bea9278d (patch)
tree1a28b7a0b2b454354f2dfdab278b51b0cc741f28 /src/tile.cpp
parent9de57d13bc7a97fba17da5807e1ef57d96586deb (diff)
parent5f52a622b6a2602742ea472c1163eba2acf17fb6 (diff)
downloadminetest-4ddf2bc8a2531e158d63e92325319f21bea9278d.tar.gz
minetest-4ddf2bc8a2531e158d63e92325319f21bea9278d.tar.bz2
minetest-4ddf2bc8a2531e158d63e92325319f21bea9278d.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/tile.cpp')
-rw-r--r--src/tile.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/tile.cpp b/src/tile.cpp
index 8b0c3f2ea..71e0c9638 100644
--- a/src/tile.cpp
+++ b/src/tile.cpp
@@ -507,12 +507,16 @@ void TextureSource::buildMainAtlas()
sourcelist.push_back("mud.png");
sourcelist.push_back("sand.png");
sourcelist.push_back("sandstone.png");
+ sourcelist.push_back("clay.png");
+ sourcelist.push_back("brick.png");
sourcelist.push_back("grass.png");
sourcelist.push_back("grass_footsteps.png");
sourcelist.push_back("tree.png");
sourcelist.push_back("tree_top.png");
sourcelist.push_back("water.png");
sourcelist.push_back("leaves.png");
+ sourcelist.push_back("cactus_side.png");
+ sourcelist.push_back("cactus_top.png");
sourcelist.push_back("glass.png");
sourcelist.push_back("mud.png^grass_side.png");
sourcelist.push_back("cobble.png");