Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								9cabb03f72 
								
							 
						 
						
							
							
								
								GCodeTimeEstimator uses annotated gcode in place of processing m600 lines to detect color print changes.  
							
							... 
							
							
							
							WARNING -> After this commit the exported gcode will contain the extra lines used by the time estimator. They will be removed by a future commit when a new post-process method will be implemented. 
							
						 
						
							2019-08-21 14:43:14 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								b79457b723 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/prusa3d/PrusaSlicer  into et_colorprint_no_m600  
							
							
							
						 
						
							2019-08-21 14:09:45 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								85ed363951 
								
							 
						 
						
							
							
								
								GCodeAnalyzer uses annotated gcode in place of processing m600 lines to detect color print changes  
							
							
							
						 
						
							2019-08-21 14:09:20 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tamasmeszaros 
								
							 
						 
						
							
							
							
							
								
							
							
								67a6775773 
								
							 
						 
						
							
							
								
								Making arrange a little bit smarter: fix for issue  #2787  
							
							
							
						 
						
							2019-08-21 14:07:56 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									bubnikv 
								
							 
						 
						
							
							
							
							
								
							
							
								668a8cd2ea 
								
							 
						 
						
							
							
								
								Fix of an update of support extruders when changing number  
							
							... 
							
							
							
							of printer extruders. 
							
						 
						
							2019-08-21 14:05:32 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									bubnikv 
								
							 
						 
						
							
							
							
							
								
							
							
								40d313961e 
								
							 
						 
						
							
							
								
								Fixing issues in Print / PrintObject / PrintRegion reporting  
							
							... 
							
							
							
							a list of printing extruders. 
							
						 
						
							2019-08-21 13:49:37 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									bubnikv 
								
							 
						 
						
							
							
							
							
								
							
							
								ded2019765 
								
							 
						 
						
							
							
								
								Fix of "spiral vase printable for a single region object only" check.  
							
							
							
						 
						
							2019-08-21 13:08:26 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									bubnikv 
								
							 
						 
						
							
							
							
							
								
							
							
								7c0c5705df 
								
							 
						 
						
							
							
								
								Fix of Excessive external_perimeter_extrusion_width error  #2784  
							
							... 
							
							
							
							Increased the perimeter_extrusion_width check limit to 3x nozzle diameter. 
							
						 
						
							2019-08-21 09:28:32 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									bubnikv 
								
							 
						 
						
							
							
							
							
								
							
							
								0fbfbf4bd8 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/Prusa3d/PrusaSlicer  
							
							
							
						 
						
							2019-08-21 08:51:50 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									bubnikv 
								
							 
						 
						
							
							
							
							
								
							
							
								e403118d7d 
								
							 
						 
						
							
							
								
								Fixed a typo in an error message.  
							
							
							
						 
						
							2019-08-21 08:50:38 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									YuSanka 
								
							 
						 
						
							
							
							
							
								
							
							
								2cc2c02a9c 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/prusa3d/PrusaSlicer  
							
							
							
						 
						
							2019-08-21 08:45:22 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Lukas Matena 
								
							 
						 
						
							
							
							
							
								
							
							
								6a22651501 
								
							 
						 
						
							
							
								
								Fixed a typo preventing compilation on Linux  
							
							
							
						 
						
							2019-08-20 20:24:37 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									YuSanka 
								
							 
						 
						
							
							
							
							
								
							
							
								18d3792d37 
								
							 
						 
						
							
							
								
								Fixed a slack bug with wrong filament preset selection after importing of config  
							
							
							
						 
						
							2019-08-20 18:45:12 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									bubnikv 
								
							 
						 
						
							
							
							
							
								
							
							
								775a54846f 
								
							 
						 
						
							
							
								
								Fixed compilation of Win32 message boxes on unix systems.  
							
							
							
						 
						
							2019-08-20 17:46:19 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									bubnikv 
								
							 
						 
						
							
							
							
							
								
							
							
								ccddcf88be 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/Prusa3d/PrusaSlicer  
							
							
							
						 
						
							2019-08-20 17:39:39 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tamasmeszaros 
								
							 
						 
						
							
							
							
							
								
							
							
								b58713c06f 
								
							 
						 
						
							
							
								
								SLA exposure bounds to printer params.  
							
							
							
						 
						
							2019-08-20 17:24:48 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									bubnikv 
								
							 
						 
						
							
							
							
							
								
							
							
								c8a78f5d85 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/ys_bf_msw_scale'  
							
							
							
						 
						
							2019-08-20 16:53:23 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									bubnikv 
								
							 
						 
						
							
							
							
							
								
							
							
								88dcb7f366 
								
							 
						 
						
							
							
								
								Checking for OpenGL driver version in the GUI slicer and giving some  
							
							... 
							
							
							
							reasonable advice to the user in case OpenGL < 2.0 was detected. 
							
						 
						
							2019-08-20 16:38:03 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									bubnikv 
								
							 
						 
						
							
							
							
							
								
							
							
								2e7d5e5bc1 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/Prusa3d/PrusaSlicer  
							
							
							
						 
						
							2019-08-20 16:22:37 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									bubnikv 
								
							 
						 
						
							
							
							
							
								
							
							
								fd3fe75d1c 
								
							 
						 
						
							
							
								
								Reworked the rename_file() function on Windows to work reliably and  
							
							... 
							
							
							
							atomically. The code was taken from the llvm project, it is complex
and hopefully it covers all the Windows file system quirks. Vojtech
has highest hopes, that this will fix the various PrusaSlicer.ini
file corruptions.
Enabled the locales switching and error handling on Linux as well,
where now the missing locales are reported and running the locale-gen
tool is recommended. 
							
						 
						
							2019-08-20 16:19:30 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tamasmeszaros 
								
							 
						 
						
							
							
							
							
								
							
							
								bafa4d6d19 
								
							 
						 
						
							
							
								
								Follow up: Adding new sla material parameters...  
							
							... 
							
							
							
							Small fix for redundant operations. 
							
						 
						
							2019-08-20 16:01:44 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									tamasmeszaros 
								
							 
						 
						
							
							
							
							
								
							
							
								7c94db0634 
								
							 
						 
						
							
							
								
								Adding new sla material parameters: (initial) exposition min/max  
							
							
							
						 
						
							2019-08-20 15:49:32 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									YuSanka 
								
							 
						 
						
							
							
							
							
								
							
							
								448d773da0 
								
							 
						 
						
							
							
								
								Fixed default transparency for ColorPicker from sidebar (was appeared under OSX for empty extruder color).  
							
							... 
							
							
							
							+ Fixed wrong getting of instance printable value inside add_object_to_list() 
							
						 
						
							2019-08-20 15:27:51 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vojtech Kral 
								
							 
						 
						
							
							
							
							
								
							
							
								03079d4928 
								
							 
						 
						
							
							
								
								avrdude: Fix: Generate the embedded conf in the bin dir, remove from repo  
							
							... 
							
							
							
							The generated file avrdude-slic3r.conf.h is not kept in repo any longer
- it was causing trouble for git diffing.
It's now generated in $CMAKE_CURRENT_BINARY_DIR and included from there.
The file embeds avrdude-slic3r.conf so that the conf doesn't need to
be loaded from disk. 
							
						 
						
							2019-08-20 15:15:30 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								6e522cea15 
								
							 
						 
						
							
							
								
								Added missing include  
							
							
							
						 
						
							2019-08-20 14:58:27 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								403e2c7003 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/prusa3d/PrusaSlicer  into et_toolpaths_export  
							
							
							
						 
						
							2019-08-20 14:35:39 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								1b6490af4c 
								
							 
						 
						
							
							
								
								Export materials file for gcode toolpaths when exported to obj file  
							
							
							
						 
						
							2019-08-20 14:35:23 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Lukas Matena 
								
							 
						 
						
							
							
							
							
								
							
							
								53939796a6 
								
							 
						 
						
							
							
								
								GCode.cpp: Fix of temperature change before print  
							
							... 
							
							
							
							Function set_extruder can be called before moving to the first layer, m_layer_index is then -1. We definitely don't want to set temperature for second layer in that case. 
							
						 
						
							2019-08-20 14:22:31 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									YuSanka 
								
							 
						 
						
							
							
							
							
								
							
							
								ae9b0a401c 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/prusa3d/PrusaSlicer  
							
							
							
						 
						
							2019-08-20 13:01:51 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									YuSanka 
								
							 
						 
						
							
							
							
							
								
							
							
								52c24a1662 
								
							 
						 
						
							
							
								
								Set list manipulation action on LeftButton too  
							
							... 
							
							
							
							Note: Doesn't work under OSX 
							
						 
						
							2019-08-20 13:01:01 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								2e3c71baaf 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/prusa3d/PrusaSlicer  into et_toolpaths_export  
							
							
							
						 
						
							2019-08-20 12:10:50 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								f63b3ba600 
								
							 
						 
						
							
							
								
								Fixed gcode toolpaths data for export to obj file when taken from cpu  
							
							
							
						 
						
							2019-08-20 12:10:15 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vojtech Kral 
								
							 
						 
						
							
							
							
							
								
							
							
								1fc05bbf00 
								
							 
						 
						
							
							
								
								ConfigWizard: Fix: Snapshot not being taken on user-requested Wizard run  
							
							... 
							
							
							
							If the user launched Wizard from the menu and checked the reset
checkbox, snapshot was not taken in case no new bundles were
to be installed from resources (ie. most of the time).
Snapshot is now taken as appropriate. 
							
						 
						
							2019-08-20 12:00:23 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								da00b7bfa5 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/prusa3d/PrusaSlicer  into et_toolpaths_export  
							
							
							
						 
						
							2019-08-20 11:34:18 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								58473f84ee 
								
							 
						 
						
							
							
								
								Check for existence of gcode toolpaths that can be exported to obj file  
							
							
							
						 
						
							2019-08-20 11:33:58 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									YuSanka 
								
							 
						 
						
							
							
							
							
								
							
							
								7706a5be3e 
								
							 
						 
						
							
							
								
								Fixed   #2738  
							
							... 
							
							
							
							+ Added update for plater config option "filament_colour", when we have multiple extruder print. 
							
						 
						
							2019-08-20 09:52:01 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									YuSanka 
								
							 
						 
						
							
							
							
							
								
							
							
								6780e74521 
								
							 
						 
						
							
							
								
								Update 3D-scene after filament's color change  
							
							
							
						 
						
							2019-08-20 09:52:01 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									YuSanka 
								
							 
						 
						
							
							
							
							
								
							
							
								3e62d7ae64 
								
							 
						 
						
							
							
								
								Implemented button "Reset to Filament Color"  
							
							
							
						 
						
							2019-08-20 09:52:00 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								a99a89a831 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/prusa3d/PrusaSlicer  into et_toolpaths_export  
							
							
							
						 
						
							2019-08-20 09:51:44 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								730283a9e9 
								
							 
						 
						
							
							
								
								Export to obj file only toolpaths visible in 3D scene  
							
							
							
						 
						
							2019-08-20 09:51:25 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									bubnikv 
								
							 
						 
						
							
							
							
							
								
							
							
								a83da0f72c 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/lm_wxmemleaks'  
							
							
							
						 
						
							2019-08-20 09:39:43 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									bubnikv 
								
							 
						 
						
							
							
							
							
								
							
							
								384ee17fcb 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/lm_circular_priming'  
							
							
							
						 
						
							2019-08-20 09:34:45 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									bubnikv 
								
							 
						 
						
							
							
							
							
								
							
							
								2870416e4d 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/lm_exceptions_rebased'  
							
							
							
						 
						
							2019-08-20 09:20:57 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									bubnikv 
								
							 
						 
						
							
							
							
							
								
							
							
								778e499827 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/lm_wipe_tower_linear_advance'  
							
							
							
						 
						
							2019-08-20 09:19:22 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									bubnikv 
								
							 
						 
						
							
							
							
							
								
							
							
								167de35e22 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'remotes/origin/lm_corrupt_config'  
							
							
							
						 
						
							2019-08-20 09:12:33 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Enrico Turri 
								
							 
						 
						
							
							
							
							
								
							
							
								1f6aab312b 
								
							 
						 
						
							
							
								
								1st installment of export of gcode toolpaths to obj file  
							
							
							
						 
						
							2019-08-20 09:01:09 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									bubnikv 
								
							 
						 
						
							
							
							
							
								
							
							
								4fbee3216b 
								
							 
						 
						
							
							
								
								Fix of Zoom by trackpad does not update until click  #2750  
							
							... 
							
							
							
							For an unknown reason, if the scrolling is performed on Windows
with the two finger gesture on touch pad, there is no Idle event
generated on some computers.
The Idle is not generated on Vojtech's laptop, it is generated
on Enrico's laptop.
evt.Skip() solves the issue on Vojtech's laptop. 
							
						 
						
							2019-08-19 19:48:07 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vojtech Kral 
								
							 
						 
						
							
							
							
							
								
							
							
								ef4ff55e55 
								
							 
						 
						
							
							
								
								Fix encoding of a few files in GUI  
							
							... 
							
							
							
							GUI/AboutDialog.cpp
GUI/MainFrame.hpp
GUI/OptionsGroup.cpp 
							
						 
						
							2019-08-19 17:04:14 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vojtech Kral 
								
							 
						 
						
							
							
							
							
								
							
							
								0ded335488 
								
							 
						 
						
							
							
								
								build: Add source file encoding check  
							
							... 
							
							
							
							Source files are checked using a small utility in src/build-utils
This is done to prevent bugs in build and localization caused
by weird non-UTF-8 encodings interpreted by MSVC in terms of local codepages
rather than UTF-8. 
							
						 
						
							2019-08-19 17:04:14 +02:00 
							
								 
							
							
								 
							
						 
					 
				
					
						
							
								
								
									Vojtech Kral 
								
							 
						 
						
							
							
							
							
								
							
							
								f937209619 
								
							 
						 
						
							
							
								
								Refactor catch(...) handlers in Http, OctoPrint, PrintHost, and Serial  
							
							
							
						 
						
							2019-08-19 17:04:14 +02:00