sapier 
							
						 
					 
					
						
						
						
						
							
						
						
							ab43377577 
							
						 
					 
					
						
						
							
							Move scriptapi to separate folder (by sapier)  
						
						 
						
						... 
						
						
						
						On the lua side, notably minetest.env:<function>(<args>) should now
be replaced by minetest.<function>(<args>).
The old way is and will stay supported for a long time.
Also:
Update and clean up lua_api.txt (by celeron55)
Move EnvRef to lua and remove add_rat and add_firefly (by kahrl)
Add separate src/util/CMakeLists.txt, other minor fixes (by kahrl) 
						
					 
					
						2013-05-25 00:51:02 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kwolekr 
							
						 
					 
					
						
						
						
						
							
						
						
							8ec3fc35c6 
							
						 
					 
					
						
						
							
							Add Mapgen V7, reorganize biomes  
						
						 
						
						
						
					 
					
						2013-04-07 00:50:21 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Juhani Numminen 
							
						 
					 
					
						
						
						
						
							
						
						
							450e7ef0c5 
							
						 
					 
					
						
						
							
							Git-ignore SQLite build files  
						
						 
						
						
						
					 
					
						2013-03-19 16:20:13 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ShadowNinja 
							
						 
					 
					
						
						
						
						
							
						
						
							350596b94f 
							
						 
					 
					
						
						
							
							Add cloud menu background by Krisi, configurable with the menu_clouds option.  
						
						 
						
						... 
						
						
						
						Also add a menuheader, menusplash, menufooter_clouds, and allow HD menu footers.
And finally don't git-ignore textures/base/. 
						
					 
					
						2013-03-13 21:18:40 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								PilzAdam 
							
						 
					 
					
						
						
						
						
							
						
						
							aa77ee66c5 
							
						 
					 
					
						
						
							
							Change libjson to libjsoncpp in .gitignore  
						
						 
						
						
						
					 
					
						2013-03-06 17:09:28 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								proller 
							
						 
					 
					
						
						
						
						
							
						
						
							ee07c3f7cf 
							
						 
					 
					
						
						
							
							new auto masterserver  
						
						 
						
						
						
					 
					
						2013-02-22 02:04:53 +04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Ilya Zhuravlev 
							
						 
					 
					
						
						
						
						
							
						
						
							30b9a4d6b4 
							
						 
					 
					
						
						
							
							Add Freetype support  
						
						 
						
						
						
					 
					
						2013-02-14 18:46:08 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Perttu Ahola 
							
						 
					 
					
						
						
						
						
							
						
						
							862d76b617 
							
						 
					 
					
						
						
							
							Move games/minetest to games/minimal and update README.txt  
						
						 
						
						
						
					 
					
						2012-03-26 23:28:19 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Perttu Ahola 
							
						 
					 
					
						
						
						
						
							
						
						
							a9a923e4da 
							
						 
					 
					
						
						
							
							Update/fix .gitignore  
						
						 
						
						
						
					 
					
						2012-03-25 15:52:08 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Perttu Ahola 
							
						 
					 
					
						
						
						
						
							
						
						
							2de91f11fb 
							
						 
					 
					
						
						
							
							Add mods/mesetint/mods_here.txt to be installed on RUN_IN_PLACE builds  
						
						 
						
						
						
					 
					
						2012-03-20 01:19:47 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Perttu Ahola 
							
						 
					 
					
						
						
						
						
							
						
						
							97b693052c 
							
						 
					 
					
						
						
							
							Flatten share/ and user/ in the source and for the RUN_IN_PLACE build  
						
						 
						
						
						
					 
					
						2012-03-20 00:08:00 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Garrosh 
							
						 
					 
					
						
						
						
						
							
						
						
							ac69a3561a 
							
						 
					 
					
						
						
							
							Added Kate backup file scheme to .gitignore for Kate users  
						
						 
						
						
						
					 
					
						2012-01-24 22:38:00 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Perttu Ahola 
							
						 
					 
					
						
						
						
						
							
						
						
							dcedfdacd1 
							
						 
					 
					
						
						
							
							Scripting WIP  
						
						 
						
						
						
					 
					
						2011-11-29 19:13:39 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Perttu Ahola 
							
						 
					 
					
						
						
						
						
							
						
						
							3028bbb95b 
							
						 
					 
					
						
						
							
							Updated .gitignore to ignore vim swap files  
						
						 
						
						
						
					 
					
						2011-08-12 00:33:24 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sebastian Rühl 
							
						 
					 
					
						
						
						
						
							
						
						
							9d09103e48 
							
						 
					 
					
						
						
							
							Merge branch 'master' of  https://github.com/erlehmann/minetest-delta.git  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> 
						
					 
					
						2011-06-26 12:24:32 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Perttu Ahola 
							
						 
					 
					
						
						
						
						
							
						
						
							7538b4c620 
							
						 
					 
					
						
						
							
							New map generator added (and SQLite, messed up the commits at that time...) (import from temporary git repo)  
						
						 
						
						
						
					 
					
						2011-06-25 04:25:14 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Perttu Ahola 
							
						 
					 
					
						
						
						
						
							
						
						
							47e4eda4bb 
							
						 
					 
					
						
						
							
							Reorganizing stuff (import from temporary git repo)  
						
						 
						
						
						
					 
					
						2011-06-25 04:23:21 +03:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nils Dagsson Moskopp 
							
						 
					 
					
						
						
						
						
							
						
						
							b11f08d5d2 
							
						 
					 
					
						
						
							
							* ignore minetestmapper output  
						
						 
						
						
						
					 
					
						2011-06-02 16:54:05 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nils Dagsson Moskopp 
							
						 
					 
					
						
						
						
						
							
						
						
							5f063ce97c 
							
						 
					 
					
						
						
							
							+ .gitignore  
						
						 
						
						
						
					 
					
						2011-05-29 19:08:59 +02:00