minetest.git - modified minetest for gpcfs purposes

	Commit message (Collapse)	Author	Age
*	Merge branch 'upstream/master'	Nils Dagsson Moskopp	2011-07-14
\|\ \| \| \| \| \| \| \| \| \| \|	Conflicts: data/oerkki1.png src/client.cpp
\| *	reorganized a lot of stuff and modified mapgen and objects slightly while ↵	Perttu Ahola	2011-06-26
\| \| \| \| \| \| \| \|	doing it
* \|	Merge branch 'master' of https://github.com/erlehmann/minetest-delta.git ↵	Sebastian Rühl	2011-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>
*	separated inventory-related game content to content_inventory.{h,cpp}	Perttu Ahola	2011-06-18