SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							2dc4a0fd39 
							
						 
					 
					
						
						
							
							Merge branch 'unstable' into issue-875  
						
						 
						
						
						
						
					 
					
						2023-03-20 12:41:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							4dfe63bc69 
							
						 
					 
					
						
						
							
							Merge branch 'unstable' into issue-875  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java
#	core/src/net/sf/openrocket/rocketcomponent/SymmetricComponent.java
#	core/test/net/sf/openrocket/rocketcomponent/SymmetricComponentVolumeTest.java
#	swing/src/net/sf/openrocket/gui/main/BasicFrame.java
#	swing/src/net/sf/openrocket/gui/util/Icons.java 
						
						
					 
					
						2023-03-08 21:29:05 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							da15c59673 
							
						 
					 
					
						
						
							
							Remove some references to None and replace with Plugged  
						
						 
						
						
						
						
					 
					
						2023-03-08 19:19:39 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							8fe69028f1 
							
						 
					 
					
						
						
							
							Changed plugged delay text  
						
						 
						
						
						
						
					 
					
						2023-03-02 00:19:43 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							5c2f35e3a1 
							
						 
					 
					
						
						
							
							Fix plugged option not selecting  
						
						 
						
						
						
						
					 
					
						2023-03-01 03:48:54 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								JoePfeiffer 
							
						 
					 
					
						
						
						
						
							
						
						
							d2091079b1 
							
						 
					 
					
						
						
							
							Rename "primary figures" to "summary data" in file save chooser  
						
						 
						
						
						
						
					 
					
						2023-02-25 18:17:25 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								JoePfeiffer 
							
						 
					 
					
						
						
						
						
							
						
						
							f3a8cfd764 
							
						 
					 
					
						
						
							
							Remove text strings associated with "save every" option  
						
						 
						
						
						
						
					 
					
						2023-02-22 10:00:50 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							ec9bfa8f63 
							
						 
					 
					
						
						
							
							[ #875 ] Implement RASAero importing  
						
						 
						
						
						
						
					 
					
						2023-02-12 07:23:29 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							e6ee6573f6 
							
						 
					 
					
						
						
							
							Re-order component config general tabs  
						
						 
						
						
						
						
					 
					
						2023-01-14 23:06:45 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							d4cd1655ea 
							
						 
					 
					
						
						
							
							Fix nose cone shoulder tab  
						
						 
						
						
						
						
					 
					
						2023-01-10 23:52:18 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							10d36145cf 
							
						 
					 
					
						
						
							
							[ #1564 ] Add component information box  
						
						 
						
						
						
						
					 
					
						2023-01-05 23:18:38 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							072616468e 
							
						 
					 
					
						
						
							
							Fix component tooltip when subcomponents overridden  
						
						 
						
						
						
						
					 
					
						2022-11-09 01:55:49 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							c1145bf008 
							
						 
					 
					
						
						
							
							Rename clear preferences button  
						
						 
						
						
						
						
					 
					
						2022-10-13 21:56:58 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							dafeaf065a 
							
						 
					 
					
						
						
							
							Merge branch 'unstable' into remove->delete  
						
						 
						
						
						
						
					 
					
						2022-08-23 14:53:03 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								SiboVG 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							2632dda0f0 
							
						 
					 
					
						
						
							
							Merge pull request  #1580  from SiboVG/issue-1405  
						
						 
						
						... 
						
						
						
						[#1405 ] Remove 'Show all compatible' in preset chooser 
						
						
					 
					
						2022-08-19 23:52:27 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							96a228396b 
							
						 
					 
					
						
						
							
							Merge branch 'unstable' into icons-sim-buttons  
						
						 
						
						
						
						
					 
					
						2022-08-16 01:45:20 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							18b15f7854 
							
						 
					 
					
						
						
							
							Rename 'remove' to 'delete'  
						
						 
						
						
						
						
					 
					
						2022-08-16 01:44:51 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							d4c07bce68 
							
						 
					 
					
						
						
							
							[ #1405 ] Remove 'Show all compatible' in preset chooser  
						
						 
						
						
						
						
					 
					
						2022-08-10 22:32:52 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							81561dae76 
							
						 
					 
					
						
						
							
							Remove unneeded tools description  
						
						 
						
						
						
						
					 
					
						2022-07-20 10:54:53 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							8d8e2a698a 
							
						 
					 
					
						
						
							
							Rename translation keys for 'Tools'  
						
						 
						
						
						
						
					 
					
						2022-07-20 10:51:35 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								SiboVG 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							84cf7dd480 
							
						 
					 
					
						
						
							
							Merge branch 'unstable' into issue-1481  
						
						 
						
						
						
						
					 
					
						2022-07-04 23:32:40 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							62864c8190 
							
						 
					 
					
						
						
							
							Change preset labels  
						
						 
						
						
						
						
					 
					
						2022-07-04 23:12:46 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							f3a0c32f55 
							
						 
					 
					
						
						
							
							Better appearance tab tooltip  
						
						 
						
						
						
						
					 
					
						2022-07-04 12:10:47 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							55e83bf642 
							
						 
					 
					
						
						
							
							[ #1481 ] Update preset combobox  
						
						 
						
						
						
						
					 
					
						2022-06-28 23:56:13 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							ddbcf597c2 
							
						 
					 
					
						
						
							
							Extend multi-select components to different-typed components  
						
						 
						
						
						
						
					 
					
						2022-06-15 12:48:23 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							7bc6bd2c81 
							
						 
					 
					
						
						
							
							Merge branch 'unstable' into rightClick  
						
						 
						
						
						
						
					 
					
						2022-05-31 13:53:50 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							3ceefa0ba4 
							
						 
					 
					
						
						
							
							Move scale translations  
						
						 
						
						... 
						
						
						
						This commit will make sense in the next commit 
						
						
					 
					
						2022-05-30 20:55:40 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							f85fa2c472 
							
						 
					 
					
						
						
							
							Replace save file size estimation by info label  
						
						 
						
						
						
						
					 
					
						2022-05-29 10:16:26 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							12cefe099c 
							
						 
					 
					
						
						
							
							[ fixes   #1137 ] Use capitalized component names + Body, Nose & Transition Length --> Length  
						
						 
						
						
						
						
					 
					
						2022-02-19 22:26:34 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sibo Van Gool 
							
						 
					 
					
						
						
						
						
							
						
						
							884c811343 
							
						 
					 
					
						
						
							
							Clean up motor configuration layout  
						
						 
						
						
						
						
					 
					
						2022-01-30 12:19:24 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sibo Van Gool 
							
						 
					 
					
						
						
						
						
							
						
						
							de646e80a9 
							
						 
					 
					
						
						
							
							[ fixes   #825 ] 100% useful commit  
						
						 
						
						... 
						
						
						
						Yeah I know, totally unnecessary, this just changes the order of the two translation keys, but I won't sleep well tonight if I don't do it. Sue me. 
						
						
					 
					
						2022-01-26 02:25:48 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sibo Van Gool 
							
						 
					 
					
						
						
						
						
							
						
						
							12aa1a447c 
							
						 
					 
					
						
						
							
							[ fixes   #825 ] Improve translation keys update error  
						
						 
						
						
						
						
					 
					
						2022-01-26 02:23:02 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sibo Van Gool 
							
						 
					 
					
						
						
						
						
							
						
						
							201ab91e47 
							
						 
					 
					
						
						
							
							[ fixes   #825 ] Clean up translations no updates available  
						
						 
						
						... 
						
						
						
						Move them to a dedicated section for the software update checker + give them a logical name. 
						
						
					 
					
						2022-01-23 00:24:52 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Joe Pfeiffer 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							8a305b4778 
							
						 
					 
					
						
						
							
							Merge pull request  #1011  from SiboVG/issue-877  
						
						 
						
						... 
						
						
						
						[fixes  #877 ] Fix deprecated 'position upwind' FlightDataEvent 
						
						
					 
					
						2021-10-15 11:16:06 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Neil Weinstock 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							ff53498cb5 
							
						 
					 
					
						
						
							
							Merge pull request  #1032  from JoePfeiffer/full-motor-designations  
						
						 
						
						... 
						
						
						
						Full motor designations 
						
						
					 
					
						2021-10-15 08:14:42 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sibo Van Gool 
							
						 
					 
					
						
						
						
						
							
						
						
							d67947bc2a 
							
						 
					 
					
						
						
							
							Rename translation keys FileHelper  
						
						 
						
						
						
						
					 
					
						2021-09-28 23:16:17 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								JoePfeiffer 
							
						 
					 
					
						
						
						
						
							
						
						
							a17f6d9b1a 
							
						 
					 
					
						
						
							
							updated translation files by copying old TCurveMotorCol.DESIGNATION entries to TCMotorSelPan.lbl.Designation  
						
						 
						
						
						
						
					 
					
						2021-09-15 11:37:13 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								JoePfeiffer 
							
						 
					 
					
						
						
						
						
							
						
						
							a85de1d053 
							
						 
					 
					
						
						
							
							updated translation files to use TCurveMotorCol.COMMON_NAME instead of  
						
						 
						
						... 
						
						
						
						TCurveMotorCol.DESIGNATION.  Used other entries in the files to make a reasonable guess as to the "name" instead of the "designation", for entries using Latin alphabet.  Left the old entries in, but commented out, for ease in comparison later. 
						
						
					 
					
						2021-09-15 11:16:14 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sibo Van Gool 
							
						 
					 
					
						
						
						
						
							
						
						
							2e95f7e768 
							
						 
					 
					
						
						
							
							[ fixes   #877 ] Fix deprecated 'position upwind'  
						
						 
						
						
						
						
					 
					
						2021-09-05 04:47:09 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sampo Niskanen 
							
						 
					 
					
						
						
						
						
							
						
						
							31ace7b312 
							
						 
					 
					
						
						
							
							Material localization support  
						
						 
						
						
						
						
					 
					
						2012-08-25 20:10:58 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Boris du Reau 
							
						 
					 
					
						
						
						
						
							
						
						
							3a53e160e9 
							
						 
					 
					
						
						
							
							updated German translations  
						
						 
						
						
						
						
					 
					
						2012-07-29 17:58:59 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Boris du Reau 
							
						 
					 
					
						
						
						
						
							
						
						
							16d4378f94 
							
						 
					 
					
						
						
							
							Updated translations  
						
						 
						
						
						
						
					 
					
						2012-07-03 21:21:46 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Boris du Reau 
							
						 
					 
					
						
						
						
						
							
						
						
							bf0e3d978a 
							
						 
					 
					
						
						
							
							updated translations  
						
						 
						
						
						
						
					 
					
						2012-04-10 18:33:58 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kevin Ruland 
							
						 
					 
					
						
						
						
						
							
						
						
							a497e6bbdb 
							
						 
					 
					
						
						
							
							Move l10n/ in to resources/.  
						
						 
						
						
						
						
					 
					
						2012-01-11 03:26:17 +00:00