Commit Graph

6126 Commits

Author SHA1 Message Date
Enrico Turri
3dba0be81e Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-27 15:32:31 +02:00
Lukas Matena
54bd0af905 Infill wiping turned off by default and in some automatic tests 2018-06-27 15:07:37 +02:00
Lukas Matena
c11a163e08 Correct extruder is used for dontcare extrusions 2018-06-27 14:08:46 +02:00
Vojtech Kral
930a2f1d12 Fix: Http: Body size limit not properly initialized 2018-06-27 13:57:21 +02:00
Vojtech Kral
6706c3b71f ConfigWizard: Mark the first variant of each printer as default in the GUI 2018-06-27 13:57:21 +02:00
Vojtech Kral
e00125d866 PresetUpdater: Fix double update detection (had_config_update) 2018-06-27 13:57:21 +02:00
Vojtech Kral
3229574a39 ConfigWizard: Fix default printer selection 2018-06-27 13:57:21 +02:00
Enrico Turri
d02c90d5d0 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-27 13:54:39 +02:00
Chow Loong Jin
8eb8a8b1f6 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
cf6552484d Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-06-27 13:53:13 +02:00
Enrico Turri
48915a65fd Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-27 13:52:57 +02:00
Enrico Turri
06f44a9e4b Code cleanup 2018-06-27 12:49:38 +02:00
Enrico Turri
8db4fdc24c 3rd attempt to fix opengl on ubuntu 2018-06-27 12:36:49 +02:00
Enrico Turri
23d10fdadc 2nd attempt to fix opengl on ubuntu 2018-06-27 12:05:23 +02:00
Enrico Turri
5c32347449 1st attempt to fix opengl on ubuntu 2018-06-27 11:31:11 +02:00
Vojtech Kral
2a23a9c5bc Fix: Http: Body size limit not properly initialized 2018-06-27 10:36:19 +02:00
Vojtech Kral
5c89a80ef4 ConfigWizard: Mark the first variant of each printer as default in the GUI 2018-06-27 10:36:19 +02:00
Vojtech Kral
ac829ea063 PresetUpdater: Fix double update detection (had_config_update) 2018-06-27 10:36:19 +02:00
Vojtech Kral
27b6c061d8 ConfigWizard: Fix default printer selection 2018-06-27 10:36:19 +02:00
bubnikv
68e82a7348 Merge branch 'master' into amf_activate_existing_presets 2018-06-27 10:33:14 +02:00
Lukas Matena
fe0f0fe6af Merge branch 'master' into wipe_tower_improvements 2018-06-27 08:56:08 +02:00
Enrico Turri
dc223066d3 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-27 08:26:55 +02:00
Enrico Turri
f7a0d817ae Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-06-27 08:26:45 +02:00
Enrico Turri
db95460154 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-27 08:26:33 +02:00
bubnikv
645cc65d2b When running on Windows, Perl $^X returns slic3r.exe or slic3r-console.exe
Do some magic to get the perl interpreter path.
2018-06-26 15:29:23 +02:00
Lukas Matena
f8388abe17 'Dontcare' extrusions now don't force a toolchange + code reorganization 2018-06-26 14:12:25 +02:00
bubnikv
22463343a7 Fixed integration tests. 2018-06-26 13:22:24 +02:00
Lukas Matena
4dae6cbf60 Merge branch 'master' into wipe_tower_improvements 2018-06-26 12:58:04 +02:00
Enrico Turri
bd1d70d8d3 Fixed crash when slicing from Layers tab 2018-06-26 12:50:04 +02:00
Enrico Turri
ab587babb9 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-26 12:20:41 +02:00
Enrico Turri
3a7c9123fa Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-06-26 12:20:34 +02:00
Enrico Turri
9b2f760679 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-26 12:20:23 +02:00
Enrico Turri
87c1654e31 Fixed bed update when changing selected printer 2018-06-26 12:19:19 +02:00
bubnikv
59510c42d1 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
YuSanka
03f21eac05 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2018-06-26 11:18:55 +02:00
YuSanka
5da3986e22 Updated POT-file 2018-06-26 11:17:40 +02:00
Enrico Turri
a754de4c32 Fixed panning in Layers view 2018-06-26 11:17:30 +02:00
Enrico Turri
90b0cd5cae Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-26 11:16:00 +02:00
Enrico Turri
a9d3e21579 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-06-26 11:15:46 +02:00
Enrico Turri
69ff60b557 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-26 11:15:33 +02:00
bubnikv
1175dc95f6 Storing and recovering the "compatible_printers_condition"
and "inherits" fields from / to the AMF/3MF/Config files.
The "compatible_printers_condition" are collected over all active profiles
(one print, possibly multiple filament, and one printer profile)
into a single vector.
2018-06-26 10:50:50 +02:00
YuSanka
2fae893af2 Fixed #998
Added detection of gtk2/gtk3 GUI libraries required by Alien::wxWidgets.
Added gtk2/gtk3 include paths, so we may call gtk2/3 API directly if needed for some workaround.
2018-06-26 10:37:36 +02:00
Enrico Turri
ecda2a6140 Merge branch 'add_kinematics' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-25 16:09:27 +02:00
YuSanka
f9b85b6700 Correct updating of "Machine limits" and "Single extruder MM setup" pages 2018-06-25 16:03:43 +02:00
Enrico Turri
714204b227 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-25 15:27:06 +02:00
Enrico Turri
b6b14ef819 Fixed conflicts after merge with master branch 2018-06-25 15:26:37 +02:00
Enrico Turri
ba0637461f Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-06-25 15:25:12 +02:00
Enrico Turri
7b0ba7a9d4 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-25 15:24:58 +02:00
Enrico Turri
40b327eb11 Fix of interaction between opengl contexts and main page notebook 2018-06-25 15:17:13 +02:00
YuSanka
515502e685 Fixed #994.
Print double-type values according to "full" value instead of 2 digits after point
2018-06-25 13:32:28 +02:00