Commit Graph

11829 Commits

Author SHA1 Message Date
tamasmeszaros
c26705ddad Try to fix deps build on win32 with forwarding CMAKE_GENERATOR_PLATFORM 2019-12-12 13:09:57 +01:00
bubnikv
792ee1be62 Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2019-12-12 12:11:37 +01:00
Enrico Turri
03fee19fef Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-12-12 11:11:20 +01:00
Enrico Turri
d6f5ed9ad0 Refactoring in GLGizmosManager to simplify code 2019-12-12 11:11:11 +01:00
David Kocik
0cb9a4c542 eject button after export 2019-12-12 10:48:33 +01:00
Lukas Matena
c284a65caa Warning fix: removed needless tautological check 2019-12-12 10:45:30 +01:00
bubnikv
77d3aba1aa Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2019-12-12 10:42:23 +01:00
YuSanka
0e157b5b07 Updated dictionaries 2019-12-12 08:45:29 +01:00
David Kocik
59fa78373b linux eject 2019-12-11 18:30:03 +01:00
David Kocik
c6b5253bce merge 2019-12-11 17:43:11 +01:00
David Kocik
e2048775f6 eject button functionality 2019-12-11 17:42:56 +01:00
Slic3rPE
a03ce255d6 macos eject 2019-12-11 17:39:34 +01:00
David Kocik
7602cde289 merge 2019-12-11 17:03:30 +01:00
David Kocik
f057077826 eject button functionality 2019-12-11 17:02:12 +01:00
Slic3rPE
38c69f16f0 macos eject 2019-12-11 16:59:26 +01:00
YuSanka
43d5437e1f Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-12-11 16:07:51 +01:00
YuSanka
d66761e030 Fixed wrong context menu selection for instance(s). Related to #3275 2019-12-11 16:07:00 +01:00
Enrico Turri
2744e71967 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-12-11 15:30:44 +01:00
Enrico Turri
57d069bd0a Some rework on layout of imgui dialogs 2019-12-11 15:30:25 +01:00
David Kocik
6dddc1cc6b eject button functionality 2019-12-11 15:02:20 +01:00
David Kocik
4a7f50ad66 eject button functionality 2019-12-11 14:53:28 +01:00
tamasmeszaros
658858b249 Another small fix for FindGLEW 2019-12-11 14:39:31 +01:00
tamasmeszaros
4a931c037a Fix CGAL target name 2019-12-11 14:23:12 +01:00
tamasmeszaros
e2bea1ed17 Merge branch 'tm_opencsg' 2019-12-11 14:04:04 +01:00
tamasmeszaros
4282c57069 Fix zlib on msvc 2019-12-11 14:01:14 +01:00
tamasmeszaros
4a4d8b4e26 Fix zlib dependencies and CMAKE_MODULE_PATH forwarding 2019-12-11 14:01:07 +01:00
tamasmeszaros
c91046925a Fix finding static libraries on windows (mingw) 2019-12-11 14:00:55 +01:00
tamasmeszaros
5b67ce5105 Merge branch 'tm_opencsg' 2019-12-11 12:52:03 +01:00
tamasmeszaros
38aa5cb437 Finding GLEW work in release and debug.
Make building in release and debug in one cmake run on msvc with the prusaslicer_add_cmake_project function.
2019-12-11 12:32:29 +01:00
David Kocik
975642e3e0 eject button functionality 2019-12-11 12:28:51 +01:00
Slic3rPE
6c98231610 Merge branch 'dk_remote_devices' of https://github.com/prusa3d/slic3r into dk_remote_devices 2019-12-11 11:01:00 +01:00
Slic3rPE
bcfc333fb1 macos better wrapper 2019-12-11 11:00:47 +01:00
YuSanka
be09c91a1d Added missed icon 2019-12-11 11:00:23 +01:00
YuSanka
bced486db3 GIT_TAG for deps-macos.cmake is changed to "v3.1.3-patched" 2019-12-11 10:32:50 +01:00
Slic3rPE
cd1d49b015 macos better wrapper 2019-12-11 10:16:32 +01:00
Lukas Matena
e747577271 Added a validation check to reject wipe tower in sequential prints
This scenario was never supported (#3283)
2019-12-11 08:12:19 +01:00
bubnikv
d0aad74c27 Fixed update logic to support newer index downloaded from the internet
than the index stored in the resources.
2019-12-10 17:49:09 +01:00
bubnikv
ece8e06914 Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2019-12-10 17:47:24 +01:00
tamasmeszaros
d7ac8f2774 Merge branch 'tm_cgal' 2019-12-10 17:45:36 +01:00
tamasmeszaros
fc19666fa2 Add dll copy after targets for gmp and mpfr 2019-12-10 17:42:25 +01:00
YuSanka
5872598679 Merge branch 'dk_remote_devices' of https://github.com/prusa3d/PrusaSlicer into dk_remote_devices 2019-12-10 17:31:58 +01:00
YuSanka
37b6d9e8ad Implemented "Disconnect" button 2019-12-10 17:31:27 +01:00
YuSanka
313e86ea94 Fixed show context menu for multiple selection in ObjectList 2019-12-10 17:25:30 +01:00
tamasmeszaros
1cf057abbc Add dlls into bin rather than lib 2019-12-10 15:49:52 +01:00
tamasmeszaros
c8a088e652 Fix CGAL import with shared boost 2019-12-10 15:10:39 +01:00
Enrico Turri
b63b5125b6 Enable selection for missing files in reload from disk command 2019-12-10 14:42:28 +01:00
David Kocik
027b9f5082 fix 2019-12-10 14:41:49 +01:00
David Kocik
d2a440c794 macos better wrapper 2019-12-10 14:10:47 +01:00
tamasmeszaros
784728bff8 Fix missing GLEW link to OpenCSG 2019-12-10 13:57:57 +01:00
tamasmeszaros
b47869c4ac Register OpenCSG in deps 2019-12-10 13:51:53 +01:00