Enno Rehling 
								
							 
						 
						
							
							
								
							
							
	a289eee06f  
						 
						
							
							
								
								
								Merge branch 'master' of github.com:eressea/server  
							
							 
							
							
							
						 
						
							2014-08-17 12:15:26 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Enno Rehling 
								
							 
						 
						
							
							
								
							
							
	f8ad9e92e7  
						 
						
							
							
								
								
								Fix some English message translations.  
							
							 
							
							... 
							
							
							
							clean up and improve some scripts, too. 
							
						 
						
							2014-08-17 11:19:04 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Enno Rehling 
								
							 
						 
						
							
							
								
							
							
	8f09ab73d9  
						 
						
							
							
								
								
								fix display of alliance status, some English translation hiccups.  
							
							 
							
							
							
						 
						
							2014-08-17 00:14:50 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Enno Rehling 
								
							 
						 
						
							
							
								
							
							
	c79dd33bfb  
						 
						
							
							
								
								
								smarter processing of MAKE TEMP.  
							
							 
							
							... 
							
							
							
							the order gets its own keyword. parsing is hard - composite commands are an anti-pattern.
this eliminates a lot of unnecessary mallocs for pushing/poping parser state. 
							
						 
						
							2014-08-16 11:41:19 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Enno Rehling 
								
							 
						 
						
							
							
								
							
							
	9ca206ec3f  
						 
						
							
							
								
								
								remove reference to thieves and spies from this spell for non-E2 games.  
							
							 
							
							... 
							
							
							
							this fixes https://bugs.eressea.de/view.php?id=1548  
							
						 
						
							2014-08-14 07:05:12 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Enno Rehling 
								
							 
						 
						
							
							
								
							
							
	911992b04d  
						 
						
							
							
								
								
								silver has a weight of 1:  http://bugs.eressea.de/view.php?id=2013  
							
							 
							
							... 
							
							
							
							this broke when I replaced the new_itemtype function. I owe a test for it. 
							
						 
						
							2014-08-14 03:48:39 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Enno Rehling 
								
							 
						 
						
							
							
								
							
							
	bd2809a975  
						 
						
							
							
								
								
								removing the core directory (moving to res and scripts).  
							
							 
							
							... 
							
							
							
							it's from when open-source Eressea was limited, and we no longer need the separation.
JSON configuration for ship flags. 
							
						 
						
							2014-07-28 14:27:30 +02:00