minetest.git - modified minetest for gpcfs purposes

	Commit message (Collapse)	Author	Age
*	random scripting work-in-progress	Perttu Ahola	2011-11-29
\|
*	Scripting WIP	Perttu Ahola	2011-11-29
\|
*	Fix apple inventory texture	Perttu Ahola	2011-10-19
\|
*	Added Iron Apple which heals 4 Hearts	sfan5	2011-09-12
\|
*	Changed the Heal Amount of Apples from 6 to 2	sfan5	2011-09-12
\|
*	Fixed duplication bug	sfan5	2011-09-11
\|
*	Removed Spaces	sfan5	2011-09-11
\|
*	Added Apple Trees	sfan5	2011-09-11
\|
*	Rats are now eatable. Also made their selection box move smoothly.	Perttu Ahola	2011-07-30
\|
*	Made rats cookable and made them spawn near trees	Perttu Ahola	2011-07-30
\|
*	merged the content type extension and delta	Perttu Ahola	2011-07-23
\|\
\| *	+ fireflies	Nils Dagsson Moskopp	2011-07-20
\| \|
\| *	Merge branch 'upstream/master'	Nils Dagsson Moskopp	2011-07-14
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: data/oerkki1.png src/client.cpp
\| * \|	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
\| \|/ \|/\|
* \|	reorganized a lot of stuff and modified mapgen and objects slightly while ↵	Perttu Ahola	2011-06-26
\|/ \| \| \|	doing it
*	separated inventory-related game content to content_inventory.{h,cpp}	Perttu Ahola	2011-06-18