SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							101d9591fc
							
						
					 | 
					
						
						
							
							Merge branch 'unstable' into issue-1147
						
						
						
						
						
						
						
						# Conflicts:
#	core/src/net/sf/openrocket/file/rasaero/importt/RASAeroCommonConstants.java
#	core/src/net/sf/openrocket/file/rasaero/importt/SimulationListHandler.java 
						
						
					 | 
					
						2023-04-05 23:10:15 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sibo Van Gool
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							27de9f6692
							
						
					 | 
					
						
						
							
							Merge pull request #2173 from SiboVG/issue-2137
						
						
						
						
						
						
						
						[#2137] Import mass and CG from RASAero sims 
						
						
					 | 
					
						2023-04-05 01:10:13 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							6962517833
							
						
					 | 
					
						
						
							
							[#2096] Update values after auto is set
						
						
						
						
						
						
					 | 
					
						2023-04-05 01:06:54 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sibo Van Gool
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							bcb2f74b60
							
						
					 | 
					
						
						
							
							Merge pull request #2169 from SiboVG/fix-FBO-transp
						
						
						
						
						
						
						
						Fix issue with exporting of transparent image when off-screen rendering is disabled 
						
						
					 | 
					
						2023-04-04 15:10:56 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							0d1a5e84f8
							
						
					 | 
					
						
						
							
							Move error messages to translation keys
						
						
						
						
						
						
					 | 
					
						2023-04-04 14:55:07 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							bcaf345bec
							
						
					 | 
					
						
						
							
							Catch booster mount being null
						
						
						
						
						
						
					 | 
					
						2023-04-04 14:14:41 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							9410d779be
							
						
					 | 
					
						
						
							
							Add depth buffer to off-screen rendering
						
						
						
						
						
						
					 | 
					
						2023-04-04 00:51:36 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							423295fe52
							
						
					 | 
					
						
						
							
							Update trans keys
						
						
						
						
						
						
					 | 
					
						2023-04-04 00:24:41 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							e7e551c090
							
						
					 | 
					
						
						
							
							Ignore update platform in exporting
						
						
						
						
						
						
					 | 
					
						2023-04-04 00:21:35 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							86b277e9cb
							
						
					 | 
					
						
						
							
							Also add table information to window ignoring
						
						
						
						
						
						
					 | 
					
						2023-04-04 00:14:59 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							485c23161e
							
						
					 | 
					
						
						
							
							Add warning when no motor
						
						
						
						
						
						
					 | 
					
						2023-04-04 00:04:02 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							811305201f
							
						
					 | 
					
						
						
							
							Refactor WarningDialog list cell renderer
						
						
						
						
						
						
					 | 
					
						2023-04-04 00:00:16 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							6b64f8e7f5
							
						
					 | 
					
						
						
							
							Merge branch 'unstable' into issue-1147
						
						
						
						
						
						
					 | 
					
						2023-04-03 23:44:03 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							1852187da7
							
						
					 | 
					
						
						
							
							Aggregate same-sized body tubes in booster
						
						
						
						
						
						
					 | 
					
						2023-04-03 23:41:41 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							8783cb6c02
							
						
					 | 
					
						
						
							
							[#2141] Reset window position if out-of-screen
						
						
						
						
						
						
					 | 
					
						2023-04-03 15:42:08 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							6ac800501f
							
						
					 | 
					
						
						
							
							Fix issue with exporting of transparent image when off-screen rendering is disabled
						
						
						
						
						
						
					 | 
					
						2023-04-03 15:35:38 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							6a54e97fb4
							
						
					 | 
					
						
						
							
							Fix merge conflict
						
						
						
						
						
						
					 | 
					
						2023-04-03 13:04:24 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							e7824c5553
							
						
					 | 
					
						
						
							
							Remove unused imports
						
						
						
						
						
						
					 | 
					
						2023-04-03 10:19:25 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							db55a2f4f3
							
						
					 | 
					
						
						
							
							Add option to exclude user directories from preferences export
						
						
						
						
						
						
					 | 
					
						2023-04-03 00:30:11 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							7186aa6dd0
							
						
					 | 
					
						
						
							
							Ensure default directory is updated after file chooser update
						
						
						
						
						
						
					 | 
					
						2023-04-01 20:48:39 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							e11c2dbaa6
							
						
					 | 
					
						
						
							
							Standardize preferences keys
						
						
						
						
						
						
					 | 
					
						2023-04-01 20:40:58 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							e7d9505ea9
							
						
					 | 
					
						
						
							
							Add some log statements
						
						
						
						
						
						
					 | 
					
						2023-04-01 20:28:19 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							518511bbd8
							
						
					 | 
					
						
						
							
							Fix issue in motor mount selection
						
						
						
						
						
						
						
						First of all: inefficient implementation
Second of all: it could select children of body tubes, we don't want that 
						
						
					 | 
					
						2023-04-01 20:25:18 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							3ddb7b7844
							
						
					 | 
					
						
						
							
							Fix issues in CG importing
						
						
						
						
						
						
					 | 
					
						2023-04-01 19:53:46 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							4e2801ea41
							
						
					 | 
					
						
						
							
							Fix issues in CG exporting
						
						
						
						
						
						
					 | 
					
						2023-04-01 17:13:09 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							bd02f17f8f
							
						
					 | 
					
						
						
							
							Fix importing when motor name has delay
						
						
						
						
						
						
						
						Could not import e.g. B6-0 motor, it needed to be B6 (delay '-0' removed) 
						
						
					 | 
					
						2023-04-01 16:20:54 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							66f7542bcc
							
						
					 | 
					
						
						
							
							Fix motor CG
						
						
						
						
						
						
					 | 
					
						2023-04-01 16:14:30 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							d834deb5ba
							
						
					 | 
					
						
						
							
							Refactor
						
						
						
						
						
						
					 | 
					
						2023-04-01 16:09:24 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							215080e0c9
							
						
					 | 
					
						
						
							
							Create default sim if no sims present
						
						
						
						
						
						
					 | 
					
						2023-04-01 16:05:56 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							d0102fde0e
							
						
					 | 
					
						
						
							
							Still set mass/CG even if there is no motor
						
						
						
						
						
						
					 | 
					
						2023-04-01 12:42:39 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							27a77825be
							
						
					 | 
					
						
						
							
							Fix issues in mass exporting
						
						
						
						
						
						
					 | 
					
						2023-04-01 12:23:02 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							c8f79bbdf5
							
						
					 | 
					
						
						
							
							Fix some issues in mass importing + give warning when mass too low
						
						
						
						
						
						
					 | 
					
						2023-04-01 11:09:55 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							153bd9ebf9
							
						
					 | 
					
						
						
							
							TODO: implement unit testing
						
						
						
						
						
						
					 | 
					
						2023-04-01 10:06:31 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							7cad04653d
							
						
					 | 
					
						
						
							
							Add 0-second delay suffic to RASAero motor export
						
						
						
						
						
						
					 | 
					
						2023-04-01 09:51:04 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sibo Van Gool
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							57c3522f6c
							
						
					 | 
					
						
						
							
							Merge pull request #2157 from SiboVG/issue-2076
						
						
						
						
						
						
						
						[#2076] Support transparent rendering and exporting of PS images 
						
						
					 | 
					
						2023-04-01 09:44:14 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sibo Van Gool
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							c2d86642a3
							
						
					 | 
					
						
						
							
							Merge pull request #2154 from SiboVG/issue-2151
						
						
						
						
						
						
						
						[#2151] Update the ruler unit upon a unit change in prefs 
						
						
					 | 
					
						2023-04-01 09:43:15 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							a7c63260c5
							
						
					 | 
					
						
						
							
							Refactor RASAero motor conversion
						
						
						
						
						
						
					 | 
					
						2023-04-01 09:41:02 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							b6af7220c6
							
						
					 | 
					
						
						
							
							Fill in missing warnings
						
						
						
						
						
						
					 | 
					
						2023-04-01 09:35:31 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							027a7008a0
							
						
					 | 
					
						
						
							
							Refactor motors loader
						
						
						
						
						
						
					 | 
					
						2023-04-01 09:32:48 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							3e2aec6e3e
							
						
					 | 
					
						
						
							
							WIP
						
						
						
						
						
						
					 | 
					
						2023-03-31 18:01:41 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							5e99746e71
							
						
					 | 
					
						
						
							
							[#2150] Don't let illegal file format be a silent warning
						
						
						
						
						
						
					 | 
					
						2023-03-31 15:19:37 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							75408cd48c
							
						
					 | 
					
						
						
							
							Fix typos
						
						
						
						
						
						
					 | 
					
						2023-03-31 15:12:52 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							4dcd43850f
							
						
					 | 
					
						
						
							
							Make sure to clean the project before building the JAR
						
						
						
						
						
						
						
						This has caused numerous weird bugs in the past... 
						
						
					 | 
					
						2023-03-31 13:35:21 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							51de605561
							
						
					 | 
					
						
						
							
							Add command line argument to ignore the JRE
						
						
						
						
						
						
					 | 
					
						2023-03-31 13:10:11 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sibo Van Gool
							
						 
					 | 
					
						
						
							
							
						
						
						
							
						
						
							5791c4ad4f
							
						
					 | 
					
						
						
							
							Update bug-report.yml
						
						
						
						
						
						
					 | 
					
						2023-03-31 02:32:26 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								SiboVG
							
						 
					 | 
					
						
						
						
						
							
						
						
							c48c3b8e4e
							
						
					 | 
					
						
						
							
							Fix some references to BasicFrame
						
						
						
						
						
						
					 | 
					
						2023-03-31 02:13:56 +02:00 | 
					
					
						
						
							
							
							
						
					 |