Commit Graph

3335 Commits

Author SHA1 Message Date
bubnikv
d41ab5b173 Merge remote-tracking branch 'remotes/origin/lm_ultimate_wipe_tower_rotation_fix' 2018-06-28 13:59:19 +02:00
Enrico Turri
a8a0fc5cfe Faster remaining times export 2018-06-28 13:57:28 +02:00
bubnikv
cc42c8acb6 Merge remote-tracking branch 'remotes/origin/vk-octoprint' 2018-06-28 13:53:27 +02:00
tamasmeszaros
d3881b6a30 ExpTime incorporated. Some refactor as welll. 2018-06-28 13:21:24 +02:00
YuSanka
dc4ef64ee6 Use silent_mode only with MK3 printer 2018-06-28 12:40:27 +02:00
Lukas Matena
69e8c564ce Wipe tower fix - incorrect start/end position reported to the GCode generator when the tower was rotated 2018-06-28 10:22:04 +02:00
Enrico Turri
c3fbbe45e6 Faster remaining time calculation 2018-06-28 09:24:07 +02:00
Enrico Turri
7b87c24256 Time estimate uses G1 lines containing E parameter for remaining time calculations 2018-06-28 08:52:07 +02:00
tamasmeszaros
dee8d8d568 Execution abstraction and build fix for linux and mac 2018-06-27 18:23:53 +02:00
tamasmeszaros
b839224dc4 Merge remote-tracking branch 'origin/master' into feature_slice_to_png 2018-06-27 17:44:33 +02:00
tamasmeszaros
eebc20098a Refactor and extensions to png export dialog. 2018-06-27 17:43:54 +02:00
Vojtech Kral
a9a33ed384 Octoprint: Improve error reporting 2018-06-27 17:00:20 +02:00
bubnikv
41586b7276 Simplified handling of the "compatible_printers_condition" and
"inherits" configuration values.
Implemented correct setting of the "inherits" flag for the profiles
loaded from AMF/3MF/Config files.
2018-06-27 16:57:42 +02:00
Lukas Matena
ed09a832ec Fixed a crash when complete_objects was turned on 2018-06-27 15:49:02 +02:00
Enrico Turri
21c7f41973 Time estimate emitted to gcode at requested interval 2018-06-27 15:35:47 +02:00
Enrico Turri
b2cc9ba7b2 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-27 15:32:47 +02:00
Enrico Turri
e5bfb60652 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-27 15:32:31 +02:00
Lukas Matena
9e0dab510d Infill wiping turned off by default and in some automatic tests 2018-06-27 15:07:37 +02:00
Lukas Matena
7d520db9c1 Correct extruder is used for dontcare extrusions 2018-06-27 14:08:46 +02:00
Vojtech Kral
59bca108d3 Fix: Http: Body size limit not properly initialized 2018-06-27 13:57:21 +02:00
Vojtech Kral
80b8be31f7 ConfigWizard: Mark the first variant of each printer as default in the GUI 2018-06-27 13:57:21 +02:00
Vojtech Kral
c7b2c5359f PresetUpdater: Fix double update detection (had_config_update) 2018-06-27 13:57:21 +02:00
Vojtech Kral
aee0fd089b ConfigWizard: Fix default printer selection 2018-06-27 13:57:21 +02:00
Enrico Turri
073ab56d0c Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-27 13:54:39 +02:00
Chow Loong Jin
8afaa3ee26 Fix format-security violation with croak
Missed one in https://github.com/prusa3d/slic3r/pull/802.
2018-06-27 13:54:07 +02:00
Enrico Turri
7b49a0b9cd Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-27 13:52:57 +02:00
Enrico Turri
5bd0f6ab2b Code cleanup 2018-06-27 12:49:38 +02:00
Enrico Turri
c2256b2faa 3rd attempt to fix opengl on ubuntu 2018-06-27 12:36:49 +02:00
Enrico Turri
1a5593ff10 2nd attempt to fix opengl on ubuntu 2018-06-27 12:05:23 +02:00
Enrico Turri
537033462d 1st attempt to fix opengl on ubuntu 2018-06-27 11:31:11 +02:00
tamasmeszaros
c44faab3e2 PngExportDialog fix on Windows 2018-06-27 11:21:14 +02:00
tamasmeszaros
288a191a76 PngExportDialog size fix on Linux 2018-06-27 11:13:40 +02:00
bubnikv
3c0e7b82ff Merge branch 'master' into amf_activate_existing_presets 2018-06-27 10:33:14 +02:00
tamasmeszaros
a0b8ede704 Patch from Lubomír Bláha applied. Polished comments and PngExportDialog. 2018-06-27 10:28:44 +02:00
tamasmeszaros
f2d6cf8a2a Merge remote-tracking branch 'origin/master' into feature_slice_to_png 2018-06-27 09:36:05 +02:00
Lukas Matena
641bfc48bc Merge branch 'master' into wipe_tower_improvements 2018-06-27 08:56:08 +02:00
Enrico Turri
3d452f07e7 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-27 08:26:55 +02:00
Enrico Turri
fcd09ad9e5 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-27 08:26:33 +02:00
tamasmeszaros
4ee61008ef Comments and refactoring 2018-06-26 17:02:46 +02:00
tamasmeszaros
b180650da7 File saving to new file fixed. 2018-06-26 16:08:58 +02:00
tamasmeszaros
e4e2fc7814 Export dialog ready 2018-06-26 15:53:43 +02:00
Lukas Matena
254dbc5206 'Dontcare' extrusions now don't force a toolchange + code reorganization 2018-06-26 14:12:25 +02:00
YuSanka
bad87a3965 Fixed post-merge bugs 2018-06-26 13:34:25 +02:00
bubnikv
2e4ec6a72c Fixed integration tests. 2018-06-26 13:22:24 +02:00
Lukas Matena
4eed42a723 Merge branch 'master' into wipe_tower_improvements 2018-06-26 12:58:04 +02:00
Enrico Turri
5b32d61a69 Fixed crash when slicing from Layers tab 2018-06-26 12:50:04 +02:00
Enrico Turri
bb7c7dac61 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-26 12:20:41 +02:00
Enrico Turri
010e2ecc62 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-26 12:20:23 +02:00
bubnikv
48e2828c6c When loading an archive (AMF/3MF/Config), the original name
of the profile is show in braces next to the file name.
2018-06-26 11:31:01 +02:00
Enrico Turri
5a52f0b773 Fixed panning in Layers view 2018-06-26 11:17:30 +02:00