Commit Graph

6106 Commits

Author SHA1 Message Date
bubnikv
d4b0d1b773 bumped up the version number 2018-06-29 10:59:58 +02:00
bubnikv
6b3c24359b Merge branch 'master' into amf_activate_existing_presets 2018-06-28 22:00:10 +02:00
bubnikv
082f88ad5f gcc / clang did not like backslashes inside comments 2018-06-28 21:46:23 +02:00
bubnikv
26b003073b Renamed the "compatible_printers_condition" and "inherits" vectors
to "compatible_printers_condition_cummulative" and "inherits_cummulative"
when storing to AMF/3MF/Config files.

Improved escaping of strings stored / loaded from config files.
2018-06-28 20:13:01 +02:00
tamasmeszaros
d3b19382fe AppController reachable trough Plater.pm 2018-06-28 19:16:36 +02:00
tamasmeszaros
85474e5803 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
ad4d95f60c AppController integration 2018-06-28 18:47:18 +02:00
YuSanka
2cbf5b75db Final Fix of tooltips on OSX showing on the first page of a parameter tab. 2018-06-28 18:30:22 +02:00
YuSanka
9e4bea8cce Code cleaning 2018-06-28 18:14:34 +02:00
YuSanka
896d898124 Resizing panel to 1 px 2018-06-28 17:52:20 +02:00
bubnikv
c4a3e4eca7 Merge branch 'for_merging' 2018-06-28 17:43:15 +02:00
YuSanka
5f1f7dcbed Fix of tooltips on OSX showing on the first page of a parameter tab. 2018-06-28 17:34:55 +02:00
YuSanka
0171f49ad0 And last try.. 2018-06-28 17:14:45 +02:00
YuSanka
75bda8cfd8 Addition to last commit 2018-06-28 16:50:06 +02:00
tamasmeszaros
5446b9f1e5 Incorporating performance optimizations from libnest2d 2018-06-28 16:14:17 +02:00
YuSanka
0b1833a2af Try to fix tooltips on OSX 2018-06-28 16:01:06 +02:00
bubnikv
aae6cfc696 Merge remote-tracking branch 'remotes/origin/lm_ultimate_wipe_tower_rotation_fix' 2018-06-28 13:59:19 +02:00
Enrico Turri
dc25df7b32 Faster remaining times export 2018-06-28 13:57:28 +02:00
bubnikv
acd712cdbc Merge remote-tracking branch 'remotes/origin/vk-octoprint' 2018-06-28 13:53:27 +02:00
bubnikv
67de1a462f Merge remote-tracking branch 'remotes/origin/vk-bugfixes' 2018-06-28 13:53:22 +02:00
YuSanka
5605835ba9 Use silent_mode only with MK3 printer 2018-06-28 12:40:27 +02:00
Lukas Matena
19f5863d75 Wipe tower fix - incorrect start/end position reported to the GCode generator when the tower was rotated 2018-06-28 10:22:04 +02:00
Enrico Turri
7d61b2076f Faster remaining time calculation 2018-06-28 09:24:07 +02:00
Enrico Turri
9725966f38 Time estimate uses G1 lines containing E parameter for remaining time calculations 2018-06-28 08:52:07 +02:00
Vojtech Kral
5787c495d6 Octoprint: Improve error reporting 2018-06-27 17:00:20 +02:00
bubnikv
80b430ad94 Simplified handling of the "compatible_printers_condition" and
"inherits" configuration values.
Implemented correct setting of the "inherits" flag for the profiles
loaded from AMF/3MF/Config files.
2018-06-27 16:57:42 +02:00
Lukas Matena
bb288f2a1b Fixed a crash when complete_objects was turned on 2018-06-27 15:49:02 +02:00
Enrico Turri
7ff22b9413 Time estimate emitted to gcode at requested interval 2018-06-27 15:35:47 +02:00
Enrico Turri
de28d4edeb Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-06-27 15:32:47 +02:00
Enrico Turri
6c6f6ed4e2 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-06-27 15:32:39 +02:00
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