Perttu Ahola 
							
						 
					 
					
						
						
							
						
						96fedb5cb0 
					 
					
						
						
							
							removed -delta namings  
						
						
						
						
					 
					
						2011-07-23 19:33:49 +03:00 
						 
				 
			
				
					
						
							
							
								Constantin Wenger 
							
						 
					 
					
						
						
							
						
						fb4c3ab4fb 
					 
					
						
						
							
							fixed some problems with filenames of the translations  
						
						
						
						
					 
					
						2011-07-22 20:40:47 +02:00 
						 
				 
			
				
					
						
							
							
								Constantin Wenger 
							
						 
					 
					
						
						
							
						
						a12229f271 
					 
					
						
						
							
							fixed some problems with filenames of the translations  
						
						
						
						
					 
					
						2011-07-22 20:40:47 +02:00 
						 
				 
			
				
					
						
							
							
								Giuseppe Bilotta 
							
						 
					 
					
						
						
							
						
						7d9dd352cf 
					 
					
						
						
							
							Declare USE_GETTEXT option  
						
						
						
						
					 
					
						2011-07-22 14:42:04 +02:00 
						 
				 
			
				
					
						
							
							
								Giuseppe Bilotta 
							
						 
					 
					
						
						
							
						
						9653522873 
					 
					
						
						
							
							Declare USE_GETTEXT option  
						
						
						
						
					 
					
						2011-07-22 14:42:04 +02:00 
						 
				 
			
				
					
						
							
							
								Giuseppe Bilotta 
							
						 
					 
					
						
						
							
						
						d78e5e7329 
					 
					
						
						
							
							updatepo cmake rule  
						
						... 
						
						
						
						Get rid of the system-specific updatelocales.sh and introduce an
updatepo cmake rule. po files are also updated before creating the mo
files, and we now keep the .pot file (in the po/en directory). To
stabilize the po file creation, file contents are sorted by source
filename.
Update po files in the process. 
						
						
					 
					
						2011-07-22 12:40:29 +02:00 
						 
				 
			
				
					
						
							
							
								Giuseppe Bilotta 
							
						 
					 
					
						
						
							
						
						aaa165f985 
					 
					
						
						
							
							updatepo cmake rule  
						
						... 
						
						
						
						Get rid of the system-specific updatelocales.sh and introduce an
updatepo cmake rule. po files are also updated before creating the mo
files, and we now keep the .pot file (in the po/en directory). To
stabilize the po file creation, file contents are sorted by source
filename.
Update po files in the process. 
						
						
					 
					
						2011-07-22 12:40:29 +02:00 
						 
				 
			
				
					
						
							
							
								Giuseppe Bilotta 
							
						 
					 
					
						
						
							
						
						e61b2f99c1 
					 
					
						
						
							
							Static naming of po file  
						
						... 
						
						
						
						The po file should not be named c55 if we're in ∆. But since it is not
exposed at installation time, we don't actually need its name to be
based on the project name at all, so just call it minetest.po 
						
						
					 
					
						2011-07-22 09:58:02 +02:00 
						 
				 
			
				
					
						
							
							
								Giuseppe Bilotta 
							
						 
					 
					
						
						
							
						
						8f2409a1b4 
					 
					
						
						
							
							Static naming of po file  
						
						... 
						
						
						
						The po file should not be named c55 if we're in ∆. But since it is not
exposed at installation time, we don't actually need its name to be
based on the project name at all, so just call it minetest.po 
						
						
					 
					
						2011-07-22 09:58:02 +02:00 
						 
				 
			
				
					
						
							
							
								Giuseppe Bilotta 
							
						 
					 
					
						
						
							
						
						d386f02893 
					 
					
						
						
							
							Refactor mo creation/installation  
						
						
						
						
					 
					
						2011-07-22 09:36:17 +02:00 
						 
				 
			
				
					
						
							
							
								Giuseppe Bilotta 
							
						 
					 
					
						
						
							
						
						0ec749317c 
					 
					
						
						
							
							Refactor mo creation/installation  
						
						
						
						
					 
					
						2011-07-22 09:36:17 +02:00 
						 
				 
			
				
					
						
							
							
								Giuseppe Bilotta 
							
						 
					 
					
						
						
							
						
						5a3218e535 
					 
					
						
						
							
							Use project name for mo files  
						
						
						
						
					 
					
						2011-07-22 08:33:08 +02:00 
						 
				 
			
				
					
						
							
							
								Giuseppe Bilotta 
							
						 
					 
					
						
						
							
						
						bc05bd8b59 
					 
					
						
						
							
							Use project name for mo files  
						
						
						
						
					 
					
						2011-07-22 08:33:08 +02:00 
						 
				 
			
				
					
						
							
							
								Giuseppe Bilotta 
							
						 
					 
					
						
						
							
						
						02653573d2 
					 
					
						
						
							
							Merge remote-tracking branch 'erlehmann/master'  
						
						... 
						
						
						
						Conflicts (from the introduction of fr translations):
	src/CMakeLists.txt 
						
						
					 
					
						2011-07-22 07:48:22 +02:00 
						 
				 
			
				
					
						
							
							
								Giuseppe Bilotta 
							
						 
					 
					
						
						
							
						
						7c1ea34baf 
					 
					
						
						
							
							Merge remote-tracking branch 'erlehmann/master'  
						
						... 
						
						
						
						Conflicts (from the introduction of fr translations):
	src/CMakeLists.txt 
						
						
					 
					
						2011-07-22 07:48:22 +02:00 
						 
				 
			
				
					
						
							
							
								Cyriaque Skrapits 
							
						 
					 
					
						
						
							
						
						6875ead7cf 
					 
					
						
						
							
							Added french translation.  
						
						
						
						
					 
					
						2011-07-21 16:09:57 +02:00 
						 
				 
			
				
					
						
							
							
								Cyriaque Skrapits 
							
						 
					 
					
						
						
							
						
						8048961cc5 
					 
					
						
						
							
							Added french translation.  
						
						
						
						
					 
					
						2011-07-21 16:09:57 +02:00 
						 
				 
			
				
					
						
							
							
								Giuseppe Bilotta 
							
						 
					 
					
						
						
							
						
						02b14090c2 
					 
					
						
						
							
							Reorganize cmake gettext message output to ease debugging  
						
						
						
						
					 
					
						2011-07-21 15:16:59 +02:00 
						 
				 
			
				
					
						
							
							
								Giuseppe Bilotta 
							
						 
					 
					
						
						
							
						
						767280577b 
					 
					
						
						
							
							Reorganize cmake gettext message output to ease debugging  
						
						
						
						
					 
					
						2011-07-21 15:16:59 +02:00 
						 
				 
			
				
					
						
							
							
								Giuseppe Bilotta 
							
						 
					 
					
						
						
							
						
						9fa4b72a47 
					 
					
						
						
							
							Find correct library for MSVC vs MingW in Winows  
						
						
						
						
					 
					
						2011-07-21 14:50:15 +02:00 
						 
				 
			
				
					
						
							
							
								Giuseppe Bilotta 
							
						 
					 
					
						
						
							
						
						02695bebc6 
					 
					
						
						
							
							Find correct library for MSVC vs MingW in Winows  
						
						
						
						
					 
					
						2011-07-21 14:50:15 +02:00 
						 
				 
			
				
					
						
							
							
								Giuseppe Bilotta 
							
						 
					 
					
						
						
							
						
						3e78b29cae 
					 
					
						
						
							
							Only install locale files if using gettext  
						
						
						
						
					 
					
						2011-07-21 14:46:23 +02:00 
						 
				 
			
				
					
						
							
							
								Giuseppe Bilotta 
							
						 
					 
					
						
						
							
						
						7b93fb59cf 
					 
					
						
						
							
							Only install locale files if using gettext  
						
						
						
						
					 
					
						2011-07-21 14:46:23 +02:00 
						 
				 
			
				
					
						
							
							
								Giuseppe Bilotta 
							
						 
					 
					
						
						
							
						
						d63c160bd6 
					 
					
						
						
							
							Uppercase DEFINED or cmake 2.8.4 complains  
						
						
						
						
					 
					
						2011-07-21 13:59:50 +02:00 
						 
				 
			
				
					
						
							
							
								Giuseppe Bilotta 
							
						 
					 
					
						
						
							
						
						adb7181969 
					 
					
						
						
							
							Uppercase DEFINED or cmake 2.8.4 complains  
						
						
						
						
					 
					
						2011-07-21 13:59:50 +02:00 
						 
				 
			
				
					
						
							
							
								Giuseppe Bilotta 
							
						 
					 
					
						
						
							
						
						1340da7b54 
					 
					
						
						
							
							Refactor and clean up gettext management  
						
						
						
						
					 
					
						2011-07-21 12:33:29 +02:00 
						 
				 
			
				
					
						
							
							
								Giuseppe Bilotta 
							
						 
					 
					
						
						
							
						
						b99174cb0c 
					 
					
						
						
							
							Refactor and clean up gettext management  
						
						
						
						
					 
					
						2011-07-21 12:33:29 +02:00 
						 
				 
			
				
					
						
							
							
								Giuseppe Bilotta 
							
						 
					 
					
						
						
							
						
						89af509d10 
					 
					
						
						
							
							Make gettext optional  
						
						
						
						
					 
					
						2011-07-21 09:03:41 +02:00 
						 
				 
			
				
					
						
							
							
								Giuseppe Bilotta 
							
						 
					 
					
						
						
							
						
						fd70bbd367 
					 
					
						
						
							
							Make gettext optional  
						
						
						
						
					 
					
						2011-07-21 09:03:41 +02:00 
						 
				 
			
				
					
						
							
							
								Weedy 
							
						 
					 
					
						
						
							
						
						89b8b792c1 
					 
					
						
						
							
							Tweak makefiles to add -delta suffix.  
						
						
						
						
					 
					
						2011-07-21 09:03:20 +02:00 
						 
				 
			
				
					
						
							
							
								Weedy 
							
						 
					 
					
						
						
							
						
						36d8f91f1a 
					 
					
						
						
							
							Tweak makefiles to add -delta suffix.  
						
						
						
						
					 
					
						2011-07-21 09:03:20 +02:00 
						 
				 
			
				
					
						
							
							
								Weedy 
							
						 
					 
					
						
						
							
						
						a19491dbd2 
					 
					
						
						
							
							Fix win32 MSVC compile. (screw gettext)  
						
						
						
						
					 
					
						2011-07-21 09:03:17 +02:00 
						 
				 
			
				
					
						
							
							
								Weedy 
							
						 
					 
					
						
						
							
						
						9cb5f70be5 
					 
					
						
						
							
							Fix win32 MSVC compile. (screw gettext)  
						
						
						
						
					 
					
						2011-07-21 09:03:17 +02:00 
						 
				 
			
				
					
						
							
							
								Giuseppe Bilotta 
							
						 
					 
					
						
						
							
						
						e7beaac6f5 
					 
					
						
						
							
							Move package search out of conditional  
						
						... 
						
						
						
						This unbreaks the Windows build which would otherwise have problems at
the jthread level. 
						
						
					 
					
						2011-07-20 23:09:28 +02:00 
						 
				 
			
				
					
						
							
							
								Giuseppe Bilotta 
							
						 
					 
					
						
						
							
						
						29aae3dcb5 
					 
					
						
						
							
							Move package search out of conditional  
						
						... 
						
						
						
						This unbreaks the Windows build which would otherwise have problems at
the jthread level. 
						
						
					 
					
						2011-07-20 23:09:28 +02:00 
						 
				 
			
				
					
						
							
							
								Giuseppe Bilotta 
							
						 
					 
					
						
						
							
						
						cd45ae3d0f 
					 
					
						
						
							
							Use system sqlite3/jthread libs if available  
						
						
						
						
					 
					
						2011-07-20 17:59:48 +02:00 
						 
				 
			
				
					
						
							
							
								Giuseppe Bilotta 
							
						 
					 
					
						
						
							
						
						3321edae77 
					 
					
						
						
							
							Use system sqlite3/jthread libs if available  
						
						
						
						
					 
					
						2011-07-20 17:59:48 +02:00 
						 
				 
			
				
					
						
							
							
								Constantin Wenger 
							
						 
					 
					
						
						
							
						
						052bb24c7f 
					 
					
						
						
							
							added gettext support  
						
						... 
						
						
						
						german translation file
and bashscript to update translations 
						
						
					 
					
						2011-07-20 16:51:19 +02:00 
						 
				 
			
				
					
						
							
							
								Constantin Wenger 
							
						 
					 
					
						
						
							
						
						6a8328de79 
					 
					
						
						
							
							added gettext support  
						
						... 
						
						
						
						german translation file
and bashscript to update translations 
						
						
					 
					
						2011-07-20 16:51:19 +02:00 
						 
				 
			
				
					
						
							
							
								Nils Dagsson Moskopp 
							
						 
					 
					
						
						
							
						
						af05e4b2de 
					 
					
						
						
							
							Merge branch 'upstream/master'  
						
						... 
						
						
						
						Conflicts:
	data/oerkki1.png
	src/client.cpp 
						
						
					 
					
						2011-07-14 22:43:28 +02:00 
						 
				 
			
				
					
						
							
							
								Nils Dagsson Moskopp 
							
						 
					 
					
						
						
							
						
						3560f0de08 
					 
					
						
						
							
							Merge branch 'upstream/master'  
						
						... 
						
						
						
						Conflicts:
	data/oerkki1.png
	src/client.cpp 
						
						
					 
					
						2011-07-14 22:43:28 +02:00 
						 
				 
			
				
					
						
							
							
								Perttu Ahola 
							
						 
					 
					
						
						
							
						
						91cfbe2891 
					 
					
						
						
							
							reorganized a lot of stuff and modified mapgen and objects slightly while doing it  
						
						
						
						
					 
					
						2011-06-26 15:48:56 +03:00 
						 
				 
			
				
					
						
							
							
								Sebastian Rühl 
							
						 
					 
					
						
						
							
						
						033ae0dcae 
					 
					
						
						
							
							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 
						 
				 
			
				
					
						
							
							
								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 
							
						 
					 
					
						
						
							
						
						2915bd5518 
					 
					
						
						
							
							more reorganizing of map code  
						
						
						
						
					 
					
						2011-06-26 01:31:43 +03:00 
						 
				 
			
				
					
						
							
							
								Perttu Ahola 
							
						 
					 
					
						
						
							
						
						cb130d9158 
					 
					
						
						
							
							cleaned map stuff  
						
						
						
						
					 
					
						2011-06-26 00:03:58 +03:00 
						 
				 
			
				
					
						
							
							
								Perttu Ahola 
							
						 
					 
					
						
						
							
						
						f2c26e2014 
					 
					
						
						
							
							moved map generator to separate source files  
						
						
						
						
					 
					
						2011-06-25 18:12:41 +03: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 
							
						 
					 
					
						
						
							
						
						534287892d 
					 
					
						
						
							
							merged Mac OSX build fix from minetest-delta  
						
						
						
						
					 
					
						2011-06-18 03:14:13 +03:00 
						 
				 
			
				
					
						
							
							
								Perttu Ahola 
							
						 
					 
					
						
						
							
						
						c391bcee16 
					 
					
						
						
							
							removed furnace menu because it is not needed anymore  
						
						
						
						
					 
					
						2011-06-18 02:32:34 +03:00