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
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
YuSanka
725a45f112
Localization: Added Hungarian dictionary. Thanks for Attila Zombori( https://github.com/zomatt )
2022-01-27 10:29:03 +01:00
YuSanka
e20a06a850
Localization: Updated POT and dictionaries for CZ, PL, IT, ES, DE, FR
...
+ Added one phrase in Tab.cpp
+ POs for CA, KR, NL, BR, RU, TR, UK, ZH are merged with new POT
2022-01-26 09:24:05 +01:00