Commit Graph

6057 Commits

Author SHA1 Message Date
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
Enrico Turri
3febf1dffb Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-06-25 13:22:02 +02:00
Enrico Turri
581ed7764c Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-25 13:21:52 +02:00
YuSanka
318212f475 Fixed crashing-bug after language changing (detected under Debug) 2018-06-25 12:27:42 +02:00
YuSanka
362a9d8eda Fixed bug #995 2018-06-25 11:40:40 +02:00
Enrico Turri
789a760fbd Fixed conflict after merge with master 2018-06-25 10:49:30 +02:00
Enrico Turri
8a4a5e487e Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-25 08:51:47 +02:00
Enrico Turri
663bc20d1b Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-06-25 08:51:38 +02:00
Enrico Turri
7d15a15e14 Fix of #999 2018-06-25 08:48:36 +02:00
Enrico Turri
3da21a4ce8 Merge branch 'add_kinematics' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-25 08:27:09 +02:00
Enrico Turri
f9e6bcf872 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-25 08:26:14 +02:00
Enrico Turri
92ecda5abe Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-06-25 08:26:04 +02:00
bubnikv
b5f97baa28 Merge remote-tracking branch 'remotes/origin/machine-limits-config' into add_kinematics 2018-06-22 17:44:12 +02:00
Enrico Turri
ac0f3a6ef7 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-22 16:13:51 +02:00
YuSanka
54c90ee948 Updated PrintConfig default values for machine limits
+ fixed incorrect default value setting for the TextCtrl
2018-06-22 16:13:34 +02:00
Enrico Turri
c948ca647c Code cleanup 2018-06-22 16:11:00 +02:00
Enrico Turri
2a03b90d2b Forced render of 3D scene when changing tab in plater's notebook 2018-06-22 16:06:37 +02:00
Enrico Turri
de540de9aa 5th Attempt to fix texture rendering on OpenGL 1.1 cards 2018-06-22 15:11:04 +02:00
bubnikv
082ed95a94 Activate existing projects after loading AMF/3MF/Config: Initial implementation. 2018-06-22 14:17:03 +02:00
Lukas Matena
e2126c2dd6 Dedicated objects are now not ignored 2018-06-22 14:03:34 +02:00