Pascal de Bruijn
201a359bea
Creality.ini: remove bowden inherit from direct drive printers
2022-08-23 17:19:21 +02:00
Pascal de Bruijn
57945708d9
Creality.ini: add Ender-3 S1 Plus
2022-08-23 17:17:35 +02:00
Pascal de Bruijn
4579f12613
Creality.ini: Ender-3 S1 (Pro) CR Touch support ( #8743 )
2022-08-23 17:17:15 +02:00
YuSanka
025b249b85
Localization: Update for zh_CN dictionary (manual merge for PR #8737 - Update translation for 2.5.0-rc1)
...
+ Fixed 1 line for JA dictionary
2022-08-22 12:40:50 +02:00
rtyr
b62689437a
Sync with PrusaSlicer-settings
2022-08-18 15:50:14 +02:00
rtyr
0c22ca3ece
Sync with PrusaSlicer-settings
2022-08-18 15:48:10 +02:00
YuSanka
dcdbc6bff1
Localization: Updated dictionary for JA
2022-08-18 13:43:47 +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
YuSanka
79e9df4b64
Merge remote-tracking branch 'PRIVATE/master' into ys_cut
2022-08-17 10:05:44 +02:00
YuSanka
a1b324d1ee
Merge remote-tracking branch 'PRIVATE/master' into ys_cut
2022-08-15 14:17:42 +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
991f2bdbd1
Sync with master_250
2022-08-11 11:34:34 +02: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
84c2358bf0
Updated bed_shape
2022-08-11 09:58:23 +02:00
rtyr
5e23694e16
Added initial Elegoo bundle.
...
https://github.com/prusa3d/PrusaSlicer-settings/issues/162
2022-08-10 14:59:32 +02:00
rtyr
60c157e7cc
Update Elegoo.idx
2022-08-10 14:58:13 +02:00
rtyr
7281d66b07
Added Elegoo bundle
2022-08-10 14:57:03 +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
rtyr
af32f8c5b7
Added thumbnails.
...
https://github.com/prusa3d/PrusaSlicer/pull/8602
2022-08-09 12:31:18 +02:00
YuSanka
2ac3861b2a
Merge remote-tracking branch 'PRIVATE/master' into ys_cut
2022-08-08 10:57:38 +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
YuSanka
27f7a8da0f
Cut WIP: Added shortcuts for "Edit connectors" ImGuiDialog
...
+ Added processing for the Ctrl+A ("Select All connectors")
2022-07-27 13:53:54 +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
Filip Sykala - NTB T15p
79a7f588b9
Merge branch 'et_world_coordinates' into fs_emboss
...
# Conflicts:
# src/libslic3r/CMakeLists.txt
# src/libslic3r/Format/3mf.cpp
# src/libslic3r/Model.hpp
# src/libslic3r/Technologies.hpp
# src/slic3r/GUI/GLCanvas3D.cpp
# src/slic3r/GUI/GUI_App.cpp
# src/slic3r/GUI/Gizmos/GLGizmoBase.cpp
# src/slic3r/GUI/Gizmos/GLGizmoBase.hpp
# src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp
# src/slic3r/GUI/Selection.cpp
# src/slic3r/GUI/Selection.hpp
2022-07-20 13:02:07 +02:00
Lukas Matena
fbdf777898
Merge branch 'master_250'
2022-07-15 15:04:10 +02:00
Filip Sykala - NTB T15p
8eda845562
save memory
2022-07-13 14:10:49 +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
89a7f6bdb1
Merge remote-tracking branch 'origin/ys_wx317_master' into ys_cut
2022-06-29 11:44:11 +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
MarkMan0
4e3369bbfc
Improve Proton X profiles, Add Proton XE-750 printer
2022-05-26 16:04:26 +02:00
enricoturri1966
c468dcbed7
Tech ENABLE_LEGACY_OPENGL_REMOVAL - Fixed calculation of normal matrices sent to shaders
...
Fixed conflicts during rebase with master
2022-05-26 12:25:55 +02:00
enricoturri1966
9dda2b0ed5
Refactoring in shader dashed_thick_lines
2022-05-26 11:39:53 +02:00
enricoturri1966
17293056d5
Refactoring in shader dashed_thick_lines
2022-05-26 11:39:53 +02:00
enricoturri1966
914a66e2c3
Tech ENABLE_GL_CORE_PROFILE - Thick lines shader enhanced to render dashed lines
...
Fixed conflicts while rebase with master
2022-05-26 08:11:04 +02:00
enricoturri1966
94305e5912
Fixes into thick_lines shader
2022-05-25 16:01:41 +02:00
enricoturri1966
017784c38e
Tech ENABLE_GL_CORE_PROFILE - Use thick_lines shader where needed
...
Fixed conflicts during rebase with master
2022-05-25 15:55:39 +02:00
enricoturri1966
389dc36053
Tech ENABLE_GL_CORE_PROFILE - Use OpenGL core profile context - 1st installment
...
Fixed conflicts during rebase with master
2022-05-25 15:29:10 +02:00
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
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
YuSanka
04145abdfc
Merge remote-tracking branch 'origin/master' into ys_cut
2022-05-12 09:21:58 +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
41eaff1482
Merge remote-tracking branch 'origin/master' into ys_cut
2022-05-10 11:10:51 +02:00
YuSanka
0869f49124
Localization: Update for list.txt
2022-05-09 17:04:10 +02:00
YuSanka
9582a9b478
Merge remote-tracking branch 'origin/master' into ys_cut
2022-05-09 11:25:29 +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
YuSanka
94f3aaacd4
Cut WIP: Undo/Redo implementation
2022-05-02 12:44:47 +02:00
Filip Sykala
3e9778b46b
Merge branch 'et_world_coordinates' into fs_emboss
2022-05-02 10:11:47 +02:00
YuSanka
73469ffa21
Merge remote-tracking branch 'origin/master' into ys_cut
2022-04-28 13:25: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
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
YuSanka
91a1cd30a0
Merge remote-tracking branch 'origin/master' into ys_cut
2022-04-14 10:04:45 +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
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
