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
rtyr
21a25fa0a2
Creality 0.2.2
...
https://github.com/prusa3d/PrusaSlicer/pull/8848
2022-09-20 08:42:36 +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
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
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
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
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
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
5e23694e16
Added initial Elegoo bundle.
...
https://github.com/prusa3d/PrusaSlicer-settings/issues/162
2022-08-10 14:59:32 +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
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
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