Commit Graph

4216 Commits

Author SHA1 Message Date
c9da021d7f Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2019-07-29 17:55:58 +02:00
e3d2412973 When accessing the localized web pages provided by Prusa Research,
only those language codes are now passed to the Prusa Research
web server, which are currently supported.
For example, there is no web page for "en_UK", the "en_UK" code will be
translated to "en_US".
2019-07-29 17:55:50 +02:00
9995f26a09 Set "wipe_into_infill" and "wipe_into_objects" options to the "Wipe options" category instead of "Extruders" 2019-07-29 16:56:24 +02:00
ce1cfcd09c Fix of "Unable to slice in command line mode: Mixing configurations
for FFF and SLA technologies" #2426
2019-07-29 16:19:32 +02:00
ec83598aad Fix for 7b5c8b7e16 2019-07-29 16:08:36 +02:00
a632cc86ba Fix of #2401 2019-07-29 15:44:00 +02:00
e7236fc925 Implemented a highlighting of the delete button for setting (related to #1767) 2019-07-29 15:14:25 +02:00
4f484187f4 Implemented some upgrades for filament overrides 2019-07-29 14:00:22 +02:00
b6e278cfc3 SLA gizmo now uses the new separate undo/redo stack for manual editing mode 2019-07-29 13:07:49 +02:00
0362e382bc Merge remote-tracking branch 'origin/master' into ys_overrides 2019-07-28 22:12:27 +02:00
1feb4ccdcc Merge remote-tracking branch 'origin/vb_filament_overrides' into ys_overrides 2019-07-28 22:01:48 +02:00
b89866051f Implemented update of the override filaments options from/to config 2019-07-28 22:00:39 +02:00
b3ad06b655 Hiding the sla support structures after undo/redo 2019-07-28 11:37:08 +02:00
17d862f010 Fix a ternary op type error in Tab
Fix #2668
Fix #2676
2019-07-26 14:27:37 +02:00
097daed717 Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2019-07-26 13:44:41 +02:00
4a3f64c4d2 New Undo / Redo stack for the gizmos. The Gizmo specific stack is
entered with Plater::enter_gizmos_stack(), and left with
Plater::enter_gizmos_stack(). Other than that, the 2nd Undo / Redo
stack is transparent to the user of the Plater.

WIP: Currently the Gizmo stack takes a snapshot of the whole scene on
Plater::enter_gizmos_stack(). While it should work, it may be cheaper
to modify the Undo/Redo stack to only take a snapshot of the gizmos
in the Gizmo mode.
2019-07-26 13:44:33 +02:00
08c1aa6d11 Take a single undo/redo snapshot when pasting from clipboard 2019-07-26 13:06:49 +02:00
96c00eb8e1 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_selection_undoredo 2019-07-26 11:34:05 +02:00
eb40cdef49 Code cleanup 2019-07-26 11:32:44 +02:00
f95c0e104d Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed 2019-07-26 09:45:42 +02:00
b70057bdda Refactoring into rendering pipeline 2019-07-26 09:45:22 +02:00
edb5e8333b Fixed updating of an option list for additional settings 2019-07-25 17:25:14 +02:00
9e299ad175 Fixed missing return value. 2019-07-25 17:18:51 +02:00
108926abec Fixed the Perl bindings, made Print::m_placeholder_parser protected,
removed the non-const accessor method to m_placeholder_parser.
2019-07-25 17:08:31 +02:00
261394d650 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-07-25 16:23:57 +02:00
4c3ef5a347 Upgrade for ModeButtons 2019-07-25 16:23:32 +02:00
9e9e85dcf3 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_selection_undoredo 2019-07-25 15:29:58 +02:00
95237ad560 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed 2019-07-25 15:29:25 +02:00
f160e2b623 Removed obsolete code 2019-07-25 15:28:34 +02:00
80eb232df2 Merge remote-tracking branch 'remotes/origin/master' into vb_filament_overrides 2019-07-25 14:40:54 +02:00
f5e17835d6 Reworked the FFF Print::update() to process the filament retract
override values and to store them into the output G-code.
2019-07-25 14:39:19 +02:00
dc396946d2 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_selection_undoredo 2019-07-25 13:44:02 +02:00
b4356510e4 Added missing include (OsX build) 2019-07-25 13:42:42 +02:00
361fb0a7b6 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed 2019-07-25 13:11:17 +02:00
de7a22f8a3 Added tooltip to filename fields for custom texture and model into bed shape dialog to show the full path of the file 2019-07-25 13:10:57 +02:00
24f18d8cd5 Bed model placed into the scene so that its origin goes into shape center 2019-07-25 11:34:42 +02:00
df38793663 Draw lighter gridlines when rendering default procedural texture on print bed when seen from above and custom model is present 2019-07-25 10:38:18 +02:00
70dda0737e Render custom bed model on custom beds 2019-07-25 09:45:43 +02:00
990df25df9 Fixed positioning of bed model into the scene and changed bundled bed models 2019-07-25 08:43:21 +02:00
4058eac7df Render custom bed model on prusa beds 2019-07-24 14:02:36 +02:00
450ae17d59 Add remove all from selection command to undo/redo stack only when the redo stack is empty 2019-07-24 13:51:39 +02:00
2cf65b5baa Merge remote-tracking branch 'origin/master' into ys_overrides 2019-07-24 12:47:00 +02:00
2e4a39b985 Merge remote-tracking branch 'origin/vb_filament_overrides' into ys_overrides 2019-07-24 12:40:07 +02:00
55dbcce4d0 Fixed is_nil() method on ConfigOptions.
PlaceholderParser was extended to support external config.
The external config has a lowest priority when looking up a variable.
2019-07-24 12:39:01 +02:00
ba998a20e9 Fix for 0592ae65ee 2019-07-24 12:32:38 +02:00
9aeb100de5 Completed setting of the item focus in ObjectList after undo/redo 2019-07-24 11:25:04 +02:00
587422f334 Refactoring in Bed3D 2019-07-24 11:04:04 +02:00
e66bb7459d Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed 2019-07-24 10:11:28 +02:00
314ee4ae55 Custom bed texture applied to custom bed shapes 2019-07-24 10:11:17 +02:00
1467381e60 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_selection_undoredo 2019-07-24 09:47:11 +02:00