Commit Graph

3662 Commits

Author SHA1 Message Date
bubnikv
53ee26cfec Reworked the "Sliced info" box on the platter to only show the
"silent mode" print time if it is available.
2018-07-18 14:52:19 +02:00
bubnikv
761c3fb731 Restored the "Fix STL through Netfabb" functionality, which has been
lost during some merge process.
2018-07-17 21:31:54 +02:00
Enrico Turri
69c5c18c07 Merge with master + resolved conflicts 2018-07-17 10:44:23 +02:00
bubnikv
1830f4059a Merge remote-tracking branch 'remotes/origin/opengl_to_cpp' 2018-07-17 09:37:38 +02:00
bubnikv
682ebeb39b Merge remote-tracking branch 'remotes/origin/wipe_tower_improvements' 2018-07-17 09:20:19 +02:00
Enrico Turri
639e0fea51 Merge with master 2018-07-17 08:54:17 +02:00
tamasmeszaros
6296b7b4d2 Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d 2018-07-16 16:08:28 +02:00
Enrico Turri
eb42e76457 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-07-13 14:45:51 +02:00
Enrico Turri
77ed8ac31f Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-07-13 14:45:15 +02:00
Enrico Turri
9071f7b244 Fixed update of sliders' texts into object settings dialog 2018-07-13 14:41:49 +02:00
tamasmeszaros
5d30f47786 Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d 2018-07-13 11:28:02 +02:00
Enrico Turri
b4b44e9928 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-07-13 11:27:56 +02:00
Enrico Turri
135dc14e56 Fixed 3D preview not updated after g-code export 2018-07-13 11:16:28 +02:00
Enrico Turri
40f2bdaf3e Attempt to fix SPE-356 2018-07-13 08:58:28 +02:00
Enrico Turri
1c3f9741d6 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-07-12 08:32:42 +02:00
Enrico Turri
95e94c9958 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-07-12 08:32:18 +02:00
Lukas Matena
21e0cdd8e0 Supports were printed twice if synchronized with object layers, added always-on settings in ObjectSettingDialog 2018-07-10 13:02:43 +02:00
tamasmeszaros
3af0614d7c Fix crash on Linux when arranging 2018-07-02 11:22:47 +02:00
tamasmeszaros
b9aee1617f Autocenter finally disabled. Progress indication works. 2018-06-29 17:46:21 +02:00
tamasmeszaros
9269876856 AppController reachable trough Plater.pm 2018-06-28 19:16:36 +02:00
tamasmeszaros
f11dd98cc4 Merge remote-tracking branch 'origin/master' into feature_arrange_with_libnest2d
# Conflicts:
#	CMakeLists.txt
#	lib/Slic3r/GUI/MainFrame.pm
2018-06-28 18:50:39 +02:00
tamasmeszaros
f0b44f95e2 AppController integration 2018-06-28 18:47:18 +02:00
bubnikv
68fd52678b Merge branch 'for_merging' 2018-06-28 17:43:15 +02:00
YuSanka
5607c9340b Fix of tooltips on OSX showing on the first page of a parameter tab. 2018-06-28 17:34:55 +02:00
Enrico Turri
21c7f41973 Time estimate emitted to gcode at requested interval 2018-06-27 15:35:47 +02:00
Enrico Turri
073ab56d0c Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-27 13:54:39 +02:00
Enrico Turri
7b49a0b9cd Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-27 13:52:57 +02:00
Enrico Turri
5bd0f6ab2b Code cleanup 2018-06-27 12:49:38 +02:00
Enrico Turri
c2256b2faa 3rd attempt to fix opengl on ubuntu 2018-06-27 12:36:49 +02:00
Enrico Turri
537033462d 1st attempt to fix opengl on ubuntu 2018-06-27 11:31:11 +02:00
Enrico Turri
3d452f07e7 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-27 08:26:55 +02:00
Enrico Turri
fcd09ad9e5 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-27 08:26:33 +02:00
bubnikv
f4ee973ab7 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
Enrico Turri
5b32d61a69 Fixed crash when slicing from Layers tab 2018-06-26 12:50:04 +02:00
Enrico Turri
bb7c7dac61 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-26 12:20:41 +02:00
Enrico Turri
010e2ecc62 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-26 12:20:23 +02:00
Enrico Turri
f1a0aa2ca1 Fixed bed update when changing selected printer 2018-06-26 12:19:19 +02:00
Enrico Turri
5a52f0b773 Fixed panning in Layers view 2018-06-26 11:17:30 +02:00
Enrico Turri
90eb01702b Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-25 15:27:06 +02:00
Enrico Turri
dd392198f8 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-25 15:24:58 +02:00
Enrico Turri
fab492e951 Fix of interaction between opengl contexts and main page notebook 2018-06-25 15:17:13 +02:00
Enrico Turri
1d81186309 Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-25 08:26:14 +02:00
Enrico Turri
afc4bbb680 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-22 16:13:51 +02:00
Enrico Turri
c0fde61e64 Code cleanup 2018-06-22 16:11:00 +02:00
Enrico Turri
13d59bca12 Forced render of 3D scene when changing tab in plater's notebook 2018-06-22 16:06:37 +02:00
Enrico Turri
f0e09fc4b4 Geometry info updated while using gizmos 2018-06-22 11:19:38 +02:00
Enrico Turri
30d38b850a Cleanup of perl code 2018-06-21 12:21:51 +02:00
Enrico Turri
e4087150eb Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-06-21 11:05:07 +02:00
Enrico Turri
03719d44de Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-21 11:03:38 +02:00
Enrico Turri
6580dae24e Force update when changing selected printer using the GUI 2018-06-21 10:43:01 +02:00