SoftFever
59bab91da9
Merge branch 'merge-upstream'
...
Signed-off-by: SoftFever <softfeverever@gmail.com>
# Conflicts:
# src/libslic3r/Preset.cpp
# src/libslic3r/PrintConfig.cpp
# src/libslic3r/PrintConfig.hpp
2023-09-30 09:51:56 +08:00
SoftFever
b8172316b8
Merge branch 'v1.7.2-remote'
...
Signed-off-by: SoftFever <softfeverever@gmail.com>
# Conflicts:
# deps/ZLIB/ZLIB.cmake
# localization/i18n/OrcaSlicer.pot
# localization/i18n/de/OrcaSlicer_de.po
# localization/i18n/en/OrcaSlicer_en.po
# localization/i18n/es/OrcaSlicer_es.po
# localization/i18n/fr/OrcaSlicer_fr.po
# localization/i18n/hu/OrcaSlicer_hu.po
# localization/i18n/it/OrcaSlicer_it.po
# localization/i18n/ja/OrcaSlicer_ja.po
# localization/i18n/ko/OrcaSlicer_ko.po
# localization/i18n/list.txt
# localization/i18n/nl/OrcaSlicer_nl.po
# localization/i18n/sv/OrcaSlicer_sv.po
# localization/i18n/zh_cn/OrcaSlicer_zh_CN.po
# resources/calib/PressureAdvance/pa_pattern.3mf
# resources/handy_models/Disc.stl
# resources/i18n/de/BambuStudio.mo
# resources/i18n/en/BambuStudio.mo
# resources/i18n/es/BambuStudio.mo
# resources/i18n/fr/BambuStudio.mo
# resources/i18n/hu/BambuStudio.mo
# resources/i18n/it/BambuStudio.mo
# resources/i18n/ja/BambuStudio.mo
# resources/i18n/ko/BambuStudio.mo
# resources/i18n/nl/BambuStudio.mo
# resources/i18n/sv/BambuStudio.mo
# resources/i18n/zh_cn/BambuStudio.mo
# resources/profiles/Anycubic.json
# resources/profiles/Anycubic/machine/Anycubic Kobra 2 0.4 nozzle.json
# resources/profiles/BBL.json
# resources/profiles/BBL/filament/Bambu ASA @BBL X1C 0.2 nozzle.json
# resources/profiles/BBL/filament/Bambu ASA @BBL X1C 0.4 nozzle.json
# resources/profiles/BBL/filament/Bambu ASA @BBL X1C.json
# resources/profiles/BBL/filament/Bambu PA-CF @base.json
# resources/profiles/BBL/filament/Bambu PA6-CF @BBL X1C.json
# resources/profiles/BBL/filament/Bambu PA6-CF @base.json
# resources/profiles/BBL/filament/Bambu PETG-CF @BBL X1C.json
# resources/profiles/BBL/filament/Bambu Support W @BBL X1.json
# resources/profiles/BBL/filament/Bambu TPU 95A @BBL X1.json
# resources/profiles/BBL/filament/Generic HIPS @BBL X1C 0.2 nozzle.json
# resources/profiles/BBL/filament/Generic HIPS @BBL X1C.json
# resources/profiles/BBL/filament/Generic PA-CF.json
# resources/profiles/BBL/filament/Generic PC.json
# resources/profiles/BBL/filament/Generic PETG-CF @BBL X1C.json
# resources/profiles/BBL/filament/Generic PLA @0.2 nozzle.json
# resources/profiles/BBL/filament/Generic PLA High Speed @BBL P1P 0.2 nozzle.json
# resources/profiles/BBL/filament/Generic PLA High Speed @BBL P1P.json
# resources/profiles/BBL/filament/Generic PLA High Speed @BBL X1C 0.2 nozzle.json
# resources/profiles/BBL/filament/Generic PLA High Speed @BBL X1C.json
# resources/profiles/BBL/filament/Generic PLA-CF.json
# resources/profiles/BBL/filament/Generic PLA.json
# resources/profiles/BBL/filament/Generic TPU.json
# resources/profiles/BBL/filament/Overture Matte PLA @BBL P1P 0.2 nozzle.json
# resources/profiles/BBL/filament/Overture Matte PLA @BBL P1P.json
# resources/profiles/BBL/filament/Overture Matte PLA @BBL X1.json
# resources/profiles/BBL/filament/Overture Matte PLA @BBL X1C 0.2 nozzle.json
# resources/profiles/BBL/filament/Overture Matte PLA @BBL X1C.json
# resources/profiles/BBL/filament/Overture Matte PLA @base.json
# resources/profiles/BBL/filament/Overture PLA @BBL P1P 0.2 nozzle.json
# resources/profiles/BBL/filament/Overture PLA @BBL P1P.json
# resources/profiles/BBL/filament/Overture PLA @BBL X1.json
# resources/profiles/BBL/filament/Overture PLA @BBL X1C 0.2 nozzle.json
# resources/profiles/BBL/filament/Overture PLA @BBL X1C.json
# resources/profiles/BBL/filament/Overture PLA @base.json
# resources/profiles/BBL/filament/P1P/Bambu TPU 95A @BBL P1P.json
# resources/profiles/BBL/filament/P1P/Generic PLA @BBL P1P 0.2 nozzle.json
# resources/profiles/BBL/filament/P1P/Generic TPU @BBL P1P.json
# resources/profiles/BBL/filament/P1P/eSUN PLA+ @BBL P1P 0.2 nozzle.json
# resources/profiles/BBL/filament/P1P/eSUN PLA+ @BBL P1P.json
# resources/profiles/BBL/filament/PolyLite ABS @BBL P1P 0.2 nozzle.json
# resources/profiles/BBL/filament/PolyLite ABS @BBL P1P.json
# resources/profiles/BBL/filament/PolyLite ABS @BBL X1C 0.2 nozzle.json
# resources/profiles/BBL/filament/PolyLite ABS @BBL X1C.json
# resources/profiles/BBL/filament/PolyLite ABS @base.json
# resources/profiles/BBL/filament/PolyLite ASA @BBL P1P 0.2 nozzle.json
# resources/profiles/BBL/filament/PolyLite ASA @BBL P1P.json
# resources/profiles/BBL/filament/PolyLite ASA @BBL X1C 0.2 nozzle.json
# resources/profiles/BBL/filament/PolyLite ASA @BBL X1C.json
# resources/profiles/BBL/filament/PolyLite ASA @base.json
# resources/profiles/BBL/filament/PolyLite PETG @BBL P1P 0.2 nozzle.json
# resources/profiles/BBL/filament/PolyLite PETG @BBL P1P.json
# resources/profiles/BBL/filament/PolyLite PETG @BBL X1C 0.2 nozzle.json
# resources/profiles/BBL/filament/PolyLite PETG @BBL X1C.json
# resources/profiles/BBL/filament/PolyLite PETG @base.json
# resources/profiles/BBL/filament/PolyLite PLA @BBL X1.json
# resources/profiles/BBL/filament/PolyTerra PLA @BBL X1.json
# resources/profiles/BBL/filament/eSUN PLA+ @BBL X1.json
# resources/profiles/BBL/filament/eSUN PLA+ @BBL X1C 0.2 nozzle.json
# resources/profiles/BBL/filament/eSUN PLA+ @BBL X1C.json
# resources/profiles/BBL/machine/Bambu Lab P1P 0.2 nozzle.json
# resources/profiles/BBL/machine/Bambu Lab P1P 0.4 nozzle.json
# resources/profiles/BBL/machine/Bambu Lab P1P 0.6 nozzle.json
# resources/profiles/BBL/machine/Bambu Lab P1P 0.8 nozzle.json
# resources/profiles/BBL/machine/Bambu Lab P1S 0.2 nozzle.json
# resources/profiles/BBL/machine/Bambu Lab P1S 0.4 nozzle.json
# resources/profiles/BBL/machine/Bambu Lab P1S 0.6 nozzle.json
# resources/profiles/BBL/machine/Bambu Lab P1S 0.8 nozzle.json
# resources/profiles/BBL/machine/Bambu Lab X1 0.2 nozzle.json
# resources/profiles/BBL/machine/Bambu Lab X1 0.4 nozzle.json
# resources/profiles/BBL/machine/Bambu Lab X1 0.6 nozzle.json
# resources/profiles/BBL/machine/Bambu Lab X1 0.8 nozzle.json
# resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.2 nozzle.json
# resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.4 nozzle.json
# resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.6 nozzle.json
# resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.8 nozzle.json
# resources/profiles/BBL/machine/fdm_bbl_3dp_001_common.json
# resources/profiles/BBL/process/0.06mm Standard @BBL X1C 0.2 nozzle.json
# resources/profiles/BBL/process/0.08mm Extra Fine @BBL P1P.json
# resources/profiles/BBL/process/0.08mm Extra Fine @BBL X1C.json
# resources/profiles/BBL/process/0.08mm Standard @BBL X1C 0.2 nozzle.json
# resources/profiles/BBL/process/0.10mm Standard @BBL P1P 0.2 nozzle.json
# resources/profiles/BBL/process/0.10mm Standard @BBL X1C 0.2 nozzle.json
# resources/profiles/BBL/process/0.12mm Fine @BBL P1P.json
# resources/profiles/BBL/process/0.12mm Fine @BBL X1C.json
# resources/profiles/BBL/process/0.12mm Standard @BBL X1C 0.2 nozzle.json
# resources/profiles/BBL/process/0.14mm Standard @BBL X1C 0.2 nozzle.json
# resources/profiles/BBL/process/0.16mm Optimal @BBL P1P.json
# resources/profiles/BBL/process/0.16mm Optimal @BBL X1C.json
# resources/profiles/BBL/process/0.18mm Standard @BBL X1C 0.6 nozzle.json
# resources/profiles/BBL/process/0.20mm Standard @BBL P1P.json
# resources/profiles/BBL/process/0.20mm Standard @BBL X1C.json
# resources/profiles/BBL/process/0.20mm Strength @BBL P1P.json
# resources/profiles/BBL/process/0.20mm Strength @BBL X1C.json
# resources/profiles/BBL/process/0.24mm Draft @BBL P1P.json
# resources/profiles/BBL/process/0.24mm Draft @BBL X1C.json
# resources/profiles/BBL/process/0.24mm Standard @BBL X1C 0.6 nozzle.json
# resources/profiles/BBL/process/0.24mm Standard @BBL X1C 0.8 nozzle.json
# resources/profiles/BBL/process/0.28mm Extra Draft @BBL P1P.json
# resources/profiles/BBL/process/0.28mm Extra Draft @BBL X1C.json
# resources/profiles/BBL/process/0.30mm Standard @BBL P1P 0.6 nozzle.json
# resources/profiles/BBL/process/0.30mm Standard @BBL X1 0.6 nozzle.json
# resources/profiles/BBL/process/0.30mm Standard @BBL X1C 0.6 nozzle.json
# resources/profiles/BBL/process/0.30mm Strength @BBL X1C 0.6 nozzle.json
# resources/profiles/BBL/process/0.32mm Standard @BBL X1C 0.8 nozzle.json
# resources/profiles/BBL/process/0.36mm Standard @BBL X1C 0.6 nozzle.json
# resources/profiles/BBL/process/0.40mm Standard @BBL P1P 0.8 nozzle.json
# resources/profiles/BBL/process/0.40mm Standard @BBL X1 0.8 nozzle.json
# resources/profiles/BBL/process/0.40mm Standard @BBL X1C 0.8 nozzle.json
# resources/profiles/BBL/process/0.42mm Standard @BBL X1C 0.6 nozzle.json
# resources/profiles/BBL/process/0.48mm Standard @BBL X1C 0.8 nozzle.json
# resources/profiles/BBL/process/0.56mm Standard @BBL X1C 0.8 nozzle.json
# resources/profiles/BBL/process/fdm_process_bbl_common.json
# resources/profiles/Creality.json
# resources/profiles/Creality/machine/Creality CR-10 Max 0.4 nozzle.json
# resources/profiles/Creality/machine/Creality CR-10 V2 0.4 nozzle.json
# resources/profiles/Creality/machine/Creality CR-6 Max 0.2 nozzle.json
# resources/profiles/Creality/machine/Creality CR-6 Max 0.4 nozzle.json
# resources/profiles/Creality/machine/Creality CR-6 Max 0.6 nozzle.json
# resources/profiles/Creality/machine/Creality CR-6 Max 0.8 nozzle.json
# resources/profiles/Creality/machine/Creality CR-6 SE 0.2 nozzle.json
# resources/profiles/Creality/machine/Creality CR-6 SE 0.4 nozzle.json
# resources/profiles/Creality/machine/Creality CR-6 SE 0.6 nozzle.json
# resources/profiles/Creality/machine/Creality CR-6 SE 0.8 nozzle.json
# resources/profiles/Creality/machine/Creality Ender-3 S1 0.4 nozzle.json
# resources/profiles/Creality/machine/Creality Ender-3 S1 Pro 0.4 nozzle.json
# resources/profiles/Creality/machine/Creality Ender-5 0.4 nozzle.json
# resources/profiles/Creality/machine/Creality Ender-5 Plus 0.4 nozzle.json
# resources/profiles/Creality/machine/Creality Ender-5 S1 0.4 nozzle.json
# resources/profiles/Creality/machine/Creality Ender-5S 0.4 nozzle.json
# resources/profiles/Creality/machine/Creality Ender-6 0.4 nozzle.json
# resources/profiles/Elegoo.json
# resources/profiles/Elegoo/machine/Elegoo Neptune 0.4 nozzle.json
# resources/profiles/Elegoo/machine/Elegoo Neptune 2 0.4 nozzle.json
# resources/profiles/Elegoo/machine/Elegoo Neptune 2D 0.4 nozzle.json
# resources/profiles/Elegoo/machine/Elegoo Neptune 2S 0.4 nozzle.json
# resources/profiles/Elegoo/machine/Elegoo Neptune 3 0.4 nozzle.json
# resources/profiles/Elegoo/machine/Elegoo Neptune 3 Max 0.4 nozzle.json
# resources/profiles/Elegoo/machine/Elegoo Neptune 3 Plus 0.4 nozzle.json
# resources/profiles/Elegoo/machine/Elegoo Neptune 3 Pro 0.4 nozzle.json
# resources/profiles/Elegoo/machine/Elegoo Neptune X 0.4 nozzle.json
# resources/profiles/Prusa.json
# resources/profiles/Prusa/machine/Prusa MINI 0.4 nozzle.json
# resources/profiles/Prusa/machine/Prusa MK3S 0.4 nozzle.json
# resources/profiles/Qidi/machine/Qidi X-CF Pro 0.4 nozzle.json
# resources/profiles/Qidi/machine/Qidi X-Max 0.4 nozzle.json
# resources/profiles/Qidi/machine/Qidi X-Max 3 0.4 nozzle.json
# resources/profiles/Qidi/machine/Qidi X-Plus 0.4 nozzle.json
# resources/profiles/Qidi/machine/Qidi X-Plus 3 0.4 nozzle.json
# resources/profiles/Qidi/machine/Qidi X-Smart 3 0.4 nozzle.json
# resources/profiles/Tronxy.json
# resources/profiles/Tronxy/machine/Tronxy X5SA 400 0.4 nozzle.json
# resources/profiles/Tronxy/process/0.08mm Extra Fine @Tronxy.json
# resources/profiles/Tronxy/process/0.12mm Fine @Tronxy.json
# resources/profiles/Tronxy/process/0.15mm Optimal @Tronxy.json
# resources/profiles/Tronxy/process/0.20mm Standard @Tronxy.json
# resources/profiles/Tronxy/process/0.24mm Draft @Tronxy.json
# resources/profiles/Tronxy/process/0.28mm Extra Draft @Tronxy.json
# resources/profiles/Voxelab/machine/Voxelab Aquila X2 0.4 nozzle.json
# resources/web/data/text.js
# src/OrcaSlicer.cpp
# src/libslic3r/GCode.cpp
# src/libslic3r/GCode/SeamPlacer.cpp
# src/libslic3r/GCode/SeamPlacer.hpp
# src/libslic3r/GCodeWriter.cpp
# src/libslic3r/GCodeWriter.hpp
# src/libslic3r/Preset.cpp
# src/libslic3r/PresetBundle.cpp
# src/libslic3r/Print.cpp
# src/libslic3r/PrintConfig.cpp
# src/libslic3r/PrintConfig.hpp
# src/libslic3r/TreeSupport.cpp
# src/libslic3r/calib.cpp
# src/libslic3r/calib.hpp
# src/slic3r/GUI/BackgroundSlicingProcess.cpp
# src/slic3r/GUI/BedShapeDialog.cpp
# src/slic3r/GUI/ConfigManipulation.cpp
# src/slic3r/GUI/GUI.cpp
# src/slic3r/GUI/GUI_App.cpp
# src/slic3r/GUI/GUI_Factories.cpp
# src/slic3r/GUI/GUI_ObjectList.cpp
# src/slic3r/GUI/Jobs/ArrangeJob.cpp
# src/slic3r/GUI/OptionsGroup.cpp
# src/slic3r/GUI/PartPlate.cpp
# src/slic3r/GUI/PartPlate.hpp
# src/slic3r/GUI/Plater.cpp
# src/slic3r/GUI/StatusPanel.cpp
# src/slic3r/GUI/Tab.cpp
# src/slic3r/GUI/Widgets/AMSControl.hpp
# version.inc
2023-09-29 19:46:49 +08:00
xun.zhang
0f4d5d40c7
ENH: update filament&process&machine profiles
...
jira:STUDIO-3518
Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I74ec718c9c40baf8f26df2f593960adf3984ddf1
2023-09-22 16:21:26 +08:00
xun.zhang
2403ed3221
ENH: update default exhaust fan speed
...
Also update BBL profile version
jira:STUDIO-3518
Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ie527758a2507c4b8a36f2663116eb406041550e7
2023-09-22 16:21:26 +08:00
xun.zhang
2d40511488
ENH: add filament PPA-GF
...
1.Add filament Generic PPA-GF
2.Set Generic PPA-CF filament type to PPA-CF
jira: STUDIO-3518
Change-Id: I1b81bca3774944aebdf15f88213fcb9b36b93e41
2023-09-22 16:21:26 +08:00
xun.zhang
596fcb0f69
ENH: add filement type pps-cf
...
jira: STUDIO-3518
Change-Id: Ifebaa96ca2e8336bf5449d7c9bd053ab00ab8041
2023-09-22 16:21:26 +08:00
xun.zhang
7d834e459c
ENH: set default chamber temp for missing filaments
...
jira: STUDIO-3518
Change-Id: Iaf947fe5a145884812eb15037458df3b83a338ab
2023-09-22 16:21:26 +08:00
xun.zhang
2ad89cf8c8
ENH:update profiles
...
jira:STUDIO-4037
Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: If6863a91d3c82ca70eb584b7db025a2ba3f09434
2023-09-22 16:21:26 +08:00
xun.zhang
a37c6647cc
FIX: add compatible printers in PolyLite PETG
...
jira:STUDIO-4222
Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I21b58f21680676e3c5e43a6de8b137db2447fd0a
2023-09-22 16:21:26 +08:00
xun.zhang
c3c6cc5e45
ENH: re add Generic PLA High Speed
...
jira:STUDIO-4205
Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ib5d17e2126a883151afd8e7a6172414c331435a8
2023-09-22 16:21:26 +08:00
xun.zhang
802865a92c
ENH: update chamber temp settings for X1E
...
1. Dont open chamber temp for ASA,ABS
jira:STUDIO-4184
Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I774708e8f4685dee2c3a4e8ada163d320f2bd3d3
2023-09-22 16:21:26 +08:00
xun.zhang
08d8d2ba74
ENH: lower filament max volumetric speed for petg
...
Lower max volumetric speed for polyLite petg
Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I4fe29c227e027132085fc67431a14f6b8ad07fd8
2023-09-22 16:21:26 +08:00
xun.zhang
7840f5d858
ENH: Sync X1E presets from the master branch.
...
Also sort the filaments and remove duplicated keys
Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I31678c42d55ba3d77c743eaeff071849a8f3d0e7
2023-09-22 16:21:26 +08:00
xun.zhang
f968c152c2
ENH: sync to A1 mini profiles
...
Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Idf0414a43bedcd970811d87b40ee3e2063e4e5c6
2023-09-22 16:21:26 +08:00
xun.zhang
aa9ace3e39
ENH: update profiles for N1
...
Adjust the print acceleration from 10000 to 6000.
Retain only PLA-type filaments, including support types for PLA,PETG,TPU.
Delete all other high-temperature filament types.
jira: STUDIO-4038
Change-Id: Iba56bfe94aee0235a629b98a29cdcac323490e34
2023-09-22 16:21:26 +08:00
xun.zhang
46ec5ea930
ENH: add profiles for N1
...
Add filament,process,machine profiles.
Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Iea89d42090fa7bf6ee66c84189b7425b8acffc27
(cherry picked from commit c9f6284d882b5df9fa8e34ab62a16813d198788c)
2023-09-22 16:21:26 +08:00
xun.zhang
82791b0320
ENH: update fan speed for Generic high speed
...
jira:STUDIO-4205
Change-Id: I301b1995befaac5b2ae1af0dd383c4107e280c59
2023-09-22 16:21:26 +08:00
xun.zhang
0b1c2cbe3a
ENH: Add Generic PLA High Speed
...
jira:STUDIO-4205
Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I6132ad07968850c2136bc24b0702d0bf525a0b8f
2023-09-22 16:21:26 +08:00
xun.zhang
17621eb3e8
ENH: change PA6-CF filament type to PA6-CF
...
PA6-CF is disabled in AMS
jira:STUDIO-4196
Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Iff32388a15f32da6b28034130d5ddadd107a3185
2023-09-22 16:21:26 +08:00
xun.zhang
507addcd4c
FIX: invalid filament vendor in PA6-CF
...
jira:STUDIO-4212
Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ie940cfb7ca3568e0fee04fa8a2bbcfad17040a15
2023-09-22 16:21:26 +08:00
xun.zhang
132e98c9c8
ENH: lower filament max volumetric speed for petg
...
Lower max volumetric speed for polyLite petg
Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Id7a28dd8bd59e01934e60e926902deeea456c89a
2023-09-22 16:21:26 +08:00
xun.zhang
80b77a9c01
ENH: add filament PA6-CF
...
As title. Also modify temperature_vitrification for PA-CF
Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: I8bc577267652be294ebe01f015b0502070c68dbe
2023-09-22 16:21:26 +08:00
xun.zhang
321f1f38e0
ENH: add more 3rd party filaments
...
Add Overture PLA, Matte PLA,PolyLite PETG,ABS,ASA
jira: STUDIO-4044
Change-Id: I3e1954dae20b6695383d8abdf55eb4eeba3b5a08
2023-09-22 16:21:26 +08:00
SoftFever
cae9ca950f
update BBL OTA profiles
2023-09-09 14:21:02 +08:00
SoftFever
f3b1694a14
update latest BL profiles from BS 1.7.1
2023-08-03 08:49:37 +08:00
xun.zhang
b8fa5decc1
ENH: lower the bed temperature for p1s and p1p
...
Change-Id: If00565c4428bc07d93eb3e2305fea4478d0f3339
2023-07-31 14:29:15 +08:00
qing.zhang
108b0b6999
ENH: add P1S machine
...
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Ide4b293e20e0a66dde748ee5844c7bc0dfcc359e
2023-07-13 10:35:05 +08:00
xun.zhang
7b0b24e64e
ENH: add PLA-AERO,add default key in common json
...
Change-Id: Ia6551f50e0f921a196a3a94659b367ca1ec4424f
2023-07-07 17:52:43 +08:00
qing.zhang
1368501508
ENH: add Generic HIPS
...
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I0fd861db6137c39f59630ae443661ddeb7a7b060
2023-07-07 17:29:08 +08:00
qing.zhang
9cbd43049e
ENH: add eSUN PLA
...
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: If518adba2d6a7651e8c8ca083578899c9267940e
(cherry picked from commit a06b89273f0f690781116f889de93e95970f9cef)
2023-07-07 17:29:08 +08:00
xun.zhang
6e34ecd749
ENH:update PETG/PTEG-CF fan_threshold
...
Change-Id: Iffdffd936f249dd763ab7ebad0b7622d1eb504af
2023-07-07 17:29:08 +08:00
xun.zhang
254c3f77c2
ENH: reduce v-speed in 0.4 nozzle for PETG/PETG-CF
...
Change-Id: I1ec04a44a16872c19de4e5148fd269aee1952147
2023-07-07 17:29:08 +08:00
xun.zhang
fb5a9062ff
ENH:add support for ASA and PLA Aero
...
Change-Id: I1d4be3cbfce5115bd06b310c947b8aa13960b43b
2023-07-07 17:25:51 +08:00
xun.zhang
2c00a44de6
ENH: update PLA/PETG start gcode
...
Change-Id: I7488f8d38dce87ac3d3c08f6d0367743b61a04ff
(cherry picked from commit 6058fe6fdc8293d7d2542958b9e9aa3562a62bd9)
2023-07-07 17:25:51 +08:00
qing.zhang
cdae0ac2b5
ENH: set fid of Genric PLA Silk & travel_length
...
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I4f8b7e73007c9740fac8c379c2b85f2d6fbdd9d8
2023-07-07 17:25:51 +08:00
xun.zhang
8b893e631b
ENH: delete duplicate keys in filament profiles
...
Change-Id: If87ed772ceae1c8b09f3dbd09f1006918622cfe5
2023-07-07 17:25:51 +08:00
qing.zhang
8b19310d5d
ENH: add support for PLA and support for PA
...
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I83781d4e11bd986131caaabba479c0074f2506a0
(cherry picked from commit 545c0122d1c0fce96b62de7ee9042b24911d93a6)
2023-07-07 17:25:51 +08:00
SoftFever
bdf8c8d5b1
Merge remote-tracking branch 'remote/v1.6.0'
...
# Conflicts:
# .github/workflows/build_ubuntu.yml
# src/libslic3r/Print.cpp
# version.inc
2023-07-07 00:38:54 +08:00
qing.zhang
64428b4d3b
ENH: add support for PLA and support for PA
...
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I83781d4e11bd986131caaabba479c0074f2506a0
(cherry picked from commit 545c0122d1c0fce96b62de7ee9042b24911d93a6)
2023-04-27 15:50:47 +08:00
SoftFever
9f598046d1
Merge remote-tracking branch 'remote/master' into feature/merge_upstream
...
# Conflicts:
# bbl/i18n/OrcaSlicer.pot
# bbl/i18n/de/OrcaSlicer_de.po
# bbl/i18n/en/OrcaSlicer_en.po
# bbl/i18n/es/OrcaSlicer_es.po
# bbl/i18n/fr/OrcaSlicer_fr.po
# bbl/i18n/hu/OrcaSlicer_hu.po
# bbl/i18n/it/OrcaSlicer_it.po
# bbl/i18n/ja/OrcaSlicer_ja.po
# bbl/i18n/nl/OrcaSlicer_nl.po
# bbl/i18n/sv/OrcaSlicer_sv.po
# bbl/i18n/zh_cn/OrcaSlicer_zh_CN.po
# resources/config.json
# resources/i18n/de/BambuStudio.mo
# resources/i18n/en/BambuStudio.mo
# resources/i18n/es/BambuStudio.mo
# resources/i18n/fr/BambuStudio.mo
# resources/i18n/hu/BambuStudio.mo
# resources/i18n/it/BambuStudio.mo
# resources/i18n/ja/OrcaSlicer.mo
# resources/i18n/nl/BambuStudio.mo
# resources/i18n/sv/BambuStudio.mo
# resources/i18n/zh_cn/BambuStudio.mo
# resources/images/ams_humidity_2.svg
# resources/images/ams_humidity_3.svg
# resources/images/ams_humidity_4.svg
# resources/images/ams_humidity_tips.svg
# resources/images/monitor_state_on.svg
# resources/images/sdcard_state_normal.svg
# resources/profiles/BBL.json
# resources/profiles/BBL/filament/Bambu PETG-CF @base.json
# resources/profiles/BBL/filament/Generic PETG-CF @base.json
# resources/profiles/BBL/machine/Bambu Lab P1P 0.4 nozzle.json
# resources/web/data/text.js
# resources/web/guide/3/index.html
# resources/web/guide/31/index.html
# src/BambuStudio.cpp
# src/libslic3r/AABBTreeLines.hpp
# src/libslic3r/Brim.cpp
# src/libslic3r/CMakeLists.txt
# src/libslic3r/ExPolygon.hpp
# src/libslic3r/Fill/FillBase.hpp
# src/libslic3r/Format/bbs_3mf.cpp
# src/libslic3r/GCodeWriter.cpp
# src/libslic3r/Line.hpp
# src/libslic3r/PerimeterGenerator.cpp
# src/libslic3r/Preset.cpp
# src/libslic3r/Print.cpp
# src/libslic3r/Print.hpp
# src/libslic3r/PrintConfig.cpp
# src/libslic3r/PrintConfig.hpp
# src/libslic3r/TreeSupport.cpp
# src/slic3r/GUI/AmsMappingPopup.cpp
# src/slic3r/GUI/BackgroundSlicingProcess.cpp
# src/slic3r/GUI/ConfigManipulation.cpp
# src/slic3r/GUI/GCodeViewer.cpp
# src/slic3r/GUI/GCodeViewer.hpp
# src/slic3r/GUI/GLCanvas3D.cpp
# src/slic3r/GUI/GUI_App.cpp
# src/slic3r/GUI/MainFrame.cpp
# src/slic3r/GUI/PartPlate.cpp
# src/slic3r/GUI/Plater.cpp
# src/slic3r/GUI/Preferences.cpp
# src/slic3r/GUI/SelectMachine.cpp
# src/slic3r/GUI/Widgets/AMSControl.cpp
# src/slic3r/GUI/wxMediaCtrl2.cpp
# src/slic3r/Utils/Process.cpp
# version.inc
2023-04-19 08:48:07 +08:00
qing.zhang
0dfbc7e719
FIX: conflict of setting-id
...
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I8eb290e4c1f86635b8d1cbafa80a221ab8ea967c
2023-04-17 15:39:02 +08:00
qing.zhang
63c9b81127
ENH: update the temp of high plate of PLA Silk
...
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I1154af98d966aa7a0f384538944d569c190ffd41
2023-04-17 15:39:02 +08:00
qing.zhang
4c41f46163
ENH: add filament_is_support to all files
...
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I439ef9a2902563874d748be9aa9fe067e99588e6
2023-04-17 15:39:02 +08:00
qing.zhang
d3d3f41f8c
ENH: update fan nax speed of Bambu PETG Basic
...
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I7e43702eb3af0e7960ea91ef3dd3a38c496b6f6b
2023-04-17 15:39:02 +08:00
lane.wei
5772b013de
FIX: fix the filename not correct issue under linux
...
Change-Id: Ic720c7734be60197135965f3dcecc84eb9a8eb5d
2023-04-17 15:39:02 +08:00
qing.zhang
afb9886e0e
ENH: add Bambu PLA Silk & Bambu PETG Basic
...
add cool plate temp for PLA
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: If3ca9c773351939358d7bed9f6d6c890a28b302b
2023-04-17 15:39:02 +08:00
qing.zhang
cafd8e7f7e
ENH: modify temperature_temp of PET-CF
...
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I2e361b79620cbc5e7df7d5a657f8b26e285d3538
2023-04-17 15:39:02 +08:00
qing.zhang
a8488f65b2
ENH: add Bambu PET-CF & modify slow down layer time of Bambu PLA-CF
...
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I8396840eca762def30cb794f4c29808f2f71adfa
2023-04-17 15:39:02 +08:00
qing.zhang
4adfb71115
ENH: add Bambu PETG-CF & change filament id of PLA Silk
...
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Ib62b479a2a6648a2a4bfa0d3deb11f6f37f754a4
2023-04-17 15:39:02 +08:00
lane.wei
dce7751750
ENH: param: remove redundant values in fdm_common
...
Change-Id: Ie23377db59196edc1857071b91889e2165e63127
(cherry picked from commit 84dc9d988decae3164c084a6b579522276cb4010)
2023-04-17 15:39:02 +08:00
