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

7776 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
supermerill
0bb658f928 update readme 2018-12-19 19:12:47 +01:00
supermerill
000d6a4aac change option priority, change "prusa" to "++" 2018-12-19 19:03:11 +01:00
supermerill
86d73b9a2a Merge branch 'master_slic3rPE_PR' into masterPE 2018-12-19 18:22:51 +01:00
supermerill
a658ae653e Merge branch 'master' into masterPE (renaming) 2018-12-19 18:18:18 +01:00
supermerill
5138597093 gitignore ignore deps-build 2018-12-19 17:23:52 +01:00
supermerill
a36142d258 merge complete 2018-12-19 17:14:11 +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
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
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
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
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
0a6e4cb39a Scalable toolbar icons 2018-12-17 11:11:49 +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
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
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
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
bubnikv
6da83c7976 Make the increase of extruder motor current during MM filament 
exchange sequences configurable.
 2018-12-14 20:09:10 +01:00
bubnikv
37806c020a Temporarily disabled the following check: 
"Levitating objects cannot be printed without support"
until the unit tests are adjusted.
 2018-12-14 19:40:02 +01:00
bubnikv
77d37f108c Iterative, not recursive, version of the Douglas-Peucker-Ramer algorithm 
based on the work by @fuchstraumer
https://github.com/slic3r/Slic3r/pull/3825
https://gist.github.com/fuchstraumer/9421573fc281b946e5f561758961212a
which was based on
http://anis-moussa.blogspot.com/2014/03/ramer-douglas-peucker-algorithm-for.html
 2018-12-14 19:29:58 +01:00
bubnikv
780b5667f3 Merge branch 'master' of https://github.com/Prusa3d/Slic3r 2018-12-14 17:19:31 +01:00
bubnikv
d6471e7b07 Fix of SLADisplayOrientation updates 2018-12-14 17:19:17 +01:00
bubnikv
506cbcb4a7 Fix of G-code invalidation on "wipe_into_object" "wipe_into_infill" 
changes.

WIP: Fix of "levitating objects cannot be sliced".
 2018-12-14 17:17:51 +01:00
YuSanka
880c1ef2b4 Next try to fix scroll the Object List to selected item (OSX & GTK) 2018-12-14 17:10:08 +01:00
YuSanka
907e510535 Changed PrusaBitmapTextRenderer's inheritance to wxDataViewRenderer instead of wxDataViewCustomRenderer : 
to fix name editing under OSX
 2018-12-14 17:10:08 +01:00
tamasmeszaros
dae01af2ac Logging during sla processing. 2018-12-14 16:58:55 +01:00
tamasmeszaros
2be23c8b14 Eliminate build warning with TBB_USE_CAPTURED_EXCEPTION 
also make small adjustment on wxWidgets detection on Unix.
 2018-12-14 13:45:58 +01:00
YuSanka
48a94ebae1 Fixed scroll the Object List to selected item on OSX & GTK 
+ fixed #1395 (maximum PresetComboBox's width limit on Ubuntu)
 2018-12-14 12:11:23 +01:00
Enrico Turri
728a124759 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2018-12-14 10:09:10 +01:00
tamasmeszaros
2d29b7d6cd Fix msvc build 2018-12-14 10:07:35 +01:00
tamasmeszaros
10bfa82107 Fix msvc build 2018-12-14 09:57:48 +01:00
Enrico Turri
07943ae669 Fixed import from 3mf of rotated models 2018-12-14 09:52:15 +01:00
supermerill
9a827d1a8b medial_axis changes from review 2018-12-13 19:41:37 +01:00
Vojtech Kral
f3e238073b Mac OS build: Set a default SDK target, fix c/cxx flags in deps/boost 2018-12-13 18:52:03 +01:00
tamasmeszaros
a16e419138 Fix for SPE-688 (crash when saving zip to low disk space) 2018-12-13 18:49:08 +01:00