Commit graph

70 commits

Author SHA1 Message Date
SoftFever
2a2604ea95 Merge branch 'master' into SoftFever 2022-12-16 23:27:00 +08:00
SoftFever
bf8a9fee1f Merge branch 'master' into SoftFever
# Conflicts:
#	bbl/i18n/zh_cn/BambuStudio_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/nl/BambuStudio.mo
#	resources/i18n/sv/BambuStudio.mo
#	resources/i18n/zh_cn/BambuStudio.mo
#	resources/profiles/Creality.json
#	resources/profiles/Voron.json
#	resources/web/guide/3/index.html
#	src/libslic3r/AppConfig.cpp
#	src/libslic3r/GCode.cpp
#	src/libslic3r/GCode/GCodeProcessor.cpp
#	src/libslic3r/LayerRegion.cpp
#	src/libslic3r/Preset.cpp
#	src/libslic3r/Print.cpp
#	src/libslic3r/PrintConfig.cpp
#	src/libslic3r/PrintConfig.hpp
#	src/libslic3r/PrintObject.cpp
#	src/slic3r/GUI/AboutDialog.cpp
#	src/slic3r/GUI/BBLTopbar.cpp
#	src/slic3r/GUI/ConfigManipulation.cpp
#	src/slic3r/GUI/ConfigWizard.cpp
#	src/slic3r/GUI/GCodeViewer.cpp
#	src/slic3r/GUI/GUI_App.cpp
#	src/slic3r/GUI/GUI_Factories.cpp
#	src/slic3r/GUI/MainFrame.cpp
#	src/slic3r/GUI/Plater.cpp
#	src/slic3r/GUI/Tab.cpp
#	version.inc
2022-12-16 13:59:30 +08:00
yifan.wu
d472eb7afb ENH: update Bambu Christmas Cabin
Change infill density from 20% to 15% to reduce warp risk for large
objects.

Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I48d616b2f07ee93784d12c7d84b83fdb451e5cc1
2022-12-15 10:33:19 -05:00
yifan.wu
b4c4819765 ENH: refine Bambu Christmas Cabin
1. replace lightning infill with gyroid infill
2. lower top surface speed to 150mm/s
3. scale up and move logo text

Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: Id65f21c04ba602cb7afe38ac3de27b7720c4ade3
2022-12-15 08:38:55 -05:00
yifan.wu
c866be7b6b ENH: update Bambu Christmas Cabin
1. update Merry Christmas board
2. update the model name

Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I2757c67dbf12152da707b73ad2a18083ac8a2f00
2022-12-15 04:49:14 -05:00
yifan.wu
e9b9561f60 ENH: update Christmas Cabin to reduce warp risk
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I48ed96ad8bd79d274d2a6d4a83afcc53b0452118
2022-12-15 04:49:14 -05:00
zorro.zhang
78c18c74c3 ENH: new 3mf of christmas cabin
Change-Id: I82e67d858fa1349e5c398a489b7fdae83715b450
2022-12-15 04:49:14 -05:00
zorro.zhang
11162ef257 ENH: remove 3d model entrance
Change-Id: I121a544fec002b87bc409d1b5de857e32ab7427a
2022-12-15 04:38:15 -05:00
zorro.zhang
1c71204e55 ENH: icon before text
Change-Id: I714aa5d744bb7d6e83b2a58add37bc67302fdd25
2022-12-15 04:38:15 -05:00
zorro.zhang
d965a93673 ENH: ScrollBar Color
Change-Id: Ice87a8ddae0ccadaa63652bb4fa8464c4bee408f
(cherry picked from commit 5db33442578ac72433131229889cc1055527de74)
2022-12-15 04:38:15 -05:00
zorro.zhang
550be104ee NEW: Christmas Cabin
Change-Id: I5b8585df171dc3be85e099b1992cef1bbd3d799c
2022-12-15 04:38:15 -05:00
养乐多
b5967505bd remove: Revert "NEW: add christmas cabin"
This reverts commit 19767aebb827abb83229e100a5ae38ff76de6478.

Change-Id: I2ccceae409a16598658a2b35ec56b11617dd0afa
2022-12-15 04:38:15 -05:00
zorro.zhang
d8f0749474 NEW: add christmas cabin
Change-Id: Icf9a56c2fdcc34e8eda6254dbb7d33695b41fc7f
2022-12-15 04:38:15 -05:00
zorro.zhang
b29404febf FIX: background color of popup dialog
Change-Id: I2ff95a45cac40be3ceb3920739a86833ac730898
(cherry picked from commit 9fdefaa7f97b70fb6c74d75ef133d5b7a677c63a)
2022-12-15 04:38:15 -05:00
zorro.zhang
e6e72a90b6 ENH: adjust right area scrolBar and text color
Change-Id: Ic430728bef302fec47a4304679cc5955a435d5e3
(cherry picked from commit 2a28dd67098e298957a83bb4d446623844db6bd8)
2022-12-15 04:38:15 -05:00
salt.wei
053c8435b6 ENH: update p1p picture
Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I89477ad69a3b1aeeee42cfe682d91656ad69f933
2022-12-15 04:38:15 -05:00
zorro.zhang
819e1192b7 ENH: ADJUST MENU BUTTON HEIGHT
Change-Id: I3b252b94ed8811145cfa236302d998c64ac9945a
(cherry picked from commit 0021bc7182b73e165227b6c90045589cfad452be)
2022-12-15 04:38:15 -05:00
zorro.zhang
ec66e7750f ENH: fix some color again
Change-Id: I8d06c7859cdcb232b0625ef1c22e562253be4dcf
(cherry picked from commit 32d143fe029e36715231156ce857fd841a4a3748)
2022-12-15 04:38:15 -05:00
zorro.zhang
e020ad3c39 ENH: fix some color problem
Change-Id: Iaae11323cfab96b05746208b8c31b20f3ab56fba
(cherry picked from commit dbe62188c877afdecc522534a2f85f7a0ea80ef4)
2022-12-15 04:38:15 -05:00
zorro.zhang
eb8c97f150 FIX: adjust background color
Change-Id: I7e32013dbd348c74dc79f0fdd38de4c46e38554d
2022-12-15 04:38:15 -05:00
zorro.zhang
670641fe7b FIX: login Username display
Change-Id: Ibc319d27b0f022d8132936b2eb275419e5f1a7ea
2022-12-15 04:38:15 -05:00
zorro.zhang
30a473c977 ENH: Add darkmode of Html,depend on UserAgent
Change-Id: I8b60db9e2cb7b0d163288e3d8a23db10b64b9bb3
2022-12-15 04:38:15 -05:00
zorro.zhang
7d717a9cb4 ENH: In case of low resolution, UserGuide Display
Change-Id: I14b764dc5f34421cadba329c9cd7a13fde0f2387
(cherry picked from commit 7c9ba185143a3d6ba96b2f28e479add3e6fe32df)
2022-12-15 04:38:15 -05:00
zorro.zhang
9ec439c8f5 NEW: add model Depot Button
Change-Id: I64f3e54dab3cd66b400d7dc1519f3ce84eba2fae
(cherry picked from commit 84e964bdd8eb63347a3fefcefe82c9cae6e52c5f)
2022-12-15 04:33:48 -05:00
SoftFever
4a20f7c22a uncheck send data by default 2022-11-29 23:06:09 +08:00
SoftFever
35455e6533 Merge branch 'master-remote' into feature/merge_remote_1.3
# Conflicts:
#	bbl/i18n/zh_cn/BambuStudio_zh_CN.po
#	resources/i18n/zh_cn/BambuStudio.mo
#	resources/profiles/Voron.json
#	resources/profiles/Voron/filament/Voron Generic ABS.json
#	resources/profiles/Voron/filament/Voron Generic ASA.json
#	resources/profiles/Voron/filament/Voron Generic PA-CF.json
#	resources/profiles/Voron/filament/Voron Generic PA.json
#	resources/profiles/Voron/filament/Voron Generic PC.json
#	resources/profiles/Voron/filament/Voron Generic PETG.json
#	resources/profiles/Voron/filament/Voron Generic PLA-CF.json
#	resources/profiles/Voron/filament/Voron Generic PLA.json
#	resources/profiles/Voron/filament/Voron Generic PVA.json
#	resources/profiles/Voron/filament/Voron Generic TPU.json
#	resources/profiles/Voron/filament/fdm_filament_abs.json
#	resources/profiles/Voron/filament/fdm_filament_asa.json
#	resources/profiles/Voron/filament/fdm_filament_common.json
#	resources/profiles/Voron/filament/fdm_filament_pa.json
#	resources/profiles/Voron/filament/fdm_filament_pc.json
#	resources/profiles/Voron/filament/fdm_filament_pet.json
#	resources/profiles/Voron/filament/fdm_filament_pla.json
#	resources/profiles/Voron/filament/fdm_filament_pva.json
#	resources/profiles/Voron/filament/fdm_filament_tpu.json
#	resources/profiles/Voron/machine/Voron 0.1 0.4 nozzle.json
#	resources/profiles/Voron/machine/Voron 0.1.json
#	resources/profiles/Voron/machine/Voron 2.4 250 0.4 nozzle.json
#	resources/profiles/Voron/machine/Voron 2.4 250.json
#	resources/profiles/Voron/machine/Voron 2.4 300 0.4 nozzle.json
#	resources/profiles/Voron/machine/Voron 2.4 300.json
#	resources/profiles/Voron/machine/Voron 2.4 350 0.4 nozzle.json
#	resources/profiles/Voron/machine/Voron 2.4 350.json
#	resources/profiles/Voron/machine/Voron Trident 250 0.4 nozzle.json
#	resources/profiles/Voron/machine/Voron Trident 250.json
#	resources/profiles/Voron/machine/Voron Trident 300 0.4 nozzle.json
#	resources/profiles/Voron/machine/Voron Trident 300.json
#	resources/profiles/Voron/machine/Voron Trident 350 0.4 nozzle.json
#	resources/profiles/Voron/machine/Voron Trident 350.json
#	resources/profiles/Voron/machine/fdm_klipper_common.json
#	resources/profiles/Voron/process/0.08mm Extra Fine @Voron.json
#	resources/profiles/Voron/process/0.12mm Fine @Voron.json
#	resources/profiles/Voron/process/0.15mm Optimal @Voron.json
#	resources/profiles/Voron/process/0.20mm Standard @Voron.json
#	resources/profiles/Voron/process/0.24mm Draft @Voron.json
#	resources/profiles/Voron/process/0.28mm Extra Draft @Voron.json
#	resources/profiles/Voron/process/fdm_process_voron_common.json
#	src/libslic3r/Preset.cpp
#	src/libslic3r/PrintConfig.cpp
#	src/libslic3r/PrintConfig.hpp
#	src/libslic3r/PrintObject.cpp
#	src/slic3r/GUI/BackgroundSlicingProcess.cpp
#	src/slic3r/GUI/Field.cpp
#	src/slic3r/GUI/GLToolbar.cpp
#	src/slic3r/GUI/GLToolbar.hpp
#	src/slic3r/GUI/MainFrame.cpp
#	src/slic3r/GUI/MainFrame.hpp
#	src/slic3r/GUI/NotificationManager.cpp
#	src/slic3r/GUI/PhysicalPrinterDialog.cpp
#	src/slic3r/GUI/PhysicalPrinterDialog.hpp
#	src/slic3r/GUI/Plater.cpp
#	src/slic3r/GUI/Plater.hpp
#	src/slic3r/GUI/PrintHostDialogs.cpp
#	src/slic3r/GUI/PrintHostDialogs.hpp
#	src/slic3r/Utils/PrintHost.cpp
2022-10-20 23:12:00 +08:00
salt.wei
aca131cfc0 ENH: change picture size of ender3
Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I2b7c2b4e7d35dd8d19473e13918cc27bf9d75649
2022-10-20 19:34:37 +08:00
zorro.zhang
428f5ed6a9 ENH: Only Default Choose Bambu 0.4 Nozzel
Change-Id: I4fe32929e50cc9f45fda620399c7ea3e49cf998f
(cherry picked from commit 0df73d322859145ff65ccbbaa08205881209a9f2)
2022-10-20 19:34:37 +08:00
salt.wei
d47d82bf43 ENH: add preset for ender3 printer
As title.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I2d9b1aaeadfe945a6a90f34cdb10a1f240a50ae4
(cherry picked from commit a223ab23605c3ef96ae878b9c4d2199520b4f201)
2022-10-20 19:34:37 +08:00
salt.wei
cd82f70002 ENH: add preset of voron
As title. Thanks SoftFever.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I752413251b7699f8d1d26c44d71d912e1ef09c7b
(cherry picked from commit 606a69173e10d0a45e1f1987c36e45c3c89a7f09)
2022-10-20 19:34:37 +08:00
SoftFever
764b7d62a0 Merge mainstream changes 2022-10-04 13:51:34 +08:00
SoftFever
5db7c30463 Revert "Add support for FLSun V400(WIP)"
This reverts commit 58871a08e0.
2022-09-30 16:18:32 +08:00
zorro.zhang
b8413d3a6c ENH: Homepage-contextmenu UI same with prepare-ui
Change-Id: I8745ce516f2d1dd945826ec6e1f14aba6ec793bb
2022-09-29 11:16:43 +08:00
SoftFever
58871a08e0 Add support for FLSun V400(WIP) 2022-09-25 13:41:43 +08:00
SoftFever
de874acc99 Merge branch 'master-remote' into SoftFever
# Conflicts:
#	src/slic3r/GUI/MediaPlayCtrl.cpp
2022-09-13 23:04:58 +08:00
yifan.wu
f846276740 ENH: update 3d text cover
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: Ieef62398bcd88cbfcb1fc82775d0bbcc1f61aaf5
2022-09-13 19:42:32 +08:00
SoftFever
61de853138 Revert "Revert "ENH: filament just show bundle machine""
This reverts commit bf416a975c.
2022-09-10 00:44:55 +08:00
SoftFever
bb74438f7c Merge remote-tracking branch 'remote/master' into SoftFever
# Conflicts:
#	src/libslic3r/Preset.cpp
2022-09-09 21:54:57 +08:00
zorro.zhang
15ccd3661e ENH: self-adaption UserGuide Icon arrange
Change-Id: I6b04d7b54bd73ae0c7864cc6e1661b44c6d6c059
2022-09-09 19:59:27 +08:00
yifan.wu
cd175eeba9 ENH: add Chinese text for user manual
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: Ie0b95d53e3c50fa8a9462c79ea0ae713540db254
2022-09-09 19:59:27 +08:00
zorro.zhang
c818ca165f ENH: Fix Default Material Logic
Change-Id: Iac40c7717e55ca7c2502cfd1012e33e1e6d88695
2022-09-09 19:59:27 +08:00
yifan.wu
4cbba82cee ENH: refine text & icon for Recent's context menu
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I194afa16ad9b2c928548e7011a40718f9a53be8c
2022-09-08 21:49:36 +08:00
yifan.wu
7b2d839642 ENH: update user manual covers
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I24eb5f391ebf2b350afafa4062e11852a7a3c669
2022-09-08 21:49:36 +08:00
zorro.zhang
aae2a0484a ENH: Adjust Homepage UI
1, User Guide Image, Top add round corner
2, Change Guide description text color
3, New UI of Mouse Right Button Menu

Change-Id: I82cf82a97e35f16478020fabada17b5637cff625
(cherry picked from commit a3a56392788a9eabc9bb0cc20ecb48050869476b)
2022-09-08 21:49:36 +08:00
zorro.zhang
2f59e77ca9 ENH: Adjust Homepage UI
Change-Id: I6d2556241d7a3eb68f4e73ef905c12d07a8ad77f
(cherry picked from commit 8ebcf2de6991d4aaad1f49571493fd9d99fdd9cc)
2022-09-08 21:49:36 +08:00
zorro.zhang
63d7d05f68 ENH: new default recentfile image
Change-Id: Ibb46b5a754e42f40b4d3ea773ca551208e0aef46
(cherry picked from commit b3a66ec1a387426842b8c43f38986ef8ada59d6f)
2022-09-08 21:49:36 +08:00
SoftFever
bf416a975c Revert "ENH: filament just show bundle machine"
This reverts commit 2ac9267e42.
2022-09-05 21:59:19 +08:00
SoftFever
4fd174175c Merge remote-tracking branch 'remote/master' into SoftFever 2022-09-03 00:17:59 +08:00
yifan.wu
1569909cc3 ENH: refine the guide pages
1. remove editable status of pages
2. refine the user manual text

Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I39ca064e15f5c7c58e491b1929eb69e4a6692a08
2022-09-02 13:16:54 +08:00
yifan.wu
02f35c1617 ENH: add contents to user guide
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I46e943ce40049a80715ba67c4e73a3587991fe82
2022-09-02 13:16:54 +08:00