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

7966 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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