JoePfeiffer 
							
						 
					 
					
						
						
						
						
							
						
						
							435b2bfcad 
							
						 
					 
					
						
						
							
							update unit tests  
						
						
						
						
					 
					
						2023-03-09 15:56:59 -07:00 
						 
				 
			
				
					
						
							
							
								JoePfeiffer 
							
						 
					 
					
						
						
						
						
							
						
						
							68bdd7ff2c 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/unstable' into fix-2058  
						
						
						
						
					 
					
						2023-03-09 13:31:54 -07:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							2252a31f97 
							
						 
					 
					
						
						
							
							Add extra rocket test  
						
						
						
						
					 
					
						2023-03-09 01:01:21 +01:00 
						 
				 
			
				
					
						
							
							
								Sibo Van Gool 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							cfea331712 
							
						 
					 
					
						
						
							
							Merge pull request  #2105  from SiboVG/issue-2103  
						
						... 
						
						
						
						[#2103 ] Fix type in default pressure setter 
						
						
					 
					
						2023-03-08 21:35:54 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							7252f44a37 
							
						 
					 
					
						
						
							
							Add unit tests for default simulation options  
						
						
						
						
					 
					
						2023-03-08 21:13:05 +01:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							da15c59673 
							
						 
					 
					
						
						
							
							Remove some references to None and replace with Plugged  
						
						
						
						
					 
					
						2023-03-08 19:19:39 +01:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							755dfc189d 
							
						 
					 
					
						
						
							
							[ #2103 ] Fix type in default pressure setter  
						
						
						
						
					 
					
						2023-03-07 01:53:31 +01:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							887e38b637 
							
						 
					 
					
						
						
							
							Refactor to better use export Action  
						
						
						
						
					 
					
						2023-03-06 20:35:47 +01:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							9c7106a253 
							
						 
					 
					
						
						
							
							Create custom CSV escape method  
						
						
						
						
					 
					
						2023-03-06 20:09:14 +01:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							80e33ba01b 
							
						 
					 
					
						
						
							
							Refactor string utils to common class  
						
						
						
						
					 
					
						2023-03-06 19:55:35 +01:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							820cb4fd8c 
							
						 
					 
					
						
						
							
							Remove commons-lang3 lib  
						
						
						
						
					 
					
						2023-03-06 19:48:28 +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 
						 
				 
			
				
					
						
							
							
								JoePfeiffer 
							
						 
					 
					
						
						
						
						
							
						
						
							3571ebad68 
							
						 
					 
					
						
						
							
							When creating a new sim branch, copy one data point and the separation event to the new branch so we can plot it if it has an immediate exception  
						
						
						
						
					 
					
						2023-03-05 09:20:18 -07:00 
						 
				 
			
				
					
						
							
							
								jppetrakis 
							
						 
					 
					
						
						
						
						
							
						
						
							8ab6aa803c 
							
						 
					 
					
						
						
							
							Commit of several suggested changes.  
						
						
						
						
					 
					
						2023-03-04 21:27:29 -05:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							9fc4ae3066 
							
						 
					 
					
						
						
							
							Fix some lib import issues  
						
						
						
						
					 
					
						2023-03-05 01:34:31 +01: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 
						 
				 
			
				
					
						
							
							
								JoePfeiffer 
							
						 
					 
					
						
						
						
						
							
						
						
							e8be376a69 
							
						 
					 
					
						
						
							
							Refine simulation loading:  if the data saved with a simulation is out of date, mark it out of date when loading  
						
						
						
						
					 
					
						2023-03-03 18:40:31 -07:00 
						 
				 
			
				
					
						
							
							
								JoePfeiffer 
							
						 
					 
					
						
						
						
						
							
						
						
							b6c6a47811 
							
						 
					 
					
						
						
							
							Unit test to see if sim status is saved/loaded properly  
						
						
						
						
					 
					
						2023-03-03 18:23:40 -07:00 
						 
				 
			
				
					
						
							
							
								jppetrakis 
							
						 
					 
					
						
						
						
						
							
						
						
							5c2ee50e0e 
							
						 
					 
					
						
						
							
							changes to include apache-commons-text in the final jar  
						
						
						
						
					 
					
						2023-03-03 19:46:46 -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 
						 
				 
			
				
					
						
							
							
								JoePfeiffer 
							
						 
					 
					
						
						
						
						
							
						
						
							f98a8749db 
							
						 
					 
					
						
						
							
							Don't terminate modID update/simulation save option search loop early  
						
						
						
						
					 
					
						2023-03-02 11:56:37 -07: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 
							
						 
					 
					
						
						
						
						
							
						
						
							1011f2df94 
							
						 
					 
					
						
						
							
							Don't let fins with zero area cause NaN exceptions.  
						
						
						
						
					 
					
						2023-02-26 09:41:55 -07:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							8dbae85bc3 
							
						 
					 
					
						
						
							
							Update recovery device import rules  
						
						... 
						
						
						
						Apparently RASAero doesn't support recovery devices in other stages 
						
						
					 
					
						2023-02-26 15:15:29 +01: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 
							
						 
					 
					
						
						
						
						
							
						
						
							590e550511 
							
						 
					 
					
						
						
							
							update unit tests  
						
						
						
						
					 
					
						2023-02-25 18:56:09 -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 
							
						 
					 
					
						
						
						
						
							
						
						
							eb65266fe8 
							
						 
					 
					
						
						
							
							Fix import issue when sim includes booster motor, but no booster present  
						
						
						
						
					 
					
						2023-02-25 20:04:53 +01:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							a9746a9983 
							
						 
					 
					
						
						
							
							Fix import issue when sim includes booster motor, but no booster present  
						
						
						
						
					 
					
						2023-02-25 20:03:13 +01: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 
						 
				 
			
				
					
						
							
							
								Sibo Van Gool 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							2c22015ec7 
							
						 
					 
					
						
						
							
							Merge pull request  #2057  from SiboVG/issue-2055  
						
						... 
						
						
						
						[#2055 ] Add motor manufacturers substitutor 
						
						
					 
					
						2023-02-24 22:12:12 +01:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							ea7ee41a25 
							
						 
					 
					
						
						
							
							Fix recovery event when first booster component is not a body tube  
						
						
						
						
					 
					
						2023-02-24 16:00:22 +01:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							5ba08cf8a4 
							
						 
					 
					
						
						
							
							Remove unused imports  
						
						
						
						
					 
					
						2023-02-23 23:40:22 +01:00 
						 
				 
			
				
					
						
							
							
								JoePfeiffer 
							
						 
					 
					
						
						
						
						
							
						
						
							9a078f0e68 
							
						 
					 
					
						
						
							
							Mark simulations loaded from .ork file with blue sphere (same as data from  
						
						... 
						
						
						
						external sources -- do we actually have a way to load data from external sources?) and appropriate tooltip 
						
						
					 
					
						2023-02-23 15:37:05 -07:00