Enrico Turri
3aa50b427a
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-23 15:33:48 +02:00
Enrico Turri
f7bd2a2c07
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-23 15:33:25 +02:00
tamasmeszaros
32f0410eb5
Using system libpng where present.
...
This avoids the crash caused on Linux where it should be present.
2018-05-23 15:21:13 +02:00
YuSanka
3284ff3fdf
Updated translations (de, fr, es, it & pl)
2018-05-23 14:22:52 +02:00
tamasmeszaros
1d6b068a3e
Making it compile on GCC 4.9
2018-05-23 14:16:54 +02:00
Enrico Turri
6ed4ee4047
3DScene mouse variables moved to c++
2018-05-23 13:56:54 +02:00
bubnikv
59f3f96443
Fix of a crash intruduced with e8247c5646
2018-05-23 13:19:25 +02:00
Enrico Turri
6b7c792777
Fixed wrong layer height texture updates when using multiple objects
2018-05-23 12:49:56 +02:00
tamasmeszaros
b53b368a6e
Merge with latest master
2018-05-23 12:27:07 +02:00
tamasmeszaros
1721a8bcd5
fix zip file error check
2018-05-23 12:24:11 +02:00
Enrico Turri
58eff6cf7f
Objects rendering moved to c++
2018-05-23 11:14:49 +02:00
tamasmeszaros
aeb36279c9
Added some comments and sequential version of png slice export.
2018-05-23 11:02:07 +02:00
Enrico Turri
3641fda6d1
3DScene plain shader moved to c++
2018-05-23 09:57:44 +02:00
Enrico Turri
4f09d18a88
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-23 08:38:40 +02:00
Enrico Turri
9deddc07f2
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-23 08:38:29 +02:00
YuSanka
295924b9b6
Merge remote-tracking branch 'origin/master' into new_main_page_ui
2018-05-23 08:30:27 +02:00
tamasmeszaros
6c9fe94926
Delete copy constructor of Raster, we dont want to use that. Getting rid of AGG warnings.
2018-05-22 17:37:39 +02:00
tamasmeszaros
5ff8603b29
getting rid of strerror problem
2018-05-22 16:39:47 +02:00
YuSanka
95bc754136
Filled content_object_settings
2018-05-22 16:14:41 +02:00
bubnikv
b09ce7e6a9
Bumped up version numbers of the PrusaResearch.ini and the Slic3r itself.
2018-05-22 15:18:38 +02:00
tamasmeszaros
9362a1b623
OSX build fixes, again...
2018-05-22 15:13:07 +02:00
Enrico Turri
f43e20913a
Merge with master
2018-05-22 15:03:40 +02:00
Enrico Turri
600e7dcdb9
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-22 14:57:45 +02:00
Vojtech Kral
2ae6f1bee4
ErrorDialog: Fix size and message encoding
2018-05-22 14:33:37 +02:00
bubnikv
7b1f575162
Merge remote-tracking branch 'remotes/origin/scene_manipulators'
2018-05-22 14:32:07 +02:00
bubnikv
97dd7c2f0a
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
b2b5129c15
Fixed correct updating of the modified preset on Plater tab.
2018-05-22 14:00:42 +02:00
Enrico Turri
41bb56c77a
Fixed remember output directory default value set to true
2018-05-22 13:57:28 +02:00
Enrico Turri
29a2e13b7e
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-22 11:48:56 +02:00
Enrico Turri
d0abd0bc4c
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-22 11:48:45 +02:00
bubnikv
15035e4d89
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
e175aad655
Merge branch 'master' of https://github.com/prusa3d/slic3r
2018-05-22 11:26:05 +02:00
tamasmeszaros
b8c548aa48
Zipped output and tryfixes for linux and mac build.
2018-05-22 11:16:32 +02:00
bubnikv
ebf83540a9
Merge remote-tracking branch 'remotes/origin/brim_width_calculation'
2018-05-22 11:08:37 +02:00
Eric
26c216cdc7
Partial french translation ( #914 )
...
* partial french translation progress (45%)
* partial french translation progress (60%)
2018-05-22 11:01:05 +02:00
Lukas Matena
90191a466f
A fix to use correct spacing with multiloop skirts
2018-05-22 10:50:38 +02:00
tamasmeszaros
0a7a659c0d
OSX and linux build fixes
2018-05-22 10:15:15 +02:00
YuSanka
e870e4859f
Merge remote-tracking branch 'origin/master' into new_main_page_ui
2018-05-22 09:05:34 +02:00
Enrico Turri
baf302a8ae
3DScene's enable_picking variable moved to c++
2018-05-22 09:02:42 +02:00
YuSanka
6af6d85d02
Billet for the part of the expert view mode
2018-05-22 08:41:33 +02:00
Enrico Turri
dbeeab3859
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-22 08:33:23 +02:00
Enrico Turri
07be4955b0
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-22 08:30:30 +02:00
bubnikv
a696f97712
One day I will fix it!
2018-05-21 23:40:17 +02:00
bubnikv
d848621b60
Yet another fix of the previous commit.
2018-05-21 23:24:18 +02:00
bubnikv
4e2ccfa02f
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
316714a635
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
bcc7f38f59
Merge branch 'fwupdater'
2018-05-21 19:12:40 +02:00
Vojtech Kral
bf7c967ffd
avrdude: Fix exit hook not being adapted properly
2018-05-21 18:59:15 +02:00
Vojtech Kral
3ec024f617
Serial port friendly name on Linux
2018-05-21 18:59:13 +02:00
bubnikv
29fdd9cac5
Another fix for linux & osx
2018-05-21 18:58:22 +02:00
