Commit Graph

5610 Commits

Author SHA1 Message Date
Enrico Turri
d85fd5501c Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-18 08:32:09 +02:00
bubnikv
19221b749c Fix of https://github.com/prusa3d/Slic3r/issues/869 2018-05-18 08:21:24 +02:00
Vojtech Kral
5fd2164612 ConfigWizard: Fix incorrent wizard run after a language change 2018-05-17 17:19:33 +02:00
Vojtech Kral
e783e00578 AppConfig: Remember previous Slic3r version 2018-05-17 16:19:58 +02:00
Enrico Turri
de0b8226e1 Tweaks to logic for sliders update in 3D Preview 2018-05-17 16:02:31 +02:00
Enrico Turri
f7702c05f2 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-05-17 15:22:55 +02:00
Enrico Turri
c9dc54bed7 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-17 15:20:25 +02:00
Enrico Turri
9b4afb77d1 Hide legend texture when invalidating gcode by editing config data 2018-05-17 15:18:52 +02:00
Enrico Turri
7ca9f46b9c Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-05-17 14:43:27 +02:00
Enrico Turri
f26bce2538 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-17 14:43:18 +02:00
bubnikv
37c498d6dc Merge branch 'master' of https://github.com/prusa3d/slic3r 2018-05-17 14:09:08 +02:00
bubnikv
35bf4aee7d Fixed loading of configuraton values octoprint_host, support_material_threshold
They were incorrectly handled by the handle_legacy() function, which has been
ported from the upstream Slic3r without inspecting its content.
2018-05-17 14:08:50 +02:00
Vojtech Kral
96c7c4a58b PresetUpdater: Remove obsolete presets 2018-05-17 13:48:11 +02:00
Enrico Turri
2cb108fbf8 Fix in File menu 2018-05-17 12:56:14 +02:00
Enrico Turri
15f35a9e9e Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-05-17 12:12:27 +02:00
Enrico Turri
74b0ed4b23 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-17 12:12:18 +02:00
Lukas Matena
d98dec3a7c Merge branch 'gcode_preview_dropdown_ui' 2018-05-17 11:22:38 +02:00
bubnikv
c5dc47c647 Merge branch 'master' of https://github.com/prusa3d/slic3r 2018-05-17 10:30:24 +02:00
bubnikv
e3d84407e0 Fix of https://github.com/prusa3d/Slic3r/issues/896
Fixed a bug in parsering a Point from a config file.
2018-05-17 10:30:20 +02:00
Lukas Matena
6f792b7ffb Horrible workaround to make the gcode preview dropdown (show feature types) work on all platforms 2018-05-17 10:23:02 +02:00
Enrico Turri
24b5d61eb3 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-05-17 09:53:46 +02:00
Enrico Turri
4a4f4db6a5 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-17 09:53:36 +02:00
Enrico Turri
e13564cb19 Fixed shell visualization in g-code preview 2018-05-17 09:50:40 +02:00
Enrico Turri
ee4f95bce5 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-05-17 09:31:06 +02:00
Enrico Turri
36ce8e395e Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-17 09:30:55 +02:00
Enrico Turri
b6b7945830 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2018-05-17 09:27:16 +02:00
Enrico Turri
77578f4a3e Reset tooltips for manifold objects into object info panel 2018-05-17 09:26:50 +02:00
YuSanka
cc52654db3 Set minimum width for the right sizer 2018-05-17 08:50:05 +02:00
Enrico Turri
7a6d83e7eb Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-05-17 08:33:32 +02:00
Enrico Turri
853ebf6ad2 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-17 08:33:16 +02:00
bubnikv
e329f6f5f2 Merge branch 'master' of https://github.com/prusa3d/slic3r 2018-05-16 16:34:19 +02:00
bubnikv
687c91d6e9 Parsing of obsolete presets from Config Bundle to remove them
from user's profile when upgrading to a new configuration structure.
2018-05-16 16:34:07 +02:00
YuSanka
b8fe48c563 Modification of the AboutDialog to be correct showing on dark theme of Linux 2018-05-16 13:56:03 +02:00
bubnikv
6d98c2b1ce Merge branch 'master' of https://github.com/prusa3d/slic3r 2018-05-16 12:16:53 +02:00
bubnikv
0b4a61a8ba Fix of https://github.com/prusa3d/Slic3r/issues/791
The preset names have to be set at the PlaceholderParser
before querying Print for a recommended file name.
2018-05-16 12:16:30 +02:00
Vojtech Kral
a97226ae54 PresetUpdater: Fix: Don't offer updates on legacy datadir 2018-05-16 10:15:05 +02:00
bubnikv
5c44453ced Fixed loading of configuration files after reverting to a snapshot
storing the old configuration format.
2018-05-16 10:11:00 +02:00
Enrico Turri
41c51d7614 3DScene's char event handler moved to c++ 2018-05-15 16:09:04 +02:00
Enrico Turri
2b4829a4b9 3DScene bed variables moved to c++ 2018-05-15 15:38:25 +02:00
bubnikv
4b87f71bbc Fix of the previous commmit. gcc and clang rightfully complained about a typo. 2018-05-15 14:20:32 +02:00
bubnikv
868b400120 Merge branch 'master' of https://github.com/prusa3d/slic3r 2018-05-15 14:04:49 +02:00
bubnikv
7645e9cb7a Added layer_num, layer_z variables to the end_gcode, end_filament_gcode,
added min(.,.), max(.,.) functions to the placeholder parser syntax.
2018-05-15 14:04:29 +02:00
Enrico Turri
c60bf694ef Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-05-15 12:22:44 +02:00
Enrico Turri
43784f3409 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-15 12:22:35 +02:00
Enrico Turri
a612b5b648 Replacement of xml escape characters when exporting to amf 2018-05-15 12:19:43 +02:00
Enrico Turri
f0d1888ca9 3DScene select_view() function moved to c++ 2018-05-15 11:30:11 +02:00
Enrico Turri
75f1f832aa 3DScene bed origin moved to c++ 2018-05-15 11:07:32 +02:00
Enrico Turri
7519e34507 3DScene zoom functions moved to c++ 2018-05-15 10:32:38 +02:00
Enrico Turri
f4303ebdb8 1st attempt of perl callback from c++ for 3DScene 2018-05-15 09:50:01 +02:00
Enrico Turri
e31244e8a5 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-05-15 09:46:57 +02:00