minetest.git - modified minetest for gpcfs purposes

	Commit message (Collapse)	Author	Age
*	merged jungle and bluish shadows	Perttu Ahola	2011-07-23
\|\
\| *	Jungle biome/whatever thing	Perttu Ahola	2011-07-23
\| \|
* \|	merged the content type extension and delta	Perttu Ahola	2011-07-23
\|\\|
\| *	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>
* \|	extended content-type range	Perttu Ahola	2011-07-23
\|/
*	New map generator added (and SQLite, messed up the commits at that time...) ↵	Perttu Ahola	2011-06-25
\| \| \| \|	(import from temporary git repo)
*	Moved some mapnode content stuff from mapnode.{h,cpp} and digging property ↵	Perttu Ahola	2011-06-17
	stuff from material.cpp to content_mapnode.{h,cpp}