Commit Graph

3040 Commits

Author SHA1 Message Date
fd3a5197e7 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-07-24 12:29:43 +02:00
b5bf33f19c Shifted the MM priming lines inside a bit (for the out-of-bed detection) 2018-07-24 12:17:26 +02:00
8982e9638f Work with model objects like reference (from/to perl side) 2018-07-24 12:15:36 +02:00
14e5f97335 Fixed an issue with MM and supports layering 2018-07-24 11:20:29 +02:00
59904bc16c Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-07-24 11:20:02 +02:00
6ad919add9 Merge branch 'scene_manipulators' of https://github.com/prusa3d/Slic3r 2018-07-24 10:03:45 +02:00
df6951bb7b Added popup menu with multiple choice of settings 2018-07-23 17:35:50 +02:00
742a706b99 Fixed crash when generating gcode of multimaterial objects with some object out of the bed 2018-07-23 15:58:08 +02:00
be328fe45c Localized the (modified) profile indicator 2018-07-23 15:44:01 +02:00
535266a05d ConfigWizard: Fix: Don't check the default printer if the wizard is requested by user or re-configure 2018-07-23 15:04:21 +02:00
c7cf85b82f PresetUpdater: Fix reloading of profiles after reconfigure and update
Fix #1060
Fix #985
2018-07-23 15:02:13 +02:00
6a4f08fe05 Added xml escape characters detection when exporting object and volumes names to 3mf files 2018-07-23 14:39:50 +02:00
6741f151ac Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-07-23 13:56:26 +02:00
8ba080d534 Attempt to fix #1067 2018-07-23 13:54:43 +02:00
356d161ca1 1st installment of 3D scene toolbar 2018-07-23 13:49:48 +02:00
72eabd76f1 PresetUpdater: Fix incompatible bundle requirements display 2018-07-23 12:34:07 +02:00
3d9ab7b799 ConfigWizard: Wrap printer model titles 2018-07-23 11:43:06 +02:00
3b47aa6418 Added xml escape characters detection when exporting object and columes names to amf files 2018-07-23 10:58:39 +02:00
82ef5afcf0 Fixed status of Slice now and Export G-Code buttons after object import 2018-07-23 10:16:56 +02:00
204d6fbd09 Try to fix #977 2018-07-23 09:59:04 +02:00
e08238a2d2 Bumped up the version number. 2018-07-21 17:39:26 +02:00
fe6e0493c6 Fixed upgrade of vendor profile from the application resources
after an upgrade of the application.
2018-07-21 09:32:45 +02:00
82c27c7c4e Bumped up the version number. 2018-07-20 17:57:21 +02:00
c75ff91e59 Added some profilling macros into GCodeTimeEstimator 2018-07-20 16:14:23 +02:00
09bbdfefa6 Faster time estimate for multimaterial 2018-07-20 15:54:11 +02:00
5d46c3c44a Slightly faster time estimation 2018-07-20 12:05:08 +02:00
9acec75cc5 Merge branch 'scene_manipulators' of https://github.com/prusa3d/Slic3r 2018-07-20 10:31:53 +02:00
6fe03f1599 Small objects can now fit inside free space surrounded by objects. 2018-07-20 09:01:24 +02:00
a275eb668a Another fix in gizmos update 2018-07-19 16:06:46 +02:00
17f95b426c Better fix for gizmo update when deleting objects 2018-07-19 13:43:33 +02:00
15bff4e02c Warning and legend textures moved from _3DScene class to GLCanvas3D class 2018-07-19 13:18:19 +02:00
5f78afb42c Fixed update of gizmo when deleting all objects 2018-07-19 11:39:51 +02:00
97c9eb1615 Fixed update of rotate gizmo when selecting objects 2018-07-19 11:24:04 +02:00
2d033dead8 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-07-19 08:31:59 +02:00
28d3299be7 Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d 2018-07-18 16:45:20 +02:00
18a159fc1e Small objects can now fit inside free space surrounded by objects. 2018-07-18 16:37:44 +02:00
a22e780791 Code cleanup 2018-07-18 15:52:20 +02:00
feb7c5ca5a Merge branch 'scene_manipulators' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-07-18 15:11:23 +02:00
ed65f88852 Fixed depth test when rendering the picking texture 2018-07-18 15:09:26 +02:00
325ed1ef8e Reordered the fields on the new "Machine limits" page. 2018-07-18 15:08:55 +02:00
7f0945ad20 Merge branch 'scene_manipulators' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-07-18 15:07:56 +02:00
a340778454 Unified opengl textures 2018-07-18 15:07:52 +02:00
fd9c169627 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-07-18 14:49:19 +02:00
b56d250d04 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-07-18 14:49:09 +02:00
a3db5b5ffe Fixed compile on Linux and Mac 2018-07-18 14:38:02 +02:00
4dd9712c17 Disable slicing when one object crosses the print volume boundary 2018-07-18 14:26:42 +02:00
18456c7e41 The acceleration G-codes (M204 Sxxx) emited for Marlin are now
clamped by the maximum acceleration when extruding.

The machine envelope values are only set at the time estimator
from the Printer parameters for the Marlin firmware.
2018-07-18 14:00:42 +02:00
f75d2ff3a5 Fixed a previous commit. 2018-07-18 12:04:56 +02:00
d13c7811c2 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2018-07-18 11:58:19 +02:00
edcee40092 Implemented clamping of the acceleration when extruding for the Marlin
firmware, both for the G-code export and the time estimator.
2018-07-18 11:58:02 +02:00