YuSanka 
								
							 
						 
						
							
							
							
							
								
							
							
								40b55a3818 
								
							 
						 
						
							
							
								
								Allow delete button in object list  
							
							 
							
							
							
						 
						
							2018-07-23 11:33:13 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								df36de0d35 
								
							 
						 
						
							
							
								
								Fixed status of Slice now and Export G-Code buttons after object import  
							
							 
							
							
							
						 
						
							2018-07-23 10:16:56 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								86caf83721 
								
							 
						 
						
							
							
								
								Update objects' list after scaling using gizmo  
							
							 
							
							
							
						 
						
							2018-07-23 08:57:00 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								1a6fdb668f 
								
							 
						 
						
							
							
								
								Fixed print info  
							
							 
							
							
							
						 
						
							2018-07-19 13:58:25 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									bubnikv 
								
							 
						 
						
							
							
							
							
								
							
							
								a46bdb1d81 
								
							 
						 
						
							
							
								
								Reworked the "Sliced info" box on the platter to only show the  
							
							 
							
							... 
							
							
							
							"silent mode" print time if it is available. 
							
						 
						
							2018-07-18 14:52:19 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									tamasmeszaros 
								
							 
						 
						
							
							
							
							
								
							
							
								eeeced1d6b 
								
							 
						 
						
							
							
								
								Merge newest master  
							
							 
							
							
							
						 
						
							2018-07-18 10:26:03 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									tamasmeszaros 
								
							 
						 
						
							
							
							
							
								
							
							
								9559ad77e5 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into feature_slice_to_png  
							
							 
							
							
							
						 
						
							2018-07-18 10:14:28 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									bubnikv 
								
							 
						 
						
							
							
							
							
								
							
							
								3bebe9f954 
								
							 
						 
						
							
							
								
								Restored the "Fix STL through Netfabb" functionality, which has been  
							
							 
							
							... 
							
							
							
							lost during some merge process. 
							
						 
						
							2018-07-17 21:31:54 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								5c90746914 
								
							 
						 
						
							
							
								
								Merge with master + resolved conflicts  
							
							 
							
							
							
						 
						
							2018-07-17 10:44:23 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									bubnikv 
								
							 
						 
						
							
							
							
							
								
							
							
								83f9813f56 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/opengl_to_cpp'  
							
							 
							
							
							
						 
						
							2018-07-17 09:37:38 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									bubnikv 
								
							 
						 
						
							
							
							
							
								
							
							
								c7f59aca7d 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/wipe_tower_improvements'  
							
							 
							
							
							
						 
						
							2018-07-17 09:20:19 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								8175c9d306 
								
							 
						 
						
							
							
								
								Merge with master  
							
							 
							
							
							
						 
						
							2018-07-17 08:54:17 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									tamasmeszaros 
								
							 
						 
						
							
							
							
							
								
							
							
								67d69830e8 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d  
							
							 
							
							
							
						 
						
							2018-07-16 16:08:28 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								a80ef7201b 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/prusa3d/Slic3r  into time_estimate  
							
							 
							
							
							
						 
						
							2018-07-13 14:45:51 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								4805df6037 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/prusa3d/Slic3r  into opengl_to_cpp  
							
							 
							
							
							
						 
						
							2018-07-13 14:45:15 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								d99b484ac6 
								
							 
						 
						
							
							
								
								Fixed update of sliders' texts into object settings dialog  
							
							 
							
							
							
						 
						
							2018-07-13 14:41:49 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									tamasmeszaros 
								
							 
						 
						
							
							
							
							
								
							
							
								eefa1678db 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d  
							
							 
							
							
							
						 
						
							2018-07-13 11:28:02 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								ee67b2c7c3 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/prusa3d/Slic3r  into time_estimate  
							
							 
							
							
							
						 
						
							2018-07-13 11:27:56 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								06613e4792 
								
							 
						 
						
							
							
								
								Fixed 3D preview not updated after g-code export  
							
							 
							
							
							
						 
						
							2018-07-13 11:16:28 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								7caada244a 
								
							 
						 
						
							
							
								
								Attempt to fix SPE-356  
							
							 
							
							
							
						 
						
							2018-07-13 08:58:28 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								a8691bc083 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/prusa3d/Slic3r  into time_estimate  
							
							 
							
							
							
						 
						
							2018-07-12 08:32:42 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								1356a9977e 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/prusa3d/Slic3r  into opengl_to_cpp  
							
							 
							
							
							
						 
						
							2018-07-12 08:32:18 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Lukas Matena 
								
							 
						 
						
							
							
							
							
								
							
							
								e44480d61f 
								
							 
						 
						
							
							
								
								Supports were printed twice if synchronized with object layers, added always-on settings in ObjectSettingDialog  
							
							 
							
							
							
						 
						
							2018-07-10 13:02:43 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									YuSanka 
								
							 
						 
						
							
							
							
							
								
							
							
								38768a7bda 
								
							 
						 
						
							
							
								
								Replaced Object list before Object(Part) Settings  
							
							 
							
							
							
						 
						
							2018-07-04 12:38:34 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									YuSanka 
								
							 
						 
						
							
							
							
							
								
							
							
								54298c8e61 
								
							 
						 
						
							
							
								
								First right-panel reorganization:  
							
							 
							
							... 
							
							
							
							* Replaced Object list from CollapsiblePane
* Sub-object are adding by context menu from list
* (sub)objects can be deleted by only one "Delete" button
* Added extruder selection to list 
							
						 
						
							2018-07-04 09:03:43 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									tamasmeszaros 
								
							 
						 
						
							
							
							
							
								
							
							
								797c812f31 
								
							 
						 
						
							
							
								
								Stop the ongoing slicing process when attempting to export.  
							
							 
							
							
							
						 
						
							2018-07-03 13:12:15 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									tamasmeszaros 
								
							 
						 
						
							
							
							
							
								
							
							
								f00c17b959 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into feature_slice_to_png  
							
							 
							
							
							
						 
						
							2018-07-03 11:40:35 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									tamasmeszaros 
								
							 
						 
						
							
							
							
							
								
							
							
								10b19c8604 
								
							 
						 
						
							
							
								
								fix for progressindicator not being destroyed after export to png  
							
							 
							
							
							
						 
						
							2018-07-03 11:40:02 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									tamasmeszaros 
								
							 
						 
						
							
							
							
							
								
							
							
								ddb4945586 
								
							 
						 
						
							
							
								
								Fix crash on Linux when arranging  
							
							 
							
							
							
						 
						
							2018-07-02 11:22:47 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									tamasmeszaros 
								
							 
						 
						
							
							
							
							
								
							
							
								952068f282 
								
							 
						 
						
							
							
								
								Autocenter finally disabled. Progress indication works.  
							
							 
							
							
							
						 
						
							2018-06-29 17:46:21 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									tamasmeszaros 
								
							 
						 
						
							
							
							
							
								
							
							
								d3b19382fe 
								
							 
						 
						
							
							
								
								AppController reachable trough Plater.pm  
							
							 
							
							
							
						 
						
							2018-06-28 19:16:36 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									tamasmeszaros 
								
							 
						 
						
							
							
							
							
								
							
							
								85474e5803 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	CMakeLists.txt
#	lib/Slic3r/GUI/MainFrame.pm 
							
						 
						
							2018-06-28 18:50:39 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									tamasmeszaros 
								
							 
						 
						
							
							
							
							
								
							
							
								ad4d95f60c 
								
							 
						 
						
							
							
								
								AppController integration  
							
							 
							
							
							
						 
						
							2018-06-28 18:47:18 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									bubnikv 
								
							 
						 
						
							
							
							
							
								
							
							
								c4a3e4eca7 
								
							 
						 
						
							
							
								
								Merge branch 'for_merging'  
							
							 
							
							
							
						 
						
							2018-06-28 17:43:15 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									YuSanka 
								
							 
						 
						
							
							
							
							
								
							
							
								5f1f7dcbed 
								
							 
						 
						
							
							
								
								Fix of tooltips on OSX showing on the first page of a parameter tab.  
							
							 
							
							
							
						 
						
							2018-06-28 17:34:55 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									tamasmeszaros 
								
							 
						 
						
							
							
							
							
								
							
							
								d337b69407 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into feature_slice_to_png  
							
							 
							
							
							
						 
						
							2018-06-27 17:44:33 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								7ff22b9413 
								
							 
						 
						
							
							
								
								Time estimate emitted to gcode at requested interval  
							
							 
							
							
							
						 
						
							2018-06-27 15:35:47 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								d02c90d5d0 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/prusa3d/Slic3r  into time_estimate  
							
							 
							
							
							
						 
						
							2018-06-27 13:54:39 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								48915a65fd 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/prusa3d/Slic3r  into opengl_to_cpp  
							
							 
							
							
							
						 
						
							2018-06-27 13:52:57 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								06f44a9e4b 
								
							 
						 
						
							
							
								
								Code cleanup  
							
							 
							
							
							
						 
						
							2018-06-27 12:49:38 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								8db4fdc24c 
								
							 
						 
						
							
							
								
								3rd attempt to fix opengl on ubuntu  
							
							 
							
							
							
						 
						
							2018-06-27 12:36:49 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								5c32347449 
								
							 
						 
						
							
							
								
								1st attempt to fix opengl on ubuntu  
							
							 
							
							
							
						 
						
							2018-06-27 11:31:11 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									tamasmeszaros 
								
							 
						 
						
							
							
							
							
								
							
							
								c28b602465 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/master' into feature_slice_to_png  
							
							 
							
							
							
						 
						
							2018-06-27 09:36:05 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								dc223066d3 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/prusa3d/Slic3r  into time_estimate  
							
							 
							
							
							
						 
						
							2018-06-27 08:26:55 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								db95460154 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/prusa3d/Slic3r  into opengl_to_cpp  
							
							 
							
							
							
						 
						
							2018-06-27 08:26:33 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									tamasmeszaros 
								
							 
						 
						
							
							
							
							
								
							
							
								d2c6190cc5 
								
							 
						 
						
							
							
								
								Comments and refactoring  
							
							 
							
							
							
						 
						
							2018-06-26 17:02:46 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									YuSanka 
								
							 
						 
						
							
							
							
							
								
							
							
								c1724f45c9 
								
							 
						 
						
							
							
								
								Fixed post-merge bugs  
							
							 
							
							
							
						 
						
							2018-06-26 13:34:25 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								bd1d70d8d3 
								
							 
						 
						
							
							
								
								Fixed crash when slicing from Layers tab  
							
							 
							
							
							
						 
						
							2018-06-26 12:50:04 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								ab587babb9 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/prusa3d/Slic3r  into time_estimate  
							
							 
							
							
							
						 
						
							2018-06-26 12:20:41 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								9b2f760679 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/prusa3d/Slic3r  into opengl_to_cpp  
							
							 
							
							
							
						 
						
							2018-06-26 12:20:23 +02:00