Filip Sykala
37961c36e8
Merge branch 'master' into fs_emboss
...
# Conflicts:
# src/libslic3r/Technologies.hpp
# src/slic3r/GUI/GLCanvas3D.cpp
# src/slic3r/GUI/GUI_App.cpp
2022-05-18 14:35:48 +02:00
rtyr
6605ad926f
Merge pull request #8251 from pmjdebruijn/creality
...
Fix Ender-3 Pro
2022-05-16 06:28:27 +02:00
Filip Sykala
34304a40bf
Merge branch 'master' into fs_emboss
2022-05-11 16:05:40 +02:00
rtyr
72b82547dd
Sync with PrusaSlicer-settings.
2022-05-10 13:19:18 +02:00
rtyr
d7857e75bc
Updated Voron v1 thumbnails.
2022-05-10 13:18:44 +02:00
YuSanka
0869f49124
Localization: Update for list.txt
2022-05-09 17:04:10 +02:00
Filip Sykala
05354eda0c
Merge branch 'master' into fs_emboss
...
# Conflicts:
# src/slic3r/GUI/GLCanvas3D.cpp
2022-05-06 08:58:04 +02:00
rtyr
ff58e73ef2
Sync with PrusaSlicer-settings
2022-05-04 09:05:00 +02:00
Filip Sykala
3e9778b46b
Merge branch 'et_world_coordinates' into fs_emboss
2022-05-02 10:11:47 +02:00
rtyr
4dbb1f8699
Sync with PrusaSlicer-settings
2022-04-28 11:20:30 +02:00
Lukas Matena
56466abe99
Fixed conflicts after stable->master merge
2022-04-27 23:45:16 +02:00
Lukas Matena
09fe421fe8
Merge branch 'stable' (no conflicts fixed)
2022-04-27 22:24:13 +02:00
Pascal de Bruijn
8415f805d9
Fix Ender-3 Pro
...
Commit 1ad8460a3c
had several errors.
2022-04-27 18:52:21 +02:00
Filip Sykala
36bc4b2cd6
Emboss icons version 3
2022-04-26 22:33:14 +02:00
Filip Sykala
a1d7040902
WIP: cut surface of model
...
update emboss icons to not be soo huge - pixel preccisse
2022-04-26 17:43:38 +02:00
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