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
								
							 
						 | 
						
							
							
							
							
								
							
							
								aacc01a56f
								
							
						 | 
						
							
							
								
								Store object and volume names in the new 'name' property instead of relying on material id
							
							
							
							
							
						 | 
						
							2014-07-12 11:20:57 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alessandro Ranellucci
								
							 
						 | 
						
							
							
							
							
								
							
							
								f82a8475a1
								
							
						 | 
						
							
							
								
								Use AMF object and volume metadata for handling per-object and per-volume settings
							
							
							
							
							
						 | 
						
							2014-07-11 20:09:01 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alessandro Ranellucci
								
							 
						 | 
						
							
							
							
							
								
							
							
								4d67f902b6
								
							
						 | 
						
							
							
								
								Fixed parsing of AMF material metadata
							
							
							
							
							
						 | 
						
							2014-07-11 19:48:03 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alessandro Ranellucci
								
							 
						 | 
						
							
							
							
							
								
							
							
								7ba08c90cf
								
							
						 | 
						
							
							
								
								Refactoring to Model API for making it stricter and safer
							
							
							
							
							
						 | 
						
							2014-05-09 14:24:35 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alessandro Ranellucci
								
							 
						 | 
						
							
							
							
							
								
							
							
								2754ddf215
								
							
						 | 
						
							
							
								
								Fix positioning of loded AMF plates
							
							
							
							
							
						 | 
						
							2014-01-05 14:04:32 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alessandro Ranellucci
								
							 
						 | 
						
							
							
							
							
								
							
							
								87342d324c
								
							
						 | 
						
							
							
								
								Fix typo
							
							
							
							
							
						 | 
						
							2014-01-05 01:25:39 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alessandro Ranellucci
								
							 
						 | 
						
							
							
							
							
								
							
							
								4e76a9e4c9
								
							
						 | 
						
							
							
								
								Parse options from AMF metadata
							
							
							
							
							
						 | 
						
							2014-01-05 01:24:31 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alessandro Ranellucci
								
							 
						 | 
						
							
							
							
							
								
							
							
								0e8a0ef1ca
								
							
						 | 
						
							
							
								
								Refactoring. Use Model class for representing the plate in GUI
							
							
							
							
							
						 | 
						
							2013-12-12 20:19:33 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alessandro Ranellucci
								
							 
						 | 
						
							
							
							
							
								
							
							
								4c96a52012
								
							
						 | 
						
							
							
								
								Read OBJ and AMF
							
							
							
							
							
						 | 
						
							2013-09-11 14:46:38 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alessandro Ranellucci
								
							 
						 | 
						
							
							
							
							
								
							
							
								026e0c06e4
								
							
						 | 
						
							
							
								
								Ability to customize how materials are mapped to extruders. #1020
							
							
							
							
							
						 | 
						
							2013-08-25 19:52:32 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alessandro Ranellucci
								
							 
						 | 
						
							
							
							
							
								
							
							
								304676b6aa
								
							
						 | 
						
							
							
								
								Use XML::SAX::ExpatXS if available
							
							
							
							
							
						 | 
						
							2012-10-24 20:36:32 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alessandro Ranellucci
								
							 
						 | 
						
							
							
							
							
								
							
							
								02356fd613
								
							
						 | 
						
							
							
								
								Large refactoring to allow processing multimaterial files
							
							
							
							
							
						 | 
						
							2012-09-22 19:04:36 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alessandro Ranellucci
								
							 
						 | 
						
							
							
							
							
								
							
							
								e40f32995f
								
							
						 | 
						
							
							
								
								Finish GUI decoupling
							
							
							
							
							
						 | 
						
							2012-09-21 15:04:33 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alessandro Ranellucci
								
							 
						 | 
						
							
							
							
							
								
							
							
								f29d455319
								
							
						 | 
						
							
							
								
								Refactor the AMF parser so that it popolates a Model object directly. Also read constellations
							
							
							
							
							
						 | 
						
							2012-08-29 18:23:34 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alessandro Ranellucci
								
							 
						 | 
						
							
							
							
							
								
							
							
								f90520ed06
								
							
						 | 
						
							
							
								
								Refactoring: new Slic3r::Model class to represent files
							
							
							
							
							
						 | 
						
							2012-08-29 17:12:32 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alessandro Ranellucci
								
							 
						 | 
						
							
							
							
							
								
							
							
								3c8dbcef4a
								
							
						 | 
						
							
							
								
								Do not store normals and save a lot of memory
							
							
							
							
							
						 | 
						
							2012-05-20 11:05:16 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alessandro Ranellucci
								
							 
						 | 
						
							
							
							
							
								
							
							
								d51ba94e8a
								
							
						 | 
						
							
							
								
								Remove XXX from dependencies
							
							
							
							
							
						 | 
						
							2012-04-16 14:03:36 +02:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alessandro Ranellucci
								
							 
						 | 
						
							
							
							
							
								
							
							
								f451bb2bd0
								
							
						 | 
						
							
							
								
								Use XML::SAX::PurePerl instead of XML::SAX::ExpatXS for now
							
							
							
							
							
						 | 
						
							2012-02-26 18:17:23 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alessandro Ranellucci
								
							 
						 | 
						
							
							
							
							
								
							
							
								b9f30d8378
								
							
						 | 
						
							
							
								
								Bugfix: AMF files with no materials were not successfully parsed
							
							
							
							
							
						 | 
						
							2012-02-26 16:22:45 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Alessandro Ranellucci
								
							 
						 | 
						
							
							
							
							
								
							
							
								959230b099
								
							
						 | 
						
							
							
								
								Refactoring: moved Slic3r::STL and Slic3r::AMF to Slic3r::Format::*
							
							
							
							
							
						 | 
						
							2012-02-25 17:35:25 +01:00 | 
						
						
							
							
							
							
								
							
							
							
								
							
							
						 |