Commit Graph

1345 Commits

Author SHA1 Message Date
enricoturri1966
2f5032ab02 Fixed conflicts after merge with branch lm_surface 2022-08-18 15:48:32 +02:00
enricoturri1966
2b996158d2 Merge branch 'master' of https://github.com/Prusa-Development/PrusaSlicerPrivate into et_opengl_es_rebase 2022-08-18 12:51:55 +02:00
Lukas Matena
bce2b148f4 Merged 2.5.0-beta1 into master (NO CONFLICTS FIXED) 2022-08-15 13:41:40 +02:00
YuSanka
60ad5d38c0 Localization: Some phrases are applied. Updated dictionaries for CS, DE, ES, FR, IT and PL 2022-08-15 12:30:57 +02:00
Valter F.C
db7946dbb6 pt_BR translation improvements 2022-08-12 10:02:58 -03:00
rtyr
dc9e35d8ea
Merge pull request #8602 from pmjdebruijn/creality_250
Creality.ini: Add alternative nozzle support
2022-08-11 11:30:17 +02:00
rtyr
1d1fb3fb37
Updated bed_shape 2022-08-11 09:59:45 +02:00
rtyr
5e23694e16
Added initial Elegoo bundle.
https://github.com/prusa3d/PrusaSlicer-settings/issues/162
2022-08-10 14:59:32 +02:00
Pascal de Bruijn
2aa79d00ca Creality.ini: adjust Geeetech Matte PLA 2022-08-09 19:57:36 +02:00
Pascal de Bruijn
ad0ac53685 Creality.ini: adjust infil_overlap 2022-08-09 19:56:26 +02:00
Pascal de Bruijn
9616f38de7 Creality.ini: adjust extrusion_widths 2022-08-09 19:56:09 +02:00
rtyr
fc6ca282dd Added thumbnails.
https://github.com/prusa3d/PrusaSlicer/pull/8602
2022-08-09 12:40:32 +02:00
rtyr
3cad3f6b89
Added new Creality thumbnails. 2022-08-09 12:33:44 +02:00
Pascal de Bruijn
3c188c5a4f Creality.ini: Add Geeetech Matte PLA 2022-08-04 18:28:06 +02:00
Pascal de Bruijn
54c5c116f6 Creality.ini: Add Ender-3 V2 Neo, Ender-3 Max Neo, CR-10 SMART Pro printers 2022-08-04 18:22:27 +02:00
Pascal de Bruijn
a8872a9211 Creality.ini: Add alternative nozzle support 2022-07-31 16:05:46 +02:00
Lukas Matena
f0cf420a84 Measuring: separated another gizmo 2022-07-26 16:37:51 +02:00
YuSanka
e0031018a7 Manually merged PR #8544 - Add 2.5.0 translate for zh_CN language 2022-07-22 16:53:11 +02:00
YuSanka
1150639306 Gallery: Update for recycling symbols 2022-07-21 10:44:09 +02:00
enricoturri1966
ac7c4b342b Added shaders for OpenGL ES 2022-07-21 10:18:18 +02:00
enricoturri1966
520261925f Fixed conflicts after merge with master 2022-07-21 08:14:44 +02:00
Lukas Matena
fbdf777898 Merge branch 'master_250' 2022-07-15 15:04:10 +02:00
YuSanka
200ab7441b Added notification about "Lightning infill" + localization for this line 2022-07-13 11:11:32 +02:00
YuSanka
92f874cdea Fix for #8450 - Tip Of The Day - configuration snapshots shortcut not work in the language Portuguese Brazil
Note: This bug was related not just for the language Portuguese Brazil but for all another dictionaries, where
for "&MenuItem" and "MenuItem" are used "&LocalMenuItem1" and "LocalMenuItem2" instead of "&LocalMenuItem" and "LocalMenuItem"
2022-07-12 14:57:11 +02:00
YuSanka
3bab1543dc localization: Updated pt_BR/PrusaSlicer.mo 2022-07-07 15:53:38 +02:00
Lukas Matena
7bfb161474 Fixed typos in pt_BR translation 2022-07-07 15:42:38 +02:00
Valter F.C
acfc43986b Updated pt_BR translation (#8449) 2022-07-07 15:42:38 +02:00
YuSanka
b0949b2dcf Manually merged PR #8438 - Russian localization update for the version PrusaSlicer 2.5.0-alpha2 2022-06-30 10:06:19 +02:00
YuSanka
5976dde2fc Back the PR #8330 - Localization: fixed a typo (JA), which was accidentally deleted in previous commit
+ Manually Added zh_CN dictionary from the PR #8425 - Update zh_CN
2022-06-29 16:56:56 +02:00
Lukas Matena
62e59a4526 Fixing conflicts part 1:
fixed simple conflicts
2022-06-29 16:43:29 +02:00
Lukas Matena
b61714bb3e Merge branch 'master_250' (NO CONFLICTS FIXED):
CONFLICT (content): Merge conflict in resources/profiles/PrusaResearch.idx
CONFLICT (content): Merge conflict in resources/profiles/PrusaResearch.ini
CONFLICT (content): Merge conflict in src/libslic3r/CMakeLists.txt
CONFLICT (content): Merge conflict in src/libslic3r/Fill/Fill.cpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode.cpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode.hpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode/GCodeProcessor.cpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode/GCodeProcessor.hpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode/SeamPlacer.cpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode/SeamPlacer.hpp
CONFLICT (add/add): Merge conflict in src/libslic3r/Geometry/Curves.hpp
CONFLICT (content): Merge conflict in src/libslic3r/PerimeterGenerator.cpp
CONFLICT (content): Merge conflict in src/libslic3r/Point.hpp
CONFLICT (content): Merge conflict in src/libslic3r/PrintConfig.hpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/ConfigWizard.cpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/GCodeViewer.cpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/GLCanvas3D.cpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/GUI_App.cpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp
CONFLICT (content): Merge conflict in src/slic3r/Utils/FixModelByWin10.cpp
CONFLICT (modify/delete): t/perimeters.t deleted in HEAD and modified in master_250.  Version master_250 of t/perimeters.t left in tree.
CONFLICT (content): Merge conflict in tests/fff_print/CMakeLists.txt
CONFLICT (content): Merge conflict in tests/fff_print/test_fill.cpp
CONFLICT (content): Merge conflict in version.inc
CONFLICT (modify/delete): xs/xsp/PerimeterGenerator.xsp deleted in HEAD and modified in master_250.  Version master_250 of xs/xsp/PerimeterGenerator.xsp left in tree.
2022-06-29 14:37:14 +02:00
YuSanka
c51326f504 Localization: Updated DE, FR and JA dictionaries 2022-06-28 14:13:16 +02:00
YuSanka
d7421696ea Localization: Fixes for CS, ES, IT and PL 2022-06-23 17:37:08 +02:00
rtyr
6d29c0584a
Added Arachne parameters. Changed default seam position. Updated output filename format. 2022-06-23 15:48:34 +02:00
YuSanka
4c65e468de Localization: New POT and updated dictionaries for CZ, PL, IT and ES
+ Fix for minor issue https://github.com/prusa3d/PrusaSlicer/issues/5672#issuecomment-1160245417
+ Fix for #7858 - Small formatting error in dutch language
+ Community PO-files are extended by new phrases
2022-06-23 13:34:29 +02:00
Akimasa Konishi
234e9066d2 Localization : fixed a typo (JA) 2022-06-23 13:34:29 +02:00
Bral
044045f3cb Fixed zh_CN translation (#8383) 2022-06-23 13:34:29 +02:00
YuSanka
8da37f568d Updated splashscreen for GCodePreview 2022-06-22 17:18:23 +02:00
YuSanka
07dfcdd94c Minor fixes for KR localization: Added missed line breaks 2022-06-17 17:37:34 +02:00
YuSanka
2688a29b08 SplashScreen: New image
+ PressureEqualizer" fixed warning
2022-06-17 17:14:14 +02:00
rtyr
2d7d8ba2f6
Added Infinity3D bundle. 2022-06-14 12:53:36 +02:00
rtyr
9fc47b9c3a
Added Infinity3D bundle.
https://github.com/prusa3d/PrusaSlicer/pull/8396
2022-06-14 12:44:25 +02:00
enricoturri1966
cd6155293b Fixed conflicts after merge with master 2022-06-07 11:10:19 +02:00
rtyr
a1143ab26e
Creality and INAT update 2022-06-03 15:11:01 +02:00
rtyr
29610bcee1
XE750 thumbnail 2022-06-03 15:10:13 +02:00
rtyr
fb5c35ccd7
Ender 3 S1 Pro thumbnail 2022-06-03 15:09:31 +02:00
rtyr
0b617e2cf6
Fixed min_slic3r_version 2022-06-03 15:00:48 +02:00
rtyr
c5c0eed1bc
Merge pull request #8359 from MarkINAT/inat_update
Inat update
2022-06-03 14:58:56 +02:00
rtyr
689b274fd3
updated bundle version to 0.1.5 2022-06-03 14:57:07 +02:00
rtyr
eb7e46895e
Merge pull request #8322 from rk0n/master
Add profile for Creality Ender 3 S1 Pro and Verbatim PLA
2022-06-03 14:56:06 +02:00