Commit graph

459 commits

Author SHA1 Message Date
SoftFever
da57260101 change default slow_down_min_speed to 10 2023-03-14 21:30:45 +08:00
SoftFever
a47c756112 Added gcode_label_objects and gcode_comments option 2023-03-12 18:25:42 +08:00
SoftFever
5b0ba1207e Change Application name to OrcaSlicer 2023-03-12 10:05:22 +08:00
SoftFever
da61839e84 Merge remote-tracking branch 'upstream/v1.5.0' into SoftFever 2023-03-10 18:46:46 +08:00
qing.zhang
67daabaddc ENH: modify temperature_temp of PET-CF
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I2e361b79620cbc5e7df7d5a657f8b26e285d3538
2023-03-09 19:07:29 +08:00
qing.zhang
fa1d8953ad 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-03-09 19:07:29 +08:00
qing.zhang
df157d3682 ENH: add Bambu PETG-CF & change filament id of PLA Silk
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Ib62b479a2a6648a2a4bfa0d3deb11f6f37f754a4
2023-03-09 19:07:28 +08:00
SoftFever
3470460931 fix colors 2023-03-09 01:05:51 +08:00
SoftFever
5ef51f6c8a Merge branch 'master-remote' into feature/1.5
Signed-off-by: SoftFever <softfeverever@gmail.com>

# Conflicts:
#	bbl/i18n/BambuStudio.pot
#	bbl/i18n/de/BambuStudio_de.po
#	bbl/i18n/en/BambuStudio_en.po
#	bbl/i18n/es/BambuStudio_es.po
#	bbl/i18n/fr/BambuStudio_fr.po
#	bbl/i18n/hu/BambuStudio_hu.po
#	bbl/i18n/it/BambuStudio_it.po
#	bbl/i18n/nl/BambuStudio_nl.po
#	bbl/i18n/sv/BambuStudio_sv.po
#	bbl/i18n/zh_cn/BambuStudio_zh_CN.po
#	deps/Boost/Boost.cmake
#	deps/wxWidgets/wxWidgets.cmake
#	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/nl/BambuStudio.mo
#	resources/i18n/sv/BambuStudio.mo
#	resources/i18n/zh_cn/BambuStudio.mo
#	resources/images/tips_arrow.svg
#	resources/profiles/Anycubic.json
#	resources/profiles/Anycubic/filament/Anycubic Generic ABS.json
#	resources/profiles/Anycubic/filament/Anycubic Generic ASA.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PA-CF.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PA.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PC.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PETG.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PLA-CF.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PLA.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PVA.json
#	resources/profiles/Anycubic/filament/Anycubic Generic TPU.json
#	resources/profiles/Anycubic/filament/fdm_filament_common.json
#	resources/profiles/Anycubic/machine/Anycubic 4Max Pro 0.4 nozzle.json
#	resources/profiles/Anycubic/machine/Anycubic 4Max Pro.json
#	resources/profiles/Anycubic/process/0.20mm Standard @4MaxPro.json
#	resources/profiles/Anycubic/process/fdm_process_common.json
#	resources/profiles/BBL.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 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/Voron.json
#	resources/web/data/text.js
#	resources/web/image/printer/Anycubic 4Max Pro_cover.png
#	src/BambuStudio.cpp
#	src/libslic3r/GCode.cpp
#	src/libslic3r/GCode.hpp
#	src/libslic3r/GCode/GCodeProcessor.cpp
#	src/libslic3r/GCodeWriter.hpp
#	src/libslic3r/PerimeterGenerator.cpp
#	src/libslic3r/PresetBundle.cpp
#	src/libslic3r/Print.cpp
#	src/libslic3r/Print.hpp
#	src/libslic3r/PrintConfig.cpp
#	src/libslic3r/PrintConfig.hpp
#	src/libslic3r/PrintObject.cpp
#	src/slic3r/GUI/AMSMaterialsSetting.cpp
#	src/slic3r/GUI/AMSMaterialsSetting.hpp
#	src/slic3r/GUI/AmsMappingPopup.cpp
#	src/slic3r/GUI/AmsMappingPopup.hpp
#	src/slic3r/GUI/Auxiliary.cpp
#	src/slic3r/GUI/BackgroundSlicingProcess.cpp
#	src/slic3r/GUI/ConfigManipulation.cpp
#	src/slic3r/GUI/DeviceManager.cpp
#	src/slic3r/GUI/DeviceManager.hpp
#	src/slic3r/GUI/ExtrusionCalibration.cpp
#	src/slic3r/GUI/GCodeViewer.cpp
#	src/slic3r/GUI/GCodeViewer.hpp
#	src/slic3r/GUI/GUI_App.cpp
#	src/slic3r/GUI/IMSlider.cpp
#	src/slic3r/GUI/Jobs/PrintJob.cpp
#	src/slic3r/GUI/Jobs/PrintJob.hpp
#	src/slic3r/GUI/Jobs/SendJob.cpp
#	src/slic3r/GUI/Jobs/SendJob.hpp
#	src/slic3r/GUI/MainFrame.cpp
#	src/slic3r/GUI/MainFrame.hpp
#	src/slic3r/GUI/MediaPlayCtrl.cpp
#	src/slic3r/GUI/OptionsGroup.cpp
#	src/slic3r/GUI/PhysicalPrinterDialog.cpp
#	src/slic3r/GUI/Plater.cpp
#	src/slic3r/GUI/PrintHostDialogs.cpp
#	src/slic3r/GUI/Printer/BambuTunnel.h
#	src/slic3r/GUI/Printer/PrinterFileSystem.cpp
#	src/slic3r/GUI/Printer/gstbambusrc.c
#	src/slic3r/GUI/Printer/gstbambusrc.h
#	src/slic3r/GUI/ReleaseNote.cpp
#	src/slic3r/GUI/ReleaseNote.hpp
#	src/slic3r/GUI/SelectMachine.cpp
#	src/slic3r/GUI/SendToPrinter.cpp
#	src/slic3r/GUI/SetBedTypeDialog.cpp
#	src/slic3r/GUI/StatusPanel.cpp
#	src/slic3r/GUI/StatusPanel.hpp
#	src/slic3r/GUI/Tab.cpp
#	src/slic3r/GUI/Widgets/AMSControl.cpp
#	src/slic3r/GUI/Widgets/AMSControl.hpp
#	src/slic3r/GUI/Widgets/ImageSwitchButton.cpp
#	src/slic3r/GUI/Widgets/Label.cpp
#	src/slic3r/GUI/WipeTowerDialog.cpp
#	src/slic3r/Utils/Process.cpp
#	src/slic3r/Utils/bambu_networking.hpp
#	version.inc
2023-03-08 00:08:26 +08:00
SoftFever
a6cd32fe72 Allow user to turn adaptive layer height for tree support.
Signed-off-by: SoftFever <softfeverever@gmail.com>
#257
2023-03-06 19:57:09 +08:00
SoftFever
c58ed92da1 Support filament shrinkage
Ported from SuperSlicer

Signed-off-by: SoftFever <softfeverever@gmail.com>
#360
2023-03-05 17:23:17 +08:00
qing.zhang
65e03a5b29 FIX: fix add PETG-CF
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I47f93ac19e0c82f0c218a01f4d916b8d76331ad9
2023-02-28 18:44:28 +08:00
qing.zhang
d484b5e5fb ENH: add PETG-CF
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Iaee30ced3be002120b6138be31a7b57422cf20bc
2023-02-28 18:44:28 +08:00
salt.wei
538c607842 ENH: z_hop_types is enum not string
Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Ia05eff8c78c65e358c8df36ea8b606a9b8da2663
2023-02-28 18:44:28 +08:00
yifan.wu
3e2fea33a9 ENH: update upward compatible machines
P1P, X1 and X1C may compatible with each other

Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I1de7350cbc613e0dc539fe2e7f26dbe9d455e4f3
2023-02-28 18:44:28 +08:00
SoftFever
29600dd67e attempt to fix black texture for Voron machines on some old computers 2023-02-27 21:06:23 +08:00
Heiko Liebscher
071cb32923
fix icon.icns for mac (#374) 2023-02-26 13:56:38 +08:00
SoftFever
463393c969 fix non-manifold issue for temp tower
#368
2023-02-25 19:23:41 +08:00
tao.jin
39f87ca39e ENH: change sdcard icon
Change-Id: I9f52213395672b591f9a4928071503d1817eaa85
2023-02-24 17:44:15 +08:00
Stone Li
a985c21f3a ENH: sync po files with localazy
Change-Id: Ifd5414a6bdb8fa1dfb55b01f7e3f85d6562b3fc1
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-24 17:44:15 +08:00
tao.jin
394391fd12 FIX: chinese translation (STUDIO-2311~13)
Change-Id: I341bae62a88cb6130a2558cbea4083abc360d444
2023-02-24 17:44:15 +08:00
salt.wei
354a3736e4 ENH: use spiral lift as default lift type
Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I52477adc3e6d48ab8201364c74006c5432db5d67
2023-02-24 17:44:15 +08:00
tao wang
ea37a10951 FIX:Gcode feed/back not supported
Change-Id: I50956060e35d95ff610b2f95764c6e97468c53bb
2023-02-24 09:23:57 +08:00
wintergua
d5f2a3e748 ENH: translate of the tooltips of brim type
Change-Id: I37601cbe4b116c79bdd164feac12d463d4b1c5ce
2023-02-24 09:23:57 +08:00
Arthur
2616479489 FIX: fix possible toolhead shake by adding 300ms delay
1. It seems there are a lot of buffered frames in IP CAM. Have to
   wait enough time untill all buffers are flushed.
2. From watermellon's suggestion, increase travel speed duing layer
   change, to save time and reduce oozing.

JIRA: STUDIO-2167
Change-Id: Ia2ec0bde216e90207897c00c395f7e02ea2fe342
(cherry picked from commit 9c85a7c68617b1628e1698912da20f1ebc69ec16)
2023-02-24 09:23:57 +08:00
zhimin.zeng
2fe0930777 FIX: Modify translation
Change-Id: I5c29e805dd8b93fbc3d8a59ef146e2fd16ce9ea0
2023-02-24 09:23:57 +08:00
liz.li
6f8557861b ENH:replace a svg
Change-Id: I6a5f13bf45d959a14f39bebbded425be8ab52d35
2023-02-24 09:23:57 +08:00
salt.wei
14ca73ec3c ENH: miss generic PLA silk for P1P
As title

Handle for github issue #1303

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Iffda4f3ea615a4e876f83ef8f85dacf954d5678e
2023-02-24 09:23:57 +08:00
liz.li
3be3c5553e ENH:add some translations
Change-Id: Iec4b31ada7d1f21f7ddb12fd777fd284298a0cde
2023-02-24 09:23:57 +08:00
5axes
6191b4b6dd
Update French Translation (#337)
* Update BambuStudio_fr.po

French translation

* Update BambuStudio_fr.po

New modifications

* Update BambuStudio_fr.po

Test to add Layer time ( missing in the original po file)

* Update French

Change some French initial translation like A-coup in Saccade

* Update BambuStudio_fr.po

Add Jerk(XY)

* Update BambuStudio_fr.po

last modification for today

* Update BambuStudio_fr.po

Last French translation of the Morning
Mainly on the Giszmo

* Update BambuStudio_fr.po

Mainly on Filament parameter

* Update BambuStudio_fr.po

Adjust translation with :

https://github.com/BastR/BambuStudio/blob/french-trad/bbl/i18n/fr/BambuStudio_fr.po

* Update BambuStudio.mo

* last modif

Last modif for today

* Update fr

an other one

* Update

Last Modification

* Update

Missing term in the German translation

* update

Changement

* update

TimeLaps

* Update 11/1/2023

Minor Change
Update  : Year / Month ( not translated in the previous translation)

* Update French Translation

Update for BambuStudio-SoftFever_V1.4.2

* Change some typro

Update some Typo

* Fix some Typo

Fix somme Typo and Label not presnet in the pot file

* Add Calibration SoftFever

Add missing Label on the SoftFever Calibration Menu

* Update BambuStudio_fr.po

Erreur Taper: -> Type:

* Update text.js

Add French Translation for Web interface

* Add Manual Web text

Translate French Manual Web text

* Update text.js

Back to "en"
2023-02-22 23:07:05 +08:00
Stone Li
a48c36fde1 ENH: refine load/unload for spool holder filament
update ams load/unload gcode

Change-Id: Ia3d4a26efb14325c89f0c9f9571268c1834361ae
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-22 20:09:17 +08:00
tao.jin
c1cc270788 ENH: chinese translation
Change-Id: I6c072b36a14fed516a9cdcbd7c7ea2038ec29f3f
2023-02-22 20:09:17 +08:00
Arthur
a981d3ac2c ENH: reduce possible toolhead shake in smooth timelapse
It's not necessary to pause before photo-shooting, but after it.
Pausng by 50ms should be enough.

Jira: STUDIO-2167

Change-Id: I88ba5db1d6cce390ae5e26ac03533b0ee277b5bd
(cherry picked from commit ae34c0b9e875d1e52798a5359b0cce2151942fb8)
2023-02-22 20:09:17 +08:00
lane.wei
6f8f937aa6 ENH: translation: add some translation
Change-Id: I3d7e9d791a3b9425f1addaca65a8ef9181616b13
2023-02-22 20:09:17 +08:00
Stone Li
85bcb8eae8 ENH: sync po files with localazy
Change-Id: Id2637ab8c80e1cc557ded245b612d6692ff6d31f
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-22 20:09:17 +08:00
tao.jin
2fc699be6a ENH: change video icons
Change-Id: Ib8baf01eae1edae4f30872e4d8d6e06dc817fba1
2023-02-22 20:09:17 +08:00
tao wang
94e097cd05 FIX:optimize the size of amsmapping item
Change-Id: I791d897c327b51991b203a58fab957cbe74b1b44
2023-02-22 20:09:17 +08:00
chunmao.guo
fc96370abe FIX: update po text
Change-Id: Ib120d6725031419e00a6098a40886859783f0b3e
2023-02-22 20:09:17 +08:00
tao wang
72a3828531 ENH:add chinese translation of humidity descriptions
Change-Id: I51a22dde87f5f0eaec44bfe41b3751cd4f12cd9e
2023-02-22 20:09:17 +08:00
tao.jin
240d106d58 NEW: check privacy update
Change-Id: I260fbc20cdddbdadd38f1470a2e7050ee1ed14cd
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-22 20:09:17 +08:00
qing.zhang
7d17bb538a ENH: fix BBL.json & change first layer height of process
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Ib9d849815760a79ffe933336b2df25594c3881e2
2023-02-22 20:09:17 +08:00
liz.li
6114a415cf NEW:add statistics of all plates in preview
Change-Id: Ia93ca5a31d07ae5d52a37bb7b6fb0e3b26cfd012
2023-02-22 20:09:17 +08:00
Stone Li
b731ac8db8 ENH: support load and edit with virtual tray
Change-Id: I36cd8d9f6da719526c38b7479625ed0fa868f63b
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-22 20:09:17 +08:00
Stone Li
71ef9e946c ENH: support ams auto switch filament for P1P
Change-Id: I18df1c962c8289931ba8f8978752c879c13cb648
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-22 20:09:17 +08:00
tao wang
bb5c614b71 NEW:update the new ui layout of ams mapping window
Change-Id: I3a5efbba2400481b5edfcf9e22aab142bf30a4f8
2023-02-22 20:09:17 +08:00
Stone Li
0aa2916d4b ENH: update ams gcode when loading filament
Change-Id: Ia837249e79702693f61cd4e170342ef1e1d8427c
Signed-off-by: Stone Li <stone.li@bambulab.com>
2023-02-22 20:09:17 +08:00
tao.jin
688084c475 NEW: add print sequence setting to plate
Change-Id: Ic4acb68743442a49dee04702e7a8073b6641bc39
2023-02-22 20:09:17 +08:00
qing.zhang
c909fd9178 ENH: start gcode midify
move to the middle upper edge of plate and ratract after calibrating to avoid leakage

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Idb09aaafee3bfccfd7c14d1140778498195b98c3
2023-02-22 20:09:17 +08:00
qing.zhang
bcd3ec146c ENH: mult height process for diff nozzle
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I26dec4431dba40dd35cc4038c674c6108e607304
2023-02-22 20:09:17 +08:00
salt.wei
209c50f50d ENH: fix for collision when print by object of multi color
Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I3d8b285dedb13ecbb5df38d46293680d9a0c1a61
2023-02-22 20:09:17 +08:00