3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,227 Commits 1 Branch 1 Tag 249 MiB
62e59a4526
Commit Graph

1308 Commits

Author SHA1 Message Date
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
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
MarkMan0
4e3369bbfc Improve Proton X profiles, Add Proton XE-750 printer 2022-05-26 16:04:26 +02:00
rk0n
1cf75100fc Remove filament spool weight from Verbatim PLA 2022-05-18 00:51:19 +02:00
rk0n
f6661f4217 Add Verbatim PLA to all Creality printers 2022-05-18 00:51:02 +02:00
rk0n
adaed9fdec Change Alpha to Beta Badge 2022-05-18 00:46:40 +02:00
rk0n
c0ab4dc2f5 Add profile for Creality Ender 3 S1 Pro 2022-05-17 19:41:54 +02:00
rtyr
6605ad926f
Merge pull request #8251 from pmjdebruijn/creality 
Fix Ender-3 Pro
 2022-05-16 06:28:27 +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
rtyr
ff58e73ef2
Sync with PrusaSlicer-settings 2022-05-04 09:05:00 +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
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
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
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
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
rtyr
69732e4b2a
Voron Trident 350mm resources 2022-03-30 16:15:51 +02:00