GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-16 20:35:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
8,485 Commits 65 Branches 55 Tags
Commit Graph

8485 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
YuSanka
7d1fb201e7 Implemented updating of the settings values for PointCtrl and Choice. 
* wx_EVT_KILL_FOCES doesn't handled on OSX, so values are updating on wx_EVT_TEXT like a temporary workaround.
 2018-12-18 15:29:49 +01:00
Enrico Turri
9335eb9780 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2018-12-18 14:46:10 +01:00
Vojtech Kral
66b5deccf5 PrintHost: Basic SL1 support 2018-12-18 14:37:35 +01:00
bubnikv
59b01b4908 Merge branch 'master' of https://github.com/Prusa3d/Slic3r 2018-12-18 14:10:44 +01:00
bubnikv
bffcaeff41 Time estimator: Added consumed memory tracing, replaced std::map 
with std::vector for lower memory consumption.
 2018-12-18 14:10:31 +01:00
Enrico Turri
4b55126765 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2018-12-18 14:10:07 +01:00
Enrico Turri
7077c1e4a1 Sidebar matrix field behavior for multiple volume selection 2018-12-18 14:08:46 +01:00
Enrico Turri
cc92d5c631 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2018-12-18 13:09:07 +01:00
Enrico Turri
d6b8ed3e3e Sidebar matrix field behavior for single volume selection 2018-12-18 13:07:50 +01:00
Enrico Turri
e498e3f37c Merge branch 'master' of https://github.com/prusa3d/Slic3r 2018-12-18 12:36:59 +01:00
Enrico Turri
3f96f6df84 Rendering of selection center (disabled) 2018-12-18 12:35:49 +01:00
bubnikv
6359bda0c0 Merge branch 'master' of https://github.com/Prusa3d/Slic3r 2018-12-18 12:05:26 +01:00
bubnikv
b8c8dfbb2f Fix of Linux/OSX build 2018-12-18 12:05:13 +01:00
Enrico Turri
411895e885 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2018-12-18 11:51:25 +01:00
Enrico Turri
f54f966663 Sidebar matrix field behavior for single full object selection 2018-12-18 11:50:22 +01:00
bubnikv
df9abe7d78 Merge branch 'master' of https://github.com/Prusa3d/Slic3r 2018-12-18 11:32:00 +01:00
bubnikv
771928d916 Logging of memory allocations on Windows during the slicing process 
when the SLIC3R_LOGLEVEL >= info.
 2018-12-18 11:31:41 +01:00
Enrico Turri
507d74c7aa Merge branch 'master' of https://github.com/prusa3d/Slic3r 2018-12-18 11:12:22 +01:00
Enrico Turri
d453b6fb3f Sidebar matrix field behavior for single full instance selection 2018-12-18 11:11:06 +01:00
Enrico Turri
653d40aa14 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2018-12-18 10:50:49 +01:00
Enrico Turri
a394e55e07 Added method ModelObject::full_raw_mesh() 2018-12-18 10:49:22 +01:00
Enrico Turri
35d949a22a Merge branch 'master' of https://github.com/prusa3d/Slic3r 2018-12-18 10:42:07 +01:00
Enrico Turri
334f747fa9 Sidebar matrix fields focus handling 2018-12-18 10:40:53 +01:00
Enrico Turri
6bc55fab41 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2018-12-18 10:10:35 +01:00
Enrico Turri
8854276965 Added size fields to sidebar matrix manipulators 2018-12-18 10:10:14 +01:00
Enrico Turri
022980889b Merge branch 'master' of https://github.com/prusa3d/Slic3r 2018-12-18 10:09:41 +01:00
bubnikv
1efb54cc6c Merge branch 'master' of https://github.com/Prusa3d/Slic3r 2018-12-18 09:57:33 +01:00
bubnikv
7cd612fc17 Fix of SPE-694 
Slicer do not generate infill after Contact Z distance settings change
 2018-12-18 09:57:19 +01:00
Enrico Turri
1dcea1da82 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2018-12-18 09:35:50 +01:00
Enrico Turri
a326ce06b1 Removed unneeded methods from ObjectManipulation 2018-12-18 09:34:41 +01:00
Enrico Turri
9b93a81b9d Merge branch 'master' of https://github.com/prusa3d/Slic3r 2018-12-18 09:19:18 +01:00
Enrico Turri
0eca8f14cc Fixed update of gcode preview view type when changing printer 2018-12-18 09:08:32 +01:00
Enrico Turri
acec513b2b Merge branch 'master' of https://github.com/prusa3d/Slic3r 2018-12-18 08:30:37 +01:00
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