YuSanka
9fe4595ae7
CutGizmo: Cut plane wasn't respect to the depth
...
+ ShapesGallery: added "universal wall mount hole"
2022-11-29 16:21:45 +01:00
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
brightstonesong
c4fb793aa6
Update PrusaSlicer_ko_KR.po
...
filling in blanks and rewriting.
2022-09-29 00:23:34 +09: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
c3bdf2fc28
Speed improvements, start gcode changes, added HIPS filament.
...
https://github.com/prusa3d/PrusaSlicer/pull/8762
2022-08-25 22:44:03 +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
Pascal de Bruijn
b7315aa9f4
Creality.ini: restore first_layer/top_infill_extrusion_widths
2022-08-23 17:43:41 +02:00
Pascal de Bruijn
201a359bea
Creality.ini: remove bowden inherit from direct drive printers
2022-08-23 17:19:21 +02:00
Pascal de Bruijn
57945708d9
Creality.ini: add Ender-3 S1 Plus
2022-08-23 17:17:35 +02:00
Pascal de Bruijn
4579f12613
Creality.ini: Ender-3 S1 (Pro) CR Touch support ( #8743 )
2022-08-23 17:17:15 +02:00
YuSanka
025b249b85
Localization: Update for zh_CN dictionary (manual merge for PR #8737 - Update translation for 2.5.0-rc1)
...
+ Fixed 1 line for JA dictionary
2022-08-22 12:40:50 +02:00
rtyr
b62689437a
Sync with PrusaSlicer-settings
2022-08-18 15:50:14 +02:00
rtyr
0c22ca3ece
Sync with PrusaSlicer-settings
2022-08-18 15:48:10 +02:00
YuSanka
dcdbc6bff1
Localization: Updated dictionary for JA
2022-08-18 13:43:47 +02:00
enricoturri1966
2b996158d2
Merge branch 'master' of https://github.com/Prusa-Development/PrusaSlicerPrivate into et_opengl_es_rebase
2022-08-18 12:51:55 +02:00
YuSanka
79e9df4b64
Merge remote-tracking branch 'PRIVATE/master' into ys_cut
2022-08-17 10:05:44 +02:00
YuSanka
a1b324d1ee
Merge remote-tracking branch 'PRIVATE/master' into ys_cut
2022-08-15 14:17:42 +02:00
Lukas Matena
bce2b148f4
Merged 2.5.0-beta1 into master (NO CONFLICTS FIXED)
2022-08-15 13:41:40 +02:00
YuSanka
60ad5d38c0
Localization: Some phrases are applied. Updated dictionaries for CS, DE, ES, FR, IT and PL
2022-08-15 12:30:57 +02:00
Valter F.C
db7946dbb6
pt_BR translation improvements
2022-08-12 10:02:58 -03:00
rtyr
991f2bdbd1
Sync with master_250
2022-08-11 11:34:34 +02:00
rtyr
dc9e35d8ea
Merge pull request #8602 from pmjdebruijn/creality_250
...
Creality.ini: Add alternative nozzle support
2022-08-11 11:30:17 +02:00
rtyr
1d1fb3fb37
Updated bed_shape
2022-08-11 09:59:45 +02:00
rtyr
84c2358bf0
Updated bed_shape
2022-08-11 09:58:23 +02:00
rtyr
5e23694e16
Added initial Elegoo bundle.
...
https://github.com/prusa3d/PrusaSlicer-settings/issues/162
2022-08-10 14:59:32 +02:00
rtyr
60c157e7cc
Update Elegoo.idx
2022-08-10 14:58:13 +02:00
rtyr
7281d66b07
Added Elegoo bundle
2022-08-10 14:57:03 +02:00
Pascal de Bruijn
2aa79d00ca
Creality.ini: adjust Geeetech Matte PLA
2022-08-09 19:57:36 +02:00
Pascal de Bruijn
ad0ac53685
Creality.ini: adjust infil_overlap
2022-08-09 19:56:26 +02:00
Pascal de Bruijn
9616f38de7
Creality.ini: adjust extrusion_widths
2022-08-09 19:56:09 +02:00
rtyr
fc6ca282dd
Added thumbnails.
...
https://github.com/prusa3d/PrusaSlicer/pull/8602
2022-08-09 12:40:32 +02:00
rtyr
3cad3f6b89
Added new Creality thumbnails.
2022-08-09 12:33:44 +02:00
rtyr
af32f8c5b7
Added thumbnails.
...
https://github.com/prusa3d/PrusaSlicer/pull/8602
2022-08-09 12:31:18 +02:00
YuSanka
2ac3861b2a
Merge remote-tracking branch 'PRIVATE/master' into ys_cut
2022-08-08 10:57:38 +02:00
Pascal de Bruijn
3c188c5a4f
Creality.ini: Add Geeetech Matte PLA
2022-08-04 18:28:06 +02:00
Pascal de Bruijn
54c5c116f6
Creality.ini: Add Ender-3 V2 Neo, Ender-3 Max Neo, CR-10 SMART Pro printers
2022-08-04 18:22:27 +02:00
Pascal de Bruijn
a8872a9211
Creality.ini: Add alternative nozzle support
2022-07-31 16:05:46 +02:00
YuSanka
27f7a8da0f
Cut WIP: Added shortcuts for "Edit connectors" ImGuiDialog
...
+ Added processing for the Ctrl+A ("Select All connectors")
2022-07-27 13:53:54 +02:00
YuSanka
e0031018a7
Manually merged PR #8544 - Add 2.5.0 translate for zh_CN language
2022-07-22 16:53:11 +02:00
YuSanka
1150639306
Gallery: Update for recycling symbols
2022-07-21 10:44:09 +02:00
enricoturri1966
ac7c4b342b
Added shaders for OpenGL ES
2022-07-21 10:18:18 +02:00
enricoturri1966
520261925f
Fixed conflicts after merge with master
2022-07-21 08:14:44 +02:00
Filip Sykala - NTB T15p
79a7f588b9
Merge branch 'et_world_coordinates' into fs_emboss
...
# Conflicts:
# src/libslic3r/CMakeLists.txt
# src/libslic3r/Format/3mf.cpp
# src/libslic3r/Model.hpp
# src/libslic3r/Technologies.hpp
# src/slic3r/GUI/GLCanvas3D.cpp
# src/slic3r/GUI/GUI_App.cpp
# src/slic3r/GUI/Gizmos/GLGizmoBase.cpp
# src/slic3r/GUI/Gizmos/GLGizmoBase.hpp
# src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp
# src/slic3r/GUI/Selection.cpp
# src/slic3r/GUI/Selection.hpp
2022-07-20 13:02:07 +02:00
Lukas Matena
fbdf777898
Merge branch 'master_250'
2022-07-15 15:04:10 +02:00
Filip Sykala - NTB T15p
8eda845562
save memory
2022-07-13 14:10:49 +02:00
YuSanka
200ab7441b
Added notification about "Lightning infill" + localization for this line
2022-07-13 11:11:32 +02:00
YuSanka
92f874cdea
Fix for #8450 - Tip Of The Day - configuration snapshots shortcut not work in the language Portuguese Brazil
...
Note: This bug was related not just for the language Portuguese Brazil but for all another dictionaries, where
for "&MenuItem" and "MenuItem" are used "&LocalMenuItem1" and "LocalMenuItem2" instead of "&LocalMenuItem" and "LocalMenuItem"
2022-07-12 14:57:11 +02:00
YuSanka
3bab1543dc
localization: Updated pt_BR/PrusaSlicer.mo
2022-07-07 15:53:38 +02:00
Lukas Matena
7bfb161474
Fixed typos in pt_BR translation
2022-07-07 15:42:38 +02:00
Valter F.C
acfc43986b
Updated pt_BR translation ( #8449 )
2022-07-07 15:42:38 +02:00
YuSanka
b0949b2dcf
Manually merged PR #8438 - Russian localization update for the version PrusaSlicer 2.5.0-alpha2
2022-06-30 10:06:19 +02:00
YuSanka
5976dde2fc
Back the PR #8330 - Localization: fixed a typo (JA), which was accidentally deleted in previous commit
...
+ Manually Added zh_CN dictionary from the PR #8425 - Update zh_CN
2022-06-29 16:56:56 +02:00
Lukas Matena
62e59a4526
Fixing conflicts part 1:
...
fixed simple conflicts
2022-06-29 16:43:29 +02:00
Lukas Matena
b61714bb3e
Merge branch 'master_250' (NO CONFLICTS FIXED):
...
CONFLICT (content): Merge conflict in resources/profiles/PrusaResearch.idx
CONFLICT (content): Merge conflict in resources/profiles/PrusaResearch.ini
CONFLICT (content): Merge conflict in src/libslic3r/CMakeLists.txt
CONFLICT (content): Merge conflict in src/libslic3r/Fill/Fill.cpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode.cpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode.hpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode/GCodeProcessor.cpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode/GCodeProcessor.hpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode/SeamPlacer.cpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode/SeamPlacer.hpp
CONFLICT (add/add): Merge conflict in src/libslic3r/Geometry/Curves.hpp
CONFLICT (content): Merge conflict in src/libslic3r/PerimeterGenerator.cpp
CONFLICT (content): Merge conflict in src/libslic3r/Point.hpp
CONFLICT (content): Merge conflict in src/libslic3r/PrintConfig.hpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/ConfigWizard.cpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/GCodeViewer.cpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/GLCanvas3D.cpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/GUI_App.cpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp
CONFLICT (content): Merge conflict in src/slic3r/Utils/FixModelByWin10.cpp
CONFLICT (modify/delete): t/perimeters.t deleted in HEAD and modified in master_250. Version master_250 of t/perimeters.t left in tree.
CONFLICT (content): Merge conflict in tests/fff_print/CMakeLists.txt
CONFLICT (content): Merge conflict in tests/fff_print/test_fill.cpp
CONFLICT (content): Merge conflict in version.inc
CONFLICT (modify/delete): xs/xsp/PerimeterGenerator.xsp deleted in HEAD and modified in master_250. Version master_250 of xs/xsp/PerimeterGenerator.xsp left in tree.
2022-06-29 14:37:14 +02:00
YuSanka
89a7f6bdb1
Merge remote-tracking branch 'origin/ys_wx317_master' into ys_cut
2022-06-29 11:44:11 +02:00
YuSanka
c51326f504
Localization: Updated DE, FR and JA dictionaries
2022-06-28 14:13:16 +02:00
YuSanka
d7421696ea
Localization: Fixes for CS, ES, IT and PL
2022-06-23 17:37:08 +02:00
rtyr
6d29c0584a
Added Arachne parameters. Changed default seam position. Updated output filename format.
2022-06-23 15:48:34 +02:00
YuSanka
4c65e468de
Localization: New POT and updated dictionaries for CZ, PL, IT and ES
...
+ Fix for minor issue https://github.com/prusa3d/PrusaSlicer/issues/5672#issuecomment-1160245417
+ Fix for #7858 - Small formatting error in dutch language
+ Community PO-files are extended by new phrases
2022-06-23 13:34:29 +02:00
Akimasa Konishi
234e9066d2
Localization : fixed a typo (JA)
2022-06-23 13:34:29 +02:00
Bral
044045f3cb
Fixed zh_CN translation ( #8383 )
2022-06-23 13:34:29 +02:00
YuSanka
8da37f568d
Updated splashscreen for GCodePreview
2022-06-22 17:18:23 +02:00
YuSanka
07dfcdd94c
Minor fixes for KR localization: Added missed line breaks
2022-06-17 17:37:34 +02:00
YuSanka
2688a29b08
SplashScreen: New image
...
+ PressureEqualizer" fixed warning
2022-06-17 17:14:14 +02:00
rtyr
2d7d8ba2f6
Added Infinity3D bundle.
2022-06-14 12:53:36 +02:00
rtyr
9fc47b9c3a
Added Infinity3D bundle.
...
https://github.com/prusa3d/PrusaSlicer/pull/8396
2022-06-14 12:44:25 +02:00
enricoturri1966
cd6155293b
Fixed conflicts after merge with master
2022-06-07 11:10:19 +02:00
rtyr
a1143ab26e
Creality and INAT update
2022-06-03 15:11:01 +02:00
rtyr
29610bcee1
XE750 thumbnail
2022-06-03 15:10:13 +02:00
rtyr
fb5c35ccd7
Ender 3 S1 Pro thumbnail
2022-06-03 15:09:31 +02:00
rtyr
0b617e2cf6
Fixed min_slic3r_version
2022-06-03 15:00:48 +02:00
rtyr
c5c0eed1bc
Merge pull request #8359 from MarkINAT/inat_update
...
Inat update
2022-06-03 14:58:56 +02:00
rtyr
689b274fd3
updated bundle version to 0.1.5
2022-06-03 14:57:07 +02:00
rtyr
eb7e46895e
Merge pull request #8322 from rk0n/master
...
Add profile for Creality Ender 3 S1 Pro and Verbatim PLA
2022-06-03 14:56:06 +02:00
MarkMan0
4e3369bbfc
Improve Proton X profiles, Add Proton XE-750 printer
2022-05-26 16:04:26 +02:00
enricoturri1966
c468dcbed7
Tech ENABLE_LEGACY_OPENGL_REMOVAL - Fixed calculation of normal matrices sent to shaders
...
Fixed conflicts during rebase with master
2022-05-26 12:25:55 +02:00
enricoturri1966
9dda2b0ed5
Refactoring in shader dashed_thick_lines
2022-05-26 11:39:53 +02:00
enricoturri1966
17293056d5
Refactoring in shader dashed_thick_lines
2022-05-26 11:39:53 +02:00
enricoturri1966
914a66e2c3
Tech ENABLE_GL_CORE_PROFILE - Thick lines shader enhanced to render dashed lines
...
Fixed conflicts while rebase with master
2022-05-26 08:11:04 +02:00
enricoturri1966
94305e5912
Fixes into thick_lines shader
2022-05-25 16:01:41 +02:00
enricoturri1966
017784c38e
Tech ENABLE_GL_CORE_PROFILE - Use thick_lines shader where needed
...
Fixed conflicts during rebase with master
2022-05-25 15:55:39 +02:00
enricoturri1966
389dc36053
Tech ENABLE_GL_CORE_PROFILE - Use OpenGL core profile context - 1st installment
...
Fixed conflicts during rebase with master
2022-05-25 15:29:10 +02:00
Filip Sykala
37961c36e8
Merge branch 'master' into fs_emboss
...
# Conflicts:
# src/libslic3r/Technologies.hpp
# src/slic3r/GUI/GLCanvas3D.cpp
# src/slic3r/GUI/GUI_App.cpp
2022-05-18 14:35:48 +02:00
rk0n
1cf75100fc
Remove filament spool weight from Verbatim PLA
2022-05-18 00:51:19 +02:00
rk0n
f6661f4217
Add Verbatim PLA to all Creality printers
2022-05-18 00:51:02 +02:00
rk0n
adaed9fdec
Change Alpha to Beta Badge
2022-05-18 00:46:40 +02:00
rk0n
c0ab4dc2f5
Add profile for Creality Ender 3 S1 Pro
2022-05-17 19:41:54 +02:00
rtyr
6605ad926f
Merge pull request #8251 from pmjdebruijn/creality
...
Fix Ender-3 Pro
2022-05-16 06:28:27 +02:00
YuSanka
04145abdfc
Merge remote-tracking branch 'origin/master' into ys_cut
2022-05-12 09:21:58 +02:00
Filip Sykala
34304a40bf
Merge branch 'master' into fs_emboss
2022-05-11 16:05:40 +02:00
rtyr
72b82547dd
Sync with PrusaSlicer-settings.
2022-05-10 13:19:18 +02:00
rtyr
d7857e75bc
Updated Voron v1 thumbnails.
2022-05-10 13:18:44 +02:00
YuSanka
41eaff1482
Merge remote-tracking branch 'origin/master' into ys_cut
2022-05-10 11:10:51 +02:00
YuSanka
0869f49124
Localization: Update for list.txt
2022-05-09 17:04:10 +02:00
YuSanka
9582a9b478
Merge remote-tracking branch 'origin/master' into ys_cut
2022-05-09 11:25:29 +02:00
Filip Sykala
05354eda0c
Merge branch 'master' into fs_emboss
...
# Conflicts:
# src/slic3r/GUI/GLCanvas3D.cpp
2022-05-06 08:58:04 +02:00
rtyr
ff58e73ef2
Sync with PrusaSlicer-settings
2022-05-04 09:05:00 +02:00
YuSanka
94f3aaacd4
Cut WIP: Undo/Redo implementation
2022-05-02 12:44:47 +02:00
Filip Sykala
3e9778b46b
Merge branch 'et_world_coordinates' into fs_emboss
2022-05-02 10:11:47 +02:00
YuSanka
73469ffa21
Merge remote-tracking branch 'origin/master' into ys_cut
2022-04-28 13:25:00 +02:00
rtyr
4dbb1f8699
Sync with PrusaSlicer-settings
2022-04-28 11:20:30 +02:00
Lukas Matena
56466abe99
Fixed conflicts after stable->master merge
2022-04-27 23:45:16 +02:00
Lukas Matena
09fe421fe8
Merge branch 'stable' (no conflicts fixed)
2022-04-27 22:24:13 +02:00
