3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,487 Commits 1 Branch 1 Tag 249 MiB
426fdfb27a
Commit Graph

1414 Commits

Author SHA1 Message Date
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
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
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