Filip Sykala
c58a8302b6
Merge branch 'et_world_coordinates' into fs_emboss
...
# Conflicts:
# src/libslic3r/Technologies.hpp
2022-04-20 10:41:11 +02:00
Mário Victor Ribeiro Silva
6953b2f877
feat: add missing translations
2022-04-20 09:54:32 +02:00
Mário Victor Ribeiro Silva
198871c711
feat: add translations
2022-04-20 09:54:06 +02:00
Filip Sykala
ec2a562d2a
clean up svg icons
2022-04-14 09:59:22 +02:00
Filip Sykala
af663a81e1
new icons
2022-04-14 08:51:39 +02:00
YuSanka
566917bfb1
Shapes Gallery: Added PLA_recycling_symbol
...
+ OTHER_recycling_symbol and PETG_recycling_symbol are mirrored to be better placed on the bottom of a model.
2022-04-12 09:15:55 +02:00
enricoturri1966
bea50dce7c
Fixed rendering of printbed while the camera is below it
2022-04-11 08:38:09 +02:00
rtyr
169ef8bfe4
BIBO sync with PrusaSlicer-settings
2022-04-11 07:34:07 +02:00
rtyr
43d306260f
Added G92 E0 to ditto printer profiles.
2022-04-11 07:28:25 +02:00
rtyr
81df544623
Fixed min_version for 0.0.3
2022-04-11 07:12:56 +02:00
Walt Sorensen
58039fc361
Update version and minimum slic3r_version
...
Added add G92 E0 to prevent error accumulation to before layer change. noting changes and version here.
2022-04-10 18:09:01 -06:00
Walt Sorensen
0d781b38e8
add G92 E0 to prevent marlin error accumulation
...
As of PrusaSlicer 2.4.1 we need to add G92 E0 to layer change to prevent error accumulation in marlin firmware and relative extrusion. tThis also eliminates the "error" notice in the slicer.
https://github.com/prusa3d/PrusaSlicer/releases/tag/version_2.4.1-beta3
2022-04-10 17:48:30 -06:00
Filip Sykala
40817f537b
Merge branch 'master' into fs_emboss
2022-04-07 16:34:28 +02:00
enricoturri1966
a4435d214f
Shader mm_contour - Customizable offset to calculate the correction to avoid z-fighting (MESA driver needs bigger one)
2022-04-07 12:59:11 +02:00
enricoturri1966
0995cfc658
Shader mm_contour - Correction to avoid z-fighting moved from fragment shader to vertex shader
2022-04-07 10:40:33 +02:00
enricoturri1966
5e0590a93e
Removed assignment to gl_FragDepth into gouraud.fs shader. Replaced with small offset of triangles along their normal.
2022-04-07 08:22:33 +02:00
Filip Sykala
8719ec8977
Merge branch 'master' into fs_emboss
...
# Conflicts:
# src/libslic3r/Model.hpp
2022-04-05 15:55:24 +02:00
rtyr
afefbdd4a9
Reworked RatRig/Artillery resources.
2022-04-05 08:38:49 +02:00
rtyr
74b80cf7bf
Reduced/reworked resources.
2022-04-05 08:34:27 +02:00
enricoturri1966
0763a48ce5
Tech ENABLE_GL_SHADERS_ATTRIBUTES - Fixed OpenGL clipping planes while rendering picking pass
2022-03-31 13:23:04 +02:00
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
rtyr
b56874e9fe
Sync with PrusaSlicer-settings
...
1.0.2
2022-03-17 23:07:01 +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
enricoturri1966
005fef7bf6
Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
...
Shader: flat_texture
2022-03-07 09:45:29 +01:00
enricoturri1966
93610ebb02
Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
...
Shader: printbed
2022-03-04 14:10:41 +01:00
enricoturri1966
4323b602f5
Code cleanup
2022-03-04 13:57:11 +01:00
enricoturri1966
44a00be329
Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
...
Shader: toolpaths_cog
2022-03-04 13:50:31 +01:00
enricoturri1966
b84b6af32a
Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
...
Shader: background
2022-03-04 13:30:21 +01:00
enricoturri1966
cdf3cb83b6
Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
...
Shader: gouraud_light_instanced_attr - Instanced options in gcode preview
2022-03-04 12:46:01 +01:00
enricoturri1966
31013fb6df
Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
...
Refactoring of flat vertex shader
2022-03-04 08:54:23 +01:00
enricoturri1966
8315f43ed0
Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
...
Shader: gouraud_light - Bed axes
2022-03-03 09:21:52 +01:00
enricoturri1966
a07e02f5ab
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_opengl_3
2022-03-02 12:11:33 +01:00
rtyr
867a38fdb6
Sync with PrusaSlicer-settings
2022-03-02 09:50:11 +01:00
rtyr
b2fba940fe
Sync with PrusaSlicer-settings
2022-03-02 09:47:29 +01:00
enricoturri1966
a5ff37013b
Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders. 1st installment.
...
Shader: flat - Default bed
2022-02-28 10:41:01 +01:00
Nick Berardi
a1846e38d2
Reved Creality.ini version
...
Reved Creality.ini version, and included `*pauseprint*` for Ender-3 Max as well.
2022-02-27 10:37:08 -05:00
Nick Berardi
537fa118df
Added support for *pauseprint*
to Ender-3 models
...
Added support for `*pauseprint*` to Ender-3 models, as they do support `M25` out of the box from at least the Ender-3 line forward.
2022-02-27 10:32:58 -05:00
Nick Berardi
1ad8460a3c
creality.ini: add Ender-3 Pro
...
Added missing profile for Creality Ender-3 Pro
2022-02-27 10:04:26 -05:00
Lukas Matena
e058f794d9
Merge branch 'stable'
2022-02-24 13:05:05 +01:00
Filip Sykala
24207403ea
Merge branch 'master' into fs_emboss
2022-02-22 13:51:04 +01:00
YuSanka
3d5353d444
Localization: Updated CS, DE, ES, FR, IT and PL dictionaries
2022-02-16 09:26:16 +01:00
rtyr
41e31c31b6
Updated Anycubic Photon structure.
2022-02-14 09:33:40 +01:00
ole00
df0751716c
Added resources and settings for Anycubic Photon Mono X SLA printer
2022-02-12 12:55:28 +00:00
Filip Sykala
faa63f3182
Merge branch 'master' into fs_emboss
...
# Conflicts:
# src/libslic3r/Format/3mf.cpp
2022-02-10 14:04:02 +01:00
YuSanka
d52807ccaf
Localization: Updated POT.
...
+ Changed a script of the merging new POT with existing PO files.
Now it processes just a PO-files which are provided by community.
Community PO-files are updated from the new POT
2022-02-09 12:52:50 +01:00
enricoturri1966
92aa6540f5
Tech ENABLE_SHOW_TOOLPATHS_COG - Show toolpaths center of gravity
2022-02-08 12:57:56 +01:00
enricoturri1966
6b041429f6
Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Removed Slic3r::GUI::GeometryBuffer from 3DBed.hpp and replaced with GLModel
2022-02-07 10:24:24 +01:00
Filip Sykala
a50d93cd66
Merge branch 'master' into fs_emboss
...
# Conflicts:
# src/libslic3r/Geometry.cpp
# src/slic3r/GUI/Gizmos/GLGizmoBase.cpp
# 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/Gizmos/GLGizmoScale.cpp
# src/slic3r/GUI/Gizmos/GLGizmoScale.hpp
# src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp
# src/slic3r/GUI/ImGuiWrapper.cpp
# src/slic3r/GUI/ImGuiWrapper.hpp
# src/slic3r/GUI/Selection.cpp
# tests/slic3rutils/slic3r_jobs_tests.cpp
2022-02-02 15:27:25 +01:00
Lukas Matena
cb5ff10a88
Merge branch 'master' into dev
2022-02-01 14:17:34 +01:00
Lukas Matena
5c616c5931
Sync to 2.4.1-beta1
2022-02-01 14:16:13 +01:00
Lukas Matena
ebb9041041
Merge branch 'master' into stable - no conflicts fixed
2022-02-01 14:15:18 +01:00
rtyr
1fe9e5231b
Added G92 E0.
2022-01-31 14:44:43 +01:00
enricoturri1966
1a47211bfc
Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Textures rendering
2022-01-28 16:50:07 +01:00
enricoturri1966
eda55701a2
Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Background rendering
2022-01-28 11:30:04 +01:00
enricoturri1966
703aefa75c
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into dev
2022-01-27 12:04:47 +01:00