Joe Pfeiffer
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							81ea69d489
							
						
					 | 
					
						
						
							
							Merge pull request #2257 from SiboVG/ask-metadata
						
						
						
						
						
						
						
						Open dialog to save design information when saving the file 
						
						
					 | 
					
						2023-07-17 18:29:29 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							407fa8162c
							
						
					 | 
					
						
						
							
							Open dialog to save design information when saving the file
						
						
						
						
						
						
					 | 
					
						2023-07-11 15:46:35 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								JoePfeiffer
							
						 
					 | 
					
						
						
						
						
							
						
						
							8c722fbc27
							
						
					 | 
					
						
						
							
							Check for 0 mass when running simulation
						
						
						
						
						
						
					 | 
					
						2023-07-07 14:36:15 -06:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							02f723cbdc
							
						
					 | 
					
						
						
							
							Clarify that total is for the rocket
						
						
						
						
						
						
					 | 
					
						2023-06-27 23:08:31 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							67552c3cb6
							
						
					 | 
					
						
						
							
							Merge branch 'unstable' into issue-2226
						
						
						
						
						
						
						
						# Conflicts:
#	core/src/net/sf/openrocket/startup/Preferences.java 
						
						
					 | 
					
						2023-06-06 21:23:21 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							3b37b078d0
							
						
					 | 
					
						
						
							
							Add discard prefs checkbox
						
						
						
						
						
						
					 | 
					
						2023-06-06 19:09:44 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							5af6827e92
							
						
					 | 
					
						
						
							
							[#2226] Add Ok/Cancel buttons in preference dialog
						
						
						
						
						
						
					 | 
					
						2023-06-06 18:14:59 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							5e717e443d
							
						
					 | 
					
						
						
							
							Add secondary stability unit in preferences
						
						
						
						
						
						
					 | 
					
						2023-05-29 15:24:36 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							2365ae2cb4
							
						
					 | 
					
						
						
							
							[#2203] Handle SimulationException separately
						
						
						
						
						
						
					 | 
					
						2023-05-07 22:51:41 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								May
							
						 
					 | 
					
						
						
						
						
							
						
						
							ff47b8117a
							
						
					 | 
					
						
						
							
							Change plot warning message name
						
						
						
						
						
						
					 | 
					
						2023-04-26 14:57:05 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								May
							
						 
					 | 
					
						
						
						
						
							
						
						
							3ab2c13b4c
							
						
					 | 
					
						
						
							
							Add translation message for plot warning
						
						
						
						
						
						
					 | 
					
						2023-04-25 14:19:07 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sibo Van Gool
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							42a9a5572b
							
						
					 | 
					
						
						
							
							Merge branch 'unstable' into issue-1147
						
						
						
						
						
						
					 | 
					
						2023-04-20 14:20:03 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sibo Van Gool
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							a0cb228186
							
						
					 | 
					
						
						
							
							Merge pull request #2167 from SiboVG/issue-2150
						
						
						
						
						
						
						
						[#2150] Don't let illegal file format be a silent warning 
						
						
					 | 
					
						2023-04-12 22:06:05 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							d3faa950b3
							
						
					 | 
					
						
						
							
							Fix translation key
						
						
						
						
						
						
					 | 
					
						2023-04-08 23:51:11 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							fa9613923f
							
						
					 | 
					
						
						
							
							Check for invalid component in sustainer
						
						
						
						
						
						
					 | 
					
						2023-04-08 23:46:11 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							8cccf49a8f
							
						
					 | 
					
						
						
							
							Throw error when wrong component in booster stage
						
						
						
						
						
						
					 | 
					
						2023-04-08 23:43:56 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							8a52185322
							
						
					 | 
					
						
						
							
							Show warning dialog about restarting OR after preferences import
						
						
						
						
						
						
					 | 
					
						2023-04-07 01:56:11 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							c698332372
							
						
					 | 
					
						
						
							
							Second component can also be boattail
						
						
						
						
						
						
					 | 
					
						2023-04-06 23:49:55 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							c7aa226995
							
						
					 | 
					
						
						
							
							Add boattail export support
						
						
						
						
						
						
					 | 
					
						2023-04-06 23:49:55 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							4da46d6869
							
						
					 | 
					
						
						
							
							Fix translation keys
						
						
						
						
						
						
					 | 
					
						2023-04-06 00:10:40 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							0d1a5e84f8
							
						
					 | 
					
						
						
							
							Move error messages to translation keys
						
						
						
						
						
						
					 | 
					
						2023-04-04 14:55:07 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							423295fe52
							
						
					 | 
					
						
						
							
							Update trans keys
						
						
						
						
						
						
					 | 
					
						2023-04-04 00:24:41 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							6b64f8e7f5
							
						
					 | 
					
						
						
							
							Merge branch 'unstable' into issue-1147
						
						
						
						
						
						
					 | 
					
						2023-04-03 23:44:03 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							75408cd48c
							
						
					 | 
					
						
						
							
							Fix typos
						
						
						
						
						
						
					 | 
					
						2023-03-31 15:12:52 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							9667466fdb
							
						
					 | 
					
						
						
							
							Add error & warning dialog for RASAero exporting
						
						
						
						
						
						
					 | 
					
						2023-03-27 22:31:52 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							41a045038e
							
						
					 | 
					
						
						
							
							[WIP] Implement RASAero exporting
						
						
						
						
						
						
					 | 
					
						2023-03-27 00:07:04 +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 | 
					
					
						
						
							
							
							
						
					 |