Filip Sykala
|
96c5744684
|
Merge branch 'fs_emboss' of https://github.com/prusa3d/PrusaSlicer into fs_emboss
|
2022-03-17 12:27:13 +01:00 |
|
Filip Sykala
|
83e62bbd28
|
Use property map instead of std::map
|
2022-03-17 12:25:46 +01:00 |
|
Filip Sykala
|
3685c59e3e
|
Add reduction map
|
2022-03-17 11:44:43 +01:00 |
|
Filip Sykala
|
84bde2163d
|
Partialy prepare surface cut
|
2022-03-16 16:58:36 +01:00 |
|
Filip Sykala
|
87f22765ba
|
Separate functionality
|
2022-03-15 19:53:43 +01:00 |
|
Filip Sykala
|
41e6dba3df
|
Fix fill on edge
change color to enum
|
2022-03-14 11:12:53 +01:00 |
|
Filip Sykala
|
572207e1c3
|
partial refactor
|
2022-03-11 16:54:53 +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 |
|
enricoturri1966
|
43db64be05
|
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_world_coordinates
|
2022-03-10 12:49:10 +01:00 |
|
enricoturri1966
|
27861fa0bd
|
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
|
2022-03-10 12:48:40 +01:00 |
|
enricoturri1966
|
f0a4fd1123
|
Fixed GLVolumes color when tech ENABLE_LEGACY_OPENGL_REMOVAL is disabled
|
2022-03-10 12:48:31 +01:00 |
|
Lukas Matena
|
68ca42abbf
|
Merge branch 'stable'
|
2022-03-10 12:29:17 +01:00 |
|
Lukas Matena
|
f196294da5
|
Bumped up version number to 2.4.1
|
2022-03-10 11:35:03 +01:00 |
|
enricoturri1966
|
fb38d80458
|
Fixed conflicts after merge with master
|
2022-03-10 11:33:59 +01:00 |
|
enricoturri1966
|
a9465ddedc
|
A few small refactorings
|
2022-03-10 11:27:05 +01:00 |
|
enricoturri1966
|
b9b8406ad8
|
Fixed conflicts after merge with master
|
2022-03-10 10:32:00 +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 |
|
Filip Sykala
|
9e1ebcf4c6
|
revert auto formating
|
2022-03-09 13:41:41 +01:00 |
|
Filip Sykala
|
c8e3836177
|
Fix merge
|
2022-03-09 12:59:20 +01:00 |
|
enricoturri1966
|
2f572d3cf0
|
Merge remote-tracking branch 'origin/et_opengl_3'
|
2022-03-09 12:07:18 +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 |
|
enricoturri1966
|
f8ce187262
|
Tech ENABLE_LEGACY_OPENGL_REMOVAL - Refactoring of GLModel to automatically detect the data type to use into the index buffer in dependence of vertices count
|
2022-03-09 11:51:02 +01:00 |
|
Filip Sykala
|
5ffab4069a
|
Merge branch 'tm_deps_update_v2.5' into fs_emboss_with_CGAL_5_4
# Conflicts:
# deps/CGAL/CGAL.cmake
|
2022-03-09 11:09:34 +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 |
|
Filip Sykala
|
57c75395c6
|
fix test
|
2022-03-09 10:59:22 +01:00 |
|
Filip Sykala
|
4a399789f4
|
Add vojta test
|
2022-03-09 09:41:03 +01:00 |
|
enricoturri1966
|
46283cfde3
|
Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES renamed as ENABLE_GL_SHADERS_ATTRIBUTES
|
2022-03-09 08:22:07 +01:00 |
|
Filip Sykala
|
e8cfe35f78
|
Do not use RaycastManager inside job
Separate Jobs for Creation of volume from creation of Object
|
2022-03-08 19:15:56 +01:00 |
|
enricoturri1966
|
5ffe010a9d
|
Tech ENABLE_GLINDEXEDVERTEXARRAY_REMOVAL merged into ENABLE_LEGACY_OPENGL_REMOVAL
|
2022-03-08 14:50:32 +01:00 |
|
enricoturri1966
|
05efb88e3f
|
Tech ENABLE_GLBEGIN_GLEND_REMOVAL renamed as ENABLE_LEGACY_OPENGL_REMOVAL
|
2022-03-08 14:08:11 +01:00 |
|
enricoturri1966
|
80717bbdec
|
Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Some code cleanup
|
2022-03-08 13:27:51 +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 |
|
Filip Sykala
|
3b55de7e0b
|
change std:err to BOOST_LOG_TRIVIAL(error)
|
2022-03-08 09:50:43 +01:00 |
|
Filip Sykala
|
f4fc23ce0d
|
fix init of string
|
2022-03-08 09:30:50 +01:00 |
|
enricoturri1966
|
c17c4d2e9a
|
Follow-up of 005fef7bf6 - Fixed imgui dialogs associated to gizmo bar and toolbar items
|
2022-03-08 09:24:42 +01:00 |
|
Filip Sykala
|
a6834a1a82
|
WxUtils are using imap
Remove unused map utils
|
2022-03-08 09:22:56 +01:00 |
|
Filip Sykala
|
41a506688a
|
Change 2 map to bimap in TextConfigurationSerialization
|
2022-03-08 08:35:26 +01:00 |
|
Lukas Matena
|
62cc48188d
|
Fix background color in InfoDialog on older macOSes (#3775, #7603)
|
2022-03-07 16:43:21 +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 |
|