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
commit63fe487d933f00123bb97d699c98e0c5248a8060 (patch)
tree446356ce6e66ccc76675eff0648d75c7e05ce2b4 /src/tile.cpp
parentd2b2c7c09e21fcf728e741e11e6fdabe03036b0e (diff)
parentc930a92b7222e0228332fb39536d7ff4f3442d1b (diff)
downloadminetest-63fe487d933f00123bb97d699c98e0c5248a8060.tar.gz
minetest-63fe487d933f00123bb97d699c98e0c5248a8060.tar.bz2
minetest-63fe487d933f00123bb97d699c98e0c5248a8060.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");