SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							8a52185322 
							
						 
					 
					
						
						
							
							Show warning dialog about restarting OR after preferences import  
						
						
						
						
					 
					
						2023-04-07 01:56:11 +02:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							423295fe52 
							
						 
					 
					
						
						
							
							Update trans keys  
						
						
						
						
					 
					
						2023-04-04 00:24:41 +02:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							2da4e4adf6 
							
						 
					 
					
						
						
							
							Merge branch 'unstable' into exportPrefs  
						
						... 
						
						
						
						# Conflicts:
#	core/src/net/sf/openrocket/startup/Preferences.java 
						
						
					 
					
						2023-04-03 13:03:17 +02:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							42714e73e7 
							
						 
					 
					
						
						
							
							Add option to ignore window information exporting  
						
						
						
						
					 
					
						2023-04-03 11:11:23 +02:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							db55a2f4f3 
							
						 
					 
					
						
						
							
							Add option to exclude user directories from preferences export  
						
						
						
						
					 
					
						2023-04-03 00:30:11 +02:00 
						 
				 
			
				
					
						
							
							
								Sibo Van Gool 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							161e536be9 
							
						 
					 
					
						
						
							
							Merge pull request  #2164  from SiboVG/issue-2159  
						
						... 
						
						
						
						[#2159 ] Add multi-sim edit indicators 
						
						
					 
					
						2023-04-01 09:45:24 +02:00 
						 
				 
			
				
					
						
							
							
								Sibo Van Gool 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							d64a8b931c 
							
						 
					 
					
						
						
							
							Merge pull request  #2163  from SiboVG/issue-2158  
						
						... 
						
						
						
						[#2158 ] Add ok/cancel button for simulation editing 
						
						
					 
					
						2023-04-01 09:44:51 +02:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							3e2aec6e3e 
							
						 
					 
					
						
						
							
							WIP  
						
						
						
						
					 
					
						2023-03-31 18:01:41 +02:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							33e3c4314c 
							
						 
					 
					
						
						
							
							[ #2159 ] Add multi-sim edit indicators  
						
						
						
						
					 
					
						2023-03-30 18:57:58 +02:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							24605bde58 
							
						 
					 
					
						
						
							
							Add sky color opacity slider  
						
						
						
						
					 
					
						2023-03-30 01:28:26 +02:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							f6b932c4a7 
							
						 
					 
					
						
						
							
							[ #2158 ] Add ok/cancel button for simulation editing  
						
						
						
						
					 
					
						2023-03-30 00:47:40 +02:00 
						 
				 
			
				
					
						
							
							
								Sibo Van Gool 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							52988bf31e 
							
						 
					 
					
						
						
							
							Merge pull request  #2129  from SiboVG/issue-2102  
						
						... 
						
						
						
						[#2102 ] Add "Select components of same color" and "Select none" option 
						
						
					 
					
						2023-03-24 11:38:28 +01:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							3d9792cafa 
							
						 
					 
					
						
						
							
							Merge branch 'unstable' into issue-2131  
						
						... 
						
						
						
						# Conflicts:
#	swing/src/net/sf/openrocket/gui/main/DesignFileSaveAsFileChooser.java 
						
						
					 
					
						2023-03-23 11:16:18 +01:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							ea05bc5001 
							
						 
					 
					
						
						
							
							Rename "Select none" to "Deselect all"  
						
						
						
						
					 
					
						2023-03-23 03:16:37 +01:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							e1c86f6a74 
							
						 
					 
					
						
						
							
							[ #2131 ] Throw warning message when design filename contains illegal characters  
						
						
						
						
					 
					
						2023-03-23 01:20:58 +01:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							fd4e357e3b 
							
						 
					 
					
						
						
							
							Fix translation  
						
						
						
						
					 
					
						2023-03-20 23:02:44 +01:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							84689df283 
							
						 
					 
					
						
						
							
							Add select None action  
						
						
						
						
					 
					
						2023-03-20 22:52:42 +01:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							daf6189c8f 
							
						 
					 
					
						
						
							
							[ #2102 ] Add "Select components of same color" option  
						
						
						
						
					 
					
						2023-03-20 22:44:23 +01:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							2dc4a0fd39 
							
						 
					 
					
						
						
							
							Merge branch 'unstable' into issue-875  
						
						
						
						
					 
					
						2023-03-20 12:41:12 +01:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							d02b8fc431 
							
						 
					 
					
						
						
							
							Use selection-specific sim exporting in context menu  
						
						
						
						
					 
					
						2023-03-14 23:29:10 +01:00 
						 
				 
			
				
					
						
							
							
								Joe Pfeiffer 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							14db274d42 
							
						 
					 
					
						
						
							
							Merge pull request  #2110  from JoePfeiffer/fix-2058  
						
						... 
						
						
						
						[#2058 ] Create simulation exception for zero-length stages; improve exception reporting 
						
						
					 
					
						2023-03-10 10:57:27 -07:00 
						 
				 
			
				
					
						
							
							
								Joe Pfeiffer 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							46df6b501d 
							
						 
					 
					
						
						
							
							Merge pull request  #2091  from SiboVG/issue-2090  
						
						... 
						
						
						
						[#2090 ] Add plugged option to charge delay combobox if it wasn't present yet 
						
						
					 
					
						2023-03-10 10:55:41 -07:00 
						 
				 
			
				
					
						
							
							
								Joe Pfeiffer 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							8d6cb3fdbc 
							
						 
					 
					
						
						
							
							Merge pull request  #2082  from JoePfeiffer/fix-2032  
						
						... 
						
						
						
						Tell user about zero-area fins and keep them from crashing simulation with NaN error 
						
						
					 
					
						2023-03-10 10:54:12 -07:00 
						 
				 
			
				
					
						
							
							
								JoePfeiffer 
							
						 
					 
					
						
						
						
						
							
						
						
							68bdd7ff2c 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/unstable' into fix-2058  
						
						
						
						
					 
					
						2023-03-09 13:31:54 -07: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 
							
						 
					 
					
						
						
						
						
							
						
						
							887e38b637 
							
						 
					 
					
						
						
							
							Refactor to better use export Action  
						
						
						
						
					 
					
						2023-03-06 20:35:47 +01:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							fab076eedf 
							
						 
					 
					
						
						
							
							Move file chooser stuff outside of exporter  
						
						
						
						
					 
					
						2023-03-06 19:46:50 +01:00 
						 
				 
			
				
					
						
							
							
								JoePfeiffer 
							
						 
					 
					
						
						
						
						
							
						
						
							9c148b5149 
							
						 
					 
					
						
						
							
							Create icon for simulation exceptions, so they can be seen in plots.  
						
						... 
						
						
						
						For the moment I've just copied the simulation_end icon; it should really be something else 
						
						
					 
					
						2023-03-05 18:53:18 -07:00 
						 
				 
			
				
					
						
							
							
								jppetrakis 
							
						 
					 
					
						
						
						
						
							
						
						
							8ab6aa803c 
							
						 
					 
					
						
						
							
							Commit of several suggested changes.  
						
						
						
						
					 
					
						2023-03-04 21:27:29 -05:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							13c1ebdb66 
							
						 
					 
					
						
						
							
							KISS  
						
						
						
						
					 
					
						2023-03-04 16:54:32 +01:00 
						 
				 
			
				
					
						
							
							
								jppetrakis 
							
						 
					 
					
						
						
						
						
							
						
						
							f1400c5c0f 
							
						 
					 
					
						
						
							
							Fixed text representation in save dialog file chooser.  More reasonable initial location for save dialog.  
						
						
						
						
					 
					
						2023-03-03 22:19:35 -05:00 
						 
				 
			
				
					
						
							
							
								jppetrakis 
							
						 
					 
					
						
						
						
						
							
						
						
							6ed680c55c 
							
						 
					 
					
						
						
							
							fix small text inconsistency  
						
						
						
						
					 
					
						2023-03-03 14:34:06 -05:00 
						 
				 
			
				
					
						
							
							
								jppetrakis 
							
						 
					 
					
						
						
						
						
							
						
						
							95e8f8b937 
							
						 
					 
					
						
						
							
							Address some concerns/suggestions.  
						
						
						
						
					 
					
						2023-03-03 12:19:00 -05:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							5c580f70de 
							
						 
					 
					
						
						
							
							Update info text  
						
						
						
						
					 
					
						2023-03-02 23:48:54 +01:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							8fe69028f1 
							
						 
					 
					
						
						
							
							Changed plugged delay text  
						
						
						
						
					 
					
						2023-03-02 00:19:43 +01:00 
						 
				 
			
				
					
						
							
							
								jppetrakis 
							
						 
					 
					
						
						
						
						
							
						
						
							b17e60c62b 
							
						 
					 
					
						
						
							
							Added: export from file menu, csv escaping using commons.text library  
						
						
						
						
					 
					
						2023-03-01 09:29:39 -05:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							5c2f35e3a1 
							
						 
					 
					
						
						
							
							Fix plugged option not selecting  
						
						
						
						
					 
					
						2023-03-01 03:48:54 +01:00 
						 
				 
			
				
					
						
							
							
								JoePfeiffer 
							
						 
					 
					
						
						
						
						
							
						
						
							4c136441ff 
							
						 
					 
					
						
						
							
							Add check for zero-length active stages  
						
						... 
						
						
						
						Add geometry checks to stage separation
Add branch name to simulation exception dialog 
						
						
					 
					
						2023-02-28 10:19:23 -07:00 
						 
				 
			
				
					
						
							
							
								jppetrakis 
							
						 
					 
					
						
						
						
						
							
						
						
							42818b3564 
							
						 
					 
					
						
						
							
							almost ready draft  
						
						
						
						
					 
					
						2023-02-26 21:20:19 -05:00 
						 
				 
			
				
					
						
							
							
								Joe Pfeiffer 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							022a986130 
							
						 
					 
					
						
						
							
							Merge pull request  #2075  from SiboVG/issue-2069  
						
						... 
						
						
						
						[#2069 ] Add motor type to motor details 
						
						
					 
					
						2023-02-26 16:03:59 -07:00 
						 
				 
			
				
					
						
							
							
								Joe Pfeiffer 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							7c65d71cfd 
							
						 
					 
					
						
						
							
							Merge pull request  #2073  from SiboVG/issue-2072  
						
						... 
						
						
						
						[#2072 ] Apply designation/common name choice to other parts 
						
						
					 
					
						2023-02-26 16:00:12 -07:00 
						 
				 
			
				
					
						
							
							
								JoePfeiffer 
							
						 
					 
					
						
						
						
						
							
						
						
							0ea93a7821 
							
						 
					 
					
						
						
							
							Warn that fins with zero area will not affect aerodynamics  
						
						... 
						
						
						
						Keep fins with zero area from getting NaN errors 
						
						
					 
					
						2023-02-26 15:42:15 -07:00 
						 
				 
			
				
					
						
							
							
								JoePfeiffer 
							
						 
					 
					
						
						
						
						
							
						
						
							a61068e9f0 
							
						 
					 
					
						
						
							
							pushed to the wrong branch, sorry  
						
						... 
						
						
						
						Revert "Don't let fins with zero area cause NaN exceptions."
This reverts commit 1011f2df944dbfe3e82016ea0a3a0f0954c1ca9b.
Revert "Add warning for fin with zero area"
This reverts commit 512ce78b51a2514a5e96f72d9e8946d63b291cd9. 
						
						
					 
					
						2023-02-26 10:22:02 -07:00 
						 
				 
			
				
					
						
							
							
								JoePfeiffer 
							
						 
					 
					
						
						
						
						
							
						
						
							512ce78b51 
							
						 
					 
					
						
						
							
							Add warning for fin with zero area  
						
						... 
						
						
						
						Also, put geometry checks together and add component name to warning where easy. 
						
						
					 
					
						2023-02-25 21:46:37 -07:00 
						 
				 
			
				
					
						
							
							
								JoePfeiffer 
							
						 
					 
					
						
						
						
						
							
						
						
							d2091079b1 
							
						 
					 
					
						
						
							
							Rename "primary figures" to "summary data" in file save chooser  
						
						
						
						
					 
					
						2023-02-25 18:17:25 -07:00 
						 
				 
			
				
					
						
							
							
								Joe Pfeiffer 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							1fa82c3fef 
							
						 
					 
					
						
						
							
							Merge branch 'openrocket:unstable' into fix-2024  
						
						
						
						
					 
					
						2023-02-25 17:56:01 -07:00 
						 
				 
			
				
					
						
							
							
								JoePfeiffer 
							
						 
					 
					
						
						
						
						
							
						
						
							367c745aaa 
							
						 
					 
					
						
						
							
							Merge branch 'unstable' into fix-2067  
						
						
						
						
					 
					
						2023-02-25 17:48:40 -07:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							22fd01d7fc 
							
						 
					 
					
						
						
							
							[ #2069 ] Add motor type to motor details  
						
						
						
						
					 
					
						2023-02-25 01:02:03 +01:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							5ac1f71922 
							
						 
					 
					
						
						
							
							[ #2072 ] Apply designation/common name choice to other parts  
						
						
						
						
					 
					
						2023-02-24 23:28:58 +01:00