Kevin Ruland
							
						 
					 | 
					
						
						
						
						
							
						
						
							4b4a7c74fc
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'upstream/master' into unstable
						
						
						
						
						
						
						
						Conflicts:
	swing/src/net/sf/openrocket/gui/figureelements/RocketInfo.java 
						
						
					 | 
					
						2016-04-02 16:49:15 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Wes Cravens
							
						 
					 | 
					
						
						
						
						
							
						
						
							74d636bf33
							
						
					 | 
					
						
						
							
							Add concurrent mass info for both with and without motor configuration
						
						
						
						
						
						
					 | 
					
						2016-03-23 13:23:40 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel_M_Williams
							
						 
					 | 
					
						
						
						
						
							
						
						
							6f4cba68ae
							
						
					 | 
					
						
						
							
							refactored RocketFigure to use RocketPanel.VIEW_TYPE enum instead of unchecked ints
						
						
						
						
						
						
					 | 
					
						2015-06-23 13:12:48 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								UncleRus
							
						 
					 | 
					
						
						
						
						
							
						
						
							43bb9ec941
							
						
					 | 
					
						
						
							
							New l10n strings
						
						
						
						
						
						
					 | 
					
						2014-01-04 04:17:39 +06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								UncleRus
							
						 
					 | 
					
						
						
						
						
							
						
						
							96e7c790aa
							
						
					 | 
					
						
						
							
							Russian l10n update. Typos fixed.
						
						
						
						
						
						
					 | 
					
						2014-01-04 03:39:52 +06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								rus
							
						 
					 | 
					
						
						
						
						
							
						
						
							ff0538957f
							
						
					 | 
					
						
						
							
							Russian translation updated, typos fixed
						
						
						
						
						
						
					 | 
					
						2013-10-16 16:32:56 +06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								kruland2607
							
						 
					 | 
					
						
						
						
						
							
						
						
							790c618101
							
						
					 | 
					
						
						
							
							Updated russian translations.
						
						
						
						
						
						
					 | 
					
						2013-09-09 22:06:44 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								kruland2607
							
						 
					 | 
					
						
						
						
						
							
						
						
							e8b38b7398
							
						
					 | 
					
						
						
							
							Updated es, fr & ru translations.
						
						
						
						
						
						
					 | 
					
						2013-04-29 09:56:21 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sampo Niskanen
							
						 
					 | 
					
						
						
						
						
							
						
						
							525869c3e7
							
						
					 | 
					
						
						
							
							Refactoring or rocket configuration description
						
						
						
						
						
						
					 | 
					
						2013-03-22 18:12:58 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sampo Niskanen
							
						 
					 | 
					
						
						
						
						
							
						
						
							b3b2303f27
							
						
					 | 
					
						
						
							
							Enhance flight configuration UI
						
						
						
						
						
						
					 | 
					
						2013-01-27 22:36:21 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								kruland
							
						 
					 | 
					
						
						
						
						
							
						
						
							a9a1860f96
							
						
					 | 
					
						
						
							
							Committing Russian l10n changes provided by Ruslan Uss.
						
						
						
						
						
						
					 | 
					
						2012-09-30 20:12:37 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kevin Ruland
							
						 
					 | 
					
						
						
						
						
							
						
						
							1542b2ee08
							
						
					 | 
					
						
						
							
							More localization updates by Ruslan Uss.
						
						
						
						
						
						
					 | 
					
						2012-09-15 22:54:27 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kevin Ruland
							
						 
					 | 
					
						
						
						
						
							
						
						
							b0d03cc473
							
						
					 | 
					
						
						
							
							More updates to localization provided by Ruslan Uss.
						
						
						
						
						
						
					 | 
					
						2012-09-11 16:10:51 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kevin Ruland
							
						 
					 | 
					
						
						
						
						
							
						
						
							d70cc32dd6
							
						
					 | 
					
						
						
							
							Updates to the russian translations provided by Ruslan Uss.
						
						
						
						
						
						
					 | 
					
						2012-08-28 13:38:53 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sampo Niskanen
							
						 
					 | 
					
						
						
						
						
							
						
						
							31ace7b312
							
						
					 | 
					
						
						
							
							Material localization support
						
						
						
						
						
						
					 | 
					
						2012-08-25 20:10:58 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kevin Ruland
							
						 
					 | 
					
						
						
						
						
							
						
						
							da430d3611
							
						
					 | 
					
						
						
							
							Applied patch for l10n supplied by Russian Uss.
						
						
						
						
						
						
					 | 
					
						2012-08-20 02:02:38 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Boris du Reau
							
						 
					 | 
					
						
						
						
						
							
						
						
							bf0e3d978a
							
						
					 | 
					
						
						
							
							updated translations
						
						
						
						
						
						
					 | 
					
						2012-04-10 18:33:58 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Boris du Reau
							
						 
					 | 
					
						
						
						
						
							
						
						
							faae38ec05
							
						
					 | 
					
						
						
							
							Translations updates
						
						
						
						
						
						
					 | 
					
						2012-03-14 23:23:28 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Boris du Reau
							
						 
					 | 
					
						
						
						
						
							
						
						
							63d926ae56
							
						
					 | 
					
						
						
							
							Updated Russian translations
						
						
						
						
						
						
					 | 
					
						2012-03-09 23:03:02 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Boris du Reau
							
						 
					 | 
					
						
						
						
						
							
						
						
							4f090843b1
							
						
					 | 
					
						
						
							
							Added initial Russian Translations
						
						
						
						
						
						
					 | 
					
						2012-02-13 22:31:57 +00:00 | 
					
					
						
						
							
							
							
						
					 |