3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
21,777 Commits 1 Branch 1 Tag 249 MiB
d09f31db9c
Commit Graph

1494 Commits

Author SHA1 Message Date
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
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
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
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
rtyr
eb1463d46a
Fixed texture extension 2022-01-25 15:23:53 +01:00
rtyr
321b656ccc
Added texture 2022-01-25 14:14:27 +01:00
rtyr
04f09361b9
Delete Jubilee_texture.svg 2022-01-25 14:12:59 +01:00
rtyr
d5d9e33486
Added bed texture. 2022-01-25 14:07:58 +01:00
rtyr
eb2f14c0ec
Jubilee bed texture 2022-01-25 14:06:02 +01:00
rtyr
8211721b9c
Jubilee initial bundle 2022-01-25 08:22:09 +01:00
rtyr
18be6a9395
Sync with PrusaSlicer-settings. 2022-01-24 14:28:38 +01:00
YuSanka
7111da2dbf Merge remote-tracking branch 'origin/master' into dev 2022-01-24 08:37:51 +01:00
rtyr
ea61190c1c
Merge pull request #7782 from top-gun/master 
RatRig printer profiles: optimizations
 2022-01-21 23:36:35 +01:00
top-gun
94c3110887 RatRig printers: Prifle optimizations 
changed the default infill to cubic

remove accidental .bak file
 2022-01-21 22:58:38 +01:00
Filip Sykala
c2608ce2fa Improove icons 2022-01-21 20:49:42 +01:00
YuSanka
0cc3a67b8c Localization: CA: Manual merge of the https://github.com/prusa3d/PrusaSlicer/pull/7566 2022-01-21 15:53:08 +01:00
YuSanka
c9dbc1cbba Localization: Added missed phrases -> Updated POT and dictionaries for CZ, PL, IT, ES, DE, FR 
+ Command to remove obsolite lines is added to gettext_concat_wx_po_with_po and gettext_merge_po_with_pot scripts
+ POs for CA, KR, NL, BR, RU, TR, UK, ZH are merged with new POT
+ Updated all MO files
 2022-01-21 15:31:01 +01:00
Filip Sykala
770a5c5501 Redesign GUI of emboss 2022-01-20 16:09:48 +01:00
YuSanka
94b8c4f096 Merge remote-tracking branch 'origin/master' into dev 2022-01-20 15:22:24 +01:00
YuSanka
d1523d2a6b Localization: Updated POT and dictionaries for CZ, PL, IT, ES, DE, FR 
+ Fixed phrases in Tab.cpp, hints.ini, NotificationManager.cpp
+ POs for CA, KR, NL, BR, RU, TR, UK, ZH are merged with new POT
+ Updated all MO files
 2022-01-20 14:18:55 +01:00
enricoturri1966
d09a0cea83 Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into dev 2022-01-18 10:48:56 +01:00
enricoturri1966
22f38235ea Tech ENABLE_GLBEGIN_GLEND_REMOVAL - 1st installment - Selection bounding box 2022-01-18 10:42:46 +01:00
YuSanka
fec654513e Merge remote-tracking branch 'origin/master' into dev 2022-01-18 08:41:10 +01:00
top-gun
347c544931 RatRig printer profiles: optimizations 
Some optimizations for speed and infill

Modified start-code to avoid automatic generation of heater commands.
 2022-01-17 22:22:36 +01:00
YuSanka
2cc20594a4 Localization: Updated POT 
+ Fixed some phrases in Preferences and Hints
+ fixed #7588 - Typo in new help feature in 2.4.0
 2022-01-17 13:42:35 +01:00
enricoturri1966
a9bd58639c Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into dev 2022-01-17 08:05:41 +01:00
rtyr
3586f1c3fe
Delete VCORE_thumbnail.png 2022-01-14 14:06:13 +01:00
rtyr
109a90e300
Initial RatRig bundle 
Based on https://github.com/slic3r/slic3r-profiles/pull/13.
 2022-01-14 13:46:55 +01:00
rtyr
1d77080421
Added Artillery Hornet 
Hornet profile based on https://github.com/slic3r/slic3r-profiles/pull/14
 2022-01-14 13:33:46 +01:00
enricoturri1966
b9b702d550 Fixed conflicts after merge with branch dev 2022-01-14 09:55:13 +01:00
YuSanka
ced6d26917 Merge remote-tracking branch 'origin/master' into dev 2022-01-12 15:05:31 +01:00
rtyr
a6d280bd9e
Sync with PrusaSlicer-settings 2022-01-11 07:18:53 +01:00
rtyr
8636ec8b47
Resources for Artillery Hornet 2022-01-07 13:22:42 +01:00
YuSanka
34d9fbdc35 Fixes for localization of the PrusaSlicer - 2.4.0 
* Added some missed phrases.
* Added some missed files to the list.txt
* Fix for https://github.com/prusa3d/PrusaSlicer/issues/7114 - Reword of the "Ask for unsaved changes..."

* Fix for https://github.com/prusa3d/PrusaSlicer/issues/7542 - Added localization for default buttons Yes/No
  Note: For some default buttons/labels/dialogs/... is used localization in wxWidgets.
        But dictionaries have to contain this strings, otherwise texts wouldn't be localized.
        "wxWidgets/local" contains dictionaries for all this default phrases.
        So, a copy of this field is added as a "wx_local" field to the "resources/localization" field.
        And a "gettext_concat_wx_po_with_po" script is written to concatenate strings from wx_local/lang_code.po to resources/localization/lang_code/PrusaSlicer_lang_code.po.
        So, to create a MO file from updated PO we have to execute "gettext_concat_wx_po_with_po" and only then execute a "gettext_po_to_mo" script.
 2022-01-04 16:31:27 +01:00
enricoturri1966
1019792884 Fixed conflicts after merge with dev branch 2022-01-03 10:09:38 +01:00
YuSanka
2458c4339b Merge remote-tracking branch 'origin/master' into dev 2021-12-23 18:31:32 +01:00
YuSanka
f2aeca3a71 Options from the "Preferences" dialog added to the Search 
Some code refactoring:
* use GUI_App::open_preferences() on all places where it's needed
* Preferences Dialog is an attribute of a ManeFrame class and created just ones during the MainFrame creation now.
* Created class Highlighter. Use it in Preferences and Tab
 2021-12-22 14:38:23 +01:00
rtyr
7323851f66
Bumped up versioni to 0.0.13 2021-12-21 10:31:36 +01:00
rtyr
0e419b265f
Merge pull request #7515 from pmjdebruijn/creality_sprite_extruder 
creality.ini: Ender-3 S1 improvements
 2021-12-21 10:21:24 +01:00
YuSanka
cce960673f Localization: Added JA dictionary 
+ fixed #7520 - Missing translation to CZ in bubble help for "Extra perimeters if needed"
 2021-12-20 12:08:52 +01:00
Pascal de Bruijn
d05bf014eb creality.ini: Ender-3 S1 improvements 
It seems the firmware is setup to not have to run ABL for each print,
and thus Creality's example start_gcode does not include G29

Finetuning for the S1's Sprite Direct Drive extruder
 2021-12-17 19:04:27 +01:00
YuSanka
5dfbea2c10 Squashed commit of the following: 
commit 79e58944b3c08e429d7dbb6592d0b758fbc9c3c4
Author: YuSanka <yusanka@gmail.com>
Date:   Fri Dec 17 14:38:49 2021 +0100

    Localization: Fixed some phrases for RU dictionary (see last comments to https://github.com/prusa3d/PrusaSlicer/pull/7501)
    + Fixed no needed formatting in CA dictionary

commit 44536ecebc41551a8129650cf882d2aefccbe1a5
Merge: 47df9458f 96485a044
Author: YuSanka <yusanka@gmail.com>
Date:   Fri Dec 17 14:26:01 2021 +0100

    Merge branch 'master' of https://github.com/AndylgTom/Slic3r into AndylgTom-master

commit 96485a044a51d97828b7e77cfd8af12e7bb35152
Author: Andy <andylg@yandex.ru>
Date:   Thu Dec 16 23:41:46 2021 +0700

    Update PrusaSlicer_ru.po

    Пофиксил указанные замечания

commit 52f7b9e5b62895dfab906150e25b6da4d260fcc1
Author: AndylgTom <andylg@yandex.ru>
Date:   Wed Dec 15 15:56:31 2021 +0700

    Russian localization update for PrusaSlicer-2.4.0-rc

    Russian localization update for PrusaSlicer-2.4.0-rc+win64-202112141553
    Please check those lines where there are three questions "???". There are 12 such lines.

    Обновление русской локализации для PrusaSlicer-2.4.0-rc+win64-202112141553
    Прошу проверить те строки, где встречаются три вопроса "???". Таких строк 12.

commit 387ca46d8a101ee9b01963c379bef7bca45f0dfb
Author: Andy <andylg@yandex.ru>
Date:   Thu Jan 14 11:53:08 2021 +0700

    Update PrusaSlicer_ru.po

commit ddef2cd1ef728be28aae62e9269fa3e65d8a1d32
Author: Andy <andylg@yandex.ru>
Date:   Thu Jan 14 11:49:59 2021 +0700

    Update PrusaSlicer_ru.po

commit 94e3946875865f141aff61fabcc121d81775b0ac
Author: Andy <andylg@yandex.ru>
Date:   Thu Jan 14 11:20:53 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 0e97fd9e4ee92d1c2d525401d3294cf9b872bc27
Author: Andy <andylg@yandex.ru>
Date:   Thu Jan 14 11:20:27 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit fc452d215ec6d724794a1799d297cc31fe412234
Author: Andy <andylg@yandex.ru>
Date:   Thu Jan 14 11:18:05 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 702b0f5a322d122cb028b748ae044c5d88b0ef24
Author: Andy <andylg@yandex.ru>
Date:   Thu Jan 14 11:14:32 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 3b56531fb06bbb49a620154524a1a75371ea73e5
Author: Andy <andylg@yandex.ru>
Date:   Thu Jan 14 11:13:19 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 0d5fcd9d801e4ff0aeb432f61f730d68a12bb9a5
Author: Andy <andylg@yandex.ru>
Date:   Thu Jan 14 11:13:01 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 0e0047d0742ba597b8854f8a9bc72002c9e429ce
Author: Andy <andylg@yandex.ru>
Date:   Thu Jan 14 11:11:06 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 0d3ec8517034df62ebd0923bbc05f3c63d316684
Author: Andy <andylg@yandex.ru>
Date:   Thu Jan 14 11:10:42 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 596df1a6909e58cbbb6b0bbc1a30cbfaff2460e2
Author: Andy <andylg@yandex.ru>
Date:   Thu Jan 14 11:10:10 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 2086358438670eebe51f7241a59bea1dbcce9eda
Author: Andy <andylg@yandex.ru>
Date:   Thu Jan 14 00:36:19 2021 +0700

    Update PrusaSlicer_ru.po

    USB-разъём

commit e2adfc752742861f2242caa7db893e317d3e4382
Author: Andy <andylg@yandex.ru>
Date:   Thu Jan 14 00:20:01 2021 +0700

    Update PrusaSlicer_ru.po

    нить -> пруток

commit 3db9c2f678e5bb3f56a7192e66b75a7852c66b60
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 23:10:22 2021 +0700

    Update PrusaSlicer_ru.po

commit 6f8a9de9247334e2ec683a234feb10371c1dc0e6
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 23:01:41 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 57c0ad1c27c70bb3d18403c067a3842f598bd191
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 23:00:03 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 8db333ac63e8962efd0bcf3efbc632164172be95
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 22:41:27 2021 +0700

    Update PrusaSlicer_ru.po

commit e7cdc325209e187c8fec54bf02606172e3bd3b89
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 22:38:56 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 943c514d8c5f8000174dfe51e6c5feead5849b67
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 22:17:26 2021 +0700

    Update PrusaSlicer_ru.po

    Выбор\...

commit d83a85f2418f24d8793c90ab0e705003c739a4e0
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 22:08:26 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 792849721a975d7bbd8b99f23e0584d31042766b
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 21:44:58 2021 +0700

    Update PrusaSlicer_ru.po

commit ef19ef3030b79045bc0e1f483530b8cd7a1da11d
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 21:41:25 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit a21dee7052f1c79853c9316a1a9b5bfe3d716428
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 21:33:15 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 07f3da91472824409fdf95cf4660959ad652c334
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 21:32:21 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit e1f948b37955b88209c087d52ff20e1bc6640683
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 21:20:31 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit d74900bacac7ba9eb340dcd07b36098d23369e64
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 21:19:35 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit d64d56191d924b897b030a03a791741c6be07657
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 21:18:39 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 49f071ec9d22dbecb47102e0f658cc137f9b9639
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 21:17:51 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 2af9eaad0016ec6c9c4f4b4cef1658d6f16a3e08
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 21:17:11 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit b0042f9077d803bb1fdb04abb3d844b0291411e9
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 21:16:22 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit dddfd61936ae9f09ef757e7e76af07cfb375f028
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 21:14:52 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 7466bbc37d971dbe67b072f2d7350393c196a4e5
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 21:14:21 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 759130b8116eaec794fd964edcee49d0d62f291d
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 21:13:34 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit c66d33000be4c6625d754e9066dc7ac930ae59da
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 21:12:33 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit cb75e4bf61161bf2ed75998ae13b63a1990310ad
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 21:10:06 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 65d0167bc2f1d8937edfd3c91f28ba1005d885cf
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 21:09:05 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 4c43e1c28f61976324cbbad3d89277d3e9abe051
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 21:07:35 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit a75b38ada68240e0df9dfb754eab08651775ea41
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 21:06:25 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit ed56a52747483262440e0331ec2d8518e1f81dc2
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 21:05:15 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit c1f2f58d1d0f888f875f0db0d0580f3063f0e178
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 21:04:43 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit e4e6519006c23f0a7d0029db41c2ed6ed4ff918a
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 21:03:53 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit fb7de82d9d672040ac632c2fe9d3c69c67da85a8
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 21:03:11 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit ce2182117d5e3f2e76c2ab0ffc0f9bd2ccf97f37
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 21:02:10 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit e46e0584e21c72116a866c7c20275e32ce387315
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 21:01:43 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit fa1dfe5add4dde9e73561d15568720321b8edbc7
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 21:00:49 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 17a6da79188fbd7878b3007016e0313f193e6a67
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 21:00:18 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 00d675e20e79915f46a8ace8ef4f5d3c19f84fec
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:59:22 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 0d60f4db0b20350f75d1b2c804b9f89b23784b4c
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:58:50 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 29218c1cc1c154b0be3545ddde67eafce4af01c7
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:58:24 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit a051c50e4bdd7c6b6e69d86e231eddfe7e2f3e1b
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:57:44 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit ea7d25cd85f934c6a59eac5afe5fcbc93c496b3a
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:56:43 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 40382f84cd8c3673ce7e3f6a21811308bb271cf5
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:56:06 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 481f96827a7f0ce1d3ad256b3966642d59272fcf
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:53:29 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 372052034ab50618232507663da6ff411c244d38
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:52:47 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 11eb973a47a77b3b1b392a6534b0575d5c6e2fa3
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:51:51 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit c363477b2b84f3065f65b5fd5f4e4c1fd51a09f7
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:50:33 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 732fbf1d9cdb8b185c6a4bc423d0fd9a386e52a1
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:49:51 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 36e88e76aaaa4e106e483330f3a2a4c9d89c48d7
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:49:25 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit dbc1f2eeab9a2b15bf09779960feff881c8d788c
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:48:32 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 1ca4e35ffd4dca4d779e91886134ee1cef5b294c
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:47:50 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 209779fcd6f008f827b2a1991bad74ed010514e6
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:46:59 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 29bc1b370b444e51ebe0a3e66139f3bc833ea4ce
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:46:03 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit cea039e9a60f5808be296fff69e43ea27b6a2714
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:45:18 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit be48ee82d2a066df2dc6e4daaa2876a962ae4804
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:44:48 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit f61990e12db90385a66e992d55f4cd9b10b907b8
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:44:15 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 0aadf3d551f3abbca81af1daf6956fc7fce9affe
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:43:44 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 2ae2e9402bc39717f4804089b4466e77c0dff18a
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:43:13 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 4cdea4b9fa6911140e1a6c68f8084ac85181dab8
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:42:44 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 2289cc62215ceee9825787348a2cb12c3cd8327f
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:42:27 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit f8e844f43ff98c61b1dc1b31bef614a45b63651b
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:42:02 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 45d11889748eedfb6fe868b33af4d155dca98bd6
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:41:35 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit e1a5b07c12a889996243353e97f6c2794d62e569
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:40:43 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 679fe59818b5e797140ef6d52966461f1496bbe6
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:39:50 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit abdb6d17d51e73075ae15e107abf4d3af0d950d5
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:38:44 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 1c55ed72425bd7329d26f26a3ddad12b109aaeb5
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:38:13 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit d1cdff3ee7fb3f5079a4a393f0cad7871c22d9ee
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:38:03 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 49e22e3341dfba5064b1ea6ee2e9e7e315385cc8
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 20:37:06 2021 +0700

    Update resources/localization/ru/PrusaSlicer_ru.po

    Co-authored-by: Oleksandra Yushchenko <yusanka@gmail.com>

commit 74620d591da0742350b3b41952a66354f0f63c96
Author: Andy <andylg@yandex.ru>
Date:   Tue Jan 12 16:36:41 2021 +0700

    Update PrusaSlicer_ru.po

commit c220687f7e1d21798dd90d1be15e62decda548fb
Author: AndylgTom <andylg@yandex.ru>
Date:   Sun Jan 10 03:00:24 2021 +0700

    Updating the Russian translation PrusaSlicer-2.3.0-rc3

    Updating the Russian translation PrusaSlicer-2.3.0-rc3 by Andylg
 2021-12-17 14:55:13 +01:00
davidjuanesb
47df9458fb
Catalan language localization (#7511) 
* Create ca
* Delete ca
* Add files via upload
 2021-12-17 13:42:56 +01:00
rtyr
65053fd776
Anycubic bumped up to 0.0.12 2021-12-16 15:49:19 +01:00
rtyr
dafb935203
Merge pull request #7092 from slghb/i3_mega_s_fixes 
Update Anycubic i3 Mega (S) profile
 2021-12-16 15:44:15 +01:00
rtyr
33351c4e5f
Bumped up version to 0.1.2 - Added Ender 3 S1 2021-12-16 12:02:32 +01:00
rtyr
ead65a55d0
Merge pull request #7502 from pmjdebruijn/creality 
Creality Bundle Enhancements
 2021-12-16 11:54:03 +01:00
rtyr
e84d5847a7
Ender 3 S1 thumbnail 2021-12-16 11:50:46 +01:00
rtyr
0516cfb612
Sync with PrusaSlicer-settings 2021-12-16 10:35:32 +01:00
Pascal de Bruijn
37cfcadadd creality.ini: add preliminary Ender-3 S1 2021-12-15 20:14:01 +01:00
Pascal de Bruijn
f5d4349016 creality.ini: slight improvements to Ender-2 Pro 
Replace bed stl with something consistent with the rest
Replace bed svg with something simpler consistent with the rest
Add tiny safety margin
 2021-12-15 20:03:45 +01:00
Pascal de Bruijn
c045a34fa0 creality.ini: always output layer heights with two decimals 2021-12-15 19:43:15 +01:00
Maximilian Engelhardt
f4b9d535de Update Anycubic i3 Mega (S) profile 
- revert retraction settings as the previous change causes issues with
  stringing.
- sync many settings with Prusa MK2 profile and some with Prusa MK3
  profile.
- remove no longer needed SUPPORTED print settings. Support settings can
  now be selected directly in the PrusaSlicer menu.
- add DAS FILAMENT PETG profile.
 2021-12-15 15:52:09 +01:00
YuSanka
caff954aa7 Localization: Update for NL dictionary. 
+ Missed "Did you know..." phrases are added to POT and merged with some PO files
 2021-12-14 16:34:56 +01:00
rtyr
e745ef095f
Updated for the PrusaSlicer 2.4.0-rc release. 2021-12-14 14:41:25 +01:00
YuSanka
6d2efe29a4 Localization: Updated dictionaries for CS, DE, ES, FR, IT, NL, PL 
+ GUI_App.cpp: Set language, color mode and initialization of image handlers before a call of check_older_app_config()
 2021-12-14 14:13:44 +01:00
enricoturri1966
cc2b8da6a4 #7461 - Use three floats for defining vertex normal to render travel toolpaths. This fixes a crash on NVIDIA Quadro graphics cards when turning on travel moves visibility in preview. 2021-12-14 13:53:37 +01:00
Filip Sykala
88523bceb6 Merge branch 'master' into fs_emboss 2021-12-13 10:52:04 +01:00
rtyr
0255ff2fd6
Bumped up version to 0.1.1 2021-12-11 21:01:34 +01:00
rtyr
cc2c2235e5
Delete ENDER2PRO_thumbnail(NONBETA).png 2021-12-11 20:57:06 +01:00
Spencer Owen
2bba01f482 Merge branch 'master' into ender2-pro 2021-12-10 17:08:17 -07:00
rtyr
c3f144c7ea
Ender2 Pro resources 2021-12-10 18:42:39 +01:00
YuSanka
080e80a4d6 Localization: Next improvements: CS, IT, ES, DE, ES, FR 2021-12-10 17:28:36 +01:00
Spencer Owen
a6d6f9af8b Add extra tab 2021-12-09 21:51:29 -07:00
enricoturri1966
b45d56b5b8 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_preview_layout 2021-12-08 08:15:51 +01:00
Spencer Owen
b81964be0f grid looking good 2021-12-07 17:49:05 -07:00
Spencer Owen
976beb6154 improved logo 2021-12-07 17:40:53 -07:00
Spencer Owen
1e63467bc9 improved logo 2021-12-06 22:50:16 -07:00
Spencer Owen
091a2181e3 Update image 2021-12-06 17:01:37 -07:00
Spencer Owen
dc30198d4f Add ender2 pro logo 2021-12-06 16:15:11 -07:00
Spencer Owen
4118c6b5b2 zoom 2021-12-05 18:07:15 -07:00
Spencer Owen
0024b8e070 165 2021-12-05 18:03:01 -07:00
Spencer Owen
41935a9538 Change dragon to public domain image https://publicdomainvectors.org/en/free-clipart/Dragon-head-silhouette-vector/6300.html 2021-12-05 17:04:42 -07:00
Spencer Owen
f189aaf2b7 resize images 2021-12-05 07:39:32 -07:00
Spencer Owen
cb77b21f7c rename files 2021-12-04 13:47:41 -07:00
Spencer Owen
93f62854b1 Add ender 2 pro 2021-12-04 13:34:29 -07:00
Vojtech Bubnik
303de63a90 Localization: 
Renamed PrusaSlicer_pt_br.po to pt_BR.po
Added one libslic3r file to lists.txt
 2021-12-04 06:05:13 +01:00
kangkang
fc93737eb8
Localization support for languages with country code on Linux. (#7410) 2021-12-04 05:57:15 +01:00
YuSanka
f14a5f40b3 Localization. 
* --boost option is added to gettext_make_pot script to recognize Boost format strings.
* New script gettext_merge_po_with_pot is added to merging new lines from POT to current PO
* --check-format option is added to gettext_po_to_mo script to check language dependent format strings during generation MO from PO.
* POT is updated and all PO files are merged with it. So, community can just load needed PO file and continue in translation.
* ExtruderSequenceDialog: Added messed localization markers
 2021-12-03 16:19:09 +01:00
Filip Sykala
581aab2dd7 Merge branch 'master' into fs_emboss 2021-12-03 11:53:18 +01:00
YuSanka
71a9ded1c0 ObjectList: Fixed update of the icons for InfoItems, when color mode was changed 
Sidebar:ObjectInfo: Fixed update of the icon, when color mode was changed
+ Added new icons for "Sinking" and "ShapeGallery"
 2021-12-02 16:11:52 +01:00
Filip Sykala
d698df2c31 Merge branch 'master' into fs_emboss 
# Conflicts:
#	src/slic3r/GUI/GUI_App.cpp
#	tests/libslic3r/test_indexed_triangle_set.cpp
 2021-12-01 14:35:42 +01:00
rtyr
e0b96e5535
Sync with PrusaSlicer-settings 2021-12-01 13:11:47 +01:00
YuSanka
b78b91b72e Localization: Updated CZ, DE, ES, FR, IT and PL dictionaries. 
+ Fixed some of phrases and updated POT-file
 2021-12-01 13:07:25 +01:00
enricoturri1966
860f1b29f2 gouraud.fs shader - removed unused code 2021-12-01 12:37:39 +01:00
enricoturri1966
353a9e61f5 Fixed conflicts after merge with master 2021-11-29 11:53:45 +01:00
enricoturri1966
8bc442cd32 Tech ENABLE_ENHANCED_IMGUI_SLIDER_FLOAT - 2nd click on edit button exits editing state in slider 2021-11-29 11:46:28 +01:00
rtyr
77740c01e1
Updated min_slic3r_version for 1.4.0-beta2. 2021-11-26 13:35:03 +01:00
Filip Sykala
1e719bab26 Separate create volume from edit 2021-11-25 15:26:45 +01:00
YuSanka
0c110af1df Localization: Next text improvements 
+ new POT
 + new CZ translation
 2021-11-23 14:56:41 +01:00
enricoturri1966
7861554645 New icons for legend toolbar 2021-11-23 10:59:52 +01:00
Filip Sykala
eba68f9a9e Merge branch 'master' into fs_emboss 
# Conflicts:
#	src/slic3r/GUI/GUI_ObjectList.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp
#	src/slic3r/GUI/ImGuiWrapper.hpp
 2021-11-23 09:09:09 +01:00
enricoturri1966
c242f31353 Fixed conflicts after merge with master 2021-11-23 08:48:11 +01:00
enricoturri1966
b9c99ab27b New icon for legend toolbar 2021-11-23 08:32:55 +01:00
rtyr
c1209fe8d7
Sync with PrusaSlicer-settings 2021-11-16 21:07:10 +01:00
enricoturri1966
9561fd8cc6 Removed obsolete gouraud shader files 2021-11-16 12:56:08 +01:00
rtyr
107f1baa32
Updated SLA material colors. 2021-11-16 08:02:28 +01:00
enricoturri1966
135352f0db Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_preview_layout 2021-11-15 08:45:22 +01:00
enricoturri1966
6d89b22a5a Tech ENABLE_LEGEND_TOOLBAR_ICONS - New icons for legend toolbar 2021-11-15 08:45:13 +01:00
YuSanka
a6863961f7 Localization + new POT 
+ added hyperlinks for Ironing parameters
 2021-11-15 08:32:40 +01:00
enricoturri1966
a08f8305b3 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_preview_layout 2021-11-12 14:04:52 +01:00
enricoturri1966
a326c5b320 Tech ENABLE_LEGEND_TOOLBAR_ICONS - Toolbar items in legend using svn icons 2021-11-12 14:04:37 +01:00
YuSanka
8ef03718d0 Linux specific: Using a pop-up menu on the "cog" wheel for changing of an extruder color.(related to #6759) 
+ some code refactoring
+ change a little bit gray color in colorchange_del icons to avoid collision in Dark mode
 2021-11-12 14:02:18 +01:00
YuSanka
8bfa132a1b Localization fixes + new POT 2021-11-12 09:21:41 +01:00
rtyr
7122572841
Fixed black SLA material color. 2021-11-10 12:56:54 +01:00
YuSanka
e8be7b2ecd Implemented possibility to show resin colors from the Plater (Bottles with resin are colored now in preset combobox) 
+ Added nsvgParseFromFileWithReplace() to replace some colors before parsing from SVG file
+ Thumbnails are saved with selected resin color in SL1 or SL1S files
+ "white" folder is deleted from "icons" now. THere is no needed anymore.
 2021-11-09 17:01:50 +01:00
enricoturri1966
7de0f1195a Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_imgui_slider 2021-11-09 15:09:32 +01:00
rtyr
99e9cea9ad
1.4.0-beta2 - Added SLA material colors. Updated BASF filament profiles. 2021-11-09 14:04:20 +01:00
enricoturri1966
869276aedb Tech ENABLE_ENHANCED_IMGUI_SLIDER_FLOAT - Changed background color of additional button and its icon 2021-11-08 13:43:53 +01:00
enricoturri1966
9752fb5810 Tech ENABLE_ENHANCED_IMGUI_SLIDER_FLOAT - Additional button, added to imgui float slider, using svg icon 2021-11-08 08:29:19 +01:00
rtyr
8b150ae235
Initial Voron bundle 2021-11-05 13:07:23 +01:00
rtyr
c8ff0de27e
Updated ABS filament density. 2021-11-03 22:45:28 +01:00
rtyr
9a484d532b
Fixed filament_diameter 2021-11-03 22:43:00 +01:00
rtyr
1a0893b783
Initial Ultimaker bundle 2021-11-03 17:11:58 +01:00
David Kocik
d25d572b36 Hints content 2021-11-03 09:46:33 +01:00
David Kocik
4c8e13947c Hint hypertext preferences highlight 2021-11-02 10:51:45 +01:00
Filip Sykala
b5a075ce4a Merge branch 'master' into fs_emboss 2021-10-26 18:58:38 +02:00
Mark Choi
9a4863a14b Translate error. 2021-10-26 18:31:12 +02:00
rtyr
fe748ca43b
1.4.0-beta1 Sync with PrusaSlicer-settings 2021-10-26 13:38:49 +02:00
Lukáš Hejl
0f9a9de745 Fixed darker colors of objects inside multi-material gizmo when objects are mirrored. 2021-10-25 08:41:41 +02:00
rtyr
723155a15c
1.4.0-beta0 Added multiple Filatech and BASF filament profiles. Added material profiles for SL1S. 2021-10-23 13:29:08 +02:00
YuSanka
176df52f64 ObjectList: Added different icons for text volumes 2021-10-21 13:51:56 +02:00
enricoturri1966
2c0815f537 Fixed conflicts after merge with master and ported changes into gouraud shaders to gouraud_mod shaders 2021-10-19 11:27:11 +02:00
Lukáš Hejl
0c2d9f01a6 Fixed z-fighting between contour around the area selected by smart fill and painted triangles inside the FDM support painting gizmo. 2021-10-18 11:35:13 +02:00
Lukáš Hejl
b45675b4e1 Follow-up of 6194e67e68 - Separated the part that computed triangles normals and lighting inside the fragment shader into a separate shader mm_gouraud, which is only used for the multi-material painting gizmo. 2021-10-18 11:35:13 +02:00
enricoturri1966
7be17d89e6 Fixed conflicts after merge with master 2021-10-14 10:48:46 +02:00
YuSanka
ce397a0c5c ShapeGallery: Added more system shapes 2021-10-08 09:05:03 +02:00
enricoturri1966
29340c1560 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_sinking_objects_collision 2021-10-07 14:22:06 +02:00
YuSanka
68fd37b300 Added SVG-file for G-CodeViewer logo 2021-10-07 11:53:19 +02:00
YuSanka
1b828ca7f5 Deleted unused PNG-files. Added mirroring_transparent.svg (thanks for @AkiraNorthstar) 2021-10-07 10:14:55 +02:00
enricoturri1966
fe4baa33f6 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_sinking_objects_collision 2021-10-06 13:48:27 +02:00
YuSanka
091f946340 Localization: Updated POT 2021-10-05 16:31:04 +02:00
David Kocik
d84867d539 notification info icon - wider hexagon 2021-10-05 15:52:44 +02:00
enricoturri1966
982172b878 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_sinking_objects_collision 2021-10-05 15:33:37 +02:00
David Kocik
23cff74efb Hint notification: selected filament tag check. 2021-10-05 12:26:45 +02:00
enricoturri1966
2e779d8594 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_sinking_objects_collision 2021-10-04 08:30:13 +02:00
David Kocik
0b55c89978 print info notification icon 2021-10-01 17:25:49 +02:00
David Kocik
29aab3a426 PrintInfoNotificationLevel with icon 2021-10-01 15:03:40 +02:00
enricoturri1966
b19c742455 Fixed conflicts after merge with master 2021-09-30 10:31:25 +02:00
YuSanka
238e65e455 Improvements for statistics information: 
+ Show 2 groups of errors: "Auto-repared" and "Remaning".
 + Use different icons for volumes with/without remaining errors
 + Fixed update of the ObjectList warnings icons after switch the color mode of a PrusaSlicer
 + Some code refactoring: Use same code for tooltips for "exclamation"-icon from an ObjectList and from a Sidebar->ObjectInfo
 2021-09-21 17:20:12 +02:00
enricoturri1966
cf380fb456 Tech ENABLE_OUT_OF_BED_DETECTION_IMPROVEMENTS - Out of bed detection for circular printbeds 2021-09-21 13:51:57 +02:00
enricoturri1966
554aa70edc Follow-up of 9abebe5fbe - Modified shader gouraud_light_instanced.vs to be more Intel's cards friendly 2021-09-15 12:32:43 +02:00
rtyr
0df83d91fc
Sync with PrusaSlicer-settings 2021-09-15 10:52:25 +02:00
enricoturri1966
9abebe5fbe Techs ENABLE_SEAMS_USING_MODELS and ENABLE_SEAMS_USING_BATCHED_MODELS - Fixed seams (and other options) zs to match toolpaths zs in preview 2021-09-08 13:04:43 +02:00
Jason Scurtu
b41e321473 rename 2021-09-06 16:19:30 +02:00
Jason Scurtu
07bdb5fbe3 add gcodeviewer 2021-09-06 16:19:30 +02:00
Jason Scurtu
ce0beabb43 add new mac icon and update MainFrame.cpp 2021-09-06 16:19:30 +02:00
Jason Scurtu
7c074d5a99
update PrusaSlicer icon for macOS (#6874) 2021-09-02 16:40:17 +02:00
David Kocik
5f7a4982f6 Open menubar item by name with translations 2021-09-02 09:48:06 +02:00
David Kocik
876e6fdddd Commented opening menubar item until its properly implemented. 2021-09-01 15:12:47 +02:00
rtyr
d0e37aada8
Updated raft_contact_distance values. 2021-09-01 13:36:13 +02:00
David Kocik
229cf4b8b6 Open menubar item by item index. Possible to call as hint notification hyperlink 2021-09-01 13:34:36 +02:00
enricoturri1966
c797bed67d Changed vertex attributes syntax in gouraud_light_instanced.vs 2021-08-31 14:35:32 +02:00
Vojtech Bubnik
5f26bfd397 Brim separation from object, follow up to 82373334bc 
1) Changed the name of the variable "brim_offset" to "brim_separation"
   for clarity.
2) Added legacy conversion after loading an old 3MF that does not define
   then new "brim_separation" variable: The "brim_separation" is being
   filled in with the "elefant_foot_compensation" value to produce
   equal brim separation to the old PrusaSlicer that saved that 3MF file.
 2021-08-31 12:22:44 +02:00
enricoturri1966
876f9d5a99 Cleanup in shader gouraud_light_instanced.vs 2021-08-30 08:37:41 +02:00
enricoturri1966
39ec1a6318 Fixed conflicts after merge with master 2021-08-26 12:39:28 +02:00
enricoturri1966
2980418706 ENABLE_SEAMS_USING_INSTANCED_MODELS -> WIP: Render models using glDrawElementsInstanced 2021-08-26 12:37:55 +02:00
Lukáš Hejl
95e4ab9460 Fixed the issue that an object disappeared in a multi-material painting gizmo when the object was almost completely sunk under the bed. 
Object disappearance was caused by calling glPolygonOffset for rendered triangles in the multi-material painting gizmo to resolve z-fighting between painted triangles and contours around selected areas using seed/bucket fill.
 2021-08-26 12:08:21 +02:00
David Kocik
02dd1b5f7d rendering highlight arrow from svg 2021-08-25 16:31:31 +02:00