diff options
| author | teddydestodes <derkomtur@schattengang.net> | 2011-06-01 14:11:52 +0200 |
|---|---|---|
| committer | teddydestodes <derkomtur@schattengang.net> | 2011-06-01 14:11:52 +0200 |
| commit | 63fe487d933f00123bb97d699c98e0c5248a8060 (patch) | |
| tree | 446356ce6e66ccc76675eff0648d75c7e05ce2b4 /src/mapnode.h | |
| parent | d2b2c7c09e21fcf728e741e11e6fdabe03036b0e (diff) | |
| parent | c930a92b7222e0228332fb39536d7ff4f3442d1b (diff) | |
| download | minetest-63fe487d933f00123bb97d699c98e0c5248a8060.tar.gz minetest-63fe487d933f00123bb97d699c98e0c5248a8060.tar.bz2 minetest-63fe487d933f00123bb97d699c98e0c5248a8060.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/mapnode.h')
| -rw-r--r-- | src/mapnode.h | 3 |
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 |