Enrico Turri
4672a18b49
Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate
2018-06-04 12:25:25 +02:00
Enrico Turri
109dde00b2
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-06-04 12:25:04 +02:00
Enrico Turri
78c32bdf9a
Merge branch 'master' of https://github.com/prusa3d/Slic3r into 3mf_io
2018-06-04 12:24:14 +02:00
YuSanka
16a5029d58
Fixed issue #875 and updated Slic3rPE.pot
2018-06-04 12:13:07 +02:00
Enrico Turri
6bf009edee
3DScene mouse event handler partially moved to c++ - part 2
2018-05-31 16:04:59 +02:00
Enrico Turri
30a3b2179b
3DScene timer and _variable_layer_thickness_action method moved to c++
2018-05-30 15:18:45 +02:00
Enrico Turri
5a8d1ffdba
Prototype for exporting estimated remaining time into gcode for default and silent mode
2018-05-30 12:08:03 +02:00
Lukas Matena
db22b2f504
Bugfix: first color of the wipe tower preview was incorrect with some models
2018-05-30 11:02:00 +02:00
Lukas Matena
b95a6f2626
Fix of previous commit
2018-05-29 15:29:20 +02:00
Enrico Turri
5c745485e1
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-29 13:56:41 +02:00
Enrico Turri
38d0c964d8
Merge branch 'master' of https://github.com/prusa3d/Slic3r into 3mf_io
2018-05-29 13:55:46 +02:00
Enrico Turri
363a964ebb
3DScene render method partially moved to c++
2018-05-29 13:54:34 +02:00
Lukas Matena
cb5f5c65b0
Analyzer tags for the wipe tower also generate layer height and line width (so the priming lines+brim are visible and ramming lines are correct width)
2018-05-29 12:41:40 +02:00
Lukas Matena
e4aff5b08a
Feedrate on the first layer of the wipe tower properly set (bugfix)
2018-05-29 09:07:23 +02:00
Enrico Turri
c51ce63b9b
3DScene layer editing overlay completely moved to c++
2018-05-25 15:56:14 +02:00
Enrico Turri
157a34bcd9
AMF I/O - Automatic detection if open file is zip archive or xml format
2018-05-24 09:57:12 +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
bubnikv
a9499ae45c
Fix of a crash intruduced with e8247c5646
2018-05-23 13:19:25 +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
bubnikv
306d77559e
Merge remote-tracking branch 'remotes/origin/scene_manipulators'
2018-05-22 14:32:07 +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
Lukas Matena
e2f44a231e
A fix to use correct spacing with multiloop skirts
2018-05-22 10:50:38 +02:00
Lukas Matena
99293011e6
Corrected brim generation (width), enabling continuity with skirt
2018-05-18 12:19:54 +02:00
Enrico Turri
5224acad59
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-18 09:55:30 +02:00
Enrico Turri
6c6b8ccc42
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-18 09:55:21 +02:00
bubnikv
3f08ef70f1
Fix of extraneous infill over thin walls.
...
Fixes https://github.com/prusa3d/Slic3r/issues/670
and some of https://github.com/prusa3d/Slic3r/issues/895
PerimeterGenerator was using an unsafe clipper offset function,
which performed offset for both a contour and its holes together.
With this commit the offsets were replaced with their safe counterparts,
though these safe counterparts may be somehow slower
(performing offset on ExPolygon or ExPolygons, piece by piece).
Also there was a bug, where if the infill & gap fill consumed
everything of the polygon, a polygon one onion shell above was still
used for infill.
2018-05-18 09:52:09 +02:00
Enrico Turri
f34250ea6a
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-18 09:29:14 +02:00
Enrico Turri
255bec7432
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-18 09:29:05 +02:00
bubnikv
651c4ab0ae
Fixed a typo in AppConfig
2018-05-18 08:46:33 +02:00
Enrico Turri
d56b543ff8
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-18 08:32:19 +02:00
Enrico Turri
d85fd5501c
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-18 08:32:09 +02:00
bubnikv
19221b749c
Fix of https://github.com/prusa3d/Slic3r/issues/869
2018-05-18 08:21:24 +02:00
Enrico Turri
7ca9f46b9c
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-17 14:43:27 +02:00
Enrico Turri
f26bce2538
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-17 14:43:18 +02:00
bubnikv
35bf4aee7d
Fixed loading of configuraton values octoprint_host, support_material_threshold
...
They were incorrectly handled by the handle_legacy() function, which has been
ported from the upstream Slic3r without inspecting its content.
2018-05-17 14:08:50 +02:00
Enrico Turri
15f35a9e9e
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-17 12:12:27 +02:00
Enrico Turri
74b0ed4b23
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-17 12:12:18 +02:00
bubnikv
e3d84407e0
Fix of https://github.com/prusa3d/Slic3r/issues/896
...
Fixed a bug in parsering a Point from a config file.
2018-05-17 10:30:20 +02:00
Enrico Turri
7a6d83e7eb
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-17 08:33:32 +02:00
Enrico Turri
853ebf6ad2
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-17 08:33:16 +02:00
bubnikv
4b87f71bbc
Fix of the previous commmit. gcc and clang rightfully complained about a typo.
2018-05-15 14:20:32 +02:00
bubnikv
868b400120
Merge branch 'master' of https://github.com/prusa3d/slic3r
2018-05-15 14:04:49 +02:00
bubnikv
7645e9cb7a
Added layer_num, layer_z variables to the end_gcode, end_filament_gcode,
...
added min(.,.), max(.,.) functions to the placeholder parser syntax.
2018-05-15 14:04:29 +02:00
Enrico Turri
c60bf694ef
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-15 12:22:44 +02:00
Enrico Turri
43784f3409
Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp
2018-05-15 12:22:35 +02:00
Enrico Turri
a612b5b648
Replacement of xml escape characters when exporting to amf
2018-05-15 12:19:43 +02:00
Enrico Turri
f4303ebdb8
1st attempt of perl callback from c++ for 3DScene
2018-05-15 09:50:01 +02:00
Enrico Turri
1edd2d01f0
Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators
2018-05-14 10:01:27 +02:00
