thzero 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							3ed19060bd 
							
						 
					 
					
						
						
							
							Merge branch 'openrocket:unstable' into scripting  
						
						
						
						
					 
					
						2022-08-02 09:22:08 -05:00 
						 
				 
			
				
					
						
							
							
								JoePfeiffer 
							
						 
					 
					
						
						
						
						
							
						
						
							2ad7cd1c95 
							
						 
					 
					
						
						
							
							When sitting on the ground, advance simulation time to next event time  
						
						
						
						
					 
					
						2022-07-31 19:46:50 -06:00 
						 
				 
			
				
					
						
							
							
								Joe Pfeiffer 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c0ba04edac 
							
						 
					 
					
						
						
							
							Merge pull request  #1540  from SiboVG/railbutton-database  
						
						... 
						
						
						
						Incorporate rail button database items 
						
						
					 
					
						2022-07-31 15:10:13 -06:00 
						 
				 
			
				
					
						
							
							
								UncleRus 
							
						 
					 
					
						
						
						
						
							
						
						
							0b4865950d 
							
						 
					 
					
						
						
							
							l10n: sync Russian translation  
						
						
						
						
					 
					
						2022-07-31 21:20:43 +05:00 
						 
				 
			
				
					
						
							
							
								Joe Pfeiffer 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e313546a65 
							
						 
					 
					
						
						
							
							Merge pull request  #1538  from SiboVG/issue-1537  
						
						... 
						
						
						
						[#1537 ] Add additional configuration parameters for rail buttons 
						
						
					 
					
						2022-07-31 09:44:30 -06:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							2db3b91995 
							
						 
					 
					
						
						
							
							Merge branch 'unstable' into issue-1539  
						
						
						
						
					 
					
						2022-07-27 23:48:02 +02:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							f784e00ecb 
							
						 
					 
					
						
						
							
							Merge pull request  #1546  from SiboVG/issue-1516  
						
						... 
						
						
						
						[#1516 ] Keep preset highlight after favorites checkbox action 
						
						
					 
					
						2022-07-27 23:46:36 +02:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							39d56e6211 
							
						 
					 
					
						
						
							
							Nevermind, this is in fact necessary...  
						
						
						
						
					 
					
						2022-07-27 22:59:26 +02:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							2be82ff36f 
							
						 
					 
					
						
						
							
							Eureka! Use concurrent-safe collections  
						
						
						
						
					 
					
						2022-07-27 22:50:28 +02:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							1123a5d4ea 
							
						 
					 
					
						
						
							
							Ignore null stages  
						
						
						
						
					 
					
						2022-07-27 22:12:10 +02:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							949c1cb08f 
							
						 
					 
					
						
						
							
							Merge pull request  #1547  from JonathanJagt23/issue-1480  
						
						... 
						
						
						
						[#1480 ] Pre-check diameter filters in component preset chooser 
						
						
					 
					
						2022-07-27 21:41:57 +02:00 
						 
				 
			
				
					
						
							
							
								David Cain 
							
						 
					 
					
						
						
						
						
							
						
						
							4949050634 
							
						 
					 
					
						
						
							
							Update Pods icons  
						
						... 
						
						
						
						Update the xcf and ping files for improved pod icons. The new pod icons better match the current display of Pod markers
 and better indicate the function of the button.
Signed-off-by: David Cain <sblkGitHub@jimmiedave.com> 
						
						
					 
					
						2022-07-26 23:02:55 -04:00 
						 
				 
			
				
					
						
							
							
								Neil Weinstock 
							
						 
					 
					
						
						
						
						
							
						
						
							b7fa2f7bda 
							
						 
					 
					
						
						
							
							Updated small icons for most components.  
						
						
						
						
					 
					
						2022-07-26 22:05:10 -04:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							ce0eeda72f 
							
						 
					 
					
						
						
							
							Use fireChangeEvent for toggling stages  
						
						... 
						
						
						
						This causes toggling stages to have an undo-action. 
						
						
					 
					
						2022-07-26 13:42:06 +02:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							fdec211c9a 
							
						 
					 
					
						
						
							
							Merge pull request  #1545  from UncleRus/unstable  
						
						... 
						
						
						
						l10n: sync Russian translation 
						
						
					 
					
						2022-07-26 11:10:12 +02:00 
						 
				 
			
				
					
						
							
							
								Jon Jagt 
							
						 
					 
					
						
						
						
						
							
						
						
							2badfe850d 
							
						 
					 
					
						
						
							
							Change Diameter Filters to use Preferences  
						
						... 
						
						
						
						Add preferences for "match diameter" filters in the Component Preset Chooser to Preferences; change filter pre-checks to use those preferences. 
						
						
					 
					
						2022-07-25 10:51:57 -05:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							f1a98bc776 
							
						 
					 
					
						
						
							
							Remove unneeded config update  
						
						... 
						
						
						
						Selected config is present in configset 
						
						
					 
					
						2022-07-23 23:29:48 +02:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							cfb51d350a 
							
						 
					 
					
						
						
							
							Remove updateconfigurations  
						
						... 
						
						
						
						Not needed, as the about iterator already calls 'update' in Rocket (iterator returns the rocket itself) 
						
						
					 
					
						2022-07-23 21:50:43 +02:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							9a59575424 
							
						 
					 
					
						
						
							
							Update unit tests  
						
						... 
						
						
						
						Because simulations are not exact, the sim results can vary, which causes unittests to fail sporadically. So increase the error margin... 
						
						
					 
					
						2022-07-23 15:15:18 +02:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							a9ede4b972 
							
						 
					 
					
						
						
							
							Add clarifying text for applying preset selection  
						
						
						
						
					 
					
						2022-07-21 01:20:57 +02:00 
						 
				 
			
				
					
						
							
							
								UncleRus 
							
						 
					 
					
						
						
						
						
							
						
						
							69637ef18d 
							
						 
					 
					
						
						
							
							l10n: sync Russian translation  
						
						
						
						
					 
					
						2022-07-21 02:08:14 +05:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							63c0a3cc86 
							
						 
					 
					
						
						
							
							Missing dependencies  
						
						
						
						
					 
					
						2022-07-20 22:15:47 +02:00 
						 
				 
			
				
					
						
							
							
								thzero 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							e35b7bda2d 
							
						 
					 
					
						
						
							
							Merge branch 'openrocket:unstable' into scripting  
						
						
						
						
					 
					
						2022-07-20 08:28:17 -05: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 
							
						 
					 
					
						
						
						
						
							
						
						
							297123a7f2 
							
						 
					 
					
						
						
							
							Redo getActiveComponents  
						
						
						
						
					 
					
						2022-07-20 00:17:22 +02:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							d2b13c6714 
							
						 
					 
					
						
						
							
							Change component change event for setCantAngle  
						
						
						
						
					 
					
						2022-07-19 23:10:59 +02:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							01d868a186 
							
						 
					 
					
						
						
							
							Merge pull request  #1505  from SiboVG/issue-1481  
						
						... 
						
						
						
						[#1481 ] Improvements to Preset selection menu 
						
						
					 
					
						2022-07-19 22:19:33 +02:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							57bc867789 
							
						 
					 
					
						
						
							
							Merge pull request  #1500  from SiboVG/issue-1487  
						
						... 
						
						
						
						[#1487 ] Fix configuration referencing after loadFrom rocket 
						
						
					 
					
						2022-07-19 22:19:00 +02:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							e1e3f89041 
							
						 
					 
					
						
						
							
							Don't include finish  
						
						
						
						
					 
					
						2022-07-19 19:29:58 +02:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							57ee3bb177 
							
						 
					 
					
						
						
							
							Clear rail button presets after change  
						
						
						
						
					 
					
						2022-07-19 13:27:09 +02:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							6b9e327508 
							
						 
					 
					
						
						
							
							Merge branch 'issue-1537' into railbutton-database  
						
						... 
						
						
						
						# Conflicts:
#	core/src/net/sf/openrocket/rocketcomponent/RailButton.java 
						
						
					 
					
						2022-07-19 13:20:24 +02:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							2c401c47fc 
							
						 
					 
					
						
						
							
							Implement rail button presets  
						
						
						
						
					 
					
						2022-07-19 13:14:44 +02:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							7626e0801b 
							
						 
					 
					
						
						
							
							Add import/save for new rail button parameters  
						
						
						
						
					 
					
						2022-07-19 00:52:46 +02:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							1bf4486a63 
							
						 
					 
					
						
						
							
							[ #1537 ] Add extra configuration parameters for rail button  
						
						
						
						
					 
					
						2022-07-19 00:18:34 +02:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							ab9ace735e 
							
						 
					 
					
						
						
							
							Remove redundant imports  
						
						
						
						
					 
					
						2022-07-18 23:52:33 +02:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							2c67b80940 
							
						 
					 
					
						
						
							
							Merge pull request  #1528  from SiboVG/issue-1524  
						
						... 
						
						
						
						[#1524 ] Add sliders to PhotoStudio 
						
						
					 
					
						2022-07-18 16:35:43 +02:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							d0be2e5e07 
							
						 
					 
					
						
						
							
							Add preference for marker visibility  
						
						
						
						
					 
					
						2022-07-18 00:28:05 +02:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							959bbfaac3 
							
						 
					 
					
						
						
							
							[ #1146 ] Add 2D visualization for pod sets  
						
						
						
						
					 
					
						2022-07-16 02:40:12 +02:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							712adc6dad 
							
						 
					 
					
						
						
							
							Include javax.json in classpath  
						
						
						
						
					 
					
						2022-07-12 18:58:55 +02:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							74d21bfa3c 
							
						 
					 
					
						
						
							
							[ #1524 ] Add sliders to PhotoStudio  
						
						
						
						
					 
					
						2022-07-12 13:00:09 +02:00 
						 
				 
			
				
					
						
							
							
								Joe Pfeiffer 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							173b332602 
							
						 
					 
					
						
						
							
							Merge pull request  #1478  from SiboVG/issue-1477  
						
						... 
						
						
						
						[#1477  & #1460 ] Don't include inactive stages in calculations 
						
						
					 
					
						2022-07-06 15:34:09 -06:00 
						 
				 
			
				
					
						
							
							
								thzero 
							
						 
					 
					
						
						
						
						
							
						
						
							78df43569a 
							
						 
					 
					
						
						
							
							refactor to remove deprecation warning for newInstance  
						
						
						
						
					 
					
						2022-07-04 17:23:03 -05:00 
						 
				 
			
				
					
						
							
							
								thzero 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							08b76e0b7e 
							
						 
					 
					
						
						
							
							XMLReaderFactory.createXMLReader Deprecation ( #1493 )  
						
						... 
						
						
						
						* remove the resources\datafiles\presets folder as its is being built by the copy-orc-files build script
* Refactored from new Boolean and new Integer to Boolean.valueOf and Integer.valueOf due to deprecation warnings.   Value of is supported in Java 8 (https://docs.oracle.com/javase/8/docs/api/java/lang/Integer.html )
* Removed non-atomic updates around deprecation
* updates
* sync
* resolved deprecated xmlreader 
						
						
					 
					
						2022-07-04 23:36:57 +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 
							
						 
					 
					
						
						
							
							
						
						
						
							
						
						
							c02f9611e7 
							
						 
					 
					
						
						
							
							Merge pull request  #1508  from SiboVG/issue-1488  
						
						... 
						
						
						
						[#1488  & #1506 ] Focus most commonly edited parameter after preset selection + Highlight spinner text after focus gained 
						
						
					 
					
						2022-07-04 16:16:27 +02:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							f3a0c32f55 
							
						 
					 
					
						
						
							
							Better appearance tab tooltip  
						
						
						
						
					 
					
						2022-07-04 12:10:47 +02:00 
						 
				 
			
				
					
						
							
							
								SiboVG 
							
						 
					 
					
						
						
						
						
							
						
						
							2814827bcc 
							
						 
					 
					
						
						
							
							[ #1509 ] Make InnerTube InsideColorComponent  
						
						
						
						
					 
					
						2022-07-04 12:10:29 +02:00 
						 
				 
			
				
					
						
							
							
								thzero 
							
						 
					 
					
						
						
						
						
							
						
						
							26019d48d3 
							
						 
					 
					
						
						
							
							refactor to use non-deprecated component iterator  
						
						
						
						
					 
					
						2022-07-03 08:30:51 -05:00