Commit Graph

1175 Commits

Author SHA1 Message Date
76b1fbc5bf Eliminate some igl warnings on msvc 2019-07-18 16:32:04 +02:00
52ab8a5f19 Wipe tower fix (do not skip the first toolchange when printing without the wipe tower)
Also, test multi.t updated so it matches new logic of inserting custom gcodes
2019-07-16 13:10:09 +02:00
4865240a9c Fixed compilation issue 2019-07-16 09:19:00 +02:00
004e2719b1 Merge branch 'master' into lm_warnings 2019-07-15 13:26:55 +02:00
63cf5edf28 Updated tooltips on custom gcodes to match actual PrusaSlicer behaviour to reflect recent changes 2019-07-15 11:49:30 +02:00
ab7ecc1819 Merge remote-tracking branch 'remotes/origin/vb_undo_redo' 2019-07-15 11:34:18 +02:00
e674c586b0 Merge branch 'lm_improving_wipe_tower'. Summary of changes:
- wipe tower respects max volumetric flow, slowing down with PVA etc is not hardcoded anymore
- wipe tower is now allowed for multiple-extruder printers. single extruder stuff is not used in that case (ramming, cooling, etc.)
- start/end filament and toolchange custom gcodes are now inserted differently than before - see 41164a9
- some refactoring, e.g. the abstract WipeTower class was eradicated
2019-07-15 10:25:38 +02:00
2ee572bd31 GCodeAnalyzer now recognizes tool-changing commands with MakerWare and Sailfish flavor
These firmwares use M135 Tn and M108 Tn commands for changing active tool, which the analyzer did not recognize. The toolpaths were then rendered in wrong color, extruder offset etc. This surfaced in issue https://github.com/prusa3d/PrusaSlicer/issues/2566
2019-07-12 12:56:41 +02:00
cc70c8dff9 Tech ENABLE_SVG_ICONS set as default 2019-07-12 10:13:35 +02:00
1f74d7fdfc Added color number in legend texture for color prints 2019-07-09 15:47:34 +02:00
29dfa786ff Merge branch 'et_color_print_times' of https://github.com/prusa3d/PrusaSlicer 2019-07-09 14:24:24 +02:00
af89bcee53 Merge branch 'master' into tm_builtin_pad 2019-07-09 13:21:26 +02:00
18fcb64681 Fixing broken SLA slicing: SPE-984 2019-07-09 13:12:55 +02:00
ad5329253e Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_color_print_times 2019-07-08 08:45:11 +02:00
25d916f144 Color change time estimates 2019-07-08 08:40:20 +02:00
4e2fda3315 Undo / Redo fixes 2019-07-05 19:06:19 +02:00
6a3fc5bde3 Documented the cereal library manual patching (FIXME!) 2019-07-05 11:42:36 +02:00
7c732c7482 Trying to fix some Linux & OSX compilation issues. 2019-07-04 23:34:18 +02:00
211d1ee1e3 Trying to make all C++ of the platforms happy. 2019-07-04 22:52:33 +02:00
9fd0c55eb8 Simplified the "cereal" includes to not clash with Perl includes 2019-07-04 22:09:14 +02:00
497b01f24a Trying to fix some template resolution on Linux 2019-07-04 21:02:08 +02:00
b1420283b6 Fixed merge issues. 2019-07-04 20:49:46 +02:00
3a24fb2f47 Yet another compilation fix. 2019-07-04 20:25:52 +02:00
c7cc760067 Merge remote-tracking branch 'origin/master' into vb_undo_redo 2019-07-04 20:22:15 +02:00
1070991149 Merge remote-tracking branch 'origin/ys_undo_redo' into vb_undo_redo 2019-07-04 20:15:50 +02:00
3e5f9b5a22 Removed some junk templates, which pass compilation on Windows
even if they are invalid.
2019-07-04 19:59:45 +02:00
70c6558a4c Fix of compilation on Linux 2019-07-04 19:48:00 +02:00
a29cc9e242 Update object list after undo/redo 2019-07-04 19:46:46 +02:00
1798e2a84c WIP Undo / Redo : serialization / deserialization of object selection. 2019-07-04 14:35:04 +02:00
e4d8c5410c Merge remote-tracking branch 'origin/master' into ys_new_features 2019-07-04 14:26:05 +02:00
5a2ace1a6e WIP Undo / Redo: First Undo in the history of PrusaSlicer! 2019-07-04 10:45:41 +02:00
e2a670218b WIP Undo / Redo: Serializing the configs of ModelObject / ModelVolume
/ ModelMaterial as separate objects to conserve memory.
2019-07-03 13:43:54 +02:00
5e846112ee WIP UndoRedo: Added Undo/Redo stack, added Platter::take_snapshot(),
experimental snapshots on loading STLs and increasing / decreasing
model instances.
2019-07-02 16:42:23 +02:00
136e5156bc Fixed colot_print issues:
* Disabled color change information for the SLA and FFF-multimaterial presets
* Corrected switch between "color print" and "feature type" on Preview
2019-07-02 14:06:58 +02:00
f09fb92b61 Fix build against system-provided qhull 2019-07-02 11:43:07 +02:00
125f474f02 Merge remote-tracking branch 'origin/master' into ys_new_features 2019-06-29 12:38:03 +02:00
f0ac54ba32 Merge branch 'master' into tm_builtin_pad 2019-06-28 16:51:55 +02:00
548f19462a Fix formatting 2019-06-28 15:42:59 +02:00
4c69a855a1 Merge branch 'master' into tm_builtin_pad 2019-06-28 15:29:26 +02:00
61080bcff6 Merge branch 'bugfixes': avrdude warnings cleanup 2019-06-28 15:21:45 +02:00
0b940ec089 Some code improvements 2019-06-27 16:07:32 +02:00
37b37cdf25 Fixed small typo 2019-06-27 14:13:07 +02:00
dd1fb286c3 Merge remote-tracking branch 'origin/master' into ys_new_features 2019-06-27 14:01:50 +02:00
cecc134550 Rewrote layers information export/import to/from 3mf using Boost Property Tree (xml_parser) 2019-06-27 13:55:24 +02:00
75b0f65d79 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-06-27 11:25:13 +02:00
90d1ac2c8f Tech ENABLE_RENDER_PICKING_PASS extended so that user can switch between picking pass texture rendering and regular rendering by pressing [T] key 2019-06-27 11:25:04 +02:00
27ee68d2f9 WIP Undo / Redo: ModelID / ModelBase renamed to ObjectID / ObjectBase 2019-06-27 11:02:45 +02:00
71d1255219 Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2019-06-27 09:48:31 +02:00
da3583b1db Fix of https://github.com/prusa3d/PrusaSlicer/issues/2516 2019-06-27 09:48:19 +02:00
d16c670ed1 Merge pull request #2569 from BeldrothTheGold/master
Add debug preprocessor directive in Technologies.hpp to render picking pass to window.
2019-06-27 09:44:48 +02:00