summaryrefslogtreecommitdiff
path: root/src/mapnode.h
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/mapnode.h
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/mapnode.h')
-rw-r--r--src/mapnode.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/mapnode.h b/src/mapnode.h
index ad256585f..e8cc0ab51 100644
--- a/src/mapnode.h
+++ b/src/mapnode.h
@@ -102,6 +102,9 @@ void init_content_inventory_texture_paths();
#define CONTENT_GLASS 20
#define CONTENT_FENCE 21
#define CONTENT_SANDSTONE 22
+#define CONTENT_CACTUS 23
+#define CONTENT_BRICK 24
+#define CONTENT_CLAY 25
/*
Content feature list