summaryrefslogtreecommitdiff
path: root/src/content_craft.cpp
Commit message (Collapse)AuthorAge
* merged the content type extension and deltaPerttu Ahola2011-07-23
|\
| * Merge branch 'master' of https://github.com/erlehmann/minetest-delta.git ↵Sebastian Rühl2011-06-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into upstream_merge Conflicts: .gitignore CMakeLists.txt data/heart.png src/CMakeLists.txt src/game.cpp src/guiMainMenu.cpp src/inventory.cpp src/map.cpp src/mapblock.cpp src/mapnode.cpp src/mapnode.h src/materials.cpp src/server.cpp Signed-off-by: Sebastian Rühl <bahamada_basti@yahoo.de>
* | extended content-type rangePerttu Ahola2011-07-23
|/
* Created and moved stuff to content_nodemeta.{h,cpp}Perttu Ahola2011-06-18