bubnikv
485de8e936
Merge branch 'master' of https://github.com/Prusa3d/Slic3r
2018-12-17 19:46:49 +01:00
bubnikv
2c63af5dd9
Fix of SPE-607
2018-12-17 19:46:36 +01:00
YuSanka
17164ee333
Fixed #1225 (Added "Parameter validation" for "mm or %" values)
...
+ fixed correct updating of the "Contact Z distance" parameter
2018-12-17 18:08:32 +01:00
YuSanka
01edb23ffc
Fixed the enabling of the "split to objects/parts" buttons
2018-12-17 18:08:32 +01:00
bubnikv
9463351abd
Merge branch 'master' of https://github.com/Prusa3d/Slic3r
2018-12-17 18:04:37 +01:00
bubnikv
6411ab5b63
Fix of SPE-607
...
Part changed to Support enforcer is not sliced with one another part
2018-12-17 18:04:23 +01:00
Vojtech Kral
862217a6b3
OctoPrint basics working, niceties to-do
2018-12-17 17:14:00 +01:00
supermerill
a4f9c28a9a
move files
2018-12-17 16:02:26 +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
tamasmeszaros
b613334b81
Considering multiple neighboring triangles for support point normals
2018-12-17 15:58:15 +01:00
Enrico Turri
8530cc21a8
Merge branch 'master' of https://github.com/prusa3d/Slic3r
2018-12-17 15:46:29 +01:00
Enrico Turri
f7a6ee9e29
Fixed volume shown in info panel for scaled objects
2018-12-17 15:45:20 +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
Enrico Turri
c879154ffb
Merge branch 'master' of https://github.com/prusa3d/Slic3r
2018-12-17 15:30:54 +01:00
Enrico Turri
11cf10774b
Fixed import from PrusaControl files
2018-12-17 15:28:17 +01:00
Enrico Turri
fe646da12c
Merge branch 'master' of https://github.com/prusa3d/Slic3r
2018-12-17 14:54:30 +01:00
Enrico Turri
cdc654540b
Added accelerator table on Windows to let numpad work with CTRL key as required by window menu shortcuts
2018-12-17 14:40:54 +01:00
Enrico Turri
12fd5c500b
Merge branch 'master' of https://github.com/prusa3d/Slic3r
2018-12-17 14:11:04 +01:00
Enrico Turri
985cd17265
Axes rendering
2018-12-17 14:09:35 +01:00
Enrico Turri
2bb11d4095
Merge branch 'master' of https://github.com/prusa3d/Slic3r
2018-12-17 13:21:52 +01:00
Enrico Turri
40f74fe6eb
Added background texture to gizmos overlay
2018-12-17 13:20:57 +01:00
supermerill
eaedfde887
fr loc file updated (because of en typos).
2018-12-17 12:58:39 +01:00
supermerill
3a7324862c
Merge branch 'master_slic3rPE_PR'
2018-12-17 12:53:33 +01:00
supermerill
35808fef10
typos (thanks to photog0411)
2018-12-17 12:52:35 +01:00
Enrico Turri
b00178013f
Merge branch 'master' of https://github.com/prusa3d/Slic3r
2018-12-17 12:50:34 +01:00
Enrico Turri
57e80f896c
Small refactoring into gizmos overlay in preparation for background texture
2018-12-17 12:49:47 +01:00
YuSanka
825f3641e2
Created GetRowByItem() to fix the Scrolling of the Object List to selected item under all platforms
...
+ temporary suppressed object/part mane editing under OSX
2018-12-17 12:47:08 +01:00
Enrico Turri
4dc1eee560
Merge branch 'master' of https://github.com/prusa3d/Slic3r
2018-12-17 12:42:16 +01:00
supermerill
e4a0f71d3c
medial axis bugfix (ctd)
2018-12-17 12:41:51 +01:00
supermerill
7c4aa2f4cc
medial_axis changes from review
2018-12-17 12:40:21 +01:00
bubnikv
7e8d9c154d
WIP: Fix of PrusaControl import.
...
Now the transformation matrices need to be restored as well.
2018-12-17 12:11:51 +01:00
Enrico Turri
c85cee0ac0
Merge branch 'master' of https://github.com/prusa3d/Slic3r
2018-12-17 11:12:22 +01:00
Enrico Turri
0a6e4cb39a
Scalable toolbar icons
2018-12-17 11:11:49 +01:00
Enrico Turri
082f7f4924
Merge branch 'master' of https://github.com/prusa3d/Slic3r
2018-12-17 10:55:48 +01:00
Enrico Turri
083c626770
Added background texture to toolbars
2018-12-17 10:55:14 +01:00
Enrico Turri
49202b0698
Merge branch 'master' of https://github.com/prusa3d/Slic3r
2018-12-17 10:54:00 +01:00
Enrico Turri
4f7a9511aa
Merge branch 'master' of https://github.com/prusa3d/Slic3r
2018-12-17 10:44:11 +01:00
bubnikv
d0edc36400
Implemented M220 B / M220 R for backup / restore of the speed override
...
at the firmware. The M220 B / M220 R are only applied for MM prints
without any flex or soluble (PVA, BVOH) material, as for these materials
the MMU slows down the print using the M220 code.
fixes "LCD Speed Modifier Lost on Tool Change #421 "
2018-12-17 10:30:20 +01:00
Enrico Turri
c7ba9cb9b0
Merge branch 'master' of https://github.com/prusa3d/Slic3r
2018-12-17 10:27:40 +01:00
Enrico Turri
58acbd6bc9
Merge branch 'master' of https://github.com/prusa3d/Slic3r
2018-12-17 10:26:41 +01:00
bubnikv
45e611c9fc
Fixed M203 processing by the time estimator for Smoothieware.
...
Fixes "Print time estimate incorrect for Smoothie flavor with M203 #1259 "
2018-12-17 09:57:24 +01:00
YuSanka
9fbbbcabc8
Merge branch 'master' of https://github.com/prusa3d/Slic3r
2018-12-17 08:38:10 +01:00
YuSanka
18a6205738
Fixed build on OSX & Linux
2018-12-17 08:37:50 +01:00
Enrico Turri
debbca0f14
Merge branch 'master' of https://github.com/prusa3d/Slic3r
2018-12-17 08:29:23 +01:00
Enrico Turri
bcac116c9c
Merge branch 'master' of https://github.com/prusa3d/Slic3r
2018-12-17 08:28:21 +01:00
Merill
dc74caa8e8
Merge pull request #18 from photog0411/english-patch-1
...
English patch 1
2018-12-16 00:35:05 +01:00
photog0411
dd1d0f86dc
Update PrintConfig.cpp
2018-12-15 11:41:57 -05:00
photog0411
91760aa0dc
Update Tab.cpp
2018-12-15 11:36:27 -05:00
photog0411
b647bad807
Update PrintConfig.cpp
2018-12-15 11:34:17 -05:00
photog0411
288e678bd7
Update PrintConfig.cpp
2018-12-15 11:30:48 -05:00
