SoftFever
77f344bee0
Merge BS 1.7.7.89
...
# Conflicts:
# bbl/i18n/ko/BambuStudio_ko.po
# 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/nl/OrcaSlicer_nl.po
# localization/i18n/sv/OrcaSlicer_sv.po
# localization/i18n/zh_cn/OrcaSlicer_zh_CN.po
# 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/machine/Anycubic Kobra Max 0.4 nozzle.json
# src/OrcaSlicer.cpp
# src/libnest2d/include/libnest2d/selections/firstfit.hpp
# src/libslic3r/GCode/GCodeProcessor.cpp
# src/libslic3r/Print.cpp
# src/libslic3r/Print.hpp
# src/libslic3r/PrintConfig.cpp
# src/slic3r/GUI/CalibrationWizardPresetPage.cpp
# src/slic3r/GUI/GLCanvas3D.cpp
# src/slic3r/GUI/PartPlate.cpp
# src/slic3r/GUI/PartPlate.hpp
# src/slic3r/GUI/ReleaseNote.cpp
# src/slic3r/GUI/Tab.cpp
# version.inc
2023-10-21 19:41:49 +08:00
Arthur
83c8c6faf6
FIX: cli arrange failed in some cases
...
1. set different bed_shrink for seq_print and layered print
2. fix the bug that seq_print arranging may get collision with exclusion
area.
3. remove unused functions.
Jira: STUDIO-4663
Change-Id: I8b726704cca33fe37bb3cb7c4502963a9ad8d16b
(cherry picked from commit f27d00f81315fe4675bbc55ef932403e31a9264f)
2023-10-10 14:19:23 +08:00
SoftFever
6ce1bc664e
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
Arthur
658be3bd2b
FIX: unify cli and GUI auto-arrange
...
Make sure cli uses same params as GUI's auto-arrange.
Previously cli uses wrong skirt_distance.
Jira: BLPIOT-255
Change-Id: Iaccfb76acf7413ec614fff006feb770dcd6783cf
2023-09-22 16:21:26 +08:00
SoftFever
6918489c55
micro refactor vender type
2023-08-27 11:01:52 +08:00
SoftFever
ce5f288430
post changes after merging BS1.7.4
...
Remove tracking etc..
2023-08-26 18:45:43 +08:00
Arthur
a5f772013a
FIX: FillBed crashes when accessing unset print config option
...
1. When the option is not set, print.full_print_config() is empty, so we
can't access opt_bool("scan_first_layer") or opt_bool("enable_support").
Should use wxGetApp().preset_bundle->full_config() instead.
Jira: STUDIO-3264
2. Allow different object having different brim_width to encode support's brim width.
In this way the arranging logic is simpler and more objects can be arranged in a plate.
Change-Id: Ic7178652147b0519d50b2eb9ceb214b4ef4c0251
(cherry picked from commit 0f163d59b40009cd29b8b1e32f730258ad0786dc)
2023-07-07 17:29:08 +08:00
Arthur
f19a0bf6dd
FIX: fill in bed may shift objects outside bed
...
Do not do final align for filling in bed.
Jira: STUDIO-3265
Change-Id: I2ce2ebed575ba05b1d78ec89923f8e91c4de6648
(cherry picked from commit 581aa4fd0ff1c6f64026d7b934d4bd8a79b803ae)
2023-07-07 17:29:08 +08:00
manch1n
6bfd20aa94
FIX: correct the obj distance of by-object partplate arrangement
...
STUDIO-3103
Change-Id: I44dd3e8677713bf5427f266ff3c88870fbb4b2f9
(cherry picked from commit aebcba75ba760d31245f9cf336cba72da3521b1a)
2023-07-07 17:29:08 +08:00
manch1n
ffac37bc94
FIX: make fill in bed arrange parameters same as normal arrange
...
Change-Id: Iec9d4e9c145ea75fc06d096e9c6905b3e412940c
2023-07-07 17:25:51 +08:00
manch1n
c7f8945ce5
ENH: add fill in bed arrangement
...
Also add an option to add_object_to_list to speedup.
Change-Id: I9860a950fb98b144d831ded11d5911d3aba77ba5
(cherry picked from commit aa9dd9a02ef4ac4cd6987b02b0c9be6d9ce9097f)
2023-07-07 17:25:51 +08:00
lane.wei
f8756e6c89
Add the full source of BambuStudio
...
using version 1.0.10
2022-07-15 23:42:08 +08:00
