Filip Sykala
c96f642b0a
Merge branch 'master' into fs_emboss
2022-03-30 19:52:38 +02:00
rtyr
69732e4b2a
Voron Trident 350mm resources
2022-03-30 16:15:51 +02:00
rtyr
cc76864666
Added Zonestar bundle
2022-03-30 16:14:55 +02:00
rtyr
8b73d8b65a
Added Zonestar bundle
...
based on https://github.com/slic3r/slic3r-profiles/pull/19
2022-03-30 16:12:14 +02:00
rtyr
6922cd8cf1
Added Trident 350mm resources
...
https://github.com/prusa3d/PrusaSlicer-settings/issues/154
2022-03-30 16:10:11 +02:00
rtyr
a4cd63186a
Snapmaker bundle.
2022-03-26 19:27:10 +01:00
Filip Sykala
0a20b04bc8
Merge branch 'master' into fs_emboss
2022-03-25 15:09:31 +01:00
rtyr
ea3e3f95b1
Fixed comment.
2022-03-25 12:19:00 +01:00
rtyr
bab44b3833
Initial Snapmaker bundle
2022-03-25 12:17:36 +01:00
Filip Sykala
e50e999b8e
Merge branch 'master' into fs_emboss
2022-03-25 09:16:01 +01:00
YuSanka
2b8f99ada6
Localization :
...
* Fix for #8024 - Wrong translation (German)
+ Translated phrases from wxWidgets localization are added to zh_CH dictionary
+ Updated MO-files for DE and zh_CH dictionaries
2022-03-24 13:02:43 +01:00
rtyr
fa565ca468
Sync with PrusaSlicer-settings.
2022-03-24 12:26:28 +01:00
rtyr
ce578439c6
Sync with PrusaSlicer-settings.
2022-03-24 12:23:57 +01:00
kangkang
b1ef96b3a3
Update Simplified Chinese translation
2022-03-24 12:13:15 +01:00
Filip Sykala
a7d3195ec0
Merge branch 'master' into fs_emboss
2022-03-22 15:48:51 +01:00
enricoturri1966
86641a481e
Fixed typo
2022-03-22 15:35:02 +01:00
Filip Sykala
65909c74c4
Merge branch 'master' into fs_emboss
...
# Conflicts:
# src/libslic3r/Technologies.hpp
2022-03-22 12:52:16 +01:00
enricoturri1966
9be3d926c5
Tech ENABLE_LEGACY_OPENGL_REMOVAL - A few refactorings and fixes
2022-03-22 08:18:39 +01:00
Filip Sykala
fec171d14e
Merge branch 'master' into fs_emboss
...
# Conflicts:
# src/libslic3r/Technologies.hpp
2022-03-21 21:40:37 +01:00
enricoturri1966
a2a9281ec8
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_opengl_3
2022-03-21 13:10:57 +01:00
enricoturri1966
76d1d4949b
Tech ENABLE_GL_SHADERS_ATTRIBUTES - Added shaders for glsl version 140
2022-03-21 13:10:47 +01:00
rtyr
b263ab9a8e
Readded Photon MONO X
2022-03-18 15:42:15 +01:00
rtyr
8a340a0cf7
Sync with PrusaSlicer-settings
2022-03-18 15:39:30 +01:00
YuSanka
9658c9c6b7
Merge remote-tracking branch 'origin/master' into ys_cut
2022-03-18 11:32:33 +01:00
rtyr
b56874e9fe
Sync with PrusaSlicer-settings
...
1.0.2
2022-03-17 23:07:01 +01:00
YuSanka
e785a66a01
Cut: Added possibility to delete a selected connector
...
+ Save connector position in object's local coordinates
+ Added missed cut_.svg
2022-03-17 17:41:36 +01:00
rtyr
dfd6ca899a
Sync with PrusaSlicer-settings
2022-03-17 13:41:08 +01:00
enricoturri1966
2922710cc4
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2022-03-14 09:04:55 +01:00
enricoturri1966
d0d89a4d5b
Tech ENABLE_GL_IMGUI_SHADERS - Render imgui using shaders
2022-03-14 09:04:44 +01:00
rtyr
b32c97ea76
Added Ender-3 Pro.
2022-03-11 10:55:47 +01:00
rtyr
d9e17c73dd
Merge pull request #7995 from nberardi/master
...
Creality Bundle Enhancements for Ender-3 Pro
2022-03-11 10:53:51 +01:00
enricoturri1966
321f94afd0
Merge remote-tracking branch 'origin/et_world_coordinates' into fs_emboss
2022-03-10 13:22:36 +01:00
enricoturri1966
05b65c3a43
Fixed conflicts after merge with branch et_world_coordinates
2022-03-10 13:22:20 +01:00
Lukas Matena
68ca42abbf
Merge branch 'stable'
2022-03-10 12:29:17 +01:00
rtyr
7a9be87775
Added Anycubic 4Max Pro 2.0 profile and resources.
...
based on https://hartrusion.com/en/prusaslicer-config-for-anycubic-4max-pro-2-0/
2022-03-10 10:12:41 +01:00
rtyr
578b80e12c
Readded Photon Mono X
2022-03-10 09:41:09 +01:00
rtyr
c2140b4b1e
Added 4Max Pro 2.0 profile and resources
2022-03-10 09:22:57 +01:00
enricoturri1966
57ffa4d9ee
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_opengl_3
2022-03-09 12:06:09 +01:00
Filip Sykala
f75f326f8e
Merge branch 'master' into fs_emboss_with_CGAL_5_4
...
# Conflicts:
# src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp
2022-03-09 11:08:39 +01:00
Filip Sykala
70b94d592b
Merge branch 'et_world_coordinates' into fs_emboss_with_CGAL_5_4
...
# Conflicts:
# src/libslic3r/Technologies.hpp
# src/slic3r/GUI/Gizmos/GLGizmoBase.hpp
# src/slic3r/GUI/Gizmos/GLGizmosManager.cpp
2022-03-09 11:06:58 +01:00
enricoturri1966
31c3952e2d
Removed obsolete shaders
2022-03-08 12:50:00 +01:00
enricoturri1966
65b5af9561
Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
...
Shader: variable_layer_height
2022-03-08 12:48:21 +01:00
enricoturri1966
dbdc272c4e
Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
...
Shader: mm_gouraud
2022-03-08 11:17:34 +01:00
enricoturri1966
3e47253725
Follow-up of 66fa2b1e26
- Cleanup
2022-03-08 10:59:12 +01:00
enricoturri1966
66fa2b1e26
Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
...
Shader: mm_contour
2022-03-08 10:57:43 +01:00
davidjuanesb
0ffba3c484
Catalan language updated to 2.4.1 RC1
2022-03-08 10:29:14 +01:00
enricoturri1966
9fb350e3dd
Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
...
Shader: gouraud
2022-03-07 15:31:23 +01:00
enricoturri1966
f4726f738c
Follow-up of 005fef7bf6
- Fixed highlight arrows for gizmos bar and toolbars
2022-03-07 15:06:45 +01:00
rtyr
8d3f4e633e
Added Ender 3 Pro thumbnail
2022-03-07 15:06:43 +01:00
rtyr
ea88d0b0ae
added Ender 3 Pro thumbnail
2022-03-07 15:05:23 +01:00