supermerill
6b20a930eb
Merge remote-tracking branch 'remotes/prusa/et_custom_bed'
...
sorry, forgot to commit it before doing changes.
so there are also the bug fix for #76 and #74
2019-07-03 20:47:31 +02:00
supermerill
3aea01e815
cherry-picked slic3r/Slic3r#4809
...
changed the ExtrusionEntity visitor a bit and add new ones.
2019-06-27 19:19:01 +02:00
supermerill
c6239850b0
new: fan startup delay. (or advanced speed-up)
2019-02-21 19:28:13 +01:00
supermerill
cfbafe4322
Sawtooth infill : may be useful for support interface (idea by e3D)
...
add a setting to select the support interface.
need some tests to see if it works.
2019-02-21 19:12:35 +01:00
supermerill
3cbb2f7524
Octoprint-Cancelobject : more reliable (i think) and add header for object bounding box.
2019-02-12 19:11:02 +01:00
supermerill
0680d6fe05
Merge remote-tracking branch 'remotes/prusa/master' into masterPE
2019-02-01 11:52:07 +01:00
bubnikv
57bd0889c3
Disabled the experimental pressure equalizer.
2019-01-29 18:07:45 +01:00
supermerill
a76bb026df
Merge remote-tracking branch 'remotes/prusa/master' into masterPE
2019-01-29 17:55:24 +01:00
bubnikv
aaaffd7f90
Fixes Add [layer_num] and [layer_z] to Custom Tool change G-code #1651
2019-01-29 12:02:48 +01:00
supermerill
1999974f7a
Merge remote-tracking branch 'remotes/prusa/master' into masterPE
2019-01-25 19:45:50 +01:00
bubnikv
54299d8eb0
Fix of https://github.com/prusa3d/Slic3r/issues/1631
...
This is a fix of a long standing bug, where an extrusion is incorrectly
drawn from the end of the last wipe move. Interestingly enough,
this bug is in Slic3r at least since 1.2.9, but lucky enough
it only occured for single perimeter, no infill prints with wipe after
retract enabled, and only if the two successive slices were discretized
exactly the same, which is quite unlikely.
2019-01-14 19:57:41 +01:00
supermerill
72d828cf74
Merge remote-tracking branch 'remotes/prusa/master' into masterPE
2019-01-03 14:47:34 +01:00
bubnikv
8bc04e640a
The G-code export was reshuffled a bit to reduce peak memory consumption.
...
Namely, the time estimate memory is released before the G-code
preview data is created from the G-code analyser data.
2018-12-18 17:34:21 +01:00
supermerill
2e2fee79ec
Merge branch 'masterPE' into master_slic3rPE_PR
...
# "resolved" Conflicts:
# lib/Slic3r/GUI/Plater.pm
# slic3r.pl
# src/libslic3r/EdgeGrid.cpp
# src/libslic3r/EdgeGrid.hpp
# src/libslic3r/Fill/Fill.cpp
# src/libslic3r/GCode.cpp
# src/libslic3r/GCode/PreviewData.cpp
# src/libslic3r/GCode/PreviewData.hpp
# src/libslic3r/GCode/WipeTowerPrusaMM.cpp
# src/libslic3r/Geometry.hpp
# src/libslic3r/LayerRegion.cpp
# src/libslic3r/Model.cpp
# src/libslic3r/MultiPoint.cpp
# src/libslic3r/Print.cpp
# src/libslic3r/PrintConfig.cpp
# src/libslic3r/PrintConfig.hpp
# src/libslic3r/PrintObject.cpp
# src/libslic3r/SupportMaterial.cpp
# src/libslic3r/TriangleMesh.cpp
# src/slic3r/AppController.hpp
# src/slic3r/AppControllerWx.cpp
# src/slic3r/GUI/3DScene.cpp
# src/slic3r/GUI/Field.cpp
# src/slic3r/GUI/GUI.cpp
# src/slic3r/GUI/GUI.hpp
# src/slic3r/GUI/OptionsGroup.cpp
# src/slic3r/GUI/Preset.cpp
# src/slic3r/GUI/Tab.cpp
# src/slic3r/GUI/Tab.hpp
# xs/CMakeLists.txt
# xs/xsp/AppController.xsp
# xs/xsp/GUI.xsp
# xs/xsp/Print.xsp
2018-12-17 15:58:41 +01:00
supermerill
a11db7a227
Merge tag 'mass_rename' into master_slic3rPE_PR
...
# "resolved" Conflicts:
# lib/Slic3r/GUI/Plater.pm
# lib/Slic3r/GUI/Plater/2DToolpaths.pm
# lib/Slic3r/GUI/Plater/ObjectCutDialog.pm
# lib/Slic3r/GUI/Plater/ObjectPartsPanel.pm
# lib/Slic3r/GUI/Plater/ObjectSettingsDialog.pm
# lib/Slic3r/GUI/Plater/OverrideSettingsPanel.pm
# src/libslic3r/EdgeGrid.cpp
# src/libslic3r/EdgeGrid.hpp
# src/libslic3r/ExPolygon.cpp
# src/libslic3r/ExtrusionEntity.hpp
# src/libslic3r/ExtrusionEntityCollection.hpp
# src/libslic3r/Fill/Fill.cpp
# src/libslic3r/Fill/FillBase.cpp
# src/libslic3r/Flow.cpp
# src/libslic3r/GCode.cpp
# src/libslic3r/GCode/ToolOrdering.cpp
# src/libslic3r/GCode/WipeTowerPrusaMM.cpp
# src/libslic3r/Geometry.cpp
# src/libslic3r/LayerRegion.cpp
# src/libslic3r/Model.cpp
# src/libslic3r/MultiPoint.cpp
# src/libslic3r/MultiPoint.hpp
# src/libslic3r/PerimeterGenerator.cpp
# src/libslic3r/PerimeterGenerator.hpp
# src/libslic3r/Polyline.cpp
# src/libslic3r/Polyline.hpp
# src/libslic3r/Print.cpp
# src/libslic3r/PrintConfig.cpp
# src/libslic3r/PrintConfig.hpp
# src/libslic3r/PrintObject.cpp
# src/libslic3r/SupportMaterial.cpp
# src/libslic3r/TriangleMesh.cpp
# src/libslic3r/TriangleMesh.hpp
# src/libslic3r/Utils.hpp
# src/libslic3r/utils.cpp
# src/slic3r/AppController.hpp
# src/slic3r/AppControllerWx.cpp
# src/slic3r/GUI/3DScene.cpp
# src/slic3r/GUI/GUI.cpp
# src/slic3r/GUI/GUI.hpp
# src/slic3r/GUI/Preset.cpp
# src/slic3r/GUI/ProgressIndicator.hpp
# src/slic3r/GUI/Tab.hpp
# xs/CMakeLists.txt
# xs/src/libslic3r/Layer.hpp
# xs/src/libslic3r/Line.cpp
# xs/src/libslic3r/Line.hpp
# xs/src/libslic3r/Point.hpp
# xs/src/libslic3r/Print.hpp
# xs/src/libslic3r/PrintRegion.cpp
# xs/src/slic3r/AppController.cpp
# xs/xsp/AppController.xsp
# xs/xsp/GUI.xsp
# xs/xsp/Print.xsp
2018-12-17 15:42:50 +01:00
Lukas Matena
9ca9e2a545
Merge branch lm_colorprint_integration into dev_native + deleting ticks outside slider range
2018-11-07 14:44:47 +01:00
bubnikv
0558b53493
WIP: Moved sources int src/, separated most of the source code from Perl.
...
The XS was left only for the unit / integration tests, and it links
libslic3r only. No wxWidgets are allowed to be used from Perl starting
from now.
2018-09-19 11:02:24 +02:00
