Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								e9d5cd726e 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/prusa3d/Slic3r  into dev  
							
							 
							
							
							
						 
						
							2018-09-07 10:32:39 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									YuSanka 
								
							 
						 
						
							
							
							
							
								
							
							
								125ece0aad 
								
							 
						 
						
							
							
								
								Fixed   #1204  
							
							 
							
							
							
						 
						
							2018-09-07 09:33:18 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								0ea18d57d0 
								
							 
						 
						
							
							
								
								Fixed wipe tower selection  
							
							 
							
							
							
						 
						
							2018-09-07 09:21:12 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								8460926d36 
								
							 
						 
						
							
							
								
								Added select by part tool to toolbar  
							
							 
							
							
							
						 
						
							2018-09-06 16:10:31 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								677dad0669 
								
							 
						 
						
							
							
								
								Object's properties updated while manipulating gizmos  
							
							 
							
							
							
						 
						
							2018-09-05 16:22:48 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								15b1340514 
								
							 
						 
						
							
							
								
								Added ModelInstance::world_matrix() method and stl_transform using eigen transform  
							
							 
							
							
							
						 
						
							2018-09-04 14:42:14 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									tamasmeszaros 
								
							 
						 
						
							
							
							
							
								
							
							
								4f53fc2a5f 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/cpp_progress_status_bar' into dev  
							
							 
							
							... 
							
							
							
							# Conflicts:
#	lib/Slic3r/GUI/MainFrame.pm
#	xs/src/slic3r/AppController.cpp
#	xs/src/slic3r/AppControllerWx.cpp
#	xs/src/slic3r/GUI/GUI.hpp 
							
						 
						
							2018-08-30 17:35:49 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									tamasmeszaros 
								
							 
						 
						
							
							
							
							
								
							
							
								15ad0ef2f2 
								
							 
						 
						
							
							
								
								working C++ status bar.  
							
							 
							
							... 
							
							
							
							Signed-off-by: tamasmeszaros <meszaros.q@gmail.com> 
							
						 
						
							2018-08-30 11:55:10 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									tamasmeszaros 
								
							 
						 
						
							
							
							
							
								
							
							
								9e2d48ff3b 
								
							 
						 
						
							
							
								
								Almost working c++ status bar  
							
							 
							
							... 
							
							
							
							Signed-off-by: tamasmeszaros <meszaros.q@gmail.com> 
							
						 
						
							2018-08-30 11:54:08 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									YuSanka 
								
							 
						 
						
							
							
							
							
								
							
							
								6c1b52afa2 
								
							 
						 
						
							
							
								
								Deleted "scale" column from object list  
							
							 
							
							
							
						 
						
							2018-08-29 13:11:30 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									YuSanka 
								
							 
						 
						
							
							
							
							
								
							
							
								5557e59d43 
								
							 
						 
						
							
							
								
								Reorganized object settings pane  
							
							 
							
							... 
							
							
							
							+ Added new control - PrusaLockButton 
							
						 
						
							2018-08-28 15:51:53 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									tamasmeszaros 
								
							 
						 
						
							
							
							
							
								
							
							
								1c4574d42e 
								
							 
						 
						
							
							
								
								fix centroid error for two points and merge with dev.  
							
							 
							
							
							
						 
						
							2018-08-27 16:20:13 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								8eb36b1bf9 
								
							 
						 
						
							
							
								
								Fixed undefined axis in rotate method of plater.pm  
							
							 
							
							
							
						 
						
							2018-08-27 14:13:06 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								4b25d3924b 
								
							 
						 
						
							
							
								
								Merge branch 'dev' of  https://github.com/prusa3d/Slic3r  into dev  
							
							 
							
							
							
						 
						
							2018-08-27 14:01:03 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								fef5a5252e 
								
							 
						 
						
							
							
								
								Fixed conflicts after merging with master  
							
							 
							
							
							
						 
						
							2018-08-27 14:00:53 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									tamasmeszaros 
								
							 
						 
						
							
							
							
							
								
							
							
								d749080261 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/dev' into sla_base_pool  
							
							 
							
							
							
						 
						
							2018-08-27 09:53:52 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									bubnikv 
								
							 
						 
						
							
							
							
							
								
							
							
								fec2545033 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/prusa3d/Slic3r  
							
							 
							
							
							
						 
						
							2018-08-24 16:58:53 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Lukas Matena 
								
							 
						 
						
							
							
							
							
								
							
							
								a4176ef933 
								
							 
						 
						
							
							
								
								Bugfix - dialog that changes number of copies deleted the object when cancelled  
							
							 
							
							
							
						 
						
							2018-08-24 16:52:06 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									YuSanka 
								
							 
						 
						
							
							
							
							
								
							
							
								02a325556d 
								
							 
						 
						
							
							
								
								Merge branch 'dev' of  https://github.com/prusa3d/Slic3r  into dev  
							
							 
							
							
							
						 
						
							2018-08-24 16:28:34 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									YuSanka 
								
							 
						 
						
							
							
							
							
								
							
							
								90fcdd4e5f 
								
							 
						 
						
							
							
								
								Fixed post-commit compilation problems  
							
							 
							
							
							
						 
						
							2018-08-24 16:20:19 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								cda135ada7 
								
							 
						 
						
							
							
								
								Removed scale and rotate actions from toolbar  
							
							 
							
							
							
						 
						
							2018-08-24 15:08:19 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									YuSanka 
								
							 
						 
						
							
							
							
							
								
							
							
								8b148a4fe4 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/new_main_page_ui' into dev  
							
							 
							
							
							
						 
						
							2018-08-24 15:01:26 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									YuSanka 
								
							 
						 
						
							
							
							
							
								
							
							
								ada6970053 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/SLA_ui' into dev  
							
							 
							
							
							
						 
						
							2018-08-24 12:20:24 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								66ce638439 
								
							 
						 
						
							
							
								
								Fixed conflicts after merging with branch eigenize  
							
							 
							
							
							
						 
						
							2018-08-23 15:37:38 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									YuSanka 
								
							 
						 
						
							
							
							
							
								
							
							
								2ec045a0fb 
								
							 
						 
						
							
							
								
								Added SetSliderValues and GetActiveValue functions  
							
							 
							
							
							
						 
						
							2018-08-23 14:44:49 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								a5fcdeec23 
								
							 
						 
						
							
							
								
								Merge branch 'gizmos_3d' of  https://github.com/prusa3d/Slic3r  into dev  
							
							 
							
							
							
						 
						
							2018-08-23 09:45:04 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Lukas Matena 
								
							 
						 
						
							
							
							
							
								
							
							
								85ae2d0d2f 
								
							 
						 
						
							
							
								
								Merge branch 'master' into lm_lay_flat_round_merged_facets  
							
							 
							
							
							
						 
						
							2018-08-22 14:03:17 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Lukas Matena 
								
							 
						 
						
							
							
							
							
								
							
							
								0b21042606 
								
							 
						 
						
							
							
								
								Lay flat minor bugfix (ObjectCutDialog called a changed function using the old signature)  
							
							 
							
							
							
						 
						
							2018-08-22 14:02:32 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Vojtech Kral 
								
							 
						 
						
							
							
							
							
								
							
							
								0c984c7584 
								
							 
						 
						
							
							
								
								Print host bugfixes / refactoring  
							
							 
							
							
							
						 
						
							2018-08-21 15:47:29 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Lukas Matena 
								
							 
						 
						
							
							
							
							
								
							
							
								86b67bbd42 
								
							 
						 
						
							
							
								
								Lay flat - rotation is now done in one go directly about the necessary axis  
							
							 
							
							
							
						 
						
							2018-08-21 15:40:11 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									tamasmeszaros 
								
							 
						 
						
							
							
							
							
								
							
							
								6e77307880 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/eigenize' into sla_base_pool  
							
							 
							
							
							
						 
						
							2018-08-21 13:50:09 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Martin Loidl 
								
							 
						 
						
							
							
							
							
								
							
							
								dd1fd66a47 
								
							 
						 
						
							
							
								
								Added possibility for upload to Duet  
							
							 
							
							... 
							
							
							
							Further changes:
- Added new configuration option Host Type
- Added abstract base class for future printer hosts
- Moved location of upload dialog (also made it a little bit more configureable)
- added possibility to send file via postfield instead a new frame 
							
						 
						
							2018-08-21 11:12:53 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Lukas Matena 
								
							 
						 
						
							
							
							
							
								
							
							
								b0dd328fde 
								
							 
						 
						
							
							
								
								Lay flat - icons and invalidation improvement  
							
							 
							
							
							
						 
						
							2018-08-20 11:27:25 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									bubnikv 
								
							 
						 
						
							
							
							
							
								
							
							
								ab60d8adb4 
								
							 
						 
						
							
							
								
								Replaced coincides_with(const Line &line) with operator==  
							
							 
							
							
							
						 
						
							2018-08-17 18:27:07 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									bubnikv 
								
							 
						 
						
							
							
							
							
								
							
							
								9e7634b6e8 
								
							 
						 
						
							
							
								
								Merged with master  
							
							 
							
							
							
						 
						
							2018-08-17 18:07:45 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									bubnikv 
								
							 
						 
						
							
							
							
							
								
							
							
								5b94f53cd7 
								
							 
						 
						
							
							
								
								Removed the Point::wkt() and Point::dump_perl() methods.  
							
							 
							
							... 
							
							
							
							Added to_string() for the basis Eigen vector types. 
							
						 
						
							2018-08-17 16:54:07 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Lukas Matena 
								
							 
						 
						
							
							
							
							
								
							
							
								72ba5c8ab4 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/convex_hull' into lm_lay_flat_round_merged_facets  
							
							 
							
							
							
						 
						
							2018-08-17 15:44:50 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								296c53e336 
								
							 
						 
						
							
							
								
								Merge branch 'convex_hull' of  https://github.com/prusa3d/Slic3r  into gizmos_3d  
							
							 
							
							
							
						 
						
							2018-08-17 10:36:42 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								048f3a03fe 
								
							 
						 
						
							
							
								
								Fixed scale to size of objects with multiple instances  
							
							 
							
							
							
						 
						
							2018-08-17 10:12:43 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								b6e0458201 
								
							 
						 
						
							
							
								
								Fixed lost selection of imported objects  
							
							 
							
							
							
						 
						
							2018-08-17 09:16:34 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Lukas Matena 
								
							 
						 
						
							
							
							
							
								
							
							
								3f72ca2a15 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/convex_hull' into lm_lay_flat_round_merged_facets  
							
							 
							
							
							
						 
						
							2018-08-16 08:56:18 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								da42b42a6c 
								
							 
						 
						
							
							
								
								Merge branch 'opengl_to_cpp' of  https://github.com/prusa3d/Slic3r  into gizmos_3d  
							
							 
							
							
							
						 
						
							2018-08-15 14:39:40 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								6b4d8ac934 
								
							 
						 
						
							
							
								
								Removed plater's toolbar  
							
							 
							
							
							
						 
						
							2018-08-15 13:19:58 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									YuSanka 
								
							 
						 
						
							
							
							
							
								
							
							
								92b578779e 
								
							 
						 
						
							
							
								
								Test of update_extruder_in_config()  
							
							 
							
							
							
						 
						
							2018-08-14 16:10:58 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									YuSanka 
								
							 
						 
						
							
							
							
							
								
							
							
								817fb5adb3 
								
							 
						 
						
							
							
								
								Test of item_changed_selection(obj_idx)  
							
							 
							
							
							
						 
						
							2018-08-14 15:35:54 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									YuSanka 
								
							 
						 
						
							
							
							
							
								
							
							
								a2eff85fa8 
								
							 
						 
						
							
							
								
								Try to fix OSX crashing on UnselectAll  
							
							 
							
							
							
						 
						
							2018-08-14 14:13:07 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								168d38df2b 
								
							 
						 
						
							
							
								
								Fixed object sinking into print bed after parts import  
							
							 
							
							
							
						 
						
							2018-08-14 09:33:58 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Lukas Matena 
								
							 
						 
						
							
							
							
							
								
							
							
								25a6c7e30e 
								
							 
						 
						
							
							
								
								Created a new gizmo for flattening an object  
							
							 
							
							
							
						 
						
							2018-08-13 09:45:18 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								bb07100a4f 
								
							 
						 
						
							
							
								
								Code cleanup  
							
							 
							
							
							
						 
						
							2018-08-13 09:23:10 +02:00  
						
						
							 
							
							
							
								 
							 
							
							
								 
							 
							
						 
					 
				
					
						
							
								
								
									 
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								b6f6200bd5 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/prusa3d/Slic3r  into opengl_to_cpp  
							
							 
							
							
							
						 
						
							2018-08-13 08:51:58 +02:00