Alessandro Ranellucci 
								
							 
						 
						
							
							
							
							
								
							
							
								dd879c3ef2 
								
							 
						 
						
							
							
								
								When loading an AMF file having multiple objects that look like multiple parts of a single object, prompt user and ask how to consider it.  #2970  
							
							... 
							
							
							
							Conflicts:
	lib/Slic3r/Model.pm 
							
						 
						
							2016-03-19 22:24:20 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alessandro Ranellucci 
								
							 
						 
						
							
							
							
							
								
							
							
								e2aae39f15 
								
							 
						 
						
							
							
								
								Bugfix: crash when input to bed shape options was '-'.  #3254  
							
							
							
						 
						
							2016-03-18 01:15:52 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alessandro Ranellucci 
								
							 
						 
						
							
							
							
							
								
							
							
								1a09ae81db 
								
							 
						 
						
							
							
								
								Merge pull request  #3166  from hippich/pk-fix-about-screen  
							
							... 
							
							
							
							Fix Slic3r crash when opening About dialog 
							
						 
						
							2016-03-14 00:17:13 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alessandro Ranellucci 
								
							 
						 
						
							
							
							
							
								
							
							
								0964700e6d 
								
							 
						 
						
							
							
								
								Merge pull request  #3209  from hyperair/fix-3046  
							
							... 
							
							
							
							Don't toggle support_material_enforce_layers field 
							
						 
						
							2016-03-13 18:30:22 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alessandro Ranellucci 
								
							 
						 
						
							
							
							
							
								
							
							
								e72a89ec23 
								
							 
						 
						
							
							
								
								New icon for Infill (credits: Carlo Mariella)  
							
							
							
						 
						
							2016-02-20 16:18:48 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Chow Loong Jin 
								
							 
						 
						
							
							
							
							
								
							
							
								a9c5874db3 
								
							 
						 
						
							
							
								
								Don't toggle support_material_enforce_layers field  
							
							... 
							
							
							
							support_material_enforce_layers works independently of the support_material ||
raft options, so we should not disable the field when support material
generation is disabled.
Fixes : #3046  
							
						 
						
							2016-01-17 17:12:47 +08:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Pavel Karoukin 
								
							 
						 
						
							
							
							
							
								
							
							
								571b406bd6 
								
							 
						 
						
							
							
								
								@farhaven: There's one more wxCLOSE in lib/Slic3r/GUI/Projector.pm, that one should probably be changed as well.  
							
							
							
						 
						
							2015-12-27 11:26:11 -06:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alessandro Ranellucci 
								
							 
						 
						
							
							
							
							
								
							
							
								f5326c393a 
								
							 
						 
						
							
							
								
								Revert "Implement resizable left column in preset editor.  #3151 "  
							
							... 
							
							
							
							This reverts commit 4b30d67e54 
							
						 
						
							2015-12-25 17:52:10 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alessandro Ranellucci 
								
							 
						 
						
							
							
							
							
								
							
							
								f7e97f7e9b 
								
							 
						 
						
							
							
								
								Refactor cutting logic, don't slice in 3DScene  
							
							
							
						 
						
							2015-12-19 23:15:37 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alessandro Ranellucci 
								
							 
						 
						
							
							
							
							
								
							
							
								025a508de2 
								
							 
						 
						
							
							
								
								Ignore cut result if user didn't click the cut button  
							
							
							
						 
						
							2015-12-19 20:41:47 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alessandro Ranellucci 
								
							 
						 
						
							
							
							
							
								
							
							
								6e231a8cae 
								
							 
						 
						
							
							
								
								Editable text control for specifying the cut Z in cut dialog  
							
							
							
						 
						
							2015-12-19 20:38:50 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alessandro Ranellucci 
								
							 
						 
						
							
							
							
							
								
							
							
								70e8db8a0a 
								
							 
						 
						
							
							
								
								Minor code cleanup here and there  
							
							
							
						 
						
							2015-12-19 20:27:04 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Pavel Karoukin 
								
							 
						 
						
							
							
							
							
								
							
							
								4f32a1cf9d 
								
							 
						 
						
							
							
								
								Fix Slic3r crash when opening About dialog  
							
							
							
						 
						
							2015-12-19 10:47:15 -06:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alessandro Ranellucci 
								
							 
						 
						
							
							
							
							
								
							
							
								4b30d67e54 
								
							 
						 
						
							
							
								
								Implement resizable left column in preset editor.  #3151  
							
							
							
						 
						
							2015-12-18 20:00:22 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alessandro Ranellucci 
								
							 
						 
						
							
							
							
							
								
							
							
								8138fbf349 
								
							 
						 
						
							
							
								
								New --retract-lift-above and --retract-lift-below options.  #763   #3057  
							
							
							
						 
						
							2015-12-18 18:36:39 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alessandro Ranellucci 
								
							 
						 
						
							
							
							
							
								
							
							
								44825d91af 
								
							 
						 
						
							
							
								
								Some changes to DLP projector  
							
							
							
						 
						
							2015-12-18 00:56:56 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alessandro Ranellucci 
								
							 
						 
						
							
							
							
							
								
							
							
								d0ad57b64d 
								
							 
						 
						
							
							
								
								Don't show any dialog if 0 configs were imported  
							
							
							
						 
						
							2015-12-17 18:48:50 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alessandro Ranellucci 
								
							 
						 
						
							
							
							
							
								
							
							
								c73378744f 
								
							 
						 
						
							
							
								
								Prevent flickering  
							
							
							
						 
						
							2015-12-15 17:10:10 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alessandro Ranellucci 
								
							 
						 
						
							
							
							
							
								
							
							
								7ecfe195f7 
								
							 
						 
						
							
							
								
								Live preview in the cut dialog  
							
							
							
						 
						
							2015-12-14 00:15:26 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alessandro Ranellucci 
								
							 
						 
						
							
							
							
							
								
							
							
								37d0558873 
								
							 
						 
						
							
							
								
								Move the position_screen method to the Screen class  
							
							
							
						 
						
							2015-12-11 01:18:02 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alessandro Ranellucci 
								
							 
						 
						
							
							
							
							
								
							
							
								9bd10b3b5e 
								
							 
						 
						
							
							
								
								Updates to GUI projector: fix buttons not updating when print finished; ring a bell at that time; disable screensaver not just when printing but until the DLP projector window gets closed  
							
							
							
						 
						
							2015-12-11 01:13:47 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alessandro Ranellucci 
								
							 
						 
						
							
							
							
							
								
							
							
								32a333f16a 
								
							 
						 
						
							
							
								
								Import config bundle automatically if found in application directory  
							
							
							
						 
						
							2015-12-07 12:17:06 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alessandro Ranellucci 
								
							 
						 
						
							
							
							
							
								
							
							
								c16cdb9d85 
								
							 
						 
						
							
							
								
								Preserve the current layer when refreshing the 3D preview  
							
							
							
						 
						
							2015-12-05 23:22:50 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alessandro Ranellucci 
								
							 
						 
						
							
							
							
							
								
							
							
								a8091e41a0 
								
							 
						 
						
							
							
								
								Fix a minor glitch with scrollbars in OverrideSettingsPanel  
							
							
							
						 
						
							2015-12-05 23:14:13 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alessandro Ranellucci 
								
							 
						 
						
							
							
							
							
								
							
							
								50b52367a2 
								
							 
						 
						
							
							
								
								New "Scale to size" command(s).  #2711  
							
							
							
						 
						
							2015-12-05 19:37:57 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alessandro Ranellucci 
								
							 
						 
						
							
							
							
							
								
							
							
								abff77cf04 
								
							 
						 
						
							
							
								
								Add color icons to menu items about axes.  #3121  
							
							
							
						 
						
							2015-12-05 19:01:17 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alessandro Ranellucci 
								
							 
						 
						
							
							
							
							
								
							
							
								e2b203ba8d 
								
							 
						 
						
							
							
								
								Disable screensaver while projecting (untested on Windows)  
							
							
							
						 
						
							2015-12-04 21:25:45 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alessandro Ranellucci 
								
							 
						 
						
							
							
							
							
								
							
							
								366b364996 
								
							 
						 
						
							
							
								
								Improvements to DLP projector: disable all options while printing; apply config changes to the printer preset so that user can save them; show total and remaining print time  
							
							
							
						 
						
							2015-12-04 18:52:53 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alessandro Ranellucci 
								
							 
						 
						
							
							
							
							
								
							
							
								5655f786f4 
								
							 
						 
						
							
							
								
								Change order in DLP projection  
							
							
							
						 
						
							2015-12-01 20:54:06 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alessandro Ranellucci 
								
							 
						 
						
							
							
							
							
								
							
							
								5844b956be 
								
							 
						 
						
							
							
								
								Bugfix: prevent crash when setting a Choice field to a non-indexed value  
							
							
							
						 
						
							2015-12-01 20:53:29 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alessandro Ranellucci 
								
							 
						 
						
							
							
							
							
								
							
							
								017ed05911 
								
							 
						 
						
							
							
								
								Removed debugging comment  
							
							
							
						 
						
							2015-11-22 10:13:58 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alessandro Ranellucci 
								
							 
						 
						
							
							
							
							
								
							
							
								ad4940a1d6 
								
							 
						 
						
							
							
								
								New option for inverting the Y axis in projection  
							
							
							
						 
						
							2015-11-20 10:30:56 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alessandro Ranellucci 
								
							 
						 
						
							
							
							
							
								
							
							
								f9d1ca8373 
								
							 
						 
						
							
							
								
								Project grid  
							
							
							
						 
						
							2015-11-20 10:04:17 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alessandro Ranellucci 
								
							 
						 
						
							
							
							
							
								
							
							
								bd00e7c584 
								
							 
						 
						
							
							
								
								Fix projection of slices with holes because wxDC is not honoring the fill rule  
							
							
							
						 
						
							2015-11-20 09:57:51 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alessandro Ranellucci 
								
							 
						 
						
							
							
							
							
								
							
							
								78d2240d71 
								
							 
						 
						
							
							
								
								Limit slider to number of layers  
							
							
							
						 
						
							2015-11-20 09:41:13 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alessandro Ranellucci 
								
							 
						 
						
							
							
							
							
								
							
							
								4a65671f64 
								
							 
						 
						
							
							
								
								Prevent absolute movement if user hasn't homed both X and Y  
							
							
							
						 
						
							2015-11-20 09:36:17 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alessandro Ranellucci 
								
							 
						 
						
							
							
							
							
								
							
							
								cc57432be4 
								
							 
						 
						
							
							
								
								Let user configure travel speed in manual control dialog  
							
							
							
						 
						
							2015-11-20 09:32:48 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alessandro Ranellucci 
								
							 
						 
						
							
							
							
							
								
							
							
								0af289ed78 
								
							 
						 
						
							
							
								
								Added manual projection control  
							
							
							
						 
						
							2015-11-20 09:18:41 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alessandro Ranellucci 
								
							 
						 
						
							
							
							
							
								
							
							
								2efc759a74 
								
							 
						 
						
							
							
								
								Add manual control to DLP projector too  
							
							
							
						 
						
							2015-11-19 17:31:47 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alessandro Ranellucci 
								
							 
						 
						
							
							
							
							
								
							
							
								624c5e78db 
								
							 
						 
						
							
							
								
								Changed default settings for DLP projector and changed time options from integer to decimal  
							
							
							
						 
						
							2015-11-19 15:04:50 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alessandro Ranellucci 
								
							 
						 
						
							
							
							
							
								
							
							
								73b6400129 
								
							 
						 
						
							
							
								
								Merge branch 'master' into sender-dlp  
							
							
							
						 
						
							2015-11-19 13:19:04 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alessandro Ranellucci 
								
							 
						 
						
							
							
							
							
								
							
							
								21a5d6e137 
								
							 
						 
						
							
							
								
								Several fixes to GCodeSender, including compilation on older OS X and DTR reset  
							
							
							
						 
						
							2015-11-19 13:17:52 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alessandro Ranellucci 
								
							 
						 
						
							
							
							
							
								
							
							
								c1f95ac173 
								
							 
						 
						
							
							
								
								Slice objects even if background processing is disabled  
							
							
							
						 
						
							2015-11-15 23:16:14 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alessandro Ranellucci 
								
							 
						 
						
							
							
							
							
								
							
							
								5ba2f72324 
								
							 
						 
						
							
							
								
								More customizable options for DLP projector  
							
							
							
						 
						
							2015-11-15 22:42:56 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alessandro Ranellucci 
								
							 
						 
						
							
							
							
							
								
							
							
								be0ba4d5a2 
								
							 
						 
						
							
							
								
								Re-enable serial connection for DLP projector  
							
							
							
						 
						
							2015-11-15 21:08:47 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alessandro Ranellucci 
								
							 
						 
						
							
							
							
							
								
							
							
								6bfa2cfaec 
								
							 
						 
						
							
							
								
								Projector for DLP  
							
							
							
						 
						
							2015-11-15 21:08:14 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alessandro Ranellucci 
								
							 
						 
						
							
							
							
							
								
							
							
								80620a5e94 
								
							 
						 
						
							
							
								
								Some fixes and improvements to controller  
							
							
							
						 
						
							2015-11-08 11:17:55 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alessandro Ranellucci 
								
							 
						 
						
							
							
							
							
								
							
							
								3c43fb8081 
								
							 
						 
						
							
							
								
								Fix rendering on Windows  
							
							
							
						 
						
							2015-11-08 10:20:47 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alessandro Ranellucci 
								
							 
						 
						
							
							
							
							
								
							
							
								9febb10bd7 
								
							 
						 
						
							
							
								
								Smoother manual control movements  
							
							
							
						 
						
							2015-11-08 10:20:47 +01:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Alessandro Ranellucci 
								
							 
						 
						
							
							
							
							
								
							
							
								25a358cd20 
								
							 
						 
						
							
							
								
								Prevent double connection check  
							
							
							
						 
						
							2015-11-06 16:34:54 +01:00