Enrico Turri
6519b1dde8
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-23 15:33:48 +02:00
Enrico Turri
486180c422
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-23 15:33:25 +02:00
tamasmeszaros
a52807df72
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
a4261b11d4
Updated translations (de, fr, es, it & pl)
2018-05-23 14:22:52 +02:00
tamasmeszaros
3bdb12ada1
Making it compile on GCC 4.9
2018-05-23 14:16:54 +02:00
Enrico Turri
90c50b281a
3DScene mouse variables moved to c++
2018-05-23 13:56:54 +02:00
bubnikv
a9499ae45c
Fix of a crash intruduced with e8247c5646
2018-05-23 13:19:25 +02:00
Enrico Turri
91b9b8aebf
Fixed wrong layer height texture updates when using multiple objects
2018-05-23 12:49:56 +02:00
tamasmeszaros
a7298d9d89
Merge with latest master
2018-05-23 12:27:07 +02:00
tamasmeszaros
0c6eb19202
fix zip file error check
2018-05-23 12:24:11 +02:00
Enrico Turri
b36243ba10
Objects rendering moved to c++
2018-05-23 11:14:49 +02:00
tamasmeszaros
7fe9a56ef8
Added some comments and sequential version of png slice export.
2018-05-23 11:02:07 +02:00
Enrico Turri
b4beb7aae9
3DScene plain shader moved to c++
2018-05-23 09:57:44 +02:00
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
tamasmeszaros
835e89f8c1
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
2eddacfb7e
getting rid of strerror problem
2018-05-22 16:39:47 +02:00
bubnikv
076b293fec
Bumped up version numbers of the PrusaResearch.ini and the Slic3r itself.
2018-05-22 15:18:38 +02:00
tamasmeszaros
9c2d9b2ba3
OSX build fixes, again...
2018-05-22 15:13:07 +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
tamasmeszaros
73b861287c
Zipped output and tryfixes for linux and mac build.
2018-05-22 11:16:32 +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
tamasmeszaros
e36164c76b
OSX and linux build fixes
2018-05-22 10:15:15 +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
