Commit Graph

5748 Commits

Author SHA1 Message Date
Enrico Turri
c5c90620ca Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-05-23 08:38:40 +02:00
Enrico Turri
37ab7594fc Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-23 08:38:29 +02:00
bubnikv
076b293fec Bumped up version numbers of the PrusaResearch.ini and the Slic3r itself. 2018-05-22 15:18:38 +02:00
Enrico Turri
85b6784dcb Merge with master 2018-05-22 15:03:40 +02:00
Enrico Turri
e8ab724382 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-05-22 14:57:45 +02:00
Vojtech Kral
360b34944d ErrorDialog: Fix size and message encoding 2018-05-22 14:33:37 +02:00
bubnikv
306d77559e Merge remote-tracking branch 'remotes/origin/scene_manipulators' 2018-05-22 14:32:07 +02:00
bubnikv
e8247c5646 When loading a config bundle, make sure a config value is not accepted
if it is placed in a wrong group (for example, max_print_height
does not belong to print settings, but a printer settings, so Slic3r
will now complain about it being in print settings, and it will
remove the value from the print settings).
2018-05-22 14:17:27 +02:00
YuSanka
6ea81279ff Fixed correct updating of the modified preset on Plater tab. 2018-05-22 14:00:42 +02:00
Enrico Turri
ae394ca97d Fixed remember output directory default value set to true 2018-05-22 13:57:28 +02:00
Enrico Turri
507bd1a567 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-05-22 11:48:56 +02:00
Enrico Turri
4e29147756 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-22 11:48:45 +02:00
bubnikv
36b337b7e7 Moved max_print_height from [print:*common*] to [printer:*common*],
there is a bug still in Slic3r, it should refuse to load config keys
from a wrong location.
2018-05-22 11:45:15 +02:00
bubnikv
81fb408671 Merge branch 'master' of https://github.com/prusa3d/slic3r 2018-05-22 11:26:05 +02:00
bubnikv
eef1d500ec Merge remote-tracking branch 'remotes/origin/brim_width_calculation' 2018-05-22 11:08:37 +02:00
Eric
ca3ea125e2 Partial french translation (#914)
* partial french translation progress (45%)

* partial french translation progress (60%)
2018-05-22 11:01:05 +02:00
Lukas Matena
e2f44a231e A fix to use correct spacing with multiloop skirts 2018-05-22 10:50:38 +02:00
Enrico Turri
451c58d58f 3DScene's enable_picking variable moved to c++ 2018-05-22 09:02:42 +02:00
Enrico Turri
59af3fb866 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-05-22 08:33:23 +02:00
Enrico Turri
369d027544 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-05-22 08:30:30 +02:00
bubnikv
b694f1ac89 One day I will fix it! 2018-05-21 23:40:17 +02:00
bubnikv
512b6dfd88 Yet another fix of the previous commit. 2018-05-21 23:24:18 +02:00
bubnikv
6b4fe7975f Fix of the previous commit: When asking the operating system to open
the datadir using the platform specific file explorer, enquote
and escape the path.
2018-05-21 22:10:38 +02:00
bubnikv
7b4aeef40c Moved the "Flash firmware" menu to "Configuration",
removed the "Check for updates" from the "Configuration" menu,
added an "Open file explorer at the datadir" item to the Help menu.
2018-05-21 21:04:03 +02:00
Vojtech Kral
2fab254ff6 Merge branch 'fwupdater' 2018-05-21 19:12:40 +02:00
Vojtech Kral
5697754c5e avrdude: Fix exit hook not being adapted properly 2018-05-21 18:59:15 +02:00
Vojtech Kral
ee5a5df2a7 Serial port friendly name on Linux 2018-05-21 18:59:13 +02:00
bubnikv
3307dbc0fb Another fix for linux & osx 2018-05-21 18:58:22 +02:00
bubnikv
1e8a0b69b2 Yet another fix for OSX 2018-05-21 18:58:22 +02:00
bubnikv
0a328789ef Fixed compilation on Linux. 2018-05-21 18:58:22 +02:00
bubnikv
8917f18ef1 Fix of previous commit, fix of compilation on OSX. 2018-05-21 18:58:22 +02:00
bubnikv
d4e939fd04 Serial port fix, get description for serial ports on OSX. 2018-05-21 18:58:22 +02:00
bubnikv
33f21422e6 Added friendly names to serial ports, added automatic selection of Prusa's printers in the firmware updater dialog 2018-05-21 18:58:22 +02:00
Vojtech Kral
7f8265e2be FirmwareDialog: Fix log clearing 2018-05-21 18:58:22 +02:00
Vojtech Kral
a43e72f696 Firmware updater: rework cancelling 2018-05-21 18:58:22 +02:00
bubnikv
4f4649d046 avrdude: Fix serial I/O timeout on Windows 2018-05-21 18:58:22 +02:00
Vojtech Kral
4723a99b15 FirmwareDialog: Fix dialog sizing 2018-05-21 18:58:22 +02:00
Vojtech Kral
e1930d57f3 Firmware updater: Disable dictionary flashing menu entry for the time being 2018-05-21 18:58:22 +02:00
Vojtech Kral
fd00ea0ca7 Firmware updater: Add cancelation 2018-05-21 18:58:22 +02:00
Vojtech Kral
98ae20c3df Firmware updater: Perform work in a background thread 2018-05-21 18:58:22 +02:00
Vojtech Kral
a54672fb54 Firmware updater: Make the GUI less scary 2018-05-21 18:58:22 +02:00
Vojtech Kral
c5f1acfbfb FirmwareUpdater: Disable dialog close while flashing 2018-05-21 18:58:22 +02:00
Vojtech Kral
fe21ca5510 avrdude: Build fixes 2018-05-21 18:58:22 +02:00
Vojtech Kral
404fdbcfdf avrdude: Fixes in error handling 2018-05-21 18:58:22 +02:00
Vojtech Kral
97b3c38148 avrdude: Fix h_addr 2018-05-21 18:58:22 +02:00
Vojtech Kral
839c0451f7 avrdude: Fix PATH_MAX 2018-05-21 18:58:22 +02:00
Vojtech Kral
4ac17daad2 avrdude: Use C99, fix alloca include in stk500 2018-05-21 18:58:22 +02:00
Vojtech Kral
af360d7097 Firmware updater GUI 2018-05-21 18:58:22 +02:00
Vojtech Kral
3d09f2a980 avrdude: bugfixes 2018-05-21 18:58:22 +02:00
Vojtech Kral
07817c8ee5 avrdude: Compilation on Windows/MSVC 2018-05-21 18:58:22 +02:00