3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
21,013 Commits 1 Branch 1 Tag 249 MiB
f100a59688
Commit Graph

1448 Commits

Author SHA1 Message Date
tamasmeszaros
f100a59688 Cherry-picking 118f4859c472ccbc30b43101c6674dadc81d7b12 
And resolve conflicts
 2022-11-29 11:14:19 +01:00
Filip Sykala - NTB T15p
7c1a513e5a Merge branch 'master' into fs_emboss 
# Conflicts:
#	src/slic3r/GUI/GLCanvas3D.cpp
 2022-11-21 10:16:25 +01:00
rtyr
edc499fa9c
Sync with PrusaSlicer-settings 2022-11-21 09:24:37 +01:00
Filip Sykala - NTB T15p
c77f8373bd Merge branch 'master' into fs_emboss 
# Conflicts:
#	src/libslic3r/Technologies.hpp
#	src/slic3r/GUI/GLCanvas3D.cpp
#	src/slic3r/GUI/Gizmos/GLGizmosManager.cpp
#	src/slic3r/GUI/Plater.cpp
#	src/slic3r/GUI/Selection.hpp
 2022-11-07 15:44:33 +01:00
rtyr
c1fec355d3
Initial Anker bundle 
https://github.com/prusa3d/PrusaSlicer/pull/9075
 2022-11-02 09:42:50 +01:00
enricoturri1966
2c9d047520 Fixed conflicts after merge with master 2022-10-31 14:59:41 +01:00
YuSanka
fbcdd4191b Merge remote-tracking branch 'PRIVATE/master' into ys_emboss_with_master 2022-10-27 13:09:55 +02:00
YuSanka
cf0f257d05 Merge remote-tracking branch 'PRIVATE/ys_cut' into master 2022-10-27 10:21:23 +02:00
YuSanka
a68dcb68a3 Localization: Updated NL dictionary 
+ Fixed format issue from a856cb29e1
 2022-10-26 16:24:36 +02:00
brightstonesong
a856cb29e1 Update PrusaSlicer_ko_KR.po 
filling in blanks and rewriting.
 2022-10-26 15:55:54 +02:00
YuSanka
bba6d8b94d Merge remote-tracking branch 'PRIVATE/master' into ys_cut 2022-10-25 16:16:36 +02:00
enricoturri1966
7ae4472827 Merge branch 'master' of https://github.com/Prusa-Development/PrusaSlicerPrivate into et_surface 2022-10-24 12:57:39 +02:00
Filip Sykala - NTB T15p
bd6a3bc8a2 Merge branch 'master' into fs_emboss 2022-10-14 19:08:23 +02:00
rtyr
53e9a8f687
Removed BETA label. 2022-10-14 13:01:34 +02:00
Filip Sykala - NTB T15p
6d4830823e Merge branch 'master' into fs_emboss 
# Conflicts:
#	src/libslic3r/Point.hpp
 2022-10-12 16:21:37 +02:00
enricoturri1966
b821f1a33e New icon for Measure Gizmo 2022-10-12 09:10:51 +02:00
Lukas Matena
bd63320a00 Measuring: separated another gizmo 2022-10-12 09:10:50 +02:00
rtyr
0219709d1f
Sync with PrusaSlicer-settings. 2022-10-06 22:03:26 +02:00
rtyr
934d51d26f
Taz Workhorse thumbnail 2022-10-06 22:00:48 +02:00
Filip Sykala - NTB T15p
bdf8c5ce88 Merge branch 'master' into fs_emboss 2022-10-06 12:25:17 +02:00
rtyr
8484f74967
Sync with PrusaSlicer-settings 2022-10-05 16:28:41 +02:00
Filip Sykala - NTB T15p
e340fa6abe Merge branch 'master' into fs_emboss 
# Conflicts:
#	src/libslic3r/AABBTreeLines.hpp
#	src/libslic3r/ExPolygon.hpp
#	tests/libslic3r/test_aabbindirect.cpp
 2022-10-05 15:14:54 +02:00
rtyr
8a54f91548
Sync with PrusaSlicer-settings. 2022-10-05 13:29:45 +02:00
rtyr
6549342008
Initial Print4Taste bundle. 
https://github.com/prusa3d/PrusaSlicer-settings/pull/168
 2022-10-05 11:49:44 +02:00
YuSanka
b4f38883a8 Merge remote-tracking branch 'PRIVATE/master' into ys_cut 2022-10-03 11:30:49 +02:00
Filip Sykala - NTB T15p
0e3b7cae12 Merge branch 'master' into fs_emboss 
# Conflicts:
#	src/libslic3r/Technologies.hpp
#	src/slic3r/GUI/GLCanvas3D.cpp
 2022-09-29 18:47:21 +02:00
rtyr
bb1b21513f
RatRig 1.0.1 Improvements and fixes. 
https://github.com/prusa3d/PrusaSlicer/pull/8955
 2022-09-29 09:37:36 +02:00
YuSanka
0201a5055a Cut WIP: 
* Suppress to split cut objects
* ObjectList:
  * Use another icons to mark the cut objects and connectors 
  * For the cut object show parts, which are not connectors
* Set different colors for the Plugs and Dowels
* CutGizmo:
  * Invalidate CutGizmo after changes in ObjectList or perform a cut
  * CupPlane in Connectors mode: Unselect selection, when click on empty space
  * Connectors mode: Fixed performance issue
 2022-09-27 16:17:09 +02:00
Filip Sykala - NTB T15p
8f644f5e08 Merge branch 'master' into fs_emboss 
# Conflicts:
#	src/slic3r/GUI/GLCanvas3D.cpp
#	src/slic3r/GUI/Selection.cpp
 2022-09-23 14:11:47 +02:00
YuSanka
b2d5fd72e9 Merge remote-tracking branch 'PRIVATE/master' into ys_cut 2022-09-23 13:32:32 +02:00
rtyr
21a25fa0a2
Creality 0.2.2 
https://github.com/prusa3d/PrusaSlicer/pull/8848
 2022-09-20 08:42:36 +02:00
YuSanka
737117e474 Merge remote-tracking branch 'PRIVATE/master' into ys_cut 2022-09-19 08:26:52 +02:00
Filip Sykala - NTB T15p
ed6a1b18f3 Merge branch 'master' into fs_emboss 
# Conflicts:
#	src/slic3r/GUI/GLCanvas3D.cpp
#	src/slic3r/GUI/Selection.cpp
 2022-09-14 11:28:36 +02:00
rtyr
0559332ca8
Added thumbnail for Ender 5 Pro 
This printer model will be commented for now. 
https://github.com/prusa3d/PrusaSlicer/pull/8848
 2022-09-13 13:35:55 +02:00
rtyr
c22c05cafa
fixed description 2022-09-13 11:43:07 +02:00
rtyr
c440e5f80b
Initial Rigid3D bundle 
https://github.com/prusa3d/PrusaSlicer/pull/8832
 2022-09-13 11:42:08 +02:00
YuSanka
484eae7a1c Merge remote-tracking branch 'PRIVATE/master' into ys_cut 2022-09-08 13:32:14 +02:00
Lukas Matena
5bf04d7964 Merge branch 'master_250' 2022-09-07 15:19:21 +02:00
YuSanka
f00a750362 Localization: Next phrases improvements 2022-09-05 15:46:07 +02:00
YuSanka
09997bcd65 Localization: Added STEP for the "Import..." phrases 2022-09-05 14:23:58 +02:00
YuSanka
130f0dff84 Follow-up 3b1f1d9444 - added missed icon 2022-09-05 11:32:41 +02:00
YuSanka
0e217c7110 Manually merge for #8787 - Updated Catalan language to 2.5.0 RC2 2022-09-01 10:02:41 +02:00
Filip Sykala - NTB T15p
c549c6afbe Merge branch 'master' into fs_emboss 
# Conflicts:
#	src/libslic3r/CMakeLists.txt
#	src/libslic3r/Format/3mf.cpp
#	src/libslic3r/Model.hpp
#	src/libslic3r/Point.hpp
#	src/libslic3r/Technologies.hpp
#	src/slic3r/CMakeLists.txt
#	src/slic3r/GUI/GLCanvas3D.cpp
#	src/slic3r/GUI/GLSelectionRectangle.cpp
#	src/slic3r/GUI/GUI_Factories.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoMove.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoMove.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp
#	src/slic3r/GUI/MeshUtils.cpp
#	src/slic3r/GUI/MeshUtils.hpp
#	src/slic3r/GUI/ObjectDataViewModel.cpp
#	src/slic3r/GUI/ObjectDataViewModel.hpp
#	src/slic3r/GUI/Selection.cpp
 2022-08-31 15:22:10 +02:00
Lukas Matena
d7a34f7e40 Merge branch 'master_250' 2022-08-30 16:31:07 +02:00
rtyr
d53b0f8b3b
Sync with PrusaSlicer-settings 2022-08-26 11:12:36 +02:00
rtyr
508739a011
Speed improvements, start gcode changes, added HIPS filament. 
https://github.com/prusa3d/PrusaSlicer/pull/8762
 2022-08-25 22:45:31 +02:00
rtyr
106bf141af
Bumped up bundle version 2022-08-24 09:26:12 +02:00
rtyr
de3720c7b1
Added Ender 3 Neo and Ender 3 S1 Plus thumbnails 
https://github.com/prusa3d/PrusaSlicer/pull/8746
 2022-08-24 09:25:11 +02:00
rtyr
d4c69c22f7
Merge pull request #8746 from pmjdebruijn/creality_250 
Creality.ini: various updates
 2022-08-24 09:23:26 +02:00
Pascal de Bruijn
5d724b3849 Creality.ini: add Ender-3 Neo 2022-08-23 18:23:58 +02:00