Compare commits

...

961 Commits

Author SHA1 Message Date
SoftFever
ab8e0665b6 bump version to 1.4.0 beta2 2022-12-17 00:15:18 +08:00
SoftFever
2a2604ea95 Merge branch 'master' into SoftFever 2022-12-16 23:27:00 +08:00
SoftFever
55b5a6ff58 fix mac 2022-12-16 23:15:27 +08:00
SoftFever
427f197ca9 fix sandwich mode for Arachene engine 2022-12-16 23:15:27 +08:00
SoftFever
52999ea757 minor change 2022-12-16 21:52:38 +08:00
SoftFever
e0335e73cf fix an issue that thirdparty won't able to send print 2022-12-16 21:39:52 +08:00
SoftFever
45a00489ec fix crash when open filament setting dialog 2022-12-16 20:08:04 +08:00
SoftFever
71b3230d62 update CN translation 2022-12-16 18:07:46 +08:00
SoftFever
5d141ee214 fix issues caused by merging 2022-12-16 17:04:19 +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
gerrit
390f68a98b ci: update build version to 01.04.00.17
Change-Id: I146a1e2f421eb54ad8ae1df8f1458468becce319
2022-12-15 08:38:55 -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
gerrit
4f5401a0bb ci: update build version to 01.04.00.16
Change-Id: I30c02e8db61f8ac760db63a8560ac7b661938b86
2022-12-15 04:49:14 -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
Arthur
a7ff17d99c FIX: add support type normal and tree in handle_legacy
If don't do this, laoding old 3mf generated by version 1.3 or lower will
have problem, e.g. normal support will be replaced with normal(auto).

Change-Id: Iaa8e1f8badaacc74479d99a6e4153d8850945279
2022-12-15 04:49:14 -05:00
Stone Li
efc761d794 ENH: set ssl version to 1.2
Change-Id: I859d55b0b0adf04e79ae812fafb04dc310ca4587
Signed-off-by: Stone Li <stone.li@bambulab.com>
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
gerrit
8c655aa128 ci: update build version to 01.04.00.15
Change-Id: I7dcf690ab3f80f7f45ca880119dfb19a808e2b79
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
miaoxin
f84402bc0e FIX: dont arrange when bed temp is greater than object's vitrify temp
Add large cost when bed temp is greater than object's vitrify temp
STUDIO-1623
Change-Id: Ib73d312fce7b80999f11d1f6c172a9c1575937b4
(cherry picked from commit aed896d44776c9cd2fd55202420a3811bc117896)
2022-12-15 04:38:15 -05:00
yifan.wu
f438c2dfcb ENH: remove bbs namespace in 3mf
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: Ib9db7bbfb8ebb9c1b29b50f5743c927250f58bef
(cherry picked from commit d7a131b97c72c01b8fc256e179309cfde4f1f8b4)
2022-12-15 04:38:15 -05:00
lane.wei
13a1dc03c1 ENH: sync the different codes
especially for the translation files

Change-Id: I940578ff6e22b0939d42eeed2209bfeddb0eb191
2022-12-15 04:38:15 -05:00
gerrit
540ecb2fb2 ci: update build version to 01.04.00.14
Change-Id: I6c1a365d1a3c5a873029a700b50d6f8f02dcf7d1
2022-12-15 04:38:15 -05:00
chunmao.guo
8d8b5c910c FIX: [STUDIO-1754] limit_handles has bugs on posix, not use
Change-Id: If65ac7196dfc02cb4ba37473127ecf48f3254049
2022-12-15 04:38:15 -05:00
Stone Li
ffd94f94f4 ENH: refine tips when sending print job failed
Change-Id: I1b45e282b990595f2e72cb89974d688040f22e86
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:38:15 -05:00
tao wang
2fa7776199 FIX:fixed the file name in the notification message after send success
Change-Id: Ib906c64c90939524ce7466897671a6c89b4b2d7b
2022-12-15 04:38:15 -05:00
tao.jin
e7081c7d5f ENH: refine UI of physical printer dialog
Change-Id: Ie6e76890dbd94862f604431fd66433fce2b9bd73
2022-12-15 04:38:15 -05:00
gerrit
1526cb6898 ci: update build version to 01.04.00.13
Change-Id: I8886e0d17d22a29556e39b4ebee65a640aa60197
2022-12-15 04:38:15 -05:00
chunmao.guo
dcb105c605 FIX: update po/mo
Change-Id: Ib2234356f9a17eec4f26791327151dde64f4e4bb
2022-12-15 04:38:15 -05:00
Stone Li
52847b8bb4 ENH: valid print all when selecting blank plate
and give a tips when print blank plate

Change-Id: Ic243dcee87d4a5a09de91c5806f1a94735f1052b
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:38:15 -05:00
chunmao.guo
026bd3d872 FIX: avoid create new console log in network module
Change-Id: I2845078e51c7fe1ca8e80a866d0dd92f4e7dce5c
2022-12-15 04:38:15 -05:00
zhimin.zeng
260e2e1c31 FIX: modify svg display position
Change-Id: Ie824d457fcac93918244a6491e821dc43e7e1d9f
2022-12-15 04:38:15 -05:00
tao wang
458ff13024 ENH:remind user rebind the printer when get wrong access code
Change-Id: I4eeb139d282a120e6646e29d832f14431cfd72f0
2022-12-15 04:38:15 -05:00
Stone Li
ecc9dbc791 ENH: modify a tips
Change-Id: I0f25dbc1c5148c8a43a454f85a8b9ad69e943791
2022-12-15 04:38:15 -05:00
zorro.zhang
11162ef257 ENH: remove 3d model entrance
Change-Id: I121a544fec002b87bc409d1b5de857e32ab7427a
2022-12-15 04:38:15 -05:00
yifan.wu
d0d90a8566 FIX: fix build error in WipeTowerDialog
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I4a9ff43de48c6e36338036a584e3c336849f040d
2022-12-15 04:38:15 -05:00
yifan.wu
6ee7645b72 FIX: fix auto-calc button not work on macos
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I1096e5e15e9e691deee185bf6dd1260679a67e4a
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
lane.wei
ff89c4d04d FIX: fix the crash at bootup in some corner case
when sys color changed on mac, we need to make sure glcanvas3d inited

Change-Id: I91f6995a07550de32fd732a2501a26c947abc5a4
2022-12-15 04:38:15 -05:00
liz.li
110d81f6f7 ENH: font preview
Change-Id: I8151036cedcba9c57183414a9d134741bb2166a5
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:38:15 -05:00
tao wang
4ee5dbb07f FIX:compatible with v6 printers
Change-Id: If89c57393a27232a5be41efaf95e70568b4b1f46
2022-12-15 04:38:15 -05:00
chunmao.guo
842515a15b FIX: [STUDIO-1664] releaseobject_settings in object table
Change-Id: Ie166ef4100017be4730e8c09c932a4369f40513b
(cherry picked from commit 5813fd181ff8ff3efee42c274fdfd7b84687d86d)
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
gerrit
7a40310924 ci: update build version to 01.04.00.12
Change-Id: I0d533aa742fc9213a97a54ac816bffe399cae5a9
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
tao wang
e9045c2f4b FIX:optimize the fan gear
Change-Id: I02361a71b56f1527d85b2085f13fb374faacdc32
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
gerrit
32b46292b9 ci: update build version to 01.04.00.11
Change-Id: Ifa72f12cc90b097945a18bb6fb7c77b29ef354b9
2022-12-15 04:38:15 -05:00
shuai.liu
ccd333e248 FIX: Fix the benchy orientation bug
[STUDIO-1717]:
1. Add area filter during finding the orientation vectors.
The vector with largest area will be selected.
2. Area_accumulation function return the accurate normals.

Change-Id: I917e29a0def4904a82d30cf0a92524bbb0da14c1
(cherry picked from commit a79cf2fa89c7247cab37ebd36974529df79f0990)
2022-12-15 04:38:15 -05:00
tao wang
8713c5ccc4 FIX:optimized some ui for macos
Change-Id: I0451edc06d9dadfef3b9d1087bb863b4666bb276
2022-12-15 04:38:15 -05:00
yifan.wu
5c9c72ee72 ENH: optimize the auto-calc button position
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I8e7be08048305b5e519400e2b35a0ebaf0f21ba7
2022-12-15 04:38:15 -05:00
tao.jin
ebec542112 FIX: rescale of camera icons when alter resolution
Change-Id: I45a59e7ec48699bfd249c7bb75cd8b70edaf0687
2022-12-15 04:38:15 -05:00
Stone Li
db94f39f78 FIX: fix bbl logo not in center of SplashScreen
Change-Id: I38e5ffebf2500ee4239e09c27e238de28da8463b
2022-12-15 04:38:15 -05:00
Stone Li
89f7065d87 ENH: do not check same physical printer with printer preset
Change-Id: Idfcc80816828c2a65cbdfb12785598df92006a76
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:38:15 -05:00
tao wang
b61da88d51 NEW:add fan control
Change-Id: I3b5c7cf638306aaac81459c2f25e37008a5a8a2f
2022-12-15 04:38:15 -05:00
chunmao.guo
59773eee02 FIX: [STUDIO-1725] DropDown: icon scale size on Mac
Change-Id: I8128035df0c8623d220c791225adeb4a827cbb3f
2022-12-15 04:38:15 -05:00
liz.li
92847823bc FIX:GcodeViwer keep growing width
Change-Id: I25b933985fe38df0f97e3d91a82e66e5c6680c2e
2022-12-15 04:38:15 -05:00
liz.li
8ad5bdb914 FIX: fix ams_dialog filament color button display
Change-Id: Id02b8e1d703e11006318fa4140393481ff9f5108
2022-12-15 04:38:15 -05:00
tao wang
ffbb7a8be5 FIX:fixed some dark mode issues
Change-Id: I778150853f02ea9d13705acca1041ef79f3747ef
2022-12-15 04:38:15 -05:00
chunmao.guo
30bdc1c116 FIX: po texts
Change-Id: I3d0a04a849003c93484133563c7e79316c7e8998
2022-12-15 04:38:15 -05:00
tao.jin
fa42a15f13 FIX: display of camera icons in dark mode
Change-Id: Idc37b76924b863114ba9d7d8267780c27f45108c
2022-12-15 04:38:15 -05:00
lane.wei
5d013a40a4 ENH: use openssl in mac
Change-Id: Idbd5fe9232d6acc1aaa7ddeb1e6f312c1a6fcb44
2022-12-15 04:38:15 -05:00
chunmao.guo
e22fbb7b43 FIX: [STUDIO-1664] release optgroup in object table
Change-Id: Ia48b2e94961d60d8c1c4ecaf9b2b334cb36aff32
2022-12-15 04:38:15 -05:00
chunmao.guo
e8d796211d FIX: copy BambuSource.dll for camera use
Change-Id: If311e2827eda655bf7cd7294f9c0749f1dd7b545
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
lane.wei
545fdbf96b ENH: remove 'repair' from cli which is not supported
Change-Id: I9ef1ef2e9971643ce9367e5ebf4417eb5c599c80
2022-12-15 04:38:15 -05:00
Stone Li
250a359247 NEW: request get version when online version is diff
Change-Id: If096fc6b050da80d4f961660a42a88deb4fe9f7e
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:38:15 -05:00
Stone Li
ab5f2aa3f7 FIX: fix get wrong extruders for printing
Change-Id: Icecdca05c314fe47314ec197c6d651967bd616d2
2022-12-15 04:38:15 -05:00
tao.jin
a3730b9236 FIX: fix display of long filename in preview-only hint
Change-Id: Ib365a39b262cbf03b14eeefa64e3e46d1b48306e
2022-12-15 04:38:15 -05:00
yifan.wu
b77e96acdd ENH: refine bed type text
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: Ia4958f316e84c7afa0d8d3af9a2f4a20e2ca8ce8
2022-12-15 04:38:15 -05:00
liz.li
a9c180df24 FIX: dark mode 3rd printer bed display
1.fix custom bed render grid inappropriately
2.optimize: do not init toolbar every time switch dark mode

Change-Id: I354496c6c982d9f72b22629f6973a79d65189dda
2022-12-15 04:38:15 -05:00
lane.wei
daf4b4ef74 FIX: fix the bed position not correct issue for 3rd printers
also remove the unused gridlines in 3dBed

Change-Id: I547bf8f48c9d79ed831ed0872699ad1da1185da8
2022-12-15 04:38:15 -05:00
tao wang
5c3c2fcb1c FIX:changed top menu bar color on macos
Change-Id: I276aab27c2c089ad322dc5cb2f6206dccb3e494d
2022-12-15 04:38:15 -05:00
tao.jin
9ab6e86b47 FIX: get exported file name in preview-only mode
Change-Id: Ibea53d951e020ff03c1e7f378714b117a4e8a19f
2022-12-15 04:38:15 -05:00
tao.jin
61aa0ddada ENH: hide resolution with only one choice supported
Change-Id: I7ede604fd95e3e11af34ca8465f391e86b1c0c8f
2022-12-15 04:38:15 -05:00
liz.li
6c04bebc3d FIX: Preview slider jump layer and inappropriate log
Change-Id: I484c52087741a8f5ee4da6bc240c9897e3f94bd3
(cherry picked from commit a2862f87369f78a39caf427a924a756f7115e1b5)
2022-12-15 04:38:15 -05:00
tao wang
25484bcba9 FIX:fixed 'dont show again' with wrong color in dark mode
Change-Id: Icedd3df2f428c9d526633b908d7017c02b4cca3a
2022-12-15 04:38:15 -05:00
gerrit
531267abd6 ci: update build version to 01.04.00.10
Change-Id: I7fb9fd5e98c1a634e14ad7407e600a63aee58e7d
2022-12-15 04:38:15 -05:00
yifan.wu
56e6ecaa95 ENH: refine the tips of support filament
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: Ieaf17127612d7186590f52dbf060b3eefe3b09e3
2022-12-15 04:38:15 -05:00
tao wang
b5e38e02fe ENH:display different thumbnails according to the printer type
Change-Id: I1534594923fdcafb231661a1a7fa289221277449
2022-12-15 04:38:15 -05:00
tao wang
5139edb876 ENH:add a drop-down arrow to the amsmapping button
Change-Id: Idb39a4c8a0f9421bce91f11705f30687f2b2d0d9
2022-12-15 04:38:15 -05:00
tao wang
c41ccedad0 FIX:fixed the wrong popup pos of printer list dialog
Change-Id: Ie69bcac45c7595a8568018633ba3691abd77377c
2022-12-15 04:38:15 -05:00
‘shuai.liu’
24160244b7 FIX: The flat plate orientation bug
[STUDIO-1676]:Auto-orientation not OK but manually OK.
When accumulating overhang, the bottom condition should select 0.5* layer
height rather than previous 1 * layer height.

Change-Id: Ide96817b8f98827388b7cb73ca33518b3ff25235
(cherry picked from commit 9f90151236340d3a10790112be65c816dcc3ae30)
2022-12-15 04:38:15 -05:00
tao.jin
38dfde8fc2 ENH: jump to prepare in preview only mode
Change-Id: Ic7d1b17938172f81f334df020699b3ffbe92d65f
2022-12-15 04:38:15 -05:00
lane.wei
6bccef66b0 ENH: optimize the texture logic of partplate
1. reduce the icon size to 256 from 1024
2. limit the mipmap minsize to 2

Change-Id: I906f4dc2e0aa2e83e05a0d60cd0283679f41d89a
2022-12-15 04:38:15 -05:00
Stone Li
c69b7780ad ENH: do not invalid thumbnails when using expoted file
fix missing project name for gcode.3mf

Change-Id: Iabc43cd54ceaa9cbbdfb7b045f5d4a24124d7007
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:38:15 -05:00
Stone Li
3fae63e8cf ENH: refine render logo to save memory
Change-Id: I8dbc999d7c1adb966f0258dafe8ab267f33d4e30
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:38:15 -05:00
chunmao.guo
91d36e0562 ENH: [STUDIO-1667] show ams tray name in color icon
Change-Id: Id98de7c8d08a337f32559b54acc0f8613aa2cf65
2022-12-15 04:38:15 -05:00
chunmao.guo
31ff48ccca FIX: [STUDIO-1694] change support filament to default if out of range
Change-Id: Ie67b1832ec92cd66c14461d01363bbf2c2069185
2022-12-15 04:38:15 -05:00
chunmao.guo
88fbcb181e FIX: [STUDIO-1603] mediafilepanel button rescale
Change-Id: Ic18d38ff751e0758f37dffc55cc2e41d0a83109a
2022-12-15 04:38:15 -05:00
chunmao.guo
b4e9a3379c FIX: [STUDIO-1670] PointCtrl dark mode
Change-Id: I6ba2585f80745083929b2ac247810e8f208d9e3c
2022-12-15 04:38:15 -05:00
Stone Li
58dab90e53 ENH: refine camera status and settings
Change-Id: I2a8c23ca119ff5d38272dad46347704bf457dee0
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:38:15 -05:00
tao wang
0d4b8382f5 FIX:change tray id from 1,2,3,4 to A1,A2,A3,A4
Change-Id: I9da42abb50d95c7a9c41064a993c3cebb68394d9
2022-12-15 04:38:15 -05:00
Stone Li
a9938d7676 ENH: display unload filament button when use_ams is false
Change-Id: I4dc7cc17c33e5f92543934c3d003c34fea94b0cb
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:38:15 -05:00
tao wang
761bf07c44 FIX:fixed wrong color in wipe tower tabel when dark mode
Change-Id: I1b7d31b66822fba52981e66426c1759373ef62be
2022-12-15 04:38:15 -05:00
tao wang
52e431170c FIX:change the humidity level icons
Change-Id: I09f0ffce9ee32ec8b7c5948971bb389f5462b89a
2022-12-15 04:38:15 -05:00
liz.li
94dd1af6c6 ENH:add ext panel in upgrade
Change-Id: I2832bec3f2b035b3c4e812d61f7bb6efb4676a37
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:38:15 -05:00
salt.wei
402e03f763 ENH: control local extrusiuon order of tree support
As title

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I82a17cd8f82a87a898f933b5437836667136d834
(cherry picked from commit aedfffc4565113f186a55efa0e89366880a22fc6)
2022-12-15 04:38:15 -05:00
tao.jin
1428a6bec7 ENH:add chinese translation
Change-Id: Id2d238e3e2918229c88dd986ed41848ea932abcf
2022-12-15 04:38:15 -05:00
lane.wei
2723ee747c FIX: fix the crash issue when network plugin installing on mac
Change-Id: I766d186fa116986ce4805e71dc5f1899f5901294
2022-12-15 04:38:15 -05:00
gerrit
6d219574a9 ci: update build version to 01.04.00.09
Change-Id: Id6ff0482e59059234ad5839012069c47eb958264
2022-12-15 04:38:15 -05:00
lane.wei
f2aaddebb8 FIX: fix the assemble view display issue when enter firstly
Change-Id: Idf432df9d3bb8eef1d57b08b6d345bc1867fe955
2022-12-15 04:38:15 -05:00
chunmao.guo
41b1ad6f2f ENH: [STUDIO-1608] select support filament by combobox
Change-Id: I26543530202a53ef5753c38404617458a6d4a1ef
2022-12-15 04:38:15 -05:00
liz.li
278eab5ae2 ENH:GcodeViewer
1.seam is selected by default
2.filament page : unselected item will show as gray color
3.adjust space betweem columns

Change-Id: I3f27b58d745ce277a4aec374cb37e2a19e162639
2022-12-15 04:38:15 -05:00
chunmao.guo
90275620d6 FIX: [STUDIO-1614] hide home webview before loaded
Change-Id: I5182e3058575c3e542813b3c380fe6dcfd11c037
(cherry picked from commit e4684cf43ee0cd11beb2cc6dea35900218d0ca98)
2022-12-15 04:38:15 -05:00
Arthur
4bab300e18 ENH: sync with master on sharp tail and cantilever detection
Change-Id: Id514d47d868fd02a8ac02ef85ef33ef48a2bd7c7
2022-12-15 04:38:15 -05:00
chunmao.guo
967909937d FIX: [STUDIO-1618] ProgressDialog: update dark before show
Change-Id: I951940d1cfa864f8abdae53ed1b151ea6bf1ea4a
2022-12-15 04:38:15 -05:00
liz.li
aab62b77bf ENH:refine GLCanvas update dark mode logic
Change-Id: Id4c4f00a18fa0672eab528a6819b6665031a8915
2022-12-15 04:38:15 -05:00
chunmao.guo
e59fe6511d FIX: [STUDIO-1638] transparent background for Notebook
Change-Id: If849fe43349f87be66b53af48737a9a2c50aa237
2022-12-15 04:38:15 -05:00
chunmao.guo
78dbefd9ba FIX: [STUDIO-1641] svg dark color
Change-Id: I88a6f0e04cba193e9ce80150743b4e90cdf683c5
2022-12-15 04:38:15 -05:00
Stone Li
00dfd1e765 ENH: modify diff for github
Change-Id: I3a441dbfa3167de3cee9fdafe62f7860fcb6891c
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:38:15 -05:00
tao wang
65ff90690f NEW:optimize text wrap and tips for sending prints
Change-Id: I6e1aa8eba4d7bf948068126cd25216e8dbc68413
2022-12-15 04:38:15 -05:00
salt.wei
81d38bf140 ENH: show the setting tab retract_before_wipe
This is useful and need to be tuned
for some special 3-rd party filament.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I0527484d47c1bb9c89d5cc70bbaa34b5078b7e43
2022-12-15 04:38:15 -05:00
zorro.zhang
e4fa6d8652 ENH: Support Child Folder of Filaments in Profiles
Change-Id: Id89281d76efe42e7e8c407cce337fee1485e2cf0
(cherry picked from commit 634159a3ce43f3aaf9223b412e993d3355cb1682)
2022-12-15 04:38:15 -05:00
tao.jin
047e5c2e90 FIX: refine hint of lacking model repair on mac
Change-Id: I3301422a46587cd92ef3688f494dd33f657fbb7c
2022-12-15 04:38:15 -05:00
gerrit
6e16906143 ci: update network module based on commit 70ff61b
Change-Id: I4fb0a7bb95989b938c85e6da0ef4a6b32a0d0bb4
(cherry picked from commit ce840596f1c033ada5392ced4a7812551888abf6)
2022-12-15 04:38:15 -05:00
liz.li
1da9bfcc13 FIX:romove font style preview
Change-Id: I1e8f2ffd94db967f17fa561fd5c56a20f718631b
2022-12-15 04:38:15 -05:00
tao.jin
4ea3d16fcc ENH: hint of lacking model repair on mac
Change-Id: Ie6bb669c642e4fbdafd29218bc8af6b55b1adc36
2022-12-15 04:38:15 -05:00
lane.wei
bf8208241d FIX: fix the object name empty issue
when loading third party 3mf, sometimes there is no object name
just named these object to 'Object_index'

Change-Id: Ie73f49ffa79e996114b7a2095de4de7d41bfec24
2022-12-15 04:38:15 -05:00
Stone Li
db4067a9dc ENH: adjust funtions for P1P
Change-Id: Id8ce17f6cae523f9e6a0ccd9903df6ebefda934e
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:38:15 -05:00
salt.wei
22780a0be4 ENH: top and bottom pattern should be in shell settings
Move setting tab position according to user suggestion
in github issue #494

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Ie5b62e57d6d4c19504f40c62ffeff1418ceee1f8
2022-12-15 04:38:15 -05:00
gerrit
9e988c6899 ci: update build version to 01.04.00.08
Change-Id: I717778946031e9b41fa27e13d428d28c5d8552ba
2022-12-15 04:38:15 -05:00
chunmao.guo
8cee81b5ef FIX: [STUDIO-1574] not switch filament preset after wizard
Change-Id: Ica703553a6994456f12b509564443902697ed374
2022-12-15 04:38:15 -05:00
zhimin.zeng
f49c4c7e4c FIX: there is a small overhang after repairing the model
Change-Id: I057d48192c71f3e737d10cc411a92bbaf4fcefc3
(cherry picked from commit ce6f3e2b5d269809a311e2e26deafd47ae73b424)
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
chunmao.guo
e54f3a75d4 FIX: [STUDIO-1563] dark mode of dataview's header
Change-Id: Ied9358df9d2edd9f0d40a81694655b8f2fdefdb8
2022-12-15 04:38:15 -05:00
tao wang
0db1b52b23 FIX:fixed some issue with send print and ams ui
Change-Id: I1a37bad6ec1f193f9fd98c74506b3bb0358ece6d
2022-12-15 04:38:15 -05:00
lane.wei
67c2f5a285 FIX: fix the slice_all display error
don't reset gcode toolpath in some cases

Change-Id: I06e5c2558462244bdd43f2712054c6097be7599a
2022-12-15 04:38:15 -05:00
chunmao.guo
588e79c76d FIX: [STUDIO-1574] not switch filament preset after wizard
Change-Id: Id830b6c8f4ffd76a0b58c51ba892a79f075c0cea
2022-12-15 04:38:15 -05:00
lane.wei
81e723711a FIX: fix the crash issue when dragging object in seq-print
Change-Id: If2fd7e2d4d41e6cde6c8d4824cf489e10700c91e
2022-12-15 04:38:15 -05:00
chunmao.guo
941df8ba8b FIX: camera stream tool file permission problem
Change-Id: I77781d158da62c95fda0abb72e49f89340c316cb
2022-12-15 04:38:15 -05:00
chunmao.guo
efd55bcffe FIX: [STUDIO-1599] not erase unfinished EnteringGizmo snapshot
Change-Id: I6faddf5de78e3e6ba40f5e962a4d4de0f2739e4d
2022-12-15 04:38:15 -05:00
chunmao.guo
26bb461667 FIX: [STUDIO-1615] adjust message for project save failed
Change-Id: Ia135053dd2206ffb2c743df65ea5273cb95f7666
2022-12-15 04:38:15 -05:00
tao wang
dc55a6a2a6 FIX:fixed some issues with dark mode on mac
Change-Id: Ic43760cd8e934f463c2bf35c2fa240d8e5b14c20
2022-12-15 04:38:15 -05:00
chunmao.guo
a1fcd05baa FIX: [STUDIO-1570] wkwebview background color
Change-Id: I6b18a2dbf654b71bff88e0c14317d4479358218a
2022-12-15 04:38:15 -05:00
chunmao.guo
4132711f4c ENH: [STUDIO-1528] support list value icons for param field
Change-Id: I44f14fde20fe4d9859c019ead09d1d565af23ba4
2022-12-15 04:38:15 -05:00
Arthur
6a644c271c FIX: lightning infill may fail for some cases
Change-Id: Ibc6e4e4262ef9fc0b36a936acc52a3b60dca2cb4
(cherry picked from commit e3b7c5c3404aa200c4b852b3963a7a0aae8837d2)
2022-12-15 04:38:15 -05:00
lane.wei
8375c73ac9 ENH: CLI: some refines on compatible logic
1. export compatible related values to 3mf
2. process compatible related values when loading

Change-Id: Ib7ed3d165cda5d62e0074652d474567494141631
(cherry picked from commit 989fe6439d573457fa78afc5376d04d3120dbbfd)
2022-12-15 04:38:15 -05:00
Stone Li
dcbe442184 ENH: request start when it stopped by app
Change-Id: I48b8692f87b834e0f96c7c19c4e8651ae7a8fc1e
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:38:15 -05:00
zhimin.zeng
5454a65c8d FIX: reopen 3mf file the position of assemble model is not right
Change-Id: I880913c48dde297decac25e5f3c41afacdaf36dc
2022-12-15 04:38:15 -05:00
miaoxin
9857f7384b ENH: auto-arrange uses inner NFP to simplify fixed_overfit
1. Add inner nfp algo.The final nfp result is inner nfp subtract outer nfp.
2. Leave 5(scaled) room in inflation to allow numeric float eps.

Change-Id: I6be0b205c9811af24a238352b256bf1399ee3716
(cherry picked from commit dbab96efc7bfa16afd9db9607b862886606b0aa0)
2022-12-15 04:38:15 -05:00
tao.jin
29e6f71402 ENH: refine details of camera setting
Change-Id: Icb8365007f96b7dde372e7b121ec4f6e2ae96d7a
2022-12-15 04:38:15 -05:00
salt.wei
dd7dbd9936 ENH: modify generic pa-cf cooling setting
Bambu pa-cf has been modified, generic pa-cf
should be changed as well

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Ie859b41bd4d138a5fab204d6ad6a79806c3f0a9b
2022-12-15 04:38:15 -05:00
Stone Li
77a37f086d ENH: hide auto switch filament for P1P
show video when printing for P1P

Change-Id: I0f35385b849a0c3081c004916258134ef161982e
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:38:15 -05:00
miaoxin
ad22dec6d9 ENH: large object with size close to bed could arrange into bed
Change large object's inflation to (bedsize-objectsize)/2 when it could actually be placed into bed but couldn't with default inflation.
JIRA: STUDIO-1536

Change-Id: Ibf8ed066ee20a9a7b1c604371a9e030c94711080
(cherry picked from commit 093bad1a1765f05d909984d24a113e125870d55b)
2022-12-15 04:38:15 -05:00
qing.zhang
41c310bf25 FIX: fix the disappear of seam on multi plate
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I58f1f0fa12497dc55c3b2a83abcee883dbbb7d9d
2022-12-15 04:38:15 -05:00
chunmao.guo
15d6130b29 FIX: [STUDIO-1562] fix sizeof PresetComboBox
Change-Id: Ia64128f9fded669cd3e7eb1c64868fada76df6b8
2022-12-15 04:38:15 -05:00
liz.li
cfafbc812f FIX: switch dark mode bug
1.selected tool item in support,seam,mmu will be invalid after swich dark mode
2.add reset direction button in mmu
3.if don't switch dark mode in prepare page,toolbar doesn't change color

Change-Id: Ibaaaee5c0cc03f66682f5eb0daafcd143b9d9edc
2022-12-15 04:38:15 -05:00
salt.wei
14417bf176 ENH: optimize bridge detect to choose short direction
For some corner case, the bridge detect may choose the long
distance rathan than the short distance.

Calculate the percentage of archored lines and choose
the shortest length

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Ia74842f3135681373f649a014c270a1b9d1755e7
2022-12-15 04:38:15 -05:00
Stone Li
1c02449201 ENH: refine camera setting logic
Change-Id: I3d80950e8f6a6391b31a06929645af17cc779cb9
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:38:15 -05:00
salt.wei
e3739a8a0f ENH: show nozzle_diameter for 3rd party printer
It's necessary to edit nozzle diameter and releted
setting for 3rd printer.

For BBL printer, keep it read-only

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I97e32967bb686b7fbb7ac306a2bb7e03b5d8c5c5
2022-12-15 04:38:15 -05:00
Arthur
3ad732bd93 ENH: translate "Slicing Canceled" and others
Change-Id: I034445d285a86e732abb9bd1dddd6cb5aabcead6
2022-12-15 04:38:15 -05:00
chunmao.guo
a4cffa3c87 FIX: [STUDIO-1589] restore pos of mainframe before show
Change-Id: I73f73597a939f8e65ff8cc5ce9a98741f62c48c3
2022-12-15 04:38:15 -05:00
chunmao.guo
c3398a089c FIX: [STUDIO-1586] take new project snapshot after reset
Change-Id: Iad3be50d5c783d0114eaea8c0a5b03f45a45aa36
2022-12-15 04:38:15 -05:00
chunmao.guo
5276528e04 FIX: [STUDIO-1592] float number format of German for flush volumes
Change-Id: I78a5d7aed836cc4ed980496f68d22c68c11c2b77
2022-12-15 04:38:15 -05:00
chunmao.guo
d480d526e1 FIX: [STUDIO-1584] Mediafile: fix batch delete not work
Change-Id: I48b5897afdaa324f80cd9d5dbcd858c86903ef06
2022-12-15 04:38:15 -05:00
qing.zhang
afcb41f821 FIX: fix the empty gap infill when open top one wall
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Ib36c06ecd6986fbe8a726e0aaa34ca02b275064e
2022-12-15 04:38:15 -05:00
gerrit
7c648ff017 ci: update build version to 01.04.00.07
Change-Id: I9ae8f65d0b632d807112ac904a01e34ac76c2a2a
2022-12-15 04:38:15 -05:00
liz.li
156afc385a FIX: focus of text tool window
Change-Id: I474f314e07234b8f5fc2db7ccd505d85539659e4
2022-12-15 04:38:15 -05:00
tao wang
09ab775667 ENH:blocking send/send all on p1p printers
Change-Id: If6ed8056790211d6ffa8237136318768e1a7f5d7
2022-12-15 04:38:15 -05:00
Stone Li
08b40dc5e8 FIX: do not reset thumbnails when using exported file
Change-Id: I4d8c7ccdf21b92354bd0c2c816665db2d2a4a958
2022-12-15 04:38:15 -05:00
chunmao.guo
dcb9862410 FIX: [STUDIO-1570] webview background color
Change-Id: Icdf41659f4ab18ce30c8b0f585bf702991531599
2022-12-15 04:38:15 -05:00
gerrit
fe50bcb5a0 ci: update build version to 01.04.00.06
Change-Id: I39d32e7cc93e30ea5616d865852ebeba02d6f00c
2022-12-15 04:38:15 -05:00
liz.li
e65e27ee57 ENH:add reset direction function
Change-Id: I3d89a738434f92ee34e9713d734347e3ea542497
2022-12-15 04:38:15 -05:00
tao wang
6f1040f0df FIX:fixed some issues for dark mode
Change-Id: I6b2b75507cf8a72672cce39cf7d8af8773723c22
2022-12-15 04:38:15 -05:00
yifan.wu
0acad21707 ENH: update Chinese translations
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I369cc80e3d7fb0c7d3292663d1fdf70544f8c765
2022-12-15 04:38:15 -05:00
liz.li
b648695754 ENH:auto focus input box when open text tool
Change-Id: Idca0fa6b1ef26a2e3f3537aa0a2e6907992c76de
2022-12-15 04:38:15 -05:00
zhimin.zeng
283f3fdd26 FIX: modify the logic when printapply check config again
Change-Id: I997c244a6b72e5f377b4898048f08ffcbd946102
2022-12-15 04:38:15 -05:00
chunmao.guo
7c6c356a3b FIX: not switch preset after cancel edit dialog
Change-Id: I2847f92a062ba5f133de1773c3e5573da574e99e
2022-12-15 04:38:15 -05:00
yifan.wu
d0d5a82938 ENH: optimize per-object setting menu
1. allow setting process parameters when multiple objects are selected
2. refine texts of per-object setting item

Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I6ef748d147da049ff8088c9308e51f18ae201397
2022-12-15 04:38:15 -05:00
tao.jin
bb70b60dbc ENH: change help menu order
Change-Id: I1589de6feac1a77f8ebc17314f513969d9891c5f
2022-12-15 04:38:15 -05:00
Stone Li
6f7f93b232 ENH: set qos = 1 for get_version cmd
Change-Id: Idc7e210a02739a329a6ae8a7c0489197472e78bb
2022-12-15 04:38:15 -05:00
Stone Li
005e8f5533 ENH: sort device list by dev_name in monitor
Change-Id: I1800407a30d3cafc52328cb29019ef6c5f7d5909
2022-12-15 04:38:15 -05:00
gerrit
887eb77574 ci: update build version to 01.04.00.05
Change-Id: Id657e765f51704c760993dca13a693aaaf8d1c7c
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
chunmao.guo
1b995c2d47 FIX: optimize click area in filament title bar
Change-Id: Id56f43b54f32730795295bb5e124898420cb0735
2022-12-15 04:38:15 -05:00
chunmao.guo
36efeea30b FIX: [STUDIO-1565] adjust ui style of media file buttons
Change-Id: Ia3598ca8a15e357021d8b74f645f4d34a853dd91
2022-12-15 04:38:15 -05:00
chunmao.guo
5a6263c9f3 FIX: [STUDIO-1525] not switch preset after cancel edit dialog
Change-Id: I91810298da40250e3c5def72737b2be6df764a3b
2022-12-15 04:38:15 -05:00
qing.zhang
50a5f8bddf ENH: increase the speed of strength process
1 out wall speed - 60
2 infill speed - 100

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I7dbcae03562596038cc47d950163ff9feb8854e2
2022-12-15 04:38:15 -05:00
zhimin.zeng
7c2417d1f8 FIX: fix crash bug when switch preset
Change-Id: I16b33af05bdaeb0261920d00b632b517f6fe857b
(cherry picked from commit 75b1c1fb9950d3031870af912919ef86d19e420b)
2022-12-15 04:38:15 -05:00
liz.li
7b82a5010a FIX: dark mode: adjust notification popup text color, adjust some svg
Change-Id: Id1a57a528a0764755789d7fe67ddc8b02340a584
2022-12-15 04:38:15 -05:00
liz.li
06e3c22b92 FIX:need a new frame when reload fonts
Change-Id: Ib59359fd1dd327a1e29990b5e774779fa672e04d
2022-12-15 04:38:15 -05:00
Stone Li
4700362f10 FIX: do not parse dirty json info
Change-Id: I543ae2818c5b23c351dc355abf115e76d5af75dc
2022-12-15 04:38:15 -05:00
liz.li
316ca3f5f5 ENH:optimize mem usage of imgui fonts loading
Change-Id: Icdd88b119c4406c407a955240698da5187f8efd8
2022-12-15 04:38:15 -05:00
yifan.wu
41fcf8eb1e ENH: optimize WipeTowerDialog logics
1. flush_multiplier will be apply the the flush volume during slicing
   rather than only in auto-calc
2. mark too small flush volume as red instead of a warning dialog
3. do not forbidden flush volume lower than the nozzle volume
4. fix incorrect focus status of text input box in WipeTowerDialog
5. check the minimum flush volume based on flush_multiplier
6. limit the decimal digit to two places

Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: Icdcc50c88ecd9463fb9ce73f996d57c2d9f0187f
(cherry picked from commit 60e01edc511f117b05a8a9b92aaf6fd55325e485)
2022-12-15 04:38:15 -05:00
tao wang
97cd9e900b ENH:updated some chinese translations
Change-Id: I7ec7b64920bd92d0d8e56a06fdaa4f0fb4add17f
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
Arthur
ab96238a69 FIX: timelapse type was wrong in end gcode
Change-Id: I4b73e74cebb36f540fd27c71584d4b4a4cff94e9
2022-12-15 04:38:15 -05:00
salt.wei
614882d28b ENH: extrude all loops ccw
Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I548bff50567c4cb6770585aafc7efb20889084d6
2022-12-15 04:38:15 -05:00
gerrit
04f66e974f ci: update build version to 01.04.00.04
Change-Id: Ia1db1bf68f25c3d3767ce1fd929791a6fee3b3bf
2022-12-15 04:38:15 -05:00
yifan.wu
98686a708f FIX: cannot input hotkey chars in 3D Text tool
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: Ie28fc3943ddcde1e2fa1f607fe9e8d0125399a74
2022-12-15 04:38:15 -05:00
gerrit
0ad9cd3ff7 ci: update build version to 01.04.00.03
Change-Id: Ia809d2d4d84e927a5fb1e01c0e023d62c818feca
2022-12-15 04:38:15 -05:00
Stone Li
0b452dc65b ENH: can not send print job when the consistency upgrade is required
Change-Id: I7a0c974d3dcfe54fd271e234513489cc0dd358d0
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:38:15 -05:00
Arthur
8cfee69015 FIX: undef SUPPORT_TREE_DEBUG_TO_SVG and tree support enhance
1. undef SUPPORT_TREE_DEBUG_TO_SVG
2. change default tree branch angle to 45 degrees
3. encourage tree neighbors merge faster
4. draw more loops at the top of trees for stronger support

Change-Id: I2edf6a2dddb3b6165c2519ee15e9a7ffaba9de94
(cherry picked from commit 3a9723b2e88a033b3298cd68daf9400265e984a1)
2022-12-15 04:38:15 -05:00
yifan.wu
e0c15db6b6 FIX: assembly wrongly displayed in the object list
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: Ie55a39bb2f98e2806cac8b79ee4afdf085c20e49
(cherry picked from commit 6aa86e6d5e08dd7431975269743e6067f2b8970b)
2022-12-15 04:38:15 -05:00
Stone Li
cc32ecdbd4 ENH: add retry for get version cmd
1. ota and xm does not have SN
2. retry for 10 times

Change-Id: Id158021435df76817262896d79bdd7d07af8db94
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:38:15 -05:00
chunmao.guo
a481e91105 FIX: [STUDIO-1510] recent project order in app config
Change-Id: I3040b693c324d4142127770a6e5bce81279cd136
2022-12-15 04:38:15 -05:00
tao.jin
7a5cd8ddd7 FIX: raise warning dialog when show on mac
Change-Id: I5c6eaf88eed9430c053d38f747eee3289e08927b
2022-12-15 04:38:15 -05:00
chunmao.guo
81e2200efb FIX: [STUDIO-1373] check save failed and show dialog
Change-Id: Ie8364d5d7156437152df0d87218128b00e08782f
2022-12-15 04:38:15 -05:00
tao.jin
6133ceac20 NEW: refresh task thumbnail with brokenimg
Change-Id: I39393a43c681ba954f9d3975b35df4551b314ef2
2022-12-15 04:38:15 -05:00
tao wang
75ddeb7572 ENH:file rename support Enter key confirmation
Change-Id: I708d120d132dac7f1bf14bb508310ba55987ad4c
2022-12-15 04:38:15 -05:00
tao wang
1c919977b1 FIX:fixed fixed crash when started on macos
Change-Id: Ic09a1fb61f68dffabdaf61b4c9e88bac62094a52
2022-12-15 04:38:15 -05:00
gerrit
f245e8c0c0 ci: update build version to 01.04.00.02
Change-Id: I5a4c6a533aa46ef21dd3eabee4932c9fb6021a98
2022-12-15 04:38:15 -05:00
Stone Li
3034ec7425 NEW: add limitation of bed temperature
Change-Id: Ib25f28d8803a022678d67ee05cf1d0c48e8727c4
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:38:15 -05:00
lane.wei
1d827bd968 ENH: optimize the cli slicing performance
load/store json files in parallel

Change-Id: I5b30463b06c922a83f84e525d6b1cd0c0555e911
(cherry picked from commit 41120270ea9bd562517aec08fbca87a9e39781ef)
2022-12-15 04:38:15 -05:00
lane.wei
c3a6b207b5 ENH: optimize the sequent-print behavior
1. don't sort automatically
2. enable the dragging on the object list to adjust the arrange order
3. adjust the object list order after auto-arrange
4. turn off label by default
5. add the snapshot key for label
6. check the the validation of the order

Change-Id: I91461c475cda5335b01a9a608143aa1df31741ab
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
liz.li
895e90733b FIX:mousewheel delta of slider turn to 5 at times
Change-Id: I64db714b26a315fa443a0ab2796b4bf21a6ec2f5
2022-12-15 04:38:15 -05:00
salt.wei
f600af7b73 ENH: po change for translation
Add chinese translation for some new line

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I10c2b46df4301f2b88dd2f3cdf32cc1c66ddf94e
2022-12-15 04:38:15 -05:00
liz.li
1f0ce4ac47 FIX: init_font crash
Change-Id: I2d2fd9f297e2980e789b124d3e026d0db1fa1602
2022-12-15 04:38:15 -05:00
zhimin.zeng
dfde6e518f FIX: add flush multiplier tool tips
Change-Id: I1d103c91dfa5b7539ca4bb848dbdcb105e1e3d94
(cherry picked from commit 080847c6f23ec362de54f5d22466827d70cbd0dd)
2022-12-15 04:38:15 -05:00
salt.wei
6551b86230 ENH: enable arachne for wall
Refer to prusa and enable arachne for wall.

Arachne also has corner case and cause strange
slicing result and bad quality when print, while
class engine is much better for these cases.

Provide option for user to choose.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Ieb3a1c6a457ca610561f8734de4a122d74165afd
2022-12-15 04:38:15 -05:00
Arthur
4419703f41 ENH: do not add L prefix to empty string
Change-Id: I0fc7f57baf256452645be497020d75ffaf9c20f4
2022-12-15 04:38:15 -05:00
zhimin.zeng
45de1d8368 FIX: third party 3mf relative position is not correct
Change-Id: If7df1e3ce7be77e6eccc39d5a18fd014289404a0
(cherry picked from commit 24a03c62fceff160e3fd4e4ce74ff61124ee2a2f)
2022-12-15 04:38:15 -05:00
qing.zhang
fe4fc04eb8 ENH: add upward_compatible_machine to preset
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I489f3cc7f9fbd0de79861b71c47494b377ef1a16
2022-12-15 04:38:15 -05:00
tao wang
01c059c358 NEW:add some chinese translations
Change-Id: I59215ab8852cf617b7ce78fe6f529f15185ea29c
2022-12-15 04:38:15 -05:00
chunmao.guo
11ea1e36ea FIX: [STUDIO-1486] set drawsBackground false for NSTextField
Change-Id: I46d6a2812d27e30cf56c037e33bb97d3d063a5b5
2022-12-15 04:38:15 -05:00
chunmao.guo
b60cabef28 FIX: [STUDIO-1503] events bind after recreate webview
Change-Id: I90ab03a43c5bedb7a89ee50a2ead91ddf5bdf8c3
2022-12-15 04:38:15 -05:00
tao wang
eca5897a25 FIX:fixed appconfig is not saved when switching dark mode
Change-Id: I77fc3808309a23497000c34b6047a359d12c4622
2022-12-15 04:38:15 -05:00
tao wang
4a5c473058 NEW:lan mode interaction optimization
Change-Id: I80eef918fe1ac4c8e306787bd7b9437262686e23
2022-12-15 04:38:15 -05:00
tao wang
5a78f7ade1 FIX:fixed some issues with sending files
1. send to printer change to send to print sd card
2. update the default error message
3. display networking error messages on the page

Change-Id: Ib82f952486d18ff481ac377aa607b5455b31564b
2022-12-15 04:38:15 -05:00
tao wang
ded0b69629 FIX:fixed the notification display error
Change-Id: I2fad466b0c17286aa1f75f3a859eb9ad2329e2f2
2022-12-15 04:38:15 -05:00
lane.wei
27d2008037 ENH: use wxFont::AddPrivateFont to load fonts for linux
Change-Id: Iefe1753a08fd188a274b4d555c5fcda8fca6d719
2022-12-15 04:38:15 -05:00
tao.jin
8f330d8b82 FIX: remove abnormal ui toggle in camerapopup
Change-Id: Id8b2b8f3be4a43e74e1e211b7bfb747b5552ca1d
2022-12-15 04:38:15 -05:00
Arthur
fd3dee6a6d FIX: remove tree_support_with_infill in 3rd party profiles
Change-Id: Ie42a45b90ce14bc27308d66474db074e8bf380da
2022-12-15 04:38:15 -05:00
liz.li
f1ed06b284 FIX:switch dark mode in assemble view will crash
Change-Id: I0bb38e50262ccfecdda48996d14048b2f3629975
2022-12-15 04:38:15 -05:00
Stone Li
e344f8b8b9 ENH: update hms panel and upgrade panel when disconnected
Change-Id: I75d724c99ec2029190641cd2cfa22b6337d0060d
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:38:15 -05:00
gerrit
42633fda28 ci: update build version to 01.04.00.01
Change-Id: I401b341cb6c0d6c9a1962556a6e9c8510c505261
2022-12-15 04:38:15 -05:00
Arthur
65766ba30a FIX: tree support crashes when there is no overhang
Default infill pattern is lightning now, which has
a crash bug when no overhang is provided.

Change-Id: I1e70b8458d1eef670a78d698c68b21d7f48bc3eb
(cherry picked from commit 777af3aa1dbb9869209945f3a6dbcc07cba0b84a)
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
yifan.wu
0e083654ce ENH: update sw version to v01.04.00.00
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: Ib99fc1b3fcaaa30a90c74e248b47bed78be203d7
2022-12-15 04:38:15 -05:00
Stone Li
2fad7b816b ENH: refine ams mapping valid logic
do not make mapping result valid for empty ams slot
when doing ams mapping

Change-Id: I5f4de0b52884a4c20cf7d0654f2364a61d1fbd3c
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:38:15 -05:00
Stone Li
929a8e3adf FIX: fix calibration bug
1. fix in calibration display error
2. refine ams remain filament settings

Change-Id: I2b3d86064707c6732b6f127e08b62baaa0dac0ae
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:38:15 -05:00
chunmao.guo
ba8015e455 FIX: more web view logs
Change-Id: Ia4b2821188c3053be297b0fe0aa19fb8d939a816
(cherry picked from commit 4e76cfc6529038252a4afd8d53cf93f817d46b01)
2022-12-15 04:38:15 -05:00
tao wang
a9f3f195e1 FIX:fixed ams setting button display error due to scaling
Change-Id: I810b9f75410d15b16851ec31e710d037d2fba1d6
2022-12-15 04:38:15 -05:00
liz.li
5afc02ee72 ENH:show several items in GcodeViewer
1.show developer mode items and adjust layout
2.fix checkBox cannot response

Change-Id: I9856fa0a781cfaa574cb6dfc4530fe52fa733154
2022-12-15 04:38:15 -05:00
chunmao.guo
38fb9dcec5 FIX: [STUDIO-1476] Media play ingore stop state when initing
Change-Id: Ie4c743be3fb1bdd095f627faed855bde57ef637a
2022-12-15 04:38:15 -05:00
chunmao.guo
2f7946333d ENH: [STUDIO-1477] indicators for that has object configs
Change-Id: I4556b049cd6aa128a05f69c00fa14d8ea5bb3f39
2022-12-15 04:38:15 -05:00
tao.jin
536df6ca23 NEW: warning before user move e axis
Change-Id: Ic06d0fa3b5ff19608a53e2d276d91375156bdc82
2022-12-15 04:38:15 -05:00
qing.zhang
5338247639 ENH: add default filament for p1p
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I00986b48378f6c36566681e6dcd00b076e833020
2022-12-15 04:38:15 -05:00
chunmao.guo
0f4db753f1 FIX: [STUDIO-1500] add/remove in preset combobox
Change-Id: I8bc59798863da6b8efe64881efb443ad2dfa787d
(cherry picked from commit 43164c163573f63812abf9967c53ec6b4d12b10f)
2022-12-15 04:38:15 -05:00
lane.wei
c0ccb733dd ENH: some improvements to 3mf loading
1. convert instance to object when loading previous 3mf
2. fix an exception issue caused by previous commit caused by nil value of import_project_action

Change-Id: Ieed853f0e8d458aab1716acf52307c5d672ebe22
2022-12-15 04:38:15 -05:00
salt.wei
1637981be5 ENH: open more setting options
For "detect narrow solid infill"

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Iee680faeadaa6b92b411be0aa28be762e5fc20e5
2022-12-15 04:38:15 -05:00
gerrit
5e410fe5ef ci: update network module based on commit fc539ac
Change-Id: Ie3eed0c22f01af228c0507eb131a1041f3fde3a8
(cherry picked from commit 0d728271668dcb85b7764859bf99f701695c5124)
2022-12-15 04:38:15 -05:00
Stone Li
b5629fa31a ENH: sync with localazy and update pos
Change-Id: Idd235f05fddc4ee7962df7fe001ee71ebaff3ce7
2022-12-15 04:38:15 -05:00
yifan.wu
3b0f75bd4e FIX: fix a cherry-pick conflict error
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: Ib8cc0598ec07fd204c3629206fb09939b7501215
2022-12-15 04:38:15 -05:00
zhimin.zeng
2ecb2fd22d FIX: STUDIO-1095 Prompt "import geometry data only" again
Prompt "import geometry data only" again when importing old or other 3mf

Change-Id: If3edd3c36efa09925a9131e31567b0672f84f84b
(cherry picked from commit 90eba8d55563997ceb1bc8feb1e110680c3b3678)
2022-12-15 04:38:15 -05:00
zhimin.zeng
284154d053 ENH: start normally when deal with unknown enumeration value
Change-Id: Ibc3d47a6181528e3aa747d79ae2a436f548f05f1
(cherry picked from commit 7fc01b6f1aea831b41d5a63b3d8858de12572b65)
2022-12-15 04:38:15 -05:00
zhimin.zeng
7dddb17d8a FIX: the P1P printer is not support smooth timelapse
Change-Id: I0e9faf9d9c63d6541189724813fd803c8522a26b
(cherry picked from commit 84edf0b3eeb84c65990926ab8fc69b0f51ce6f3d)
2022-12-15 04:38:15 -05:00
liz.li
882e06bd9b FIX:add some missing darkmode svgs
Change-Id: I0a5a47e9733b534e45c65cb79ecd5b1cd2da7303
2022-12-15 04:38:15 -05:00
qing.zhang
1f5454052f ENH: align the parameter
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: If5b5f5c18d23ccae9524501dd4b99eff2e5532b4
2022-12-15 04:38:15 -05:00
Stone Li
8fcd6f31dd NEW: add config of P1P printer
Change-Id: I8ddebea9f194a6a64c4bd7ef17cbf432035113cb
2022-12-15 04:38:15 -05:00
Stone Li
e7408b171a NEW: add warnings when sending print job
tpu can not be used with ams

Change-Id: Icf93b0daed017eb1b378daba00b754bbf18ad354
Signed-off-by: Stone Li <stone.li@bambulab.com>
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
tao.jin
e217baad50 ENH: refine display of camera state and add setting
Change-Id: I85f02565e1581fde9a6c161f4fbed0283fda208f
2022-12-15 04:38:15 -05:00
tao wang
dc7822e816 ENH:losing focus when renaming is automatically saved
Change-Id: I411e824e4b7154aa85e14d1c0aae3ddf979bd259
2022-12-15 04:38:15 -05:00
lane.wei
795c1851be ENH: add more logs for debugging panel switch
Change-Id: If35e00e2b70223ce8bda62d0b2da7f072eb8c1e4
2022-12-15 04:38:15 -05:00
chunmao.guo
ca2f05e60b ENH: [STUDIO-1478] collapse siderbar printer/filament region
Change-Id: Id0d1009f5b2c344bc2a95702d33d1d87c864b8f2
2022-12-15 04:38:15 -05:00
liz.li
56a98390f9 FIX:search dialog cannot open
reason:search_line window modified by darkmode-commit

Change-Id: I1a6c58362b2d1eff506b62a97d908b95dc591ff9
2022-12-15 04:38:15 -05:00
lane.wei
b65d47b544 FIX: fix the default materials loading failed issue
Change-Id: I9341e6ec209673585a9ed3a981db92d28ac30659
2022-12-15 04:38:15 -05:00
lane.wei
03226c9e43 FIX: fix the empty plate exception issue when slicing all
Change-Id: I55746b575025fdcc732fa2386cbce45a34bce210
2022-12-15 04:38:15 -05:00
lane.wei
45dd07cfe4 FIX: fix serveral issues in multi-plate slicing
1. fix the thumbnail white issue in some random case
2. fix the thumbnail not update issue under preview panel
3. fix the previous panel's toolpath not clear issue while switch panel
   under preview
4. fix the toolpath not clear issue while switch from 3d to preview in
   some corner case

Change-Id: I158eba35e3b5d8a1e77f19ee9f86801e6a6dbd86
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
salt.wei
ce2d2defc0 ENH: remove a assert which is wrong
This is a wrong assert code!

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Iec33e0ab456f0e726b1c3e87c30cb2649a55b39d
2022-12-15 04:38:15 -05:00
salt.wei
416e100b1d ENH: eliminate too narrow area of stBottomBridge
For very narrow bottom bridge, it's useless and even
harmful to be printed as bridge. Eliminate it.

This is handling for github issue #298

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I1dc614781a028716a6de59454577f0b7f3b5b1f5
2022-12-15 04:38:15 -05:00
liz.li
d3e6455cf7 FIX:linux hms text display bug
Change-Id: Ia7c51c8233acba2e529a2ba878698bf9c1f567f6
2022-12-15 04:38:15 -05:00
salt.wei
f59d59fbe8 ENH: change some system presets
1 Use 25% infill density. 60% is too high and useless
2 update filament change gcode

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I9a1fbbfb56b61723aa6e9d6bc44a22f467d92562
2022-12-15 04:38:15 -05:00
Arthur
4eba8a2a2d FIX: auto-arrange may crash due to clipper
1. Use nlopt and clipper offset togather seems not stable, very easy to
crash. We do the offset outside nlopt now.
2. Fix a bug with finalAlign where objects may be translated to overlap
   with excluded region.
3. change the words of support_expansion

Change-Id: I22e37b20e4ae16f47bde206de90845616e4cefad
(cherry picked from commit 1c26e5d2862fd3f3292971b5c749420bfb2cdf0e)
2022-12-15 04:38:15 -05:00
Arthur
95ed039879 ENH: simplify support options and fix a tree sup bug
1. add default support base pattern (lightning for tree support,
   rectilinear for normal)
2. change default support interface pattern to "Default" (concentric for
   absoluble material, rectilinear for others)
3. delete tree_support_with_infill, replace no-infill optio with "None" infill type
4. delete HAS_LIGHTNING_INFILL macro (lightning is impossible to be
   removed now)
5. fix the issue that tree support base may grow above interface by
   adding virtual nodes (distance_to_top<0).

Change-Id: I5affa44e1f72d0dc54052927f2b315de83702870
(cherry picked from commit a2b41b1dfd9227e68ac6d971312133ec3382baa7)
2022-12-15 04:38:15 -05:00
salt.wei
bcedd7e557 ENH: fix gcode viewer line error issue
Should not insert new line in post process
which changes the the final line id in gcode
file

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Ib8b837cf313a1308260db88bf5390fefe9708cc8
2022-12-15 04:38:15 -05:00
lane.wei
c3abc64b61 ENH: slicing: add cache data load/export for slicing
Change-Id: I88b7c79b6f79ec6bed0f829316b67310cac99b44
(cherry picked from commit 67c1d2e8dd459cc4450ce580632f01e25db038ac)
2022-12-15 04:38:15 -05:00
tao.jin
2ffa56633c ENH: rebuild warning dialog with frame
Change-Id: Id4a8ab80ecec30b668de59556823dad6838276fe
2022-12-15 04:38:15 -05:00
Stone Li
5b7ebc3684 FIX: fix use ams always checked
Change-Id: Iaf4e894bab3ca2bd2f57e174ad4fcae517ec20cf
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:38:15 -05:00
zhimin.zeng
fe3a1f724c FIX: special model slice color is incorrect
Change-Id: I35eb51920e4d586354a98aac61aa4a806ea66464
(cherry picked from commit 7eae730907e25733968853a850762458bf0682ac)
2022-12-15 04:38:15 -05:00
zhimin.zeng
d55cd76ebf FIX: remember the flush_multiplier
Change-Id: I38d50fb21791b2a469bb5169fc0da6b95c836466
(cherry picked from commit ca822601e4e41b7ab744c9bb4c4af6eb9db4263f)
2022-12-15 04:38:15 -05:00
qing.zhang
53af32dd1a ENH: add infill pattern
archimedeanchords pattern
octagramspiral pattern

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: If07cca732de1f0169e89d5999a290839e2f00da1
(cherry picked from commit 9e322618e8ef03cf79be1526685017eafb9cb3ae)
2022-12-15 04:38:15 -05:00
MusangKing
d1e4cb430c NEW: Add "Support xy expansion distance" setting
Open the "Support xy expansion distance" setting for users who can set
expanding and shrinking distance along xy to change normal supports' overhang area.

Jira: STUDIO-1297
Change-Id: If3a1efe99acaced12216966a6f8abd0dc3734757
(cherry picked from commit c1fd588a181b17403109b64a0019818f428252da)
2022-12-15 04:38:15 -05:00
Tao Wang
ab49516ec1 FIX:fixed popup wrong pos of the print menu on multiple displays
Change-Id: I9712244df4e0df9dcb5beedf4dd36e3a06fa9db6
2022-12-15 04:38:15 -05:00
Stone Li
b81a26d019 ENH: can not send print task when printer need force upgrading
Change-Id: I3be5c9c54b3a5fb448b1e96901df8aa7ffbffbd8
2022-12-15 04:38:15 -05:00
liz.li
eb723d1979 ENH:remove start G-code layer in preview-slider
Change-Id: I89d66453078bb2df1f9a0161f6cfde032a9dd90d
2022-12-15 04:38:15 -05:00
tao.jin
1e4582f966 FIX: sync with master(update slice state)
Change-Id: Iec749349837d969c0a84b56d16d0fb32ed594c0a
2022-12-15 04:38:15 -05:00
tao wang
8216265725 NEW:add remaining capacity detection switch in ams setting
Change-Id: I8f7be78dbf881bb5e2564aea4d0e01d78f1b0433
2022-12-15 04:38:15 -05:00
tao wang
a316bdfa22 ENH:notify the user to save the project before switching languages
Change-Id: Ife8acc0aeaef013d9dbbb753686ad4b4a319bf80
2022-12-15 04:38:15 -05:00
liz.li
ee187f2f78 FIX: macos crash : .dfont file cannot load into imgui
Change-Id: I0efd73da821afbb5e0cea314c56d8243342adb32
2022-12-15 04:38:15 -05:00
tao.jin
9c55e42b32 FIX: update slice state after changing bed type
Change-Id: Iaea235233ecdc0c486daedda9f0d844cb176906b
2022-12-15 04:38:15 -05:00
salt.wei
f49f1385b5 ENH: fix error acceleration in Gcode processor
When travel in x-y-z move, the acceleration should
be limited by trivector rather than one axis.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: If8e5d394cf5d8772d324b9c851c047d9235d9b6b
2022-12-15 04:38:15 -05:00
MusangKing
aa0dbac351 ENH: add paint-on support on vertical faces
Add paint-on support on vertical faces of slender rods

ENH STUDIO-970/1285
FIX STUDIO-1183

Change-Id: I36b398f9c1c1341bce080ec3d454dcc6e6f991e8
(cherry picked from commit 65ee2c8d74284b21bfd34a1059e2005998d749c5)
2022-12-15 04:38:15 -05:00
Arthur
e61e6c3c95 ENH: improve tree support interface quality
Always draw a wall before infill for 1st interface.

Jira: STUDIO-1402

Change-Id: I9cba46f9bcacbe6c78a82bbb7099cc1d1182cb97
(cherry picked from commit d7381adb78c99414f538db82f0ac1f2de2e968cf)
2022-12-15 04:38:15 -05:00
MusangKing
2a8fe9ec54 NEW: Open "Bottom Z distance" setting for users
Users can set distance between support bottom contacts and object
once enable normal/tree support.

Jira: STUDIO-1383

TODO:Func seems good though, some details (e.g., bottom_interface
detection) need to be optimized furthur. Will keep follow-up.

Change-Id: I85815e7aa6cf1a5d0249633cd8ab995873461e8a
(cherry picked from commit eab39e89c94d749ebe6266ab745cbb70a068277d)
2022-12-15 04:38:15 -05:00
tao wang
63ea4179e4 FIX:fixed ams mapping instructions img not clear
Change-Id: I21d4d024078ad2b2a983b54938efb13015382a10
2022-12-15 04:38:15 -05:00
tao wang
3c9a28017d FIX:modify the title of the second confirmation
Change-Id: I85b4b0bb7dc12cdd2e37b494abc5de54a5939210
2022-12-15 04:38:15 -05:00
tao wang
0f00adb0d1 NEW:added to send all plate to printer sd card
Change-Id: Ib7610d64a3b45afaea432c26832313d248c6890b
2022-12-15 04:38:15 -05:00
tao wang
4c9cf7577d FIX:send printing no longer has suffix
Change-Id: I73577279f973713783d4eb214b27ac7909b9b1f3
2022-12-15 04:38:15 -05:00
shuai.liu
1ad8e7ed74 FIX: fix quantized convexhull normal bug.
1. use face_normals as convex_hull normals instead of quantized normals.
2. The quantized normals will result in bad orientation because of accumulated error.

Change-Id: I8e554905dcec430738135cb8a9f08d8e0fdfecae
(cherry picked from commit 33c474f6f6e7469aed75e981e700e0279cb23de3)
2022-12-15 04:38:15 -05:00
shuai.liu
2b3e533b8b FIX: fix the bugs related to bottom area and flip
[STUDIO-1079] Large plane not stick to bed
[STUDIO-1437] Model auto flipping bug
1. Changed the orientation threshold so that some tiny rotations wont be ignored.
2. Added flipping detection. Rotation with same unprintability will not be excuted.
3. Added the weight of first layer area to improve large planar face orientatio performance while not influence other objects with small first layer areas.

Change-Id: I1efc9252c90bc053e65cb71e7770cb8d0305cb6e
(cherry picked from commit 1eda67e4fd0cd2536af219e0c225fc08949b5023)
2022-12-15 04:38:15 -05:00
chunmao.guo
f6ff0f6131 FIX: re-register BambuSource when maybe installed under administrator
Change-Id: Iff4c4dc9a581de33e08681b7033c1f29ebacb6a4
2022-12-15 04:38:15 -05:00
yifan.wu
9a0ef5b989 FIX: fix a bed texture not display issue
1. change default bed_type to "1" in app_config
2. if old app_config.bed_type is 0, change it to 1

Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I9923187ab480b0a4991bfbc13892bfb43b2a990b
2022-12-15 04:38:15 -05:00
Arthur
5df1317f40 FIX: tree suppoort generates wrong sharp tails
support_critical_regions_only may generate wrong supports on sharp tails

Test case: calicat.stl

Change-Id: I73671d9bf0f9c27ef70efa5765cd291761c4d18d
(cherry picked from commit 8ff2ac7ce437dc2f9eee6068d596294c054dee1b)
2022-12-15 04:38:15 -05:00
Arthur
86631eab47 ENH: translate print options and so on
Change-Id: I23f2720442efb4491fe7854cc080f644a8bed414
2022-12-15 04:38:15 -05:00
Arthur
f6fed97b9d FIX: auto-arrange unable to arrage a large number of small items
1. Should start from bottom left if there is excluded regions
2. avoid exclusion regions in fixed_overfit_topright_sliding

Jira: STUDIO-1422

Change-Id: If88ecf86a0485bd478a77df8cfd4942df8ca27ac
(cherry picked from commit a8393de51bd178b731ef4c7201a5fe3247d97a1f)
2022-12-15 04:38:15 -05:00
yifan.wu
d152b4d235 ENH: refine global bed type config logic
Add default type to plate bed types.

Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I26f3a64dba4a19b0d882b828f1ee54c84df1879c
(cherry picked from commit 1ebed465d2b3bcd482dd4ba7a5930b721c79fc13)
2022-12-15 04:38:15 -05:00
chunmao.guo
3b3ad1b390 FIX: scroll offset with touch pad
Change-Id: I7dbec590f39f174c02e4179fd781ff7fd1a93374
2022-12-15 04:38:15 -05:00
Stone Li
fee419797d FIX: fix use wrong preset folder
this happened when stop sync user preset

Change-Id: I16e17614d64a3e81adbc32fc9819cc32c6599a77
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:38:15 -05:00
liz.li
fafff5c1d1 FIX:fix search dialog cannot dismiss when alt+tab
Change-Id: I2fd0099685ce80e72f6214643b35535c274f7e22
2022-12-15 04:38:15 -05:00
chunmao.guo
5f2a537f14 FIX: occt font encoding
Change-Id: Ief4fc0ced20f386b85bb0963c5953954a85df9e0
(cherry picked from commit 50b10de0b1261272208c6676e9ca1c917c4707b1)
2022-12-15 04:38:15 -05:00
tao wang
f3b4618932 ENH:change style for the refresh button on model mall page
Change-Id: I1fb368b279dad3dc300374e5338655cf2a896142
2022-12-15 04:38:15 -05:00
liz.li
f76d214ae6 FIX:temperature character in GcodeViewer display '?'
Change-Id: I89b03d04ff280f1f5e6a16a4cd7143dfa31efea1
2022-12-15 04:38:15 -05:00
chunmao.guo
9b10b1438c FIX: [STUDIO-1011] windows can not scroll in inactivate window
Change-Id: Ib09e58f4637d632625bf7bd484fd26319630cdb2
2022-12-15 04:38:15 -05:00
chunmao.guo
05904e3770 FIX: [STUDIO-1419] conflict when removing old logs by multi process
Change-Id: I6529fa649020a2d4419048e470e343bfd63c41bf
2022-12-15 04:38:15 -05:00
chunmao.guo
5e02f87980 FIX: max 18 recent files
Change-Id: I83d1b38a6c5f89150ee4cd6dc9ed0c6f548fe234
2022-12-15 04:38:15 -05:00
tao wang
00ab44f0a0 ENH:add notification when sending gcode finished
Change-Id: I9a2dac701053591a1c0bd4d8b376ef07b31262f0
2022-12-15 04:38:15 -05:00
liz.li
df260dd724 ENH:dark mode of imgui part
Change-Id: I42975f9004be1a348db83f1a5790490dbc444c9d
2022-12-15 04:38:15 -05:00
chunmao.guo
1400e9d63a FIX: not open STL files with new window on Mac
Change-Id: Icecd60297197e5130801e32d4b0a6dfa714146a1
2022-12-15 04:38:15 -05:00
tao wang
6f4e80bbb6 NEW:added dark mode
Change-Id: I3f61f1d93020e0a9dfba2c7d6cf6bf5194effcfa
2022-12-15 04:38:15 -05:00
zhimin.zeng
6ae575d885 FIX: the object move a distance when laying on face
Change-Id: Iddea713d2237e1cc232a4ce114b17d3fb7c0d8b0
(cherry picked from commit 5e09aceca1794ea2be5e7718a5b3f29f971676a9)
2022-12-15 04:38:15 -05:00
zhimin.zeng
36d08e1849 ENH: add layer_num/[total_layer_count in layer change gcode
Change-Id: Ib5f7ad56390c07002999019816174f035aa3d484
(cherry picked from commit c4142c666d1613f6ad3c4269fb741b9a72558512)
2022-12-15 04:38:15 -05:00
zhimin.zeng
c38daab5da FIX: raise the nozzle when moving to wipe tower in smooth timelapse
Change-Id: I3feea8dc36697b9328d68faa97e55f5a1dcb827e
2022-12-15 04:38:15 -05:00
tao wang
de0b0508eb FIX:fixed the display error caused by the incorrect remain
Change-Id: I9c0bb7325d4d9ae043aa3dc868f94102e3aa24ae
2022-12-15 04:38:15 -05:00
tao wang
1ae4a74687 FIX:fixed the crash caused by scaling screen on windows
Change-Id: I50aa57eb67e3f671f4e894cfaef3da5bcb88efca
2022-12-15 04:38:15 -05:00
tao wang
8f498c7665 FIX:fixed the issue publish menu being added twice
Change-Id: Id414e281749a08a285344eec818d03dc6af3846d
2022-12-15 04:38:15 -05:00
salt.wei
93a0d3a4ca FIX: fix a crash issue when copy failed
Change-Id: Ie0cd4676d9f31213c80a4a9a7f5c836c58a53120
2022-12-15 04:38:15 -05:00
tao wang
de8db2a89c ENH:The model mall dialog can be activated
Change-Id: I19aa551ffc79c4f5c9369331f28adbe7410ccab2
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
wintergua
6dfd598b7f FIX: Auto brim will not be considered during model arrange
if the brim of an object exceeds the bed area, it will be clipped before transformed to G-Codes

Change-Id: I68d700a85e1d28a5e337e53d614266f6e5e0a653
(cherry picked from commit d19ffaa7bdf4b0ab750119d9ef6252491d936f3e)
2022-12-15 04:38:15 -05:00
chunmao.guo
bf24a71b60 ENH: webview dark mode
Change-Id: I0b58e759268d057d5942dd8726c37d1abbdd5930
2022-12-15 04:38:15 -05:00
chunmao.guo
65ee16f676 FIX: dark mode of wxTextCtrl
Change-Id: I8a377228b79d24ffe6284acf9be7017207b5dddc
2022-12-15 04:38:15 -05:00
tao wang
3925ceb9f4 ENH:add humidity display/surplus material
Change-Id: I1a04df257c9b09fef7ff06cfa192644478a30716
2022-12-15 04:38:15 -05:00
Stone Li
3a9397307d NEW: add calibration options
add calibration option of xcam_cali, bed_leveling
and vibration.

Change-Id: I63dc47e08ac89554f0e45db35eecd72be484647d
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:38:15 -05:00
chunmao.guo
73242280ef FIX: MediaPlayCtrl crash on switch language
Change-Id: If69bd42f586e6e15387ffe387c820480cbf750dd
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
Stone Li
46bde9b337 FIX: fix lang_code for hms
Change-Id: I75035f8d0fe70b35683cc383ca139c0377bf3a14
2022-12-15 04:38:15 -05:00
qing.zhang
f43eb35d38 ENH: shorten the travel before wipe
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I3b8c3e188aae85ead926c02a3edf8d23379fbcb1
2022-12-15 04:38:15 -05:00
liz.li
8222b86a32 ENH:add show labels menu item
1. add show labels menu item at default menu
2. adjust flush option menu position

Change-Id: I525db0b486885e1399c6fcd776195b502329c08b
2022-12-15 04:38:15 -05:00
liz.li
f3968c5d99 FIX: one_layer slider ,text doesn't display fully
Change-Id: I9d02b246267bfd0eb74a1cea55dd769ea32da14a
2022-12-15 04:38:15 -05:00
zhimin.zeng
035c38bdc7 FIX: old gcode files don't show timelapse when send print
Change-Id: If1829c8848ab9874a55367cdf77f881be0645c10
(cherry picked from commit 95d456f4cc16840167b3e2beaee597208bc885b4)
2022-12-15 04:38:15 -05:00
zhimin.zeng
11fa28a87a FIX: location is incorrect when loading modifier
Change-Id: Ib750c96ad61ca9e804040a75aed0dda58b76f3af
(cherry picked from commit 8c797905e5ed81971cd72ae3a2d001b9d1bee312)
2022-12-15 04:38:15 -05:00
zhimin.zeng
0ce31da96e FIX: back up error offset of new object
Change-Id: I4bb78f14e41cf5b299525fcec7d1dd99330abbb4
(cherry picked from commit d081d03cc66c5ed0b2c777ea12d5942cdb48b03c)
2022-12-15 04:38:15 -05:00
chunmao.guo
b209243b27 ENH: dark mode of StateColor
Change-Id: I5928898c50280c7f2eedbb9389032230c7e251c4
2022-12-15 04:38:15 -05:00
liz.li
faec57d263 FIX:macos dailytips popup on wrong position
Change-Id: Ic257073f38f51aa31132043538b412074e895ce0
2022-12-15 04:38:15 -05:00
liz.li
61c323d7cb FIX:macos GcodeViewer display alignment problem
Change-Id: Ie10b062edd0c930a410397542fecf15d7fb326d4
2022-12-15 04:38:15 -05:00
Arthur
869b93e270 ENH: improve auto-arrange compactness around wipe tower
1. improve auto-arrange compactness around wipe tower
2. do not show "Avoid extrusion calibration region" for P1P
3. encourage objects with similar height to be arranged together

Jira: STUDIO-1364

Change-Id: I5efa61a676c453618cdb3915fb98928d07138deb
(cherry picked from commit 571ee0c6d91d8a5f6a60838052f09d49d85f12ed)
2022-12-15 04:38:15 -05:00
Stone Li
a06de19577 FIX: fix hms display error when language code is empty
Change-Id: I1bf5185ef808bd8f8bbe75cf4a62d2825fffefe0
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:38:15 -05:00
shuai.liu
0193e70a9e FIX: enhance auto-orientation with parameters
The tolerance of orientation filter is too large.

Jira: STUDIO-1375,1376,1382

Change-Id: I794a161e74acbcf2e13c03dcc6e5e51d6b4e1f23
(cherry picked from commit 9d8f838fb06b8c0d4efed3e50d33db410efae360)
2022-12-15 04:38:15 -05:00
yifan.wu
05a00edb79 ENH: support default filament for modifier
1. set modifier's initial filament index to "default" (0)
2. allow to change modifier's filament index to "default"

Change-Id: I66e546e20fa5492532dd8733df5b0d38a92fd4d7
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
2022-12-15 04:38:15 -05:00
Stone Li
6d46ac98ba ENH:GLGizmoText style display
Change-Id: Ie7e3a91a10464cf8b85f7553b74973a4cbac3bca
2022-12-15 04:38:15 -05:00
Stone Li
929ab9d327 FIX: reconnect lan mode printer when select printer
Change-Id: I6838360b6ddcf2cf49d7857ec536a29f92be0489
2022-12-15 04:38:15 -05:00
Arthur
9f96c8adec FIX: auto-arrange ignores wipe tower due to supports
Wipe tower is needed if support base and interface use different materials.
Jira: STUDIO-1336

Change-Id: I006ece952aac1a0f0a57721c2cd1b52b2ceee28a
(cherry picked from commit 1a387e4b1607dee36f5abe499892f027e244fbeb)
2022-12-15 04:38:15 -05:00
lane.wei
fb4f30a4a4 ENH: gizmo: use native string for snapshot name
to avoid possible crash issue(not sure)

Change-Id: I34f7859b5eb8d2b9b09093ac9b68d24fa1074612
2022-12-15 04:38:15 -05:00
tao wang
ceae5fb0ed FIX:fixed the border of the material control is not clear on the mac
Change-Id: I732690728f0e954ca9cbd37b03d6cf1ebf58f9a0
2022-12-15 04:38:15 -05:00
tao wang
f7a35424df FIX:add chinese translation about the print option
Change-Id: I0411da5e37fc113565517bf516297f18f1c4ab95
2022-12-15 04:38:15 -05:00
tao wang
01744f1759 FIX:fixed users can not click drop-down menu on mac
Change-Id: Ib9ac9e323d70f5be32a7d1bd935effba974ef006
2022-12-15 04:38:15 -05:00
liz.li
196f20fbc9 FIX:macos change delete character to backspace
Change-Id: I91f9b005b4105928ff73fc7b956ffa99974b9455
2022-12-15 04:38:15 -05:00
chunmao.guo
fc7b1cf9fe FIX: [STUDIO-1401] C11 has not access code now
Change-Id: I31a8e45290f98455ff2703f70e20f5427e8c22ab
2022-12-15 04:38:15 -05:00
chunmao.guo
6d2a667c92 FIX: [] delete MediaPlayCtrl before wxMediaCtrl2
Change-Id: Ic92be54f159baf78a27afb18838397f1eb99fac0
2022-12-15 04:38:15 -05:00
tao wang
fbcf589a18 ENH:change the mall dialog to frame
Change-Id: Idee98d2c9a84cca5245c42c60b545fabf31fb037
2022-12-15 04:38:15 -05:00
chunmao.guo
7587cb5737 FIX: [STUDIO-1389] update dirty state when changing bed type
Change-Id: I5e8939b72a68ebd51b900289bdc9b38695797d08
2022-12-15 04:38:15 -05:00
lane.wei
eecc2a738c ENH: label: refine some label logic
1. only show label of object in current partplate
2. disable label under gizmo
3. fix a issue of label not updated in time
4. add some logs

Change-Id: If20196a566cc45a4a0c2bcc6bbe212aaa9f74dd3
(cherry picked from commit 3e92ed61e9687d5351a9bb2bc6d25b568cd1c973)
2022-12-15 04:38:15 -05:00
chunmao.guo
93ce494741 FIX: update po of virtual camera
Change-Id: I20619f0ecf387af48d62fa953e101fcde3b1519b
2022-12-15 04:38:15 -05:00
Stone Li
13c15c82e7 ENH: can not cancel print job after FINISH_STAGE
Change-Id: I91eefd8b9c7ec0d3d2b8a37e0348bb9a8442f3bc
2022-12-15 04:38:15 -05:00
lane.wei
d40f9b24ed ENH: bootup: add slow bootup mode to avoid some possible crash on seldom computers
Change-Id: Ia7a05082eee32dcc8a2ed9ca47cf13287ee2aed9
2022-12-15 04:38:15 -05:00
tao wang
2aedc84586 FIX:remove the RELEASE_TO_PUBLIC for publish option
Change-Id: Iadf1fa28a2770d75dd0fa39246c42a7a30ee2ad5
2022-12-15 04:38:15 -05:00
Stone Li
2cc7dd02af FIX: fix version format in bbs_3mf
Change-Id: I3a266e42bf7efc44533cdd38a5bd843bae764cbd
Signed-off-by: Stone Li <stone.li@bambulab.com>
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
tao wang
46dc96fddf NEW:add some new changes for send print job
1. change tray id like to A1, B1, C1, D1
2. can change the name of the project that is sent
3. add ams mapping instructions

Change-Id: If301f4051f640157a53d6927a0ddf2facf4961b4
2022-12-15 04:38:15 -05:00
tao wang
06ac3f73a6 ENH:popup msg for user when printing with unknown filaments
Change-Id: Ic1dfa9d70e7bd5ed0e4220b718e261ecf4ef64a8
2022-12-15 04:38:15 -05:00
chunmao.guo
64ae3c3a56 FIX: [STUDIO-1360] media file image scale on macOS
Change-Id: I2a25ff53b9beb08a90aca07adad7accc69b6d2ed
2022-12-15 04:38:15 -05:00
Stone Li
cb83284b24 ENH: store 3mf metadata info to a map
Change-Id: I17700b1c4a7e47b017d18815e76b4b9bed5c9de4
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:38:15 -05:00
Stone Li
cb5f5a26cf NEW: support calibrate option of printer
Change-Id: Iacc974d5cfec54789223f9ba298db21bea277d18
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:38:15 -05:00
chunmao.guo
3f4136157e FIX: [STUDIO-1358] Media file cancel waiting download
Change-Id: Iaaa0da90f57aeb0e8aaf1049589d4f1012fc6460
2022-12-15 04:38:15 -05:00
chunmao.guo
662cfb6f7b FIX: [STUDIO-1369] backup object mesh when renaming
Change-Id: I17644b732a0a476ca3d5b4cf61c0f5b53b81eaa6
2022-12-15 04:38:15 -05:00
lane.wei
aac34a5411 FIX: fix serveral issues under multiple plate slicing
1. preview result not correct when switch from invalid to valid
2. slice_all button not correct after loading gcode
3. slice_all button always set to enable with normal model(not gcode and exported files)
4. thumbnail missing issue after mmu paint

Change-Id: I9873a035acc277b790d46d705c4a794c09bbd889
2022-12-15 04:38:15 -05:00
salt.wei
276989a878 ENH: use outer wall acceleration to do calibration
As title.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Ibf7a9253a9837d6a2148e6ce9c0582ac915fde48
2022-12-15 04:38:15 -05:00
Stone Li
bdab8a28c9 ENH: add filament alias to a print warning
Change-Id: Ie7a2e0cbdd016c2120c46cde9a92a93baffbe832
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:38:15 -05:00
Stone Li
8f9d8b55eb ENH: refine print progress display when sending a print
Change-Id: Ie31cc0c1f71f251b79cf5ac2da64cc61c77a4858
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:38:15 -05:00
Stone Li
b54870106d ENH: refine ams mapping valid logic
do not make mapping result valid for empty ams slot

Change-Id: I2e6be7f973dea7784804ec1978c68cc2bd47c6c0
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:38:15 -05:00
Stone Li
2b23e3c119 NEW: add menu item of per object process
Change-Id: I09c7516903e59e976f582d7efaff33cc3033c820
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:38:15 -05:00
Stone Li
e50d75026a ENH: add more log in HMS
Change-Id: I40f92639d2e5621277cdbd1e0309a2f5b47c7b61
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:38:15 -05:00
lane.wei
776137aaaf ENH: CLI: support filament mapping
support null filament when mapping

Change-Id: I9384fc5a8e78aa8467eef1610d49b92d87512720
2022-12-15 04:38:15 -05:00
salt.wei
588f18ac58 ENH: improve archor of internal bridge
Add loop inside sparse infill of lower layer
to provide archor for internal bridge.

This option controls how many lower layers generate
loop path.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Ifdb6db9090115732aa2cacf5d155b587a10e18fc
(cherry picked from commit 4fdb87ecd5c2e680f6bad2d018ba39cd05f787ce)
2022-12-15 04:33:48 -05:00
lane.wei
08494b5f6f ENH: 3mf_importer: optimize the load speed of 3mf
1. parallel load object files
2. only load object used by some plate(cli)
3. improve the loading speed when generate objects by using reference

Change-Id: I2719651e715f2e35326e760c4b7cdb3114f54992
2022-12-15 04:33:48 -05:00
salt.wei
58bed3e60d ENH: optimize speed of exporting gcode
Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I70caed8664a647a98a0434dd62d329977e0feaaa
2022-12-15 04:33:48 -05:00
Stone Li
4e43ad8c2a ENH: enlarge filament system colors to 16
Change-Id: Ib31fb10869e86e36733aecab858303fafd993cbf
2022-12-15 04:33:48 -05:00
Stone Li
4b0d63ba8e ENH: check ams support only on X1 printer
Change-Id: I830ad6c5f4f7c16edda4d880737548fda0697667
2022-12-15 04:33:48 -05:00
tao.jin
e56c266edc FIX: refine Warning dialog
Change-Id: I8169dd8bce0013a1acacd837871af2051f5cc3a5
2022-12-15 04:33:48 -05:00
yifan.wu
4abce326bc ENH: refine the nozzle_volume
Exclude T command extrusion from nozzle_volume.

Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: Ie06a84a6b22ef1bcbf8cdd81b928835f8b3fd439
(cherry picked from commit 63e722a297b89432fe50113d00a1ff12fb99c507)
2022-12-15 04:33:48 -05:00
liz.li
95626d57b1 FIX: synchronize with master branch
Change-Id: I4642a1f579db1317834622244652b36c9cce9e4b
2022-12-15 04:33:48 -05:00
liz.li
f7f7a18fe2 FIX:GcodeViewer crash
1.a situation that multi-filaments but no flush will cause crash, been
  fixed.

Change-Id: Ic9a76d000e923c3010636a2d39a4d521e4ea9f37
2022-12-15 04:33:48 -05:00
chunmao.guo
95fe7fc528 FIX: [STUDIO-1172] keep file download progress shown
Change-Id: Idac86b4d4f03fe4fa9120353d185b6592123b980
2022-12-15 04:33:48 -05:00
chunmao.guo
67fd44c551 FIX: [STUDIO-909] not dynamic inc filament_presets size
Change-Id: Ie231667213cceec1bca56e1af8eabd6503bd3fed
2022-12-15 04:33:48 -05:00
liz.li
82f1bad002 ENH:flush_option display only when multi-color
Change-Id: I510444818eda820f4f54ecbb0063142467cbf334
2022-12-15 04:33:48 -05:00
qing.zhang
49b00bfcd2 ENH: close the fan if the filament end
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Ifbf46d4987bb76628881c1be85f3870d1d490e78
2022-12-15 04:33:48 -05:00
qing.zhang
d2f915a558 ENH: gcodechecker updare
check nozzle temp
e/flow_ratio before calculate the width

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I5c95522f061671d4bf503258ef3cd6be714db631
(cherry picked from commit c15d6efdd36db1773ad762e6a09cf21e1a3d9c8b)
2022-12-15 04:33:48 -05:00
miaoxin
12206e59b4 ENH: auto-arrange handles 4*4 alignment better
I improve the cost function to align big item better.

JIRA: https://jira.bambooolab.com/browse/STUDIO-1221

Change-Id: Id5a16c127ec51bf7463e331058cb1a8f78b764ca
(cherry picked from commit 39773a901df82081c7d9d089807a52aa09e6a498)
2022-12-15 04:33:48 -05:00
qing.zhang
6bc580930e FIX: fix the error path when it is bridge & top
if the region is top surface as well as bridge
use bridge path

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Ia23910e4c49daeacf12d2f40d21a7ca319ddcfb7
2022-12-15 04:33:48 -05:00
liz.li
9795cb8d0e ENH:add next_button in dailytips
1.add next button in dailytips
2.adjust menuitem position of show tip in menu bar
3.add new tip

Change-Id: Idad011b5849d7bddeb36b3a3e7d843aa596023d4
2022-12-15 04:33:48 -05:00
liz.li
7bcc8c1de8 FIX:add a tip on ams dialog
Change-Id: I78879591a68c0f0c556642a683c6b39208f38bb9
2022-12-15 04:33:48 -05:00
chunmao.guo
b918052a97 ENH: [STUDIO-1185] jump to object in slice error notification
Change-Id: I0d8c3de78ac326f5ab0802fd301defaaac376bb6
2022-12-15 04:33:48 -05:00
chunmao.guo
0966655756 FIX: [STUDIO-1309] failure message of media files
Change-Id: If95f66c0bc62d4139d8fa709164347333a866159
2022-12-15 04:33:48 -05:00
chunmao.guo
011b22dee8 FIX: select file in folder
Change-Id: I383a60f19fe7c54bcb6c1348152ac72a2bab9e34
2022-12-15 04:33:48 -05:00
lane.wei
c431cbf202 ENH: CLI: some refines of slicing
1. add support_used flag in sliced_info
2. use the old thumbnail if no need

Change-Id: I8ad166978fe6f76f86b1ef014945dd70b26a6285
2022-12-15 04:33:48 -05:00
tao wang
0713945e02 FIX:Fixed crash issue on mac without plugin
Change-Id: I19f82037c58d61c3286f6a029b007e1199fb87cf
2022-12-15 04:33:48 -05:00
Stone Li
f64b42e3d2 FIX: clean selected machine when connecting failed
Change-Id: I7e4a2bcb055d5a1c0a333fd92179040fb97086f6
2022-12-15 04:33:48 -05:00
Stone Li
2659eab268 NEW: display cloud slicing state
Change-Id: Ie44ad49c4cf6bf7698c5e1621480d9d6ed78b94e
2022-12-15 04:33:48 -05:00
Stone Li
79958838e3 FIX: fix skip print error logic
Change-Id: I08f21cc585613cf92c22698448a5316e305eeb90
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:33:48 -05:00
Stone Li
c7d8b3871a NEW: save unrecognized matadata field in 3dmodel.model
Change-Id: Ia5db9990b8b871f03ffd961cbf1808d228060e21
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:33:48 -05:00
Arthur
b6a54103b8 ENH: translate normal(manual), tree(manual) and others
Change-Id: I3615da23d19c05bfcabb52bd808cb1f3dec702e8
2022-12-15 04:33:48 -05:00
Stone Li
22211f1b54 NEW: add more print option
1. add option of ai monitor
2. add option marker detection of buildplate
3. add auto recovery step loss

Change-Id: I8483105fed9699d1072b5ef0f08aeff30e6f610a
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:33:48 -05:00
salt.wei
f3c7953bdc ENH: fix the error time in gcode viewer
As title

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I9322b119b68055baea0e6f63d179a0addf02307e
2022-12-15 04:33:48 -05:00
lane.wei
65f2a063b6 ENH: refine multiple plate and CLI logic
1. support bed_type for each plate in CLI
2. don't render the calibration thumbnail under CLI
3. fix the plate box not generated issue
4. refine the slice_all button's status logic: from all slicable to one slicable
5. fix serveral issues in multiple plate's switch and slicing

Change-Id: I6193a799da0367068169ce315d1fcc9098357fd1
2022-12-15 04:33:48 -05:00
salt.wei
dea19ded1e ENH: add generic PLA silk
Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I4e988b5c2e7f1b3689c50f231eac170591ab1bf5
2022-12-15 04:33:48 -05:00
salt.wei
df5cff29ec ENH: add generic PLA silk
Generic PLA silk should use lower filament
volumetroc and retraction

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I8ba11094afc0274710e97d50554001d3a0a4caa1
2022-12-15 04:33:48 -05:00
zhimin.zeng
af48c3db38 FIX: add notes
Change-Id: I230637e6c8b3cfe9e49655cf67f338f77a57732e
2022-12-15 04:33:48 -05:00
tao.jin
2a339d02c2 ENH: add Chinese translation
Change-Id: I76dc4d26f6231686073669afd4887ae285983bb1
2022-12-15 04:33:48 -05:00
Stone Li
e2002ec152 ENH: disable use_ams if not supported
Change-Id: Iebed3edd7fbd7733109ea8dfaac50f5c8fa27d04
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:33:48 -05:00
zhimin.zeng
2f12ad7bf2 ENH: enable thick bridge for wipe tower
Change-Id: I96dae7753995af1862fe4ad33a00fa56cfbb7d3c
(cherry picked from commit 5f98ff50613e3358de10fa1b6d4429ce71e526c2)
2022-12-15 04:33:48 -05:00
zhimin.zeng
148f6ba05d ENH: enhance timelapse user interaction
Change-Id: I95e84d20cbb8973a76a5b5887399b4ccc293c78b
(cherry picked from commit ade00ade11b285b69fb4a635274f5c6d16dc64aa)
2022-12-15 04:33:48 -05:00
zhimin.zeng
da4be5a802 FIX: small wipe tower width result in infinite loop
Change-Id: I1e25dba1728b9427a0cab2c2629c340bf2a4566a
(cherry picked from commit b1fc2f5857e05a177c00134178ddd39882c2a6ab)
2022-12-15 04:33:48 -05:00
Stone Li
a801672963 ENH: update ams when recevied ack of ams_filament_settings
Change-Id: Ibe74baf9d05833166927febce6f9ad027d01d925
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:33:48 -05:00
zhimin.zeng
493a8f5cea FIX: variable layer height not show error in error case
Change-Id: Ia989f9b7b141c392468a633ec0beeb9a4f379b62
2022-12-15 04:33:48 -05:00
zhimin.zeng
6f81e017d0 FIX: add adaptive_layer_height ignore
Change-Id: I8a673b7f295affae8a3a565370953e6d7b7cfbf1
(cherry picked from commit f81129556cc9f0a00f073ecea7b91487a3ab4afa)
2022-12-15 04:33:48 -05:00
tao.jin
36d8d53427 ENH: refine set partplate bedtype dialog & button
Change-Id: Icf1ec314f04c6156e92f2f5a8646b97cf4c2220c
2022-12-15 04:33:48 -05:00
Stone Li
9f4b778d8c FIX: fix print error display
Change-Id: I8080648e57bef10bc7fa8de9122d57e2e637cf20
2022-12-15 04:33:48 -05:00
Stone Li
06459ac808 ENH: disable buttons when no printer selected
Change-Id: I238f2861d41a06d661d04cf205ccdb7b4bbe113a
2022-12-15 04:33:48 -05:00
Stone Li
4385fc9d94 NEW: parse new protocols
Change-Id: Ie2b8963552e576260f461e33002ec6e8606e6fa9
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:33:48 -05:00
tao wang
72b4827f85 ENH:displays the publish button based on user permissions
Change-Id: I853506fa61f1f8cf14dfeb4601c8bb5f1a0c5914
2022-12-15 04:33:48 -05:00
Stone Li
d1021e6861 ENH: export calibration bbox
when exporting all sliced file

Change-Id: I5cb085422f1114eacf5e11dce57f1ceb4d2113a4
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:33:48 -05:00
Stone Li
9f95436b56 ENH: do not update lan mode printer msg
Change-Id: Icbda0e7bae567f5d9b518af8865778eb12d17984
2022-12-15 04:33:48 -05:00
liz.li
e27a1cdd9b ENH:refine GcodeViewer
1.recalculate layout of filament page
2.add fan speed and temperature page
3.fix that value of time and percent too small to display correctly

Change-Id: I5d0cfaea03aa6e9286fe2d7243de7dd413fe7982
2022-12-15 04:33:48 -05:00
chunmao.guo
5761f8c050 ENH: [STUDIO-1272] handle default filament color in presetcomboxbox
Change-Id: Id78749db063fd222915b1aa5ad6abf47fb4294ca
2022-12-15 04:33:48 -05:00
lane.wei
8340e1ceec ENH: CLI: add warning message
send the warning message back to caller

Change-Id: Id36edc9537721fb890f2bd4eb8db4fc0670eb97d
2022-12-15 04:33:48 -05:00
chunmao.guo
79c644d1da FIX: [STUDIO-1242] fix object settings list after delete object
Change-Id: Ide57256b1840a98f0fa44fed4f55585c9bf88a95
2022-12-15 04:33:48 -05:00
lane.wei
4b655f06d4 FIX: fix the total progress not correct issue
Change-Id: I18b9d5034726b45c7331f1dae5e2b24c5e5bd170
(cherry picked from commit ba8c691a2c94f7a2f2ff0ce7f195de20a6c22573)
2022-12-15 04:33:48 -05:00
chunmao.guo
e44e1c1f19 FIX: video error message when lan ip missing
Change-Id: I5adaa89e2631a4e7853d806a53f41da927cc0ea7
2022-12-15 04:33:48 -05:00
chunmao.guo
9c57c808fa FIX: [STUDIO-1249] tips on syncing unknown ams filaments
Change-Id: I754ca576e1e0e832a6c69a2bf4bef58900252040
2022-12-15 04:33:48 -05:00
Stone Li
bde96c1542 FIX: several small fixs
Change-Id: Iee10daeedae924fa829148841556e31eb5e9d225
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:33:48 -05:00
tao.jin
0dd5057b4d ENH: mark icon if plate bed_type differ from global
Change-Id: I6ae1396b8a3007b61ce85992ebb2aec6c64ec2ff
(cherry picked from commit c8dbb583838df20105c0ca4f9d1a5d711d7c0347)
2022-12-15 04:33:48 -05:00
salt.wei
f01cf37ead ENH: preset improvement
Reduce infill/wall overlap

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I7999f278fdba620bd463ecd315bc35a7b725c2bd
2022-12-15 04:33:48 -05:00
yifan.wu
acf8f7b2a3 ENH: return if the bed_type of a plate is the same as global
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I15882d04fa89ebb27bc57434ff9f2c9468725d71
(cherry picked from commit b1606e07f1b9d91f1c01676ebbbe550e69a2ce53)
2022-12-15 04:33:48 -05:00
tao wang
0320872e4e FIX:fixed the mall system dialog not being destroyed
Change-Id: Ie453bdbb41e59da69987e24a7c2d5cc9f378aee4
2022-12-15 04:33:48 -05:00
liz.li
7f3d9a8edd FIX:fix when layers editing mouse click activate model by mistake
Change-Id: I4a457a1deb9fd7100d7d01fb2e29d6216bc3d9fa
2022-12-15 04:33:48 -05:00
qing.zhang
62ae445f97 NEW: 0.2mm Strength process preset
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I9b3c1393912ae3dc748363aef15167591588915e
2022-12-15 04:33:48 -05:00
salt.wei
e863d1054a ENH: add clipper2 for preparing
Add clipper2 code into repo

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Ib98ea3085055db7d125a92879c46b54e39bdc6b1
(cherry picked from commit 7398e71236a300531a172163c71f15440c37bd5e)
2022-12-15 04:33:48 -05:00
yifan.wu
f258da6add FIX: remove gap btw internal bridge and inner wall
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I7223cedb4ab5394b370d8e413dbbf478b9928c42
(cherry picked from commit be4daaf6fc5428b51b239c5692d1735d4e47b1f6)
2022-12-15 04:33:48 -05:00
zhimin.zeng
aa1bd63d61 FIX: WipeTowerIntegration::append_tcr error when slicing
Change-Id: I8055c7c8586fec3dbdc757daf18b740835ce4b13
(cherry picked from commit 5bf6f1b9d5c1ce376bee149df0110d1e44f1d343)
2022-12-15 04:33:48 -05:00
zhimin.zeng
82325973f8 FIX: prime tower start position is incorrect
when support material is used in first tool change

Change-Id: If06459b8404fd599b42187859f476efded57deba
(cherry picked from commit 71f9ed69a3eff4cf3139d04a76176f798a1e1e0d)
2022-12-15 04:33:48 -05:00
zhimin.zeng
118a13200b FIX: variable layer height prompt an error when enable the prime tower
Change-Id: I80b3965d25a9e1faaff1298f42b171660974463e
(cherry picked from commit a519f82ce7c1b169ad995d10a28e873e133f2373)
2022-12-15 04:33:48 -05:00
yifan.wu
4671aed03b FIX: slice btn and error msg not updated after changing bed type
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I9ee624de38ef9193c0d9cda9f687dbc49d8c5b28
2022-12-15 04:33:48 -05:00
Arthur
a330429af7 ENH: change manual support names
Add (manual) to normal and tree for better understanding.

Change-Id: I6d39764a16510707912dfdeb80787d63a6e5ad96
(cherry picked from commit 46a0e9a1bb5da747f7d8c90a9235ae59ddf68bc4)
2022-12-15 04:33:48 -05:00
Arthur
7bdba58b98 ENH: save bed type in 3mf for first layer scan
Change-Id: Id3d83a58f0cca4899e3247b5854500af79cf1b34
(cherry picked from commit d192ae2d8c7d404048e980cfaa0846be48c5fbad)
2022-12-15 04:33:48 -05:00
lane.wei
f9793be848 FIX: fix the auxiliaries files not included issue in cli
Change-Id: Iecc18d6013ddc3397b4405a80b24e0630b293fc7
2022-12-15 04:33:48 -05:00
Stone Li
3b25d02eea NEW: set bed type for partplate
Change-Id: I876e24fb424b16eeb674313c7e0e03a228bc4b35
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:33:48 -05:00
liz.li
9f4a2c0c1c FIX: layer height cannot edit after changing layer_height by parameter
Change-Id: I7da6c7d4ed1a0392ec2a1d961cf75be8426167ac
2022-12-15 04:33:48 -05:00
chunmao.guo
d2b112d1c1 ENH: Label Wrap
Change-Id: I7492f058f731a68e441ab9b78693872364fc00ab
2022-12-15 04:33:48 -05:00
chunmao.guo
4d4fcc1780 NEW: management camera video stream in device panel
Change-Id: I39634af900071cc5c01a88100457880a513e416f
2022-12-15 04:33:48 -05:00
chunmao.guo
1068baf10e FIX: ignore wxImage's waring in release build
Change-Id: I4f250fdb64c98edfa76d3f19c5b60096488e1d87
2022-12-15 04:33:48 -05:00
salt.wei
13ca93adc8 ENH: some change to support layer height edit
1 delete adaptive layer height config
2 support load and save layer heights profile with 3MF

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I109b3b791c3130b5ab2df445e8ae5cb55a78cec1
2022-12-15 04:33:48 -05:00
salt.wei
c1599aa138 ENH: add back even-odd mode
Add back even-odd mode to support slicing 3DLabPrint
airplane models

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Id3efcfb0ecf98350add7a19885750df74d4fdedd
(cherry picked from commit 553371e61e35355b3a73694d4cf9acb179b2a427)
2022-12-15 04:33:48 -05:00
lane.wei
5791ca7e8d ENH: CLI: add total progress of slicing
Change-Id: I05e471aa4cd76642cdd63275620a4b656c8e3327
2022-12-15 04:33:48 -05:00
chunmao.guo
8d0f19fd6a FIX: test HasCapture before CaptureMouse
Change-Id: Ia18b2288b4601c1ae8769d56e5bf46b886a1264e
2022-12-15 04:33:48 -05:00
chunmao.guo
0da5585582 FIX: [STUDIO-1193] jump to object in slice object warnings
Change-Id: Ic6445d81a31e3ecaa069c5fd49b177dc454dc1b9
2022-12-15 04:33:48 -05:00
liz.li
ba1cb7820a FIX:cannot quit layers edit if new project
Change-Id: Id04a0386ab022283fd42503a1c363dc10535d5c6
2022-12-15 04:33:48 -05:00
liz.li
22dd20ab58 NEW:add variable layer height
Change-Id: Idef7f0dea32e4faaeb4d6eb188695cc7b554099c
(cherry picked from commit 4969835159eebb356e9b26dab223ad0a18882b70)
2022-12-15 04:33:48 -05:00
lane.wei
b44f3ae3e6 ENH: CLI: use json insteadof string for progress pipe
Change-Id: I1fdecfa6198d06d0c9745f3cbeb02dece9d8e20f
2022-12-15 04:33:48 -05:00
lane.wei
6be79946f4 FIX: fix the appconfog:save exception under virtualbox of linux
Change-Id: Iadf682727d8ac2ac8694b03e999790866120bf10
2022-12-15 04:33:48 -05:00
lane.wei
55f55e3ad9 ENH: CLI: refine logic
1. return error when there is object partly inside the plate;
2. add the status callback for progress indicating
3. add the version in help
4. fix the return state of validation from 1 to -51

Change-Id: I716057bd5b28a4beb2871614b94708a0860af1a2
2022-12-15 04:33:48 -05:00
liz.li
8278be8d26 NEW:support jump to specific layer in preview
Change-Id: Ia2396c3512f521e31e440783e2ce12926f1ddeca
2022-12-15 04:33:48 -05:00
lane.wei
d91fe4e38c Remove: "ENH: Flatten: refine the flatten logic"
This reverts commit b8a4530eccb76dd5673cced468deeb10bdcade01.

Change-Id: I22304b0396f1c17c1cb741751cfa8fb928d3fd99
2022-12-15 04:33:48 -05:00
Stone Li
782a35f750 FIX: fix enable status in object menu
Change-Id: Ie2f8302a6d2b345d7715401c8a4f9467a5fe05ce
2022-12-15 04:33:48 -05:00
qing.zhang
f3469729e5 ENH: update gcode of X1
start_gcode
end_gcode
change_filament_gcode
layer_change_gcode

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I1dc52c3e371cf702a02c18e877a3aafbfcc186b3
2022-12-15 04:33:48 -05:00
tao wang
72393b5ffc ENH:updated German translation
Change-Id: Id7a62e1cc4b1e42d6af94aefc1f6fb75164eb321
2022-12-15 04:33:48 -05:00
chunmao.guo
f82afdcfb5 FIX: dealloc player on destructor of wxMediaCtrl2
Change-Id: Ie8055dc6c0b861c2f9b0dcd86cf333fd68b3bf0f
2022-12-15 04:33:48 -05:00
salt.wei
c70e8d486f ENH: update jerk strategy according to printer
Jerk handling has been changed in printer.
Changed in slicer as well.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Ic3aef43a534a7f0b85b734e747dc3ca883faaa46
2022-12-15 04:33:48 -05:00
Arthur
4b7ad20159 FIX: tree support may crash for faulty models
Root cause: overhang offset may be empty
Jira: STUDIO-1197

Change-Id: If472be8ed6d209366f118f1f0e5e14b41ce26b3c
(cherry picked from commit 663e7f29f01395bf335b6bccc91f192b64be69ae)
2022-12-15 04:33:48 -05:00
lane.wei
6edafa8502 ENH: CLI: add error code logic in cli
Change-Id: I4c1aace95218ff3a7a3a37f47b7d0880c9b64451
2022-12-15 04:33:48 -05:00
tao wang
eb5be1ac7f ENH:optimize the layout of auxiliary
Change-Id: I42b846bd7a3c35b964ce1f9403cc924ef45577d9
2022-12-15 04:33:48 -05:00
chunmao.guo
a52857e95b FIX: mouse wheel direction
Change-Id: I7b9a5e300de8e7f0c5a9883a20a18856f79c2b93
2022-12-15 04:33:48 -05:00
lane.wei
dbcdc876ac FIX: fix the print config status not correct issue
the print object updating is behind the .normalize_fdm
which will cause some issue in corner cases

Change-Id: I57e9e7aa2acff81b89aedd95ffc7a7effb76cc6b
2022-12-15 04:33:48 -05:00
Arthur
5fa771c6cb ENH: improve auto-arrange in several ways
1. reduce expansion of exclusion regions
2. expand extrusion calib regions to let them touch bed boundary, to
   greately simplify auto-arranging with avoidance option on
3. improve dist_for_BOTTOM_LEFT to allow objects be put left to
    exclusion regions temporarily
4. improve on_preload for better handling objects around exclusion regions.
5. improve debug tools
6. fix a bug with wipe tower estimation (don't estimate if wipe tower is
    explicitly disabled)
7. use larger y-overlap threshold to estimate rod height confliction
   better in per-object print ordering (now we use half the clearance
   radius)

Change-Id: Iab29d47a072d8515f28a09855432f92fcffa8c5f
(cherry picked from commit 3a4f242a3a6fd2f82dcc8306cde4d1cb107a5099)
2022-12-15 04:33:48 -05:00
tao wang
17bc464bac FIX:mall window minimization will no longer refresh web page
Change-Id: I22552e793ab0f3acdaa50e916ee81f9977d0f859
(cherry picked from commit 56ef8886f64b4e294840d602850f832b38b5989b)
2022-12-15 04:33:48 -05:00
tao.jin
7b3621bb0c ENH: set 4 status of monitor extruder icon
Change-Id: I2739c7079268409975a9bd6ed1efb6cf47868438
2022-12-15 04:33:48 -05:00
Stone Li
cd1210b0ca ENH: save error code to slice info
Change-Id: Ic70ef81775c23d160f40ff29f02cc9e1f9d336d6
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:33:48 -05:00
Stone Li
7f53455105 ENH: set timeout to 15 for get version and get plugin
when a DNS problem occurs, the UI isblocked for too long

Change-Id: I3ee1fe1ddb1bec38be9fc3c3e5c3e08931b6eb76
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:33:48 -05:00
Stone Li
1eacc5d38f NEW: parse camera recording and resolution fields
Change-Id: I8aa5af228d6ad50ff495577652c2ba716f6cc3b3
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:33:48 -05:00
tao wang
a8ad6e9f69 FIX:fixed some issues with unsavechangeddialog
Change-Id: I5addcc4c1ddaa6a98c31a0e57028de72a606a493
2022-12-15 04:33:48 -05:00
tao wang
752e00694a FIX:fixed some mall issues
1. The size of the window is scaled to 0.75
2. Add an interface to close publishing pages
3. The host chooses not to judge caching anymore

Change-Id: I8db73a94203ba427059d5121659dfdcd8d4c1940
2022-12-15 04:33:48 -05:00
Stone Li
04bbcf1122 ENH: modify a tips when sending a print job
Change-Id: Ia1b0fc6444a02aa6b1827f42573aba789afe6a86
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:33:48 -05:00
Stone Li
db8a66e49e ENH: do not adjust camera when entering paint gizmo
Change-Id: I1510a57af7c2a5cea96346681dac4865f533d335
2022-12-15 04:33:48 -05:00
Stone Li
20702af590 ENH: add more log for print error
Change-Id: I8cccf4c8dc5c6e3d6fc08f75839585b384d83e4b
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:33:48 -05:00
qing.zhang
1167225348 ENH: fix extrusion of interface on the first layer
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I08a3599e349f2137a53737010220209dc2a54d6a
2022-12-15 04:33:48 -05:00
qing.zhang
8d71053b08 ENH: allow to print PETG with other filaments
and do not check temp when print by object

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I4a89b181df478cdb2fb925ab5fc7d9415059a1f6
2022-12-15 04:33:48 -05:00
qing.zhang
d0def61ca0 ENH: fix the warning msg of nozzle hrc check
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I0cb6d10e002b3053624a970ecca12801576d8250
2022-12-15 04:33:48 -05:00
Arthur
b95959b8b2 ENH: translate several tooltips and daily tips
Change-Id: Icdb211d4ed199b781067cbf4abc7d835cde3d4c5
2022-12-15 04:33:48 -05:00
liz.li
100af8a27f NEW:add flush options in glcanvas menu
Change-Id: I884fd6939267b9b17736725ca87e6722ebc1b939
2022-12-15 04:33:48 -05:00
tao wang
3e21f0cc91 FIX:keep all three import methods consistent
Change-Id: I82fe0b8ec2df2092b35119c021d6dff2575720ae
2022-12-15 04:33:48 -05:00
Stone Li
71acbec38d NEW: add slice all and print all buttons
1. export all sliced files
2. support to print all sliced files

Change-Id: I59345370fb590b4c3c70b9b71385b25342a22e02
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:33:48 -05:00
chunmao.guo
ad636acac7 FIX: adjust filament parameter ui layout
Change-Id: I3d46894333ad165b43487b8472fc1451fbbf5224
2022-12-15 04:33:48 -05:00
gerrit
6834f0096b ci: update network module based on commit 1addfb7
Change-Id: I73401577238aa76cb9a9e1d2e20f19543c0cc276
(cherry picked from commit 1b04c461c1f85d2d26294af244512e7346e5876a)
2022-12-15 04:33:48 -05:00
tao wang
75e960f999 NEW:Fixed some mall issues
Change-Id: I1f9105a1a7089457f4ecb327cb5db43ca0d39f4e
(cherry picked from commit 975bdcf64f88b4f1e7c0e03abd9dfba6c32c00fe)
2022-12-15 04:33:48 -05:00
lane.wei
2406cc35b6 FIX: cli: fix the thumbnail rendering issue
1. fix the color not correct issue
2. fix the warning when loading thumbnail under cli
3. remove the invalid error log

Change-Id: I4dd553b218e264bb811606053d920b5861ad6bd4
2022-12-15 04:33:48 -05:00
tao wang
b685cbf37c NEW:add dont show again button on msgdialog
Change-Id: Id532ba9c10f01863dbe0f0319e9c9fd509a818fe
2022-12-15 04:33:48 -05:00
tao wang
1c4ed26b81 FIX:fixed crash caused by unable to resolve file name
Change-Id: I98388cd95e8b2bc26d33cddcc4945580a1c34292
2022-12-15 04:33:48 -05:00
lane.wei
451352183c FIX: export 3mf using SplitModel under CLI
Change-Id: Ie6b81de47ebd04b462522d72d30e030e91bda313
(cherry picked from commit 2c284ab5681fd50699a1fd152dd6e4f18a0d4cb4)
2022-12-15 04:33:48 -05:00
Stone Li
e4198ad63a NEW: add a new slicing warning
Change-Id: I62a31e505318441699141a5c86355c8d41b890f2
2022-12-15 04:33:48 -05:00
tao wang
a9ac3657ca FIX:disable the mall when there is no network plugin
Change-Id: I1f7d9c1e3de3e91f705593b23386d329cb28d3d8
2022-12-15 04:33:48 -05:00
salt.wei
47302b0cf9 ENH: support force cooling for outer wall only
For PA-cf material, forcing cooling for all outer
wall and using lower fan speed for infill and inner
wall can get more high strength.

Add this cooling strategy.

When set overhang fan threshold to be 0%, then bridge
and all outer wall will be force to cool with
the overhang fan speed.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Ideed1ac8690f1eeb68aad760678db76bb4dae8ec
2022-12-15 04:33:48 -05:00
qing.zhang
5aee1505a6 FIX: add ; before ===turn on fans to prevent PLA jamming===
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I7c5f2219d8a7abda88288cccf34a9cc5c430be73
2022-12-15 04:33:48 -05:00
qing.zhang
033a101da3 ENH: increase the temp of some plate to improve the print result
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Ia933d2aa63dcdad634316fe830e470ac6bc2c159
2022-12-15 04:33:48 -05:00
tao wang
407d1faf0d NEW:add model mall system
Change-Id: Iccfe460cd7bfd11d91cdd7eddf142a8590e3c5b0
2022-12-15 04:33:48 -05:00
salt.wei
35edf03eca ENH: add "ensure_vertical_shell_thickness" back
See the new requirement of the latest update at
github issue #317

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I68c9922a272b1d426126a531bfdee7a4f7e53620
2022-12-15 04:33:48 -05:00
zhimin.zeng
7b437d4f58 FIX: modify the text position
Change-Id: Id0d23b0d15d57a0cbc8eb5c9eb0e685d600f31eb
(cherry picked from commit bf229251c758279be8876756576257fd609b44dd)
2022-12-15 04:33:48 -05:00
zhimin.zeng
687476bc27 FIX: modify the translation
Change-Id: Ia147871df754f5188fb7a0a8fcfac01e2db18c1d
2022-12-15 04:33:48 -05:00
salt.wei
bd577fafb2 ENH: don't apply new fan speed until filament change finished
This patch can make sure that the cooling fan will not
be enabled during change fimanet.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I9f480b99116d62fe7522233b69b5bca209663821
2022-12-15 04:33:48 -05:00
salt.wei
9c7d55b8b4 ENH: lower outer wall acceleration for better quality
As title. And also not make printing time increased
too much.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I79f578227c5d81e76d8dd9254c43a3cb90109132
2022-12-15 04:33:48 -05:00
tao.jin
e22115bf9c ENH: remove placeholder '0' in version display
Change-Id: I6c0ffdd229a630a48a676c12a8f124f7a6e39f09
2022-12-15 04:33:48 -05:00
qing.zhang
99eee4a2d6 ENH: reroder the path seq for concentric fill pattern
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I06bb9c5666e2205364d7031815e868eccfee6fd5
2022-12-15 04:33:48 -05:00
qing.zhang
6ca5df9118 NEW: add nozzle_hrc and filament required hrc
hrc determine which filament could be printed by the nozzle
if the filament required hrc smaller than the nozzle hrc
the fillament could be printed

either of it be zero means use other printers
or user want to print it anyway

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Ic32dfaed4f9c80774a670c362de612254f3a5ed0
2022-12-15 04:33:48 -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
chunmao.guo
ca9d1ad4ae FIX: [STUDIO-1105] default has ipcam
Change-Id: I92d1857289fcf37ffc0b76b388ec6ef033840020
2022-12-15 04:33:48 -05:00
chunmao.guo
711f5906b9 FIX: save and restore filament colors and flush volumes
Change-Id: I04b80d95e6a3e23ef3561e512673ea39dfc3ff0c
2022-12-15 04:33:48 -05:00
chunmao.guo
8be11c8688 FIX: [STUDIO-1060] buttons orider of media file panel
Change-Id: I9adb07916c4e61a957098c156be1b3247563a14c
2022-12-15 04:33:48 -05:00
chunmao.guo
ce818dd6d1 FIX: [STUDIO-1094] windows task bar title
Change-Id: I99c943345013d97839178f36683d81979cf8e3f5
2022-12-15 04:33:48 -05:00
chunmao.guo
808a82300a FIX: only update ams list on selected machine
Change-Id: I7aac78ef1e10c0004651d3686f806d9d15d77d7a
2022-12-15 04:33:48 -05:00
salt.wei
11f74c21d3 ENH: add bridge direction option
In some complicated cases or irregular shape, the direction
of external bridge is not good when calculated automaticlly.
So user may use modifier to change bridge direction.

This is handling for github issue #340

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I3baf313f47925fa7e6aa087f5896b0af560f902d
2022-12-15 04:33:48 -05:00
zhimin.zeng
09c4a08cb5 FIX: Prompting flush options not take effect when disable wipe tower
Change-Id: Id1195880ebe6021136446dc02ea46224aff4e801
(cherry picked from commit 7edd7f389c97acad8baa0bb809914d3aeeb75fd8)
2022-12-15 04:33:48 -05:00
zhimin.zeng
13df80ffb7 ENH: remember the filament_opts and limit minimum flushing volumes
Change-Id: I7b2538fcaf5b5fc5e4f86191207de981bd766a89
(cherry picked from commit 392be8d2a4e9465fffc4018da77c6ee00ad46ade)
2022-12-15 04:33:48 -05:00
zhimin.zeng
eb80720e75 NEW: import svg files
Change-Id: I1658308f9d9529c969f7067d053f16f779f8b6a6
(cherry picked from commit bfcb05e24ef5224cabc42772e94cc0cbed3de412)
2022-12-15 04:33:48 -05:00
yifan.wu
795c03164f ENH: move raft to advanced mode
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I805e9059405680926a5423b5aa0e23d97840a51a
2022-12-15 04:33:48 -05:00
qing.zhang
026be61af7 ENH: bring GCodeChecker up to ci to check some issues
Fix some issues in gcode checker to make it work
normally in following cases.
1 Bridge cmd could pass the checker
2 Some G1 cmd could pass the checker
3 All axis cmd could pass the checker

Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Ib21b3f8c11a0982c15166c77fb9765f248a5c6aa
2022-12-15 04:33:48 -05:00
yifan.wu
a1523f3381 FIX: fix a build error in mac and linux
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I8e50356b5ff4d1449852de7a1136e28fc5d8e5ea
2022-12-15 04:33:48 -05:00
chunmao.guo
5fc2acc235 FIX: Label hyperlink style
Change-Id: Ib0935b41080de994b0b82e4c211ff7a0b9f295bc
2022-12-15 04:33:48 -05:00
yifan.wu
e363966f9b ENH: support to set bed type for each plate
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I654743ce8b49057587545c3acfe0b78504242d46
2022-12-15 04:33:48 -05:00
salt.wei
c61fd447c9 ENH: fix duplicate setting name
As title.

Test multi-color 3MF loading OK

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I9b2791f8d020a051f934cda3027293a948b07088
2022-12-15 04:33:48 -05:00
Tao Wang
24ce050a91 FIX:fixed the menu popup in the wrong position when multiple screens
Change-Id: I1cb1124b2c1898fd650ec0eb750fbfc9e36bee72
2022-12-15 04:33:48 -05:00
tao wang
c5811178ae FIX:fixed the fix window cant not display full text
Change-Id: Ibab602396e2261059d7e730dbeea1f3e3282e841
2022-12-15 04:33:48 -05:00
qing.zhang
4d8eefb1ea ENH: open the filament_color preset
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Idca08be5401aad1672adc46f9604338e3456f519
2022-12-15 04:33:48 -05:00
salt.wei
569f76ecf1 ENH: provide settings for fuzzy skin
When fuzzy skin is enabled, show more related settings
so that user can tune.

This is enhancement for github issue #44

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I35e3883983b62117c4306dd894a04edd40c70f8e
2022-12-15 04:33:48 -05:00
tao wang
33a38393cf NEW:popup warning message when has filament in the extrusion
Change-Id: Ice9a3b5e6ae6ef8514213e61d9034ceb4c585093
2022-12-15 04:33:48 -05:00
lane.wei
9f749b304c Fix: forbid the filament setting to negative/enforcer/blocker
Change-Id: I846ad591c9967af1df3e47c1d007958cf0846766
2022-12-15 04:33:48 -05:00
lane.wei
bb4d537991 ENH: support: add overhang only checkbox back
Change-Id: I16742100d613c2915b2cbe19c38e65d7a90a3403
2022-12-15 04:33:48 -05:00
Arthur
f8fc565dd8 ENH: ease tree support removal
We discover a good quaility interface can help remove support. When
enabling interface, directly generating circles from overhang polygons
gives fairly good quality.

Change-Id: I5d347fa7abaacea839650b6fd3a8c2c73abd5e56
(cherry picked from commit 474cbf7d59beda63e9ef1ec8b52636f2674811c7)
2022-12-15 04:33:48 -05:00
lane.wei
a9a228d071 ENH: wireframe: refine the rendering logic under paint
1. remove wireframe in 3d view, only keep in paint;
2. pass barycentric_coordinates from outside
3. add shortcut hints

Change-Id: I911e5cdf3475926d9527dc0839fdce072ed54746
(cherry picked from commit 6e16d0ccfb71741e55daabd757be9f9e7613e695)
2022-12-15 04:33:48 -05:00
lane.wei
79b5c94f4f ENH: enable wireframe
This reverts commit ed6e149381240fd83b61da70891127d400f30a39.

Change-Id: I010871fcf22322214c627fe907539c0916fa6ff5
2022-12-15 04:33:48 -05:00
salt.wei
5e024f75b9 ENH: support specific acceleration for outer wall
So we can set lower acceleration for outer wall now.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Ib4728bf16f6c540afca62f423c8aab4c9e0c4d02
2022-12-15 04:33:48 -05:00
qing.zhang
9c32cff1dd FIX: modify the max volumetric speed of default fliament
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I6c84b35d0b4a663a3f2fdd96ce2fa5a7dd3208b7
2022-12-15 04:33:48 -05:00
yifan.wu
9e89a1e10e ENH: optimize the performance of slicing
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: Ic769fabf641eb07eaf5cb55bf308a49831998470
2022-12-15 04:33:48 -05:00
lane.wei
d641f947d6 ENH: some small refines
1. don't sync_tooltip for it is not used
2. enable the dll black list
3. add some log

Change-Id: I4f7ea008121cf7252ef32680b68f063d146661e5
2022-12-15 04:33:48 -05:00
lane.wei
157b081363 FIX: fix the version key treated as unrecognized issue
Change-Id: I0c0a85cb021af54c150e505ed0e11ffa037ed9e6
2022-12-15 04:33:48 -05:00
Arthur
867a5c982c ENH: modify some words to simplify translation
Some sentenses are only slightly different which is
unnecessary. Making them the same can save a
translation and also keep consistency.

Change-Id: Ie59c0bf788a31ee0c6a0d792af7b3d532fe34f75
(cherry picked from commit eb69195569518e3be61e5a8887ea317fbe3e7302)
2022-12-15 04:33:48 -05:00
salt.wei
1c6c8ff696 ENH: regenerate wall when switch to manual brim
The first layer order should be outer wall first,
when the object indeed has brim.

So must regenerate wall when switch to manual brim.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I44fd0686b7a0e836337f5e6ff8ee311ea0c7bceb
2022-12-15 04:33:48 -05:00
chunmao.guo
5f20d14476 FIX: retry thumbnail request after refresh file list
Change-Id: I013566743f21df6403fb6bcd835e9e13dd40ddef
2022-12-15 04:33:48 -05:00
tao wang
453c005423 FIX:update chinese translation
Change-Id: I254c0617a9ee5e43aa1388b06788f332f0094a40
2022-12-15 04:33:48 -05:00
liz.li
0b84ca62bf NEW: add custom printer config wizard
Change-Id: I48f34039635803c3f1cee4cc2c853a0ffa5b451a
Signed-off-by: Stone Li <stone.li@bambulab.com>
(cherry picked from commit 387ba2a5aac05d3b3af0923f88415188ae8cb44e)
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-12-15 04:33:48 -05:00
Stone Li
5c82ec410e NEW: add timeplase option when sending a job
Change-Id: I4909ec834bcc7acb04f501b8b22f049cca32e79b
2022-12-15 04:33:48 -05:00
Stone Li
5e8f7a9102 ENH: do not allow to send print if no sdcard
Change-Id: Icfa325ceea865ecb695da95bb3293c6defe6d722
2022-12-15 04:33:48 -05:00
tao.jin
92b0f591d3 FIX: replace ConfirmHintDialog with SecondaryCheckDialog
Change-Id: I3a712f838d7a4d8cbfe725c30f3d77813dd80b92
2022-12-15 04:33:48 -05:00
SoftFever
c06190b79c Update README.md 2022-12-14 09:01:15 +08:00
SoftFever
dfb33304c0 Merge branch 'master' into SoftFever 2022-12-14 00:10:07 +08:00
SoftFever
01103a77c3 update readme 2022-12-14 00:06:48 +08:00
SoftFever
ea5c88e36f merge upstream changes (#25)
* Add sigxcpu76's fix to force use of light GTK theme

When using Bambu Studio with a dark themed Linux desktop, many of the dialogs appear as white text on a white background (font's correctly invert, but dialogs remain white).

@sigxcpu76 provided a workaround for this in #12 which is to tell the app to use a light GTK theme.  This change incorporates that workaround into the AppImage making the app more usable until such time as proper dark theme support can be added to Bambu Studio.

* Update Containerfile to make it Docker compatible

- Replace COPY command with Docker compatible syntax
- Rename container tag to bambu-studio-builder so as to not confuse with a container that would actually run Bambu Studio
- Add Docker alternative build method (thx @SG-R)
- Update podman syntax to remove unnecessary sudo

* Add check_available_memory_and_disk to BuildLinux.sh

* Fixes #740

Removing check for local or Remote FX virtualized RDP session. The checks below this line already verify if proper OpenGL support is present.

Co-authored-by: deftdawg <deftdawg@gmail.com>
Co-authored-by: hifihedgehog <16614343+hifihedgehog@users.noreply.github.com>
2022-12-13 12:41:41 +08:00
GiaPag
cad4caaf5b Fixed deps "directory not found" (#23) 2022-12-13 11:48:52 +08:00
Heiko Liebscher
1e523fa912 set PA for RepRap (#19)
* set PA for RepRap

* Fix generated  by

* change  Slicer Name
2022-12-13 11:40:19 +08:00
hifihedgehog
7e96cbf7da Fixes #740
Removing check for local or Remote FX virtualized RDP session. The checks below this line already verify if proper OpenGL support is present.
2022-12-09 10:54:41 +08:00
deftdawg
51e8788167 Add check_available_memory_and_disk to BuildLinux.sh 2022-12-09 09:42:41 +08:00
deftdawg
e434009577 Update Containerfile to make it Docker compatible
- Replace COPY command with Docker compatible syntax
- Rename container tag to bambu-studio-builder so as to not confuse with a container that would actually run Bambu Studio
- Add Docker alternative build method (thx @SG-R)
- Update podman syntax to remove unnecessary sudo
2022-12-09 09:42:41 +08:00
deftdawg
91db1be09e Add sigxcpu76's fix to force use of light GTK theme
When using Bambu Studio with a dark themed Linux desktop, many of the dialogs appear as white text on a white background (font's correctly invert, but dialogs remain white).

@sigxcpu76 provided a workaround for this in #12 which is to tell the app to use a light GTK theme.  This change incorporates that workaround into the AppImage making the app more usable until such time as proper dark theme support can be added to Bambu Studio.
2022-12-09 09:42:41 +08:00
SoftFever
abb6676b65 bump version to 1.3.4 2022-11-30 22:55:56 +08:00
SoftFever
8d0111721a add screenshots 2022-11-30 22:55:45 +08:00
SoftFever
4576ea4287 update translations 2022-11-30 22:55:16 +08:00
SoftFever
a0af14fc80 fix build error 2022-11-30 22:54:48 +08:00
SoftFever
ce0fd3736e Merge branch 'feature/wall_order' into SoftFever 2022-11-30 21:36:45 +08:00
SoftFever
6ddf2e8c08 Merge branch 'SoftFever' into feature/wall_order 2022-11-30 21:36:23 +08:00
SoftFever
f06171f551 make extruder clearance settings editable 2022-11-30 21:31:33 +08:00
SoftFever
4f53ef9316 bump version to 1.3.3.2 2022-11-30 00:16:00 +08:00
SoftFever
eeb8b6eb37 Skip version check on App startup 2022-11-30 00:04:25 +08:00
SoftFever
264b0ee891 support RRF firmware(experiment) 2022-11-29 23:06:37 +08:00
SoftFever
4a20f7c22a uncheck send data by default 2022-11-29 23:06:09 +08:00
SoftFever
5bb0addb3d Merge branch 'master-remote' into SoftFever
# Conflicts:
#	src/slic3r/GUI/GUI_App.cpp
#	version.inc
2022-11-28 20:46:53 +08:00
SoftFever
57755c766c Skip version check on App startup 2022-11-28 20:41:20 +08:00
gerrit
b77682c13f ci: update network module based on commit b27bf8e
Change-Id: I31fd12de0b7f9b457f925a834fdc273bd944f966
2022-11-26 15:39:32 +08:00
gerrit
bcff4f81c2 ci: update network module based on commit 175cde3
Change-Id: I7a803608dfc894644d1c074856a35a84fa231d84
2022-11-26 15:39:32 +08:00
gerrit
f18550bd9d ci: update build version to 01.03.01.01
Change-Id: Ibee60aed5abb7e6b23f0c28322ca7ff03e930ce4
2022-11-26 15:39:32 +08:00
yifan.wu
44c2c235c0 ENH: update version to v1.3.1.0
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I0df092f831ea9f77b8e4cce1fe29781f95b7b795
2022-11-26 15:39:32 +08:00
lane.wei
fcf490028a ENH: Updater: always update plugin to the newest compatible version
Change-Id: Icec343ba4913b9738add9564c78934553a33336c
2022-11-26 15:39:32 +08:00
Yifan Wu
9d85a7f216 Update issue templates 2022-11-23 22:58:48 +08:00
Yifan Wu
d039fc95ed Update issue templates 2022-11-23 22:53:51 +08:00
SoftFever
e022c5ad5b New inner-outer-inner/infill mode 2022-11-20 11:22:35 +08:00
SoftFever
ff2cf17a73 special outer wall order 2022-11-20 09:23:16 +08:00
SoftFever
88c0fea06f Merge branch 'SoftFever' into feature/wall_order 2022-11-19 23:05:15 +08:00
SoftFever
3af2c20bb2 fix a gcode preview compatibility issue 2022-11-13 13:02:12 +08:00
SoftFever
0355d0297e update changeme 2022-11-09 23:56:45 +08:00
SoftFever
de761660cb update cn translation 2022-11-09 22:58:12 +08:00
SoftFever
0cfb0ed830 bump version to 1.3.3 2022-11-09 22:32:16 +08:00
SoftFever
d3326f9f0c wip 2022-11-09 22:04:03 +08:00
SoftFever
a22a382e1d explicitly specify linear PA mode for Bambu printers 2022-11-09 21:48:29 +08:00
SoftFever
e551fe57b7 moonraker compatibility fix 2022-11-08 20:13:27 +08:00
SoftFever
f9160c2909 fix a Monotonic bug 2022-11-08 18:48:17 +08:00
SoftFever
19ca3fee68 remove print bed temp 0 degree check 2022-11-08 13:04:45 +08:00
SoftFever
69e9a7454e Merge branch 'master' into SoftFever
# Conflicts:
#	resources/i18n/zh_cn/BambuStudio.mo
#	version.inc
2022-11-08 11:22:03 +08:00
zhimin.zeng
96707fc4b4 FIX: tool change time is too long
Change-Id: Iaecc3dc832c6a20a2acc180a79923e45b97f18f3
(cherry picked from commit a3528545af4176bdba3240120ebde32abf8a9d8d)
(cherry picked from commit cbdab12b2e218427e51f39d6860b00a844caef7a)
2022-11-07 19:59:23 +08:00
tao.jin
9e561a3887 FIX: cancel remove if log file is opened by other program
Change-Id: I725b03a82af292f9dc81d5f5500773600346c218
(cherry picked from commit f72f4044c2d8a010d1129b4eba1220c20bdf050b)
(cherry picked from commit 3a4daa90b526e8970913311fe9bd314b865c92dd)
2022-11-07 19:59:23 +08:00
gerrit
4d90cc5f80 ci: update build version to 01.03.00.25
Change-Id: I420b14020b48c6633214a315b43e640ec6eb61f5
2022-11-07 19:59:23 +08:00
Arthur
cb34f5ef6a ENH: add translation for supports and others
Change-Id: Ic742519cf32fd21726302ace90649e8b695d125d
2022-11-07 19:59:23 +08:00
Stone Li
239f7e3e32 FIX: clean preset_folder when logging out
Change-Id: I0a61db6b6ae0fc4bad1f178e1492384a42de1501
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-11-07 19:59:23 +08:00
gerrit
d950c1d323 ci: update build version to 01.03.00.24
Change-Id: I3ecb24ac56faffde1afc95938442104d8a946cc2
2022-11-07 19:59:23 +08:00
Stone Li
8d8dcc36c5 FIX: fix a crash, set APP_MODAL for dialog
Change-Id: I80d216df134febdcefd2fd5f3859bdb62c1b81bd
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-11-07 19:59:23 +08:00
gerrit
7e4cec3c1a ci: update build version to 01.03.00.23
Change-Id: Iaf8eddfdd40027c660858b413676651565f3bd76
2022-11-07 19:59:23 +08:00
Stone Li
61a54bb38e ENH: avoid crash on mac platform
Change-Id: I86e7394956c860b13319b53e647ec6c8f2842c91
(cherry picked from commit 5c7077b8b9712af50c28d675f5129b518e56c92e)
2022-11-07 19:59:23 +08:00
猫山王
c21c84c62f remove: "ENH: add paint-on support on vertical faces"
This reverts commit ccf1746530a6f68d38a9b6714e70a0acdbec5b8c.

Reason for revert: multi color printing has problem

Change-Id: Ibc53b99a715b987ee447d7c3b03407de2790abaf
2022-11-07 19:59:23 +08:00
Stone Li
d6117788a8 ENH: handle 403 error when sync the user settings
Change-Id: I33794d1f7354f369e76b83e90c8a03d2c349b545
Signed-off-by: Stone Li <stone.li@bambulab.com>
(cherry picked from commit a5edb419b49b18e7fa94b05d14aa215ed756076c)
2022-11-07 19:59:23 +08:00
SoftFever
f15b6d5cf8 Fix a bug that PA was not set properly 2022-11-07 19:58:26 +08:00
SoftFever
d65311858c remember last filament choice and ignore network plugin check for thirdpary printers 2022-11-06 14:03:34 +08:00
SoftFever
ec7a7ff1ff PA per filament 2022-11-05 14:49:37 +08:00
SoftFever
6fb941cf4c Merge branch 'master-remote' into SoftFever
# Conflicts:
#	resources/profiles/Creality.json
#	resources/profiles/Voron.json
#	version.inc
2022-11-05 11:26:59 +08:00
SoftFever
3c70c12720 add heating command.
Save new users from panic
2022-11-05 11:19:38 +08:00
SoftFever
0008668fa5 Change layer time to float 2022-11-05 00:33:07 +08:00
SoftFever
78b9fcb71b filter out tiny gaps 2022-11-04 16:44:43 +08:00
SoftFever
1a371a9417 fix a small UI glitch caused by printer viewer 2022-11-02 21:19:46 +08:00
SoftFever
47225a83a2 add doxygen 2022-11-01 21:14:40 +08:00
gerrit
c05d42cc1c ci: update build version to 01.03.00.22
Change-Id: I69d99b1b3306fd0d191a22b320705f846b82eb9d
2022-11-01 20:52:23 +08:00
qing.zhang
eae71a5184 ENH: remove the dulicate warning msg of temp
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I978f2de34e277c6747adc783cb91c341f159a67e
2022-11-01 20:52:23 +08:00
lane.wei
8df60acc61 FIX: fix the label switch incorrect issue when print_sequence change
1. only turn on label while switch from by_layer to by_object
2. don't crash when filament_colours mismatch between project_config and PresetBundle

Change-Id: Icac9d0d7f88e17fcad3b042ea19cda3ac23ae62c
2022-11-01 20:52:23 +08:00
lane.wei
082c695db1 ENH: version: increase version of profiles
Change-Id: I2dc0bbf8374f60f4e4c43806c9e16bd20d9d08f2
2022-11-01 20:52:23 +08:00
lane.wei
7086a3fb5a ENH: add some logs for appconfig::save exception
Change-Id: Ic65345af7debdb340fce5dd03fe09257d7c2c395
2022-11-01 20:52:23 +08:00
gerrit
28cf2d56e2 ci: update build version to 01.03.00.21
Change-Id: Iff25f6602a010247776103aa882d2fb1eefe4ec3
2022-11-01 20:52:23 +08:00
Arthur
8dd401d35f FIX: auto-arrange reads wrongs first_bed_temp
Also change words for extruder clearance parameters.

Change-Id: I736fd9049d184c140b33078d78f764b4fe172765
(cherry picked from commit e70c0c0ea133cffa5788efbfc9633332b196e8df)
2022-11-01 20:52:23 +08:00
gerrit
d3e7989119 ci: update build version to 01.03.00.20
Change-Id: I9245d64eb7ae836581fc2426921b4ecda63a064e
2022-11-01 20:52:23 +08:00
Arthur
703f93d8e2 FIX: reduce height_to_lid to 90mm
Towline may be even lower than the upper rod. Let's
take away 10mm tolerance.

Change-Id: I13972fc4ecb0671e1af4b2c6d102e319417e532f
(cherry picked from commit cedcb862556c8c9014a91ef2aad8f39fc118d925)
2022-11-01 20:52:23 +08:00
gerrit
85c0aeb19f ci: update build version to 01.03.00.19
Change-Id: Ieee2345c952011ef87915bb07134ccb3c36309ec
2022-11-01 20:52:23 +08:00
lane.wei
c79af29ad4 ENH: refine the label logic of seq_print
use the arrange_order computed by Print
turn on label by default when switch to sequent print

Change-Id: I7063bcc9494bbfc14a3cee85eaf30a9eb52c99d2
2022-11-01 20:52:23 +08:00
gerrit
301b85f5c0 ci: update build version to 01.03.00.18
Change-Id: Ic3ad3d2e1314e131178962961c6d8c75afb3ad4c
2022-11-01 20:52:23 +08:00
gerrit
387889cda0 ci: update build version to 01.03.00.17
Change-Id: I4a3695999070a72b9cf59f2273875d788ecb4cb8
2022-11-01 20:52:23 +08:00
Arthur
f16f5afec5 FIX: 2 auto-arrange bugss with per-object printing
1. use strict ordering to ensure the printing order is right
2. reduce height-to-lid to 100mm considering towline is lower than lid
and may collid with objects

TODO: printing brim may still collide, need to subtract inflated boundary of
others during brim generation

Change-Id: Icf0cba10c579d28fabd97764c1b3abec267ebd9b
(cherry picked from commit 46c6f5ff94488b2f4481bf1d34555f4a7c45e135)
2022-11-01 20:52:23 +08:00
gerrit
66f38fbb81 ci: update build version to 01.03.00.16
Change-Id: I44e01e64fcc762c9bc0082b446543f78bfb40279
2022-11-01 20:52:23 +08:00
gerrit
95496fc057 ci: update build version to 01.03.00.15
Change-Id: I2936f6922e0ee188575777483d7c12a92dcef024
2022-11-01 20:52:23 +08:00
liz.li
c065c3a2e6 FIX:AssembleViewData crash
Change-Id: I759a385621b8a83d89abcc7c1b38786e067dbb33
(cherry picked from commit c218e7dd77fad970f637412dc9c230b1241c1f67)
2022-11-01 20:52:23 +08:00
gerrit
ebf7a6c3c7 ci: update build version to 01.03.00.14
Change-Id: I2d9679a72adafd0e0b29cf1da27d98f034cd4abf
2022-11-01 20:52:23 +08:00
Arthur
c8c073a199 FIX: print ordering didn't consider object height
This may cause tall objects be printed before short ones. There are two
possible solutions:
1. do strict ordering only when y-overlap is large enough (the one
   chosen in this commit)
2. when considering vertical collision with rod, the actual expansion
   can be much smaller (because the rod is only slightly off extruder).
   But this solution requires an extra parameter. Let's hold it for a
   while.

Change-Id: Icc9a4796d49dad93cbcc20d4103e641a48886e5e
(cherry picked from commit 6a958b1fa9e58e4ca3be63b4918da77bcdc53314)
(cherry picked from commit ceff67789c27ea576afd663a2e5bae9a10241728)
2022-11-01 20:52:23 +08:00
tao wang
db233c6051 FIX:fixed cant not link to wiki on macos
Change-Id: I8c7fc943e9c6eb46c1f7a63dcd32f0a9a7f120d3
(cherry picked from commit 1fd7ef86e39c979e8b986c9f6d6db239949682cd)
2022-11-01 20:52:23 +08:00
gerrit
badd314724 ci: update build version to 01.03.00.13
Change-Id: Iedf30b5615da18c0b5e3a1e86e12cfd9d7de6af2
2022-11-01 20:52:23 +08:00
Arthur Tang
5544e9602c FIX: rewrite per-object printing order logic
1. Previous logic can't guarantee left-to-right printing order, so
   toolhead may crash on the right side. In the new algorithm printing
   order is guaranteed.
2. Clearance radius should be the max of 3 directions (left, bottom,
   up), not including right, otherwise collision may happen on bottom or
   up directions.
3. Add is_extrusion_cali_object property to handle extrusion brim
   overlap better.

Change-Id: I44868b9925d983f5cca0c31d35dfa28d895fadbf
2022-11-01 20:52:23 +08:00
qing.zhang
59dfcb98fc FIX: fix the empty layer after adding modifier
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Iad6c149cb5f1a50a199fdf1dd50f4971898972e2
(cherry picked from commit 6065729c6febb9f3a704dde12bda6ad34f62caec)
2022-11-01 20:52:23 +08:00
tao wang
39df4c8b49 FIX:fixed description messages not refreshing the scrollbar
Change-Id: Ie067784144031d4f9418b4af1b08420bf919d7f1
(cherry picked from commit 520703c1823bdf6ec802467b4bc035da8e797d8f)
2022-11-01 20:52:23 +08:00
tao wang
34e1939666 FIX:change the downloading plugin url of the wiki
Change-Id: I0eb1c42105e5e27e16b9888f8c415aa157cd6f03
(cherry picked from commit 6a35a3546722d16e6118539ab60b748aa9666097)
2022-11-01 20:52:23 +08:00
tao wang
57c877ab9a FIX:fixed incorrect display after adding files via add
Change-Id: Id812b40cb85a882a8c490ccdc2375e0d9b8e312d
2022-11-01 20:52:23 +08:00
SoftFever
cf8ff30c74 bump voron profile version 2022-10-30 21:32:40 +08:00
SoftFever
dc941163eb bump up version 1.32 2022-10-30 19:45:35 +08:00
SoftFever
fdb4196ad5 handle klipper set_velocity_limit 2022-10-30 00:50:15 +08:00
SoftFever
258f800b8b Merge branch 'SoftFever' into feature/compatible_comments 2022-10-28 17:44:50 +08:00
SoftFever
9a5a336483 show fan speed 2022-10-28 17:17:35 +08:00
SoftFever
a89a354c31 layer count issue fixed 2022-10-28 17:16:07 +08:00
SoftFever
644742133e fix crash when there are unicode string in the model path 2022-10-26 21:23:51 +08:00
SoftFever
96810ea994 handle url 2022-10-26 12:45:16 +08:00
SoftFever
bd672054cc fix aux fan issue for third party printers 2022-10-25 21:42:36 +08:00
SoftFever
ec28acf476 Special handling temperature for Klipper 2022-10-25 10:40:23 +08:00
SoftFever
bd38df6a6a un-hide fan speed/temp preview 2022-10-25 09:11:19 +08:00
SoftFever
48e5d3d3c1 hide bed type for 3rd party printer 2022-10-25 09:10:09 +08:00
SoftFever
dd77599dea small perimeter threshold 2022-10-24 22:35:40 +08:00
SoftFever
397e0f0a29 Merge branch 'SoftFever' into feature/small_perimeter 2022-10-24 14:53:58 +08:00
SoftFever
166832cd94 add back small perimeter support 2022-10-24 14:47:18 +08:00
SoftFever
e65ba104dd support changing thumbnail size 2022-10-23 23:00:46 +08:00
SoftFever
cd71a86d3f support klipper gcode flavor 2022-10-23 19:42:01 +08:00
SoftFever
ff760815ca Device view for third party printers 2022-10-23 16:37:34 +08:00
SoftFever
658d41dd69 Omit M981 for third party printers 2022-10-23 15:49:02 +08:00
SoftFever
c40607aef3 update 1.3.1 changenotes 2022-10-22 14:37:56 +08:00
SoftFever
1b6db78f9e bump version to 1.3.1 2022-10-22 01:09:57 +08:00
SoftFever
3d2ee60acd update mac build script 2022-10-22 01:07:32 +08:00
SoftFever
b7572b9004 Omit BBL specific gcodes for other machines 2022-10-22 00:19:08 +08:00
SoftFever
bab4f443e2 expose more parameters 2022-10-21 16:50:59 +08:00
SoftFever
6072053737 update SF version 2022-10-21 16:50:34 +08:00
SoftFever
7a2babcd05 update SoftFever version number 2022-10-21 00:43:21 +08:00
SoftFever
d41f0a0a40 update Chinese translation 2022-10-21 00:43:03 +08:00
SoftFever
b4faed3ecf rename "z lift type" to "z hop type" 2022-10-21 00:42:41 +08:00
SoftFever
ed0c742d2f hide circle bed shape 2022-10-21 00:42:11 +08:00
SoftFever
6ec4e15e6e tweak ender 3 profile 2022-10-21 00:41:33 +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
SoftFever
293f2af0dc move config info to the end of file 2022-10-20 21:30:42 +08:00
gerrit
c24680e09d ci: update build version to 01.03.00.12
Change-Id: I900d47d2b015ed8b0ad15c35d98c595d29fe4fb7
2022-10-20 19:34:37 +08:00
yifan.wu
aaa70fed23 FIX: fix print order issue of flush_into_support
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: Icc4cef72bed7e439b63a0f0fd02a85bbf890ea38
2022-10-20 19:34:37 +08:00
qing.zhang
e3d256ca5e FIX: fix the empty layer after adding modifier
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Iad6c149cb5f1a50a199fdf1dd50f4971898972e2
2022-10-20 19:34:37 +08:00
gerrit
8bc8c373a8 ci: update build version to 01.03.00.11
Change-Id: I83b92e67d38732119941389636ce243f7090d3b7
2022-10-20 19:34:37 +08:00
salt.wei
cc853d9061 ENH: revert "ENH: fix for modifier region issue"
The original patch can't fix empty layer issue

Revert.

This reverts commit 152a650fb80a84523e977b15f5f30d28837d80e9.

Change-Id: Ib6d47ac981fca24ca953b45068703bbcd231cf95
2022-10-20 19:34:37 +08:00
gerrit
cef16d9e7b ci: update build version to 01.03.00.10
Change-Id: If2f671b01495d3c65ea29dca1c309ecc22bc860e
2022-10-20 19:34:37 +08:00
tao wang
529131138a FIX:block send to printer function
Change-Id: I04dff128e598b9679d39ece3f60f56ba09cbd72f
2022-10-20 19:34:37 +08:00
chunmao.guo
55d6bbbe21 FIX: replace print file default image
Change-Id: I58ff7c02b725c38b9c898fd1d4d4c92bf61c4c24
2022-10-20 19:34:37 +08:00
养乐多
9abe0ad9f6 remove: "FIX:fixed some issues with sending prints"
This reverts commit d1036a86604da5d5f72bb9531618d959036caf42.

Change-Id: I17ad13d477ece20638c9c1a2f72aea7401d335ca
2022-10-20 19:34:37 +08:00
gerrit
4a52147443 ci: update build version to 01.03.00.09
Change-Id: I3834e0f8f85ffeec4b479564b516fe3d041c1970
2022-10-20 19:34:37 +08:00
tao wang
77e45b8709 FIX:fixed some issues with sending prints
1. send to printer change to send to print sd card
2. update the default error message
3. display networking error messages on the page

Change-Id: I27b67091e9449bb9d469f9ded53148e0b1a74369
2022-10-20 19:34:37 +08:00
liz.li
11651ac437 FIX: fix send to printer dialog flicker
Change-Id: If5007501a2b0b268193b667503bd2bff8f3362ca
2022-10-20 19:34:37 +08:00
chunmao.guo
f16d2f337e FIX: add process id to save file name
Change-Id: I359d75ef4f7f63e6f5eb5138f18921faa09593fa
2022-10-20 19:34:37 +08:00
chunmao.guo
48083f7c0c FIX: use shellex to open file, avoid cmd window
Change-Id: I6ae868381003c85a319e9c3bad37b0bffc3dbdd7
2022-10-20 19:34:37 +08:00
yifan.wu
946ba89cd7 FIX: fix an flush_into_support bug for copied objects
Copied objects share extrusion paths but they should be treated
seperately.

Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I891c70d261a2fa5b198ec776694d74eeb8fd987f
2022-10-20 19:34:37 +08:00
zhimin.zeng
92c6f85586 FIX: Revert uniform scale modify
Revert "ENH: save uniform scale to an app_config item" Revert "ENH: do uniform scale if uniform_scale is true"

Change-Id: I069baecec143e77d796247f29cd5478b877971fb
(cherry picked from commit c7cf95cf5c365f314a53fead6612fac84a0a5f71)
2022-10-20 19:34:37 +08:00
zhimin.zeng
24778543e2 FIX: remember the status of uniform scale
Change-Id: I60f36d6ac6e9be1be4b3e45bd3e7868dcd062e5d
(cherry picked from commit b1cde25a722a62720f7a877c985246078320149c)
2022-10-20 19:34:37 +08:00
salt.wei
10d8b6c609 ENH: first layer nozzle temp doesn't work sometimes
This is a bug when printing multi filament

When the filament changing is finished before printing
first layer, the temperature should be resumed to be
initial layer nozzle temperature as well.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I82231f8a47fac1995d8f1ba12c4f7797afce2891
2022-10-20 19:34:37 +08:00
yifan.wu
76b40c9636 FIX: fix an flush_into_object bug for copied objects
Copied objects share extrusion paths but they should be treated
seperately.
Thanks hisptoot for the fix.

Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I24d3050df7d284e92fc50a0213023a43ee8c529c
2022-10-20 19:34:37 +08:00
yifan.wu
65f57882b9 FIX: fix an exception happened in flush option in debug mode
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I02847ac516f560863c126ee8bf7bfc9018c2d69e
2022-10-20 19:34:37 +08:00
zhimin.zeng
0a4269f053 FIX: assemble view does not handle model scaling
Change-Id: I4acce82e108128c4eee4e9fb5bcdeb6e74b6147e
(cherry picked from commit 8a9c5fbf11c26b112838c2790b9def9abcee7797)
2022-10-20 19:34:37 +08:00
Stone Li
23339c94ec FIX: update calibration status
Change-Id: I38a4340bf744b5aab29b95986ff0424250a179c5
2022-10-20 19:34:37 +08:00
Stone Li
095243eff3 ENH: hide select timelapse widget
Change-Id: I916644ff07f0578d80a1efac6f8cc075b56291c0
2022-10-20 19:34:37 +08:00
MusangKing
6f13d5cbf4 ENH: add paint-on support on vertical faces
Add paint-on support on vertical faces of slender rods

Jira: Studio/STIDIO-970

Change-Id: If280b570a8076059b5583f385ba6517bf305723b
(cherry picked from commit 6832ee98ac146421c061fa90840c2751c3b3d875)
2022-10-20 19:34:37 +08:00
Stone Li
13377992f7 FIX: fix flushed filament
Change-Id: I57965d0679d94da483f4ea3b1ada3600e7aa340a
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-10-20 19:34:37 +08:00
tao wang
464957864c FIX:hide the printer status on the upgrade page
Change-Id: Ia462b047081243c5b5c32ce035dc37afa251a84c
2022-10-20 19:34:37 +08:00
chunmao.guo
6ba97a6b94 FIX: update po of slice texts
Change-Id: If1a47b1d378bd71961996e7329612693b333f5d7
2022-10-20 19:34:37 +08:00
gerrit
51ae905770 ci: update build version to 01.03.00.08
Change-Id: Ie0fd9cad09c2f1305198c0eb0b05e6b91c620b72
2022-10-20 19:34:37 +08:00
lane.wei
5627413b23 ENH: disable wireframe currently
there are some issues need to be solved

Change-Id: I107db3d9411d2487c4c6fb65d54763896c3954b5
2022-10-20 19:34:37 +08:00
tao wang
6844c694b5 NEW:update the chinese translation
Change-Id: I7c5ff743ed306fb4da137e2f053e5a6c94e962bb
2022-10-20 19:34:37 +08:00
lane.wei
0693f8c8c6 Fix: fix the user directory not found issue
wrongly delete by update_user_presets_directory with empty username

Change-Id: I88521cddde5db5aeaccdbc62b09db74f5f596fbe
2022-10-20 19:34:37 +08:00
Stone Li
6635e57c36 ENH: refine confirm dialog when sending a print job
Change-Id: Id65afa8c5181a4b31e60a0b298bc945fbb77ade0
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-10-20 19:34:37 +08:00
salt.wei
b829419c54 ENH: fix one typo
As title

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Ief2cf0129f06ebf3bd1f9eb947ad17ad595cee79
2022-10-20 19:34:37 +08:00
tao wang
97095e4319 NEW:download plugin failure can link to wiki page
Change-Id: Ib4590b5300e03c1bcf379cb2760a860a9426987e
2022-10-20 19:34:37 +08:00
lane.wei
a73c504ea3 ENH: support sub-directories under system profiles
when copy directory, will copy the sub-directory recursively

Change-Id: Ib49cc38aaf889556b0b94f0e4d20451d3d4f03b2
2022-10-20 19:34:37 +08:00
Arthur
3fecdd6e7d FIX: tree support has empty layers for some models
Root cause:
support_floor_layers_above is not properly set,
so adjust_layer_height() fails to detect extremes,
and then deletes the middle layers.

Also reduce max_bridge_length to 10mm.

Jira: STUDIO-1084

Change-Id: I1e72a0600ec7e2b812705e45b47b76189152daac
2022-10-20 19:34:37 +08:00
lane.wei
631897c0a6 ENH: add logic to load default filaments of newly added model
1. fix the prefer_model issue
2. when a printer is visible and no filament is selected, just set its default materials to visible
3. add some log for shutdown debug

Change-Id: I599dbd9c8b180c944ff4086c7638267ff002f94a
2022-10-20 19:34:37 +08:00
liz.li
16e7993a65 ENH:update mo of dailytip
Change-Id: I168159af60bbda827d24238f656aeaa192fd4299
2022-10-20 19:34:37 +08:00
Stone Li
f968374b46 ENH: some improvements and fixs
1. create user folder if not exists
2. add a tips for binding a printer
3. fix sdcard tips
4. modify icons
5. refine layout of task options

Change-Id: Ic0529cf1e8bdde0128052bc42454f6e6aaae87ca
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-10-20 19:34:37 +08:00
Arthur
13b5e589cb ENH: reduce extruder_clearance_radius to 32
to improve per-object auto-arrange

Change-Id: I682c5405ef1aebdb3a9c32a0314e83bf9f116653
(cherry picked from commit 2c3d6b657694aa4826bb80526d160163bb673a33)
2022-10-20 19:34:37 +08:00
lane.wei
f3a5a50199 Fix: add the preset auto-copy logic at bootup
sometimes the installed profiles are deleted by the installer/uninstaller
add the auto-copy logic to make sure it is there after bootup

Change-Id: I2e7c9eb7576672377c0f08575d17c775282f4671
2022-10-20 19:34:37 +08:00
liz.li
97c6573a75 NEW:render layer_width and layer_height info over slider
Change-Id: I25e9d58ebd4343373aab146676c4e05aaa3652c7
2022-10-20 19:34:37 +08:00
liz.li
a795ae35e1 ENH:update po and of some text
Change-Id: If45808707878e4f84489017eeeb5a936f990a1ab
2022-10-20 19:34:37 +08:00
tao wang
0d8de21429 FIX:update the studio naming rules
1.use the name of the first project when importing multiple projects
2.name the current project with the part name

Change-Id: Ia1a863173b3682a18dcc5a4d5e2245a53e309135
2022-10-20 19:34:37 +08:00
chunmao.guo
9ba218ab37 FIX: update po mo of Media file & AMS sync
Change-Id: Ie2659d7d87c60edf37d54a5cc79f54e429ca9f9c
2022-10-20 19:34:37 +08:00
gerrit
79005d0e2e ci: update network module based on commit 07ca983
Change-Id: I096991aeac7f01c80d76767d274be9ebf414af84
2022-10-20 19:34:37 +08:00
gerrit
9c30225249 ci: update build version to 01.03.00.07
Change-Id: I935d4fcf179f5194a5c81a2ed8002c7b1ac8c40c
2022-10-20 19:34:37 +08:00
salt.wei
99974c7f59 ENH: add warning info when bed temperature is too high
Add bed temperature checker in gcode processer. And
save slice warning into GcodeProcessorResult.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Iee96e4ab165a3171a5a1e165450bfc360401647f
2022-10-20 19:34:37 +08:00
chunmao.guo
48aed7fbe5 FIX: combox can not pop if hide with entry keyevent
Change-Id: I0b86ebadd524eafb69ba810f7a1b899ecb25914c
2022-10-20 19:34:37 +08:00
chunmao.guo
84a4622fdf FIX: Media playing state & detect play end
Change-Id: I378da3f104120110b8032a355a22a89ebe69a0fb
2022-10-20 19:34:37 +08:00
chunmao.guo
746d5960ba FIX: auto scroll to visible focus child in params panel
Change-Id: Ib3f7b7528c7fd221a824719d2199b4c85451fe67
2022-10-20 19:34:37 +08:00
lane.wei
033830f73b Fix: fix the volume saving issue caused by left-hand logic
now we save volume's matrix seperately,
so we don't need to adjust the vertex order anymore while saving to 3mf

Change-Id: I71b865c44f0d99e2e88e34cd253fcfba583f345c
2022-10-20 19:34:37 +08:00
Stone Li
cf6e66e5ee ENH: update translations
Change-Id: I387dac803687ee345f42f9b003dd896a5800973d
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-10-20 19:34:37 +08:00
Stone Li
d089b1aab2 ENH: update print button enable status
Change-Id: Ieb4a74a336ef9f4a552b104df88d4e73967b8a5d
2022-10-20 19:34:37 +08:00
Stone Li
82a1a38c30 NEW: add slice warning msg to slice_info
Change-Id: I145a14b7ab6f4aff2158ca0f86191e57b7efa643
2022-10-20 19:34:37 +08:00
tao wang
2ed702766b NEW:add printer tips can link to wiki
Change-Id: Id6fc6afbcdfcab9ac0747d9f7228f94aba6c871e
2022-10-20 19:34:37 +08:00
Stone Li
ee62ffcc7d NEW: add confirm dialog after check conditions
confirm to check printer model and slice warnings

Change-Id: I07a272fda1a5e2ebc0f4e106815fe07da5aaa4df
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-10-20 19:34:37 +08:00
tao.jin
a84cf46699 ENH: refine UI of sending 3rd-party printer task
Change-Id: I47cd1682a495eb7aa6f230dfa41ee4f5c321fc72
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-10-20 19:34:37 +08:00
tao wang
3992e25c93 FIX:disable the send button if not on same LAN
Change-Id: I730fc3b14ab048b4336c0164f775f870a9b171b8
2022-10-20 19:34:37 +08:00
yifan.wu
4928ef31b8 FIX: fix some error link in daily tips
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I2e4fee013eb9544e9ebc5e610508da049da52b10
2022-10-20 19:34:37 +08:00
tao.jin
a0e273fd06 FIX: print-error dialog: hide cancel button, fix msg display
Change-Id: I26fe098cedd16ee568060f12bb5aea855e9ae279
2022-10-20 19:34:37 +08:00
Stone Li
508f814bbc NEW: add ams retry and ams wiki guide
Change-Id: Ic589eeab1472a4625a5f1cbe98b56901c3e655ee
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-10-20 19:34:37 +08:00
liz.li
066a4d70c9 NEW:add ams guide wiki
Change-Id: I825f9dbbf3aa0a32eb5272b941179025ef2d35e2
2022-10-20 19:34:37 +08:00
Stone Li
12d0e0b7ea NEW: select timelapse option when sending a print
Change-Id: I3a43d2ad038c397f45d1505d7eb7367746dd09ba
Signed-off-by: Stone Li <stone.li@bambulab.com>
(cherry picked from commit 7b26b69975746a6005fbc70728c1d16b1b120850)
2022-10-20 19:34:37 +08:00
gerrit
d885052341 ci: update build version to 01.03.00.06
Change-Id: I58f06d04601b78fc7bbd99e203815a8a8d09328a
2022-10-20 19:34:37 +08:00
lane.wei
227e1f4dc3 ENH: shader: add logic to avoid error when opengl version less than 3.0
use a seperate shader for function which needs opengl 3.0 supports

Change-Id: Iff30a90211aa10ae9c4a1e36afeb331d252fb814
2022-10-20 19:34:37 +08:00
Stone Li
c9c98dcee8 FIX: fix ams mapping tips do not displayed
Change-Id: I108a2d313472ec2c8909c1e521fa1f1f6f6254f8
2022-10-20 19:34:37 +08:00
tao wang
a4cda21926 FIX:fixed some issues with send to printer
Change-Id: Ic14f1285d234cd00895a343ae22aef90be415072
(cherry picked from commit 9bfb2ddb01878ffa983e9174cb46041fc8330aa8)
2022-10-20 19:34:37 +08:00
liz.li
8029b62daa NEW:modify dailytips
Change-Id: I3adc91b6bc2a2288a034678ad2df9b963f3adcf9
(cherry picked from commit fad2d0edf5d87ba7044b257747dcfb9b1090776f)
2022-10-20 19:34:37 +08:00
Arthur
74a76e026a ENH: improve extrusion calibration region in auto-arrange
1. do not consider extrusion calibration region if no micro lidar on the
   printer
2. do not inflate extrusion calibration region by brim width, just let
   them overlap

Change-Id: I62228d85e8a55d40e22a6ae7f5f065f281936429
(cherry picked from commit 4c456e1f3e675a2ea1358d2983f85a95e58eb49c)
2022-10-20 19:34:37 +08:00
yifan.wu
368badd225 ENH: delete objects/parts by back key on macOS
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I4fb5a940955a3f165fe61b7499509c5c72c53460
2022-10-20 19:34:37 +08:00
yifan.wu
f3c65f8597 ENH: refine gizmo paint tools
1. support to adjust cursor size and section view by key + mouse wheel
2. display shortcut tips according to the selected tool type
3. change the left mouse behavior to object movement for color painting tool

Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I13d2a83d562d6ccd8d915158e263a90ad3c02db0
2022-10-20 19:34:37 +08:00
liz.li
d38c5b07fa FIX:disable an item in dailytip temporarily
Change-Id: I4f60243336d1b6a247733674f75f721dce7444b6
2022-10-20 19:34:37 +08:00
Arthur
d402e302f3 FIX: hybrid support is too slow
Change-Id: I5c0d0432a0ce4010de044816780fbfbd9aabe30c
(cherry picked from commit 6be3b9cd71ac5708ba03fe6678966c31b73c90eb)
2022-10-20 19:34:37 +08:00
Arthur
8614d24932 FIX: nozzle_volume should not be array
Change-Id: Ib6de4bda64fb0a8620caf56c18f9fd6ac86f0171
2022-10-20 19:34:37 +08:00
lane.wei
b4d66394e7 NEW: add the wireframe rendering mode for debug
currently we can turn on/off it by 'ctrl+shift+enter'

Change-Id: Ic9e5460e8955376e8e2c1a3701e12a1f0b4216ad
2022-10-20 19:34:37 +08:00
salt.wei
c423577e1d ENH: fix for modifier region issue
empty region after adding the modifier cube
this fix for STUDIO-1025

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I5ed35b54f8ee9d2fdc387d1b4391021e4e82aaad
2022-10-20 19:34:37 +08:00
chunmao.guo
76d021ceaf FIX: optimize media file panel
1. disable select when no file
2. disable batch edit button when no selection
3. hide batch edit when no file
4. delete/play/open_folder for downloaded file
5. hide type panel

Change-Id: Ida00da366a8f59b2c5028ddcf87e197c20a21e44
2022-10-20 19:34:37 +08:00
lane.wei
c2c7a6786d FIX: fix the vendor disappear issue after de-select the printers in newbie_guide
after the vendor profile is deselected
the system files are deleted from userdata dir
we should always load the other vendor's profiles from resource instead of userdata dir

Change-Id: I29220d30d203ea318092430c02cfa662caf0f388
2022-10-20 19:34:37 +08:00
lane.wei
0aef20dd23 ENH: refine the printer select logic after newbie_guide
1. when printer are newly added, switch to the first printer newly added
2. when printer not added, filaments are added, switch to the first filament newly added
3. when the current filament/print are not compatible with the printer preset newly added and selected
switch to the first visible one which is compatible with the printer preset

Change-Id: I542eda9ac6133d19690ce03ae349b8629ea233f9
2022-10-20 19:34:37 +08:00
lane.wei
5cee2208d7 ENH: do not throw exception when data directory creating failed in some cases
if the directory already created by other instance
do not throw exception

Change-Id: I3ebde1ab62fa85ea946b6aeafc87aa7468327ce6
2022-10-20 19:34:37 +08:00
gerrit
40b01327a2 ci: update build version to 01.03.00.05
Change-Id: I496f7e07660917e7ed674b3e87a89670fc9dc3ad
2022-10-20 19:34:37 +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
tao wang
4918c4d643 FIX:fixed some issues about text
1.part cooling cross the border
2.the text on the upper-right menu is not clear

Change-Id: I41e07053d7a4b9d3dc574d380a1af7808362d276
2022-10-20 19:34:37 +08:00
salt.wei
4172ad8a8e ENH: some po change for new settings
Some po change for new setting option

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I804355868ff2507b038d3c163ba5c4ce30901f7f
2022-10-20 19:34:37 +08:00
Stone Li
90f19d27f0 ENH: render default bed when use third-party printer
Change-Id: Ia6ffa5913159e71f89b00b9311be56608d6721d9
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-10-20 19:34:37 +08:00
Stone Li
35d2e91d68 NEW: support to display internal Version
Change-Id: If074529312fe3f5e32f061280b8c8914fdcaf7e0
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-10-20 19:34:37 +08:00
Stone Li
4d70fd0eee NEW: add Internal Version text in splashscreen
Change-Id: I1ef69fcf74ba1ffa3d610e4c85b3230b162431a2
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-10-20 19:34:37 +08:00
salt.wei
6c8015ca28 ENH: avoid crossing wall when travel
Provide related two options to avoid crossing wall
when travel.

This is handling for github issue #106

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I127adbb70f33c3954a08f3087e64c4e75212c7f0
2022-10-20 19:34:37 +08:00
Stone Li
f155f5a498 FIX: fix crash when closing the app
Change-Id: I292b75ea026f1f187b4b8c13b3d19f0e087bab78
2022-10-20 19:34:37 +08:00
salt.wei
78ff2f4daa ENH: allow higher z speed
This is change requirement from printer developer
for github issue #393

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Ief306d89dba70d8515050cbd842edc4e1d22822e
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
xiang.zeng
9cf95696a4 NEW: enable lightning infill pattern for model and tree support
Change-Id: I6e2cbfdd30f8d222f88301ed0c8cc89e21cfdc24
(cherry picked from commit ddfee7c069cfc42685be509d48b8c609e1dc0cfc)
2022-10-20 19:34:37 +08:00
Stone Li
f331d5998e ENH: add media file and upgrade panel to public
Change-Id: I9fdc16fcc584bf72f85a02668a42c05af0065efc
2022-10-20 19:34:37 +08:00
gerrit
0bc182436d ci: update build version to 01.03.00.04
Change-Id: Iace9f5d7b178fd0d08aa715ee0c908e86d363c05
2022-10-20 19:34:37 +08:00
zhimin.zeng
34fb5c84d9 FIX: the position of the assembly view is wrong after adding text
Change-Id: I1fa465b9155a0718ca7122d4591023de963152c6
(cherry picked from commit cd95bfaea18b9f77f9b3deb1bf27ee1188201f69)
2022-10-20 19:34:37 +08:00
zhimin.zeng
f996eedf49 FIX: allow smooth timelapse without wipe tower
Change-Id: I60d487faa96641dbf88f5502d2fa9ccb83e622c6
(cherry picked from commit 0286a7add9c698a2efd6d40910d72a83f06edba5)
2022-10-20 19:34:37 +08:00
salt.wei
a3dcc40f23 ENH: fix compiling issue in debug mode
As title.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I1fa86effc355ee350726fc81eef89f8a43bce89a
2022-10-20 19:34:37 +08:00
liz.li
ca4db188ea FIX:cannot input 'L' in custom gcode dialog
Change-Id: Ib30420fdb57816d4e8e3a6cd7b327c09737f3b86
(cherry picked from commit 71278d55c410bb36210d7aaa8e938ae5bfddbbcf)
2022-10-20 19:34:37 +08:00
salt.wei
bea9a0854e ENH: fix compiling issue for github branch
Lighting infill has not been enabled on this branch.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Ic3c8d1f57fd36e73eaec190a43bf9f5868667d9b
2022-10-20 19:34:37 +08:00
salt.wei
b8d9a2fdf3 ENH: add custom gcode back
Add custom gcode back, which can be inserted in
gcode viewer layer slider.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I270cc438bedf11b30f07f8f9bad6ae5436d5a2dd
2022-10-20 19:34:37 +08:00
tao wang
b0de324ea8 FIX:updateversiondialog be compatible with full text and web display
Change-Id: I8b8b7fc1acd090c85bda286f09effe3dad1c3a4a
2022-10-20 19:34:37 +08:00
salt.wei
0f1a001fd6 ENH: sync some code change from prusa
Sync some code change and fix from Prusa.
Thanks Prusa.

This also can fix github issue #317

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: If6993e0149733ccf85ed85f82553caa03df7ac60
2022-10-20 19:34:37 +08:00
tao.jin
afd5e241e6 FIX: fix TempInput Widget display error on mac
Change-Id: I6a5d14ece9b22453e2c22b1a279db6ff15d1f7c6
2022-10-20 19:34:37 +08:00
tao wang
45b9406b63 FIX:fixed some issues with object/part table
1.can stretch the window vertically
2.the lock icon is not in the correct position

Change-Id: Ibb4d4d9d1238c8613526a3c59b6379b18dfa694f
2022-10-20 19:34:37 +08:00
qing.zhang
f3744b8169 NEW: add link to infill pattern
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I4a06d1443fc82efeff0ba3e94179914692b284c6
(cherry picked from commit 9e239305474d849343774a0af51876f4f82bcf99)
2022-10-20 19:34:37 +08:00
Stone Li
91d5ba2870 NEW: support send gcode to third-party printer
Thanks SoftForever for your works to support
sending a gcode file to third-party printer

Change-Id: I3cba43c8bd878f1f1c2fd5fae202ed4d922e8727
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-10-20 19:34:37 +08:00
salt.wei
52cdf4930d ENH: modify start gcode of voron
Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I1bd10f930cbe7572b9419dd5930fc0ba4f2f6a52
2022-10-20 19:34:37 +08:00
gerrit
b66e085afc ci: update build version to 01.03.00.03
Change-Id: If317a5adfff1dd96f3421381a8b6e9d39e249aa8
2022-10-20 19:34:37 +08:00
gerrit
b7f1df7fe9 ci: update build version to 01.03.00.02
Change-Id: Ibf7c2ee58f925126aa930bb3879b22e69fd8478c
2022-10-20 19:34:37 +08:00
chunmao.guo
37723752cd ENH: optimize media file user interface
Change-Id: Ic16133fd366fcbf41dd0c9535907786754186857
2022-10-20 19:34:37 +08:00
gerrit
aa2129280d ci: update build version to 01.03.00.01
Change-Id: I206e4a15696e6c72ba52962654567d678f00c4ec
2022-10-20 19:34:37 +08:00
salt.wei
4ef50375cb ENH: resume addition cooling fan after filament change
During filament changing, additional cooling fan may
be closed to reduce strings. Force to resume after
changing filament.

This logic is same with part cooling fan.
So no side effect.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I207c8692dbe5b0450ed0a3d11c4c9b70eda0e28c
2022-10-20 19:34:37 +08:00
tao wang
2daf0ab5df FIX:fixed cant not display full text in preferences page
Change-Id: I9e62d8916924336f534c6e4393c78c3b10fc259c
2022-10-20 19:34:37 +08:00
zhimin.zeng
a2d65c0c6a FIX: do not use interface support filament for default support
Change-Id: Ieb9da1df74b17e81a0fdb4d0b7e9bead54d8bb96
(cherry picked from commit b54caf82b1bc6d2097188c75c57e2f4e6b7792fc)
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
tao wang
29e19cb32e NEW:added sending gcode file to sdcard
Change-Id: I60654676a3001c59b8202581576fbfcd5f8388eb
(cherry picked from commit 930b8e034aaa55743aa02fc6e3961fdc388ce53c)
2022-10-20 19:34:37 +08:00
gerrit
631dd00038 ENH: update network module based on commit 9f48f1f
Change-Id: If0215a649eb4480f0139640f40968b3e87f48017
2022-10-20 19:34:37 +08:00
chunmao.guo
0dd3589a21 ENH: re-register BambuSource with bat script
Change-Id: I67f014bc8de55597134a9974557e622082daaf97
2022-10-20 19:34:37 +08:00
tao wang
b5979375b4 NEW:add the download path edit in the preferences
Change-Id: I8dfd3373a25bdd9d70360b61605d92f20052d478
2022-10-20 19:34:37 +08:00
lane.wei
79480405a0 ENH: update version to 1.3.0
Change-Id: Icceb853d6ea948dd8e23ef875d6e5e13d20537c6
2022-10-20 19:34:37 +08:00
Stone Li
497be311db NEW: add get_my_message interface
Change-Id: If904d6b5692a12bdbca7732002d5bf4e83a85932
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-10-20 19:34:37 +08:00
Stone Li
de5f9dfb12 NEW: add ams mapping info when sending a job
Change-Id: Ic225c34762be7293155befd87b61f9b5056cb937
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-10-20 19:34:37 +08:00
gerrit
54046b750b ci: update network module based on commit 2687434
Change-Id: I653f7e05ea11155fb906610d1549827e38f2de8b
(cherry picked from commit 4672e15697dd012a915f5e7bb17b378cff4249b6)
2022-10-20 19:34:37 +08:00
salt.wei
54377760b9 ENH: use different margin for top/bottom and bottom bridge
Too large margin for bridge will cause overflow for
shell model. But too small margin for top/bottom will
cause infill area discontinuous.

Using different margin for top/bottom and bridge to
make a balance.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I9ba8388b85b978ae39caf2df04f96c704b5d2e05
2022-10-20 19:34:37 +08:00
chunmao.guo
17076cc1bd FIX: hyperlink style and size of status label in media panel
Change-Id: I06431002ef7c86f6992c4c3cc48932503e2aab00
2022-10-20 19:34:37 +08:00
tao wang
0239cf34a1 FIX:update ams mapping result colours when it's changed
Change-Id: If30c05e1262262ed398c094c657a355516ff36ab
2022-10-20 19:34:37 +08:00
chunmao.guo
66c5d39e28 FIX: update bambu source api
Change-Id: I1689733af6cd8778f017a732dd36ad91bff80ea8
(cherry picked from commit 40bc2c251e00d6d95289fdd9def11f9e1bd9202f)
2022-10-20 19:34:37 +08:00
Stone Li
00284f52b8 FIX: hide use ams when no printer
Change-Id: I8bc32145102fbb06ec93b56d4f49754aab10c03c
2022-10-20 19:34:37 +08:00
chunmao.guo
e87860e033 FIX: live_view: check camera exist and show ttcode request error
Change-Id: I036006ec4efddf0a5801a6b1d304c9e81555a284
2022-10-20 19:34:37 +08:00
salt.wei
ccd7b7fd7b ENH: modify default value to support 3rd-party printer
As title.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Id8be38a23e4fe4c19eb255ffb7cabf1befeae85b
2022-10-20 19:34:37 +08:00
salt.wei
a0524cd25d ENH: set some settings to be readonly when printer vendor is Bambu Lab
It's meaningless to edit some settings, for example, machine limits
of Bambu Lab printer.

Set these settings to be read-only for Bambu Lab printer.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I61a21cfa2a2f574f690725125e226f4f258aa92f
2022-10-20 19:34:37 +08:00
tao wang
622f3da8df FIX:fixed isses with the devices dialog
Change-Id: I5e4822786fb2105893798b44622d080a593e41bb
2022-10-20 19:34:37 +08:00
tao wang
0761cbd1cb FIX:fixed clicking on first item has no effect in search dialog
Change-Id: Ifdbbf06a8b5c780155e394003470f6fa39a2b4c2
2022-10-20 19:34:37 +08:00
Arthur
efec8fef2f ENH: move extruder clearance settings to machine setting
Change-Id: Id6d550548f8fb8639349450a4b12c6eef4f441cd
(cherry picked from commit bd4420e4af9626772c90d553bf1f3bb7fd2e20c4)
2022-10-20 19:34:37 +08:00
liz.li
143c0f3750 NEW:add section view at assemble_view
Change-Id: I05b77e96e0d382b34ef80f622c71deca1eeb93b8
2022-10-20 19:34:37 +08:00
salt.wei
c02dd81c61 ENH: emit printing acceleration before start gcode
As title. Make calibration to use printing acceleration,
although no-using has no influence on calibration.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I98cb791c1e0fba6b77360b60567c29511cff75b8
2022-10-20 19:34:37 +08:00
tao.jin
d97db7e617 ENH: change extruder icon colour when loading filament
Change-Id: Ifd1e9c868702352790de9ddf25f256d504875785
2022-10-20 19:34:37 +08:00
chunmao.guo
633d14e711 FIX: crash when delete media file in PrinterFileSystem
Change-Id: I9783bbfc9c9979b6da662b917b6f5cf4db04aa69
2022-10-20 19:34:37 +08:00
tao wang
e325214cb6 FIX:fixed crash when creat projecy in full screen mode on mac
Change-Id: I029bf52e805d699a5d6de4e3a049954b09e58255
2022-10-20 19:34:37 +08:00
salt.wei
fd0f22b771 ENH: don't calculate overhang degree if disable overhang slow down
When the model has no overhang, user may disable overhang
slowing down.
In this case, it's unnecessary to calculate overhang
degree which make slicing slow when model is complex.

This is improvement for github issue #331.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I2eaeca3ee4068f76709fe97535bbf05c0d27c062
2022-10-20 19:34:37 +08:00
liz.li
81da77d1e0 NEW:DailyTips
Change-Id: I510e96652c9a0c9fe422546b09b2d035d9e46a23
2022-10-20 19:34:37 +08:00
tao.jin
c9499b7401 FIX: repair of print error message dialog
Change-Id: I5e551274074dbbd8d32b798b129486cc5d2c9ead
2022-10-20 19:34:37 +08:00
chunmao.guo
3d7d2badf7 FIX: handle mouseCaptureLost in common ctrls
Change-Id: Ifde2406911a628fa61acf41c0e7a5120612d73bf
2022-10-20 19:34:37 +08:00
tao wang
e2d10baea0 FIX:renaming will display the current file name
Change-Id: I0893d2b3e0c34822f311aaac2ec41911b66b4383
2022-10-20 19:34:37 +08:00
chunmao.guo
c243893aae FIX: update ams list in SelectMachineDialog
Change-Id: Ice625ab10197ba1e49d70243ee020c5eeae60053
2022-10-20 19:34:37 +08:00
Stone Li
3651066a77 FIX: do not upload auxilary file when send a printing job
Change-Id: I030cb93cf9b34036bf4f9164a2bd691b23328a9b
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-10-20 19:34:37 +08:00
SoftFever
be75bfaacb z lift type 2022-10-19 17:02:19 +08:00
SoftFever
d0fab5a5bd Merge branch 'SoftFever' into feature/more_parameters 2022-10-18 18:06:39 +08:00
SoftFever
eebb69d3ae more moonraker support 2022-10-18 18:06:28 +08:00
SoftFever
b8fb80c17f bring back ISO view! 2022-10-18 00:18:06 +08:00
SoftFever
e131938cac wip 2022-10-16 16:39:45 +08:00
SoftFever
24723679cd default acceleration value to 10000 2022-10-16 11:12:43 +08:00
SoftFever
834d43af1d Merge branch 'master-remote' into SoftFever 2022-10-14 20:40:22 +08:00
SoftFever
e69a6d6ebd bridge angle 2022-10-14 17:58:23 +08:00
SoftFever
5b674cfe9e Update README.md 2022-10-13 23:29:54 +08:00
SoftFever
d0c9bb0398 file format customization 2022-10-13 22:34:00 +08:00
SoftFever
1ef2b509e5 label objects by default 2022-10-13 22:33:59 +08:00
SoftFever
01d5dcdc09 Remove M900 S0 code. 2022-10-13 22:33:59 +08:00
SoftFever
38a4e3213e Update README.md 2022-10-13 16:30:24 +08:00
SoftFever
473b57314d set default pressure advance to 0.02 2022-10-12 23:15:08 +08:00
SoftFever
02ab24f459 update 3rd party printer profiles 2022-10-12 21:32:59 +08:00
SoftFever
b1145f368f fix a bug that pressure advance value is not stored. 2022-10-11 16:39:06 +08:00
SoftFever
457c7ec556 fix mac osx build script when ninja is installed 2022-10-09 21:55:54 +08:00
DeftDawg
cb2e89d93e - Update AppImage AppRun:
- Force LC_ALL=C locale; BBS segfaults without this on Holo-ISO
  - Try to create config dir each time; BBS will segfault with a boost logging error, if this doesn't exist
2022-10-09 10:38:37 +08:00
DeftDawg
207d4f6bbb - Podman Containerfile improvements:
- Add dependencies to base packages so BuildLinux doesn't need to install anything
  - Switch to Ubuntu 20.04, so glibc is older more widely available (22.04 glibc ABI was too new for Holo-iso)
  - Add debconf config to force non-interactive setup
2022-10-09 10:38:37 +08:00
DeftDawg
221a7c8e42 - BuildLinux Improvements:
- Add BBL_RELEASE_TO_PUBLIC for non-debug builds
  - Increase cmake jobs
2022-10-09 10:38:37 +08:00
lane.wei
c6f0c41213 Fix the random crash at the startup on Macos&&Linux
don't do the post_init when adding script handler of webview

Change-Id: I2c766c46bb67347286765dee539657b5efd7f64a
2022-10-09 10:37:45 +08:00
Stone Li
3dbdc40360 ENH: add tips when no sdcard
add has_ipcam status in DeviceManager

Change-Id: Ie51608218c9bf9513201ccffebfd12802d320680
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-10-09 10:37:45 +08:00
qing.zhang
a2c847be11 ENH: modify start_gcode of machine
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I43b73e1355a401e22393ea990b337c8ea8a64057
2022-10-09 10:37:45 +08:00
qing.zhang
b3e9fbce67 NEW: add preset of X1 0.2mm nozzle
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Ic04fd53ea640c67449a455fd34fd714e76eac946
2022-10-09 10:37:45 +08:00
Stone Li
ab261089d5 FIX: fix crash in get_firmware_info
Change-Id: I26807cfc9f66f13c3b44efb24570f23817c8b829
2022-10-09 10:37:45 +08:00
lane.wei
c855cdaf54 ENH: refine the text description of collision
Change-Id: Id78537de719cd5081c097694948a81ee735205f9
2022-10-09 10:37:45 +08:00
lane.wei
6323a1c35c Fix the bed type incorrect issue after reopen studio for new project
Change-Id: Ia1a07cb2cde6864552e6dd084949c1cb83c8cab0
2022-10-09 10:37:45 +08:00
Arthur
c9e8ef3f93 FIX: fix two tree support bugs
1. hybrid(auto) on_buildplate_only option not working correctly because
parent is not set.
2. tree(auto) on_buildplate_only not working correctly because unsupported
branch isn't deleted completely. I add child to track the dangling nodes
and then delete nodes with no child.

Change-Id: I24c69a7cf400d2961b22a720a6069cf95db6c1a5
(cherry picked from commit bce77c16128d35c668b175e7135b9fe9acd71d13)
2022-10-09 10:37:45 +08:00
zhimin.zeng
c37f489f35 FIX: sync associate file after installation
Change-Id: Ib68f292b81b3d57ee44fb1548a50d04faea5dfb1
2022-10-09 10:37:45 +08:00
zhimin.zeng
d7a8219a8f FIX: modify reorder extruders time
Change-Id: Ib72faf039dee6a08770617c4c2f341079d7e02e9
(cherry picked from commit 5e9d479bd7d7ef54bcafe7181dcdd8c03adaae51)
2022-10-09 10:37:45 +08:00
tao.jin
c2b2c75bf2 ENH: refine firmware upgrade interaction: ams version, translation
Change-Id: Ifc42421a4dedf8d8ef427d491cf8afc7b0e0665e
2022-10-09 10:37:45 +08:00
chunmao.guo
bb02d0f0ae FIX: close GuideFrame on exit to fix crash on MacOS
Change-Id: Ia9c6103961ce13c3f88f898ed449a3f8f299858d
2022-10-09 10:37:45 +08:00
tao.jin
dfa475210f ENH: add hint dialog for print error message
Change-Id: Ie17bf3a342e7d79f1e5a6f7a1638af6beec2f4a1
2022-10-09 10:37:45 +08:00
tao.jin
3ad719cd50 ENH: jump to monitor->device-status after sending print task
Change-Id: Id94e1d153c1462941460914dc5bac54f6fa85133
2022-10-09 10:37:45 +08:00
tao.jin
41508fc5ad ENH: refine the model repair dialog, adding scroll bar
Change-Id: I73f06036baba210c11283fc92d2d5204af946a14
2022-10-09 10:37:45 +08:00
SoftFever
111f26a5ce add ChangeNotes for 1.2.5 release 2022-10-07 18:33:07 +08:00
SoftFever
764b7d62a0 Merge mainstream changes 2022-10-04 13:51:34 +08:00
SoftFever
65062d33eb tweak some messages 2022-10-04 12:12:37 +08:00
SoftFever
bf7479ca35 Add following options:
1. Travel acceleration control
2. X Y jerk control for different parts
3. Manually Linear Advance control
2022-10-03 11:26:48 +08:00
salt.wei
63a33c8d1a ENH: revert the bridge change
Find some problem for the change of bridge, revert.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Ib195a9b4425fa54408bcd3842bbafc41a3c79409
2022-09-30 17:37:38 +08:00
chunmao.guo
05bee8d8f4 FIX: run script async with linux webkit
Change-Id: Ia86ff30680baf3045da99909614f3d32a7fe526b
2022-09-30 17:37:38 +08:00
SoftFever
5db7c30463 Revert "Add support for FLSun V400(WIP)"
This reverts commit 58871a08e0.
2022-09-30 16:18:32 +08:00
SoftFever
96be1ffdbf macos build script 2022-09-30 16:18:24 +08:00
SoftFever
7874704aa8 update build_release.sh 2022-09-30 16:18:24 +08:00
SoftFever
5200e03257 Fix an issue that bed temperature for other layers is not set properly 2022-09-29 11:46:21 +08:00
lane.wei
ef73232311 Fix a crash on Linux when first shown of Plater
Change-Id: Ia8cab01ed022b6d48dd41820adbd4901236df561
2022-09-29 11:16:43 +08:00
lane.wei
636319fb4c set the data dir of linux to correct path
Change-Id: Id11cde4518507fa6f2a6eefbccc4638ae7e4053d
2022-09-29 11:16:43 +08:00
lane.wei
8caa6347bb Fix a preview issue when the plate has some error after another plate sliced
Change-Id: I66a5824b0b62afb854fa2649b72942c4beeccaca
2022-09-29 11:16:43 +08:00
yifan.wu
b6a077b128 FIX: top shell filament does not hide the internal filament
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I143b49075992bb9556f248886ab5f1a442db8deb
2022-09-29 11:16:43 +08:00
tao wang
75711de9e1 FIX:fix sending print without extruder info from tab prepare
Change-Id: I34ce80b805ca98e20c0667b11732afb0c9269f47
2022-09-29 11:16:43 +08:00
yifan.wu
3f5e88b9a1 FIX: abnormal color line in multi-color slicing
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: Ie9c7242f2c320a1ece24df4690b74b599e32f7c6
2022-09-29 11:16:43 +08:00
lane.wei
dc9ff8b826 Fix: fix the crash issue when switch language under Debug mode
Change-Id: Ie6f978099c9b12f69d340ff39552eebafc10ba38
2022-09-29 11:16:43 +08:00
tao wang
4e4472c5b6 FIX:fixed a crash caused by mobile devices when switching languages
Change-Id: I7f28bf6bd917b16a798eea9b661987205ab3e1c8
2022-09-29 11:16:43 +08:00
zhimin.zeng
cb569fdb55 FIX: fix the extrude speed
Change-Id: I11d91c3bc422664d5a851966297a6b874fc1815a
2022-09-29 11:16:43 +08:00
qing.zhang
21e035ffbb ENH: modify the preset of some filaments
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Ia660304b830af36dfddec793e164660811c29c08
2022-09-29 11:16:43 +08:00
Tao Wang
6633ef4acf FIX:fixed the blocking module of linux
Change-Id: I06b357f9592631a729208514a3239f944a98cc96
2022-09-29 11:16:43 +08:00
chunmao.guo
851b6d6304 FIX: remove compare preset button in Tab
Change-Id: I268327bd2ea791de46d2972f08d528883d63da87
2022-09-29 11:16:43 +08:00
Stone Li
14aa9df496 FIX: fix chinese display error in imgui
Change-Id: I03f463725a4688354cf82d96505e5187912df3a4
(cherry picked from commit e040d640a65c228229ec1f547d1b5a93d667989d)
2022-09-29 11:16:43 +08:00
tao.jin
5179b745e1 NEW: limit log files within 30 by deleting old files
Change-Id: I1bb5c827c7fb01d97b84a4a1bf3f905bb8e90448
(cherry picked from commit 065ef224357352851cbba2c0dcac131ea9acae82)
2022-09-29 11:16:43 +08:00
tao.jin
6f01c4841d ENH: zh-CN translation of recent commits
Change-Id: I83b9cf087f59a0137f7f00a3649df5d410cc2576
2022-09-29 11:16:43 +08:00
chunmao.guo
35bb20b2cf FIX: use thread stack to keep shared ref of PrinterFileSystem
Change-Id: I86dce263f43eb65074d4fec777cb08885505b7cf
(cherry picked from commit 1dbc32b2335c33831ac94a787c8e7ec7d898ccba)
2022-09-29 11:16:43 +08:00
lane.wei
e228e72db1 Fix serveral issues on Linux environments
1. fix the crash issue in ComboBox
2. fix the network agent directory not correct issue
3. fix the first 3d tab switch failed issue
4. fix the filemenu not correct issue

Change-Id: I6a99218c0f7edbd57114ca1d9ff8c5c020d26d94
(cherry picked from commit b5e1b06af42aea9d1413be29dd58150b2ac8d470)
2022-09-29 11:16:43 +08:00
zhimin.zeng
b468b0da0e FIX: wipe tower lose step in the printing process
Change-Id: I17b72dd2fb7332a39859a5c3727b34d14ff827d8
(cherry picked from commit dbdd71f0b89e3d4d188e4937cdb1db1510b5f208)
2022-09-29 11:16:43 +08:00
zhimin.zeng
92a59a60b4 FIX: Incorrect color of a layer after slicing
Change-Id: I8b53d4cdf23d8f3389b1063ec84572ede3706ca2
(cherry picked from commit 608150a1b823e5c728540dc62df9a03571acfe9a)
2022-09-29 11:16:43 +08:00
zhimin.zeng
e2d65994f9 FIX: disable wipe tower still prompting too close to the tower
Change-Id: Ie6a3be2fb6021bc6f5e18cd061667e02d7b36f0b
(cherry picked from commit b83337f56b61d3b80679ec2714594012550e6f4b)
2022-09-29 11:16:43 +08:00
Stone Li
32ac28738e ENH: do ams mapping in printing and upgrading
Change-Id: I592d37ce581077c317642cbdf250a369bc992d09
2022-09-29 11:16:43 +08:00
chunmao.guo
ad471bf3db FIX: missing border in static box on Linux
Change-Id: I2105608cf74c5bc40caf383d3086ff852beaa07d
2022-09-29 11:16:43 +08:00
chunmao.guo
70de37d1ae ENH: help video play failure
Change-Id: I5f847547877a82d626bffb78488e5f3d20cc56d0
2022-09-29 11:16:43 +08:00
chunmao.guo
6dc68c4c9e FIX: optimize style of media file panel
Change-Id: I2e5319538adae84b9b0348874d7b468b0dbc2db1
2022-09-29 11:16:43 +08:00
chunmao.guo
b21b4aec95 FIX: device video/tunnel functions, add local video tunnel
Change-Id: I9da97406544c233d5ba6903857db6ad6f7f851e1
2022-09-29 11:16:43 +08:00
salt.wei
80575cd269 ENH: some change for external bridge
1 move thick bridge from support to quality page

2 Fix the issue that some times the external bridge angle
is not the best, and the bridge line is not the shortest one.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Ie26570fb289898f6b62960f9333e79aa92c08ae4
2022-09-29 11:16:43 +08:00
chunmao.guo
d41e0db18f ENH: icon for param group
Change-Id: I435830615747aa850ed82621349f5fedfc29d860
2022-09-29 11:16:43 +08:00
chunmao.guo
c5024af7e2 FIX: move preset dirty suffix to prefix
Change-Id: I52d4d6e3dea28d071eb7bf2f3b5e77b5e1b8c8bb
2022-09-29 11:16:43 +08:00
Stone Li
99fcecf193 ENH: fixed gcode of ams switch
Change-Id: Iad3845e5797a699dacc1a505db8f12e3fbb1b64e
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-09-29 11:16:43 +08:00
Stone Li
ca3ba7604a ENH: do uniform scale if uniform_scale is true
Change-Id: Iac208416110492fccb7b8a326c807641311dabd8
2022-09-29 11:16:43 +08:00
Stone Li
2996affc55 ENH: save uniform scale to an app_config item
Change-Id: Ib4a42597308382ea195d73776790e9cd4a122b76
2022-09-29 11:16:43 +08:00
miaoxin
c6d6784070 FIX: large unarrangable objects may overlap with bed boundary
large unarrangable objects may overlap with bed boundary in auto-arranging

Change-Id: Ie98aa96fb26cc819d1bb38ad0fc316f99423393c
(cherry picked from commit 3caf447a62e4dec5f56807c9f86a351db8fff5a7)
2022-09-29 11:16:43 +08:00
Arthur
abddb1edc3 NEW: add support_critical_regions_only for tree support
When this option enabled, only generate supports for sharp tail, cantilever,
thin pillar (not well supported). So holes are safe from unnessary supports.

Currently only works for tree supports, will need to copied to normal
supports if it works fine.

Change-Id: I5eb86484a5b503149e3bfdee8ce73f76a0a849e4
2022-09-29 11:16:43 +08:00
salt.wei
5152a90545 ENH: add some pattern back for user case
For github issue #328

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Iafbb141173f4ebe8352c5247f5de00ee671077e5
2022-09-29 11:16:43 +08:00
zhimin.zeng
0072e5ec37 FIX: prompt when opening 3mf
Change-Id: Ife452f5b16bdcf3f8eb105aeb58ffccdccb9177f
(cherry picked from commit c1e984d0feadef778fd09e61063ac1dacbbf9a64)
2022-09-29 11:16:43 +08:00
zhimin.zeng
0d25141a90 FIX: prompt when cancel loading 3mf
Change-Id: Id4a472a4d4ece3202fd8374e2154533c44e41635
(cherry picked from commit 3953223bb46dac8a39a54859b5e7579e8c6c318e)
2022-09-29 11:16:43 +08:00
Stone Li
66a2f49008 FIX: fix HMS display blank string
Change-Id: I36fe5879a5db76fba65095ce409b3f0060689de6
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-09-29 11:16:43 +08:00
Arthur
fae9036f01 FIX: tree support floating branches
Change-Id: Id28324e7676b28a315b03055d941b9876b2b3b5b
(cherry picked from commit 8b5d3fae4a476b91caf854cc75d5de36ff984790)
2022-09-29 11:16:43 +08:00
zhimin.zeng
2ee113b9da FIX: Remember the bed typ of the previous project
Change-Id: Id3b0e4ec7f8b4fcb2396f6f9f22789736e48eb8a
(cherry picked from commit 2ea818594b6da0ee323b5e255c36b45ff4247324)
2022-09-29 11:16:43 +08:00
zhimin.zeng
1ed06855a9 FIX: When rescaling an object, "Uniform scale" is checked again
Change-Id: I850c63abe77e45380f49cbd96cfd6e500252d89c
(cherry picked from commit a2bbbd7051427d54aefd28a9bd6fcf3269eb304c)
2022-09-29 11:16:43 +08:00
liz.li
07dd4c3672 FIX:mousewheel bug in preview slider
Change-Id: I9366a9c36250519259c132380e0a69697b6ee18c
2022-09-29 11:16:43 +08:00
tao wang
ecc76d0f33 FIX:Use url links to display Releasenote
Change-Id: Ib57931d71702d1356b10bd4c665017b3331189aa
2022-09-29 11:16:43 +08:00
chunmao.guo
42e08b5414 FIX: less param line option vertical gap
Change-Id: I5b63a078c54a6bd744321a5a57f2452b01c0dd0a
2022-09-29 11:16:43 +08:00
lane.wei
516a960f71 refine the plate's sliced_result logic
1. when the plate is locked, the sliced result is kept after auto-arrange;
2. when only arrange a plate, other plates' results are not affected

Change-Id: I7566e11e9eec0c2b196a2e78d9dc306ea325e9ff
2022-09-29 11:16:43 +08:00
tao.jin
8386b48554 ENH: add confirm dialog for cancel-print button
Change-Id: I0a97c7a3122b1b5dd0b306212292e8c51b9acd9b
2022-09-29 11:16:43 +08:00
tao wang
1b4486cc5d FIX:Change the menu options from Reduce Triangles to Simplify Model
Change-Id: I68d44b8c055456ae237925896573316c2a24b264
2022-09-29 11:16:43 +08:00
zorro.zhang
b8413d3a6c ENH: Homepage-contextmenu UI same with prepare-ui
Change-Id: I8745ce516f2d1dd945826ec6e1f14aba6ec793bb
2022-09-29 11:16:43 +08:00
Arthur
92f1236128 FIX: height not synced when inputing cut movement
Change-Id: I0640f9a21e1d700806ade79e4e1637338aef963a
(cherry picked from commit 8bacb887da19a9bed6451d2aaa1ebc149c20359d)
2022-09-29 11:16:43 +08:00
tao wang
c47f892ec8 FIX:release note support for richtext and markdown
Change-Id: Ie00dc94d88005c123acd20f05f43c5473b6dfa46
2022-09-29 11:16:43 +08:00
chunmao.guo
673b6418c1 ENH: sync with ams filament
Change-Id: Ifa8b9487c934a18ad1003f380bbb53fa9288e387
2022-09-29 11:16:43 +08:00
tao.jin
83a9c259f7 ENH: add hint dialogs for firmware upgrade
Change-Id: Iff34e4543d50074db05280fec8178029c4531e00
(cherry picked from commit 6f98eda25c722ecb6e0b6f4926972031c00bc366)
2022-09-29 11:16:43 +08:00
zhimin.zeng
37d6efdbef FIX: thumbnails not showing after simplifying model
Change-Id: Ie599b3067cf3f3dbf48a38f5f434678a7d56dbda
2022-09-29 11:16:43 +08:00
salt.wei
6a8d42359a ENH: don't load empty mesh when loading step
This is fix for crash issue for some specific step
file, which generate empty mesh.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I910e3d2da670b623570665265a12361492bd706b
2022-09-29 11:16:43 +08:00
salt.wei
1d1e12901b ENH: max e speed is 30mm/s
As title. Sync with printer limitation

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I5f9f594d5f6f33b0035f8200bf8b46b43e5955c5
2022-09-29 11:16:43 +08:00
zhimin.zeng
87718e6725 FIX: prompt when opening 3mf
Change-Id: I645bb675ea060ca3827a597b13a86cd56425735f
(cherry picked from commit 743d0bf1757a886784a41cc35c4f13381d27699d)
2022-09-29 11:16:43 +08:00
zhimin.zeng
46a0e67be7 FIX: sort extruders for minimal flush volume
Change-Id: Idf96e10ae5a8809a689c80e38611a14dbb108f0a
(cherry picked from commit cbfa3f17807313b7120e19e5f30836fb49d36b55)
2022-09-29 11:16:43 +08:00
zhimin.zeng
9f74ea5763 FIX: wipe tower does not extruder fill in smooth mode timelapse
Change-Id: Ia6957cfe41ed3624baa4c12b6df90462fc436475
(cherry picked from commit 39ecccc94bea2a43a74ac852f121c5dbc739dc67)
2022-09-29 11:16:43 +08:00
chunmao.guo
530c2287c8 FIX: restore config value of Bools type
Change-Id: I6ea8b44d71176fe75238e0207addceb8ddd1e73f
2022-09-29 11:16:43 +08:00
lane.wei
d2eb526ea3 Fix the slice button status incorrect issue after auto-arrange
when a plate is locked, the slice result is also affected by auto-arrange

Change-Id: I83b3400d07fd55c42422b358d4b9ed7a179bd3a7
2022-09-29 11:16:43 +08:00
liz.li
613b433bfa ENH:refine GUI of speed/flow text display
Change-Id: Ia077a56a14af059d94d9581518ac39a45fa56527
2022-09-29 11:16:43 +08:00
Arthur
3d55647895 ENH: increase auto-arranging spacing to 5mm
Change-Id: Iebf4d31f2f869f11ddb6d9e903dfd446082802d1
2022-09-29 11:16:43 +08:00
lane.wei
cb3c9503d0 Fix the Bed texture gone missing issue on AMD systems
patch picked from PrusaSlicer, thanks to Prusa3D

Windows specific: Use mipmaps generated through OpenGL for AMD graphics cards with drivers newer than 22.6.1.

Since AMD driver version 22.7.1,
there is probably some bug in the driver that causes the issue with the missing texture of the bed.
It seems that this issue only triggers when mipmaps are generated manually (combined with a texture compression)
and when mipmaps are generated through OpenGL glGenerateMipmap is working.

This workaround detects the AMD driver version and generates mipmaps through OpenGL for driver versions newer than 22.6.1.

Change-Id: I679dd61efec8f4baf97e5bf4868cb93db5184dcf
2022-09-29 11:16:43 +08:00
tao wang
bf927f5adc FIX:add the sd card removal function
Change-Id: I98592a5d3d4abcfd3a67b8c12fa4cf07e79b0e4b
2022-09-29 11:16:43 +08:00
tao wang
b9b3f7b4c1 FIX:only show the material used in the actual printing
Change-Id: I44edd5ffb54376da91077e2e3d990851af050949
2022-09-29 11:16:43 +08:00
liz.li
07d234825e NEW:show flush of every filament on gcodeviewer
1.show flush of every filament
2.modify first-layer text display
3.show time in seconds when time cost < 1h
4.forbid add-filament when print by-object

Change-Id: Ib8a94b9f620797e367bfc9e8a33abd5d7ab648ec
2022-09-29 11:16:43 +08:00
salt.wei
ec347aba3a ENH: po change to add some translation
As title

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I25acd3ff199ac04f5f86f21859dec441c90e6925
2022-09-29 11:16:43 +08:00
salt.wei
fac58ccefa ENH: reduce infill margin for small nozzle
Small nozzle has higher print accuracy. Reduce
infill margin to improve bridge overlap quality.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I5321c2fe1fe5c3d6422c5f11e8c9f0b82b9ba5bd
2022-09-29 11:16:43 +08:00
salt.wei
6d8887e858 ENH: handle github issue 254 and 286
1 add back Aligned Rectilinear infill pattern

2 allow wall loop to be 0

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Id2873b9107b7b269466a8db1768dfead9ebdad0d
2022-09-29 11:16:43 +08:00
salt.wei
db9ade2257 ENH: enable arachne for concentric pattern
Enable arachne for concentric pattern by
referring to PrusaSlicer

Also remove useless pattern we added.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Ie2574f7fc4751ebdf1caab4de52013f3101e104f
2022-09-29 11:16:43 +08:00
liz.li
df321f8cd9 NEW:show speed and flow in gcodeviewer
Change-Id: I107f8be06820bc7859aee5654f264397331726b6
2022-09-29 11:16:43 +08:00
tao.jin
31ba41ec3e NEW: move selected model to the center of selected plate
Change-Id: I7af49e98e83f5eef690f7d30d10a2cc240046466
2022-09-29 11:16:43 +08:00
chunmao.guo
62da568e0b FIX: check int value invalid in Choise Field
Change-Id: I75cbe55b36dd75480903b6991f234c02ad8de5cc
2022-09-29 11:16:43 +08:00
Stone Li
09e1c0a1af FIX: do not display use_ams checkbox when no ams
Change-Id: I5be4843b22e019111264922f1721787e2dd5111b
Signed-off-by: Stone Li <stone.li@bambulab.com>
2022-09-29 11:16:43 +08:00
salt.wei
3e0f26c296 ENH: remove old typo
Delete some useless and wrong code

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: If103e5ced2c930340e6291a63e2226ecf577f19e
2022-09-29 11:16:43 +08:00
Arthur
9edc90704a ENH: unify multi-object copy with single copy
Also adapt empty cell stride with object size plus 1mm.

Change-Id: I47ac98bede196d636ebb3da549c16e393756de0a
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
c18e11bb8e update gcode macros for klipper 2022-09-25 12:22:17 +08:00
SoftFever
fee7c05c5b update readme 2022-09-24 13:18:30 +08:00
SoftFever
8fda310433 update install folder name 2022-09-24 12:04:06 +08:00
lane.wei
b71917b28c add extra-cmake-modules required in buildlinux.sh
for linux building
patch picked from deftdawg, thanks deftdawg

Change-Id: I0049131fccffb3e018834f9613b10c57dcfd13e5
2022-09-17 09:08:04 +08:00
DeftDawg
f5a4862da5 Add Linux related build scripts
including following changes:
- Linux build scripts from SuperSlicer project;
- Update BuildLinux dev dependencies, remove unused bits;
- Update BuildLinuxImage to use nproc for cpus;
- CMake: render BuildLinuxImage and build_appimage templates;
- Fix "DSO missing" linking problems;
- Add Podman Containerfile for building;
- Update BuildLinux.sh to work better in container build;
- fixes to create AppImage inside container;
- add env to build environment;
- Update build instructions in Containerfile;

Change-Id: I73e30ab488cda8c1b0886cd34858e125596f282b
(cherry picked from commit 83fc26670ca592c91c7af1d4033a04b587cfd4cd)
2022-09-15 16:03:53 +08:00
salt.wei
014152f078 ENH: wrong == in brim code
Typo, Should be fixed.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: I576b15df9bc738ef2c4440356afc06c9132bd9eb
2022-09-15 16:03:53 +08:00
salt.wei
d4854c0df7 ENH: fix empty infill layers
This is fix for github issue #216 that
sometimes the infill layer is empty.

Signed-off-by: salt.wei <salt.wei@bambulab.com>
Change-Id: Ie3be08b75506e48f5ae9dd6aae2ae729ba666e01
2022-09-15 16:03:53 +08:00
lane.wei
1b07874ea3 add release notes files for current version
Change-Id: I4153ed48f1242832e02bc73feb8022185924ab78
2022-09-14 17:39:11 +08:00
lane.wei
d9d88b8022 change the main thread name to bambustu_main
the max length of linux's thread name could only be 16 bytes
bambustudio_main can not be set by pthread_setname_np

Change-Id: Idab83896c81787b32f6a4dde869b101da1d69e5c
2022-09-14 17:39:11 +08:00
zhimin.zeng
e05f28d0fb FIX: modify the translation
Change-Id: I8f894012660ec9877fb3af9f87be370d78859c76
2022-09-14 17:39:11 +08:00
zhimin.zeng
084ea583fb FIX: support to import color in standard 3mf
Change-Id: I631e3f62c4d996924efafdfe9352d1585ad4d130
(cherry picked from commit ec08a5194b45a98973eb53ab0022a0799238134c)
2022-09-14 17:39:11 +08:00
zhimin.zeng
56fddf988a ENH: add reload from disk and replace with stl
Change-Id: I23088c023141c2f8b76ee6d2de663fb4b311f1f5
(cherry picked from commit d4e4b5eb6ef01ea3a3d097809b229c438ee18169)
2022-09-14 17:39:11 +08:00
zhimin.zeng
2e9174500d FIX: add tips for timelapse
add tips when both print by object and smooth mode are selected

Change-Id: I13f4cc14f2ff7c33c23dcd1708fdb784aef5afa3
(cherry picked from commit a0bfe48df21d4eecf105d41387838f14b22fff3c)
2022-09-14 17:39:11 +08:00
qing.zhang
4ad4151a07 ENH: modify the warning msg of virification temperature
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I77157ed65aedc9c114c40c2e1e72d323cf4a46b8
2022-09-14 17:39:11 +08:00
qing.zhang
c778207bc2 ENH: modify the start_code & virification temperature of PETG & TPU
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: Ic2a6490d73b59b91a954d55827b84a0f0714d575
2022-09-14 17:39:11 +08:00
882 changed files with 69721 additions and 11979 deletions

31
.github/ISSUE_TEMPLATE/bug_report.md vendored Normal file
View File

@@ -0,0 +1,31 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: bug
assignees: ''
---
**Describe the bug**
A clear and concise description of what the bug is.
**3mf File for This Bug**
If it is related to slicing, please append the 3mf file. It could be extremely helpful to solve the issue.
**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error
**Expected behavior**
A clear and concise description of what you expected to happen.
**Screenshots**
If applicable, add screenshots to help explain your problem.
**Desktop (please complete the following information):**
- OS: [e.g. iOS, Windows]
- Version [e.g. 22]

10
.github/ISSUE_TEMPLATE/custom.md vendored Normal file
View File

@@ -0,0 +1,10 @@
---
name: Custom issue template
about: For generic ideas such as enhancement of a feature, some questions, and etc.
title: ''
labels: ''
assignees: ''
---

View File

@@ -0,0 +1,20 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: feature
assignees: ''
---
**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
**Describe the solution you'd like**
A clear and concise description of what you want to happen.
**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.
**Additional context**
Add any other context or screenshots about the feature request here.

252
BuildLinux.sh Executable file
View File

@@ -0,0 +1,252 @@
#!/bin/bash
set -e # exit on first error
export ROOT=`pwd`
export NCORES=`nproc --all`
export CMAKE_BUILD_PARALLEL_LEVEL=${NCORES}
FOUND_GTK2=$(dpkg -l libgtk* | grep gtk2)
FOUND_GTK3=$(dpkg -l libgtk* | grep gtk-3)
function check_available_memory_and_disk() {
FREE_MEM_GB=$(free -g -t | grep 'Mem:' | rev | cut -d" " -f1 | rev)
MIN_MEM_GB=10
FREE_DISK_KB=$(df -k . | tail -1 | awk '{print $4}')
MIN_DISK_KB=$((10 * 1024 * 1024))
if [ ${FREE_MEM_GB} -le ${MIN_MEM_GB} ]; then
echo -e "\nERROR: Bambu Studio Builder requires at least ${MIN_MEM_GB}G of 'available' mem (systen has only ${FREE_MEM_GB}G available)"
echo && free -h && echo
exit 2
fi
if [[ ${FREE_DISK_KB} -le ${MIN_DISK_KB} ]]; then
echo -e "\nERROR: Bambu Studio Builder requires at least $(echo $MIN_DISK_KB |awk '{ printf "%.1fG\n", $1/1024/1024; }') (systen has only $(echo ${FREE_DISK_KB} | awk '{ printf "%.1fG\n", $1/1024/1024; }') disk free)"
echo && df -h . && echo
exit 1
fi
}
unset name
while getopts ":dsiuhgb" opt; do
case ${opt} in
u )
UPDATE_LIB="1"
;;
i )
BUILD_IMAGE="1"
;;
d )
BUILD_DEPS="1"
;;
s )
BUILD_BAMBU_STUDIO="1"
;;
b )
BUILD_DEBUG="1"
;;
g )
FOUND_GTK3=""
;;
h ) echo "Usage: ./BuildLinux.sh [-i][-u][-d][-s][-b][-g]"
echo " -i: Generate appimage (optional)"
echo " -g: force gtk2 build"
echo " -b: build in debug mode"
echo " -d: build deps (optional)"
echo " -s: build bambu-studio (optional)"
echo " -u: only update clock & dependency packets (optional and need sudo)"
echo "For a first use, you want to 'sudo ./BuildLinux.sh -u'"
echo " and then './BuildLinux.sh -dsi'"
exit 0
;;
esac
done
if [ $OPTIND -eq 1 ]
then
echo "Usage: ./BuildLinux.sh [-i][-u][-d][-s][-b][-g]"
echo " -i: Generate appimage (optional)"
echo " -g: force gtk2 build"
echo " -b: build in debug mode"
echo " -d: build deps (optional)"
echo " -s: build bambu-studio (optional)"
echo " -u: only update clock & dependency packets (optional and need sudo)"
echo "For a first use, you want to 'sudo ./BuildLinux.sh -u'"
echo " and then './BuildLinux.sh -dsi'"
exit 0
fi
# mkdir build
if [ ! -d "build" ]
then
mkdir build
fi
# Addtional Dev packages for BambuStudio
export REQUIRED_DEV_PACKAGES="libmspack-dev libgstreamerd-3-dev libsecret-1-dev libwebkit2gtk-4.0-dev libosmesa6-dev libssl-dev libcurl4-openssl-dev eglexternalplatform-dev libudev-dev libdbus-1-dev extra-cmake-modules"
# libwebkit2gtk-4.1-dev ??
export DEV_PACKAGES_COUNT=$(echo ${REQUIRED_DEV_PACKAGES} | wc -w)
if [ $(dpkg --get-selections | grep -E "$(echo ${REQUIRED_DEV_PACKAGES} | tr ' ' '|')" | wc -l) -lt ${DEV_PACKAGES_COUNT} ]; then
sudo apt install -y ${REQUIRED_DEV_PACKAGES} git cmake wget file
fi
#FIXME: require root for -u option
if [[ -n "$UPDATE_LIB" ]]
then
echo -n -e "Updating linux ...\n"
# hwclock -s # DeftDawg: Why does SuperSlicer want to do this?
apt update
if [[ -z "$FOUND_GTK3" ]]
then
echo -e "\nInstalling: libgtk2.0-dev libglew-dev libudev-dev libdbus-1-dev cmake git\n"
apt install -y libgtk2.0-dev libglew-dev libudev-dev libdbus-1-dev cmake git
else
echo -e "\nFind libgtk-3, installing: libgtk-3-dev libglew-dev libudev-dev libdbus-1-dev cmake git\n"
apt install -y libgtk-3-dev libglew-dev libudev-dev libdbus-1-dev cmake git
fi
# for ubuntu 22.04:
ubu_version="$(cat /etc/issue)"
if [[ $ubu_version == "Ubuntu 22.04"* ]]
then
apt install -y curl libssl-dev libcurl4-openssl-dev m4
fi
if [[ -n "$BUILD_DEBUG" ]]
then
echo -e "\nInstalling: libssl-dev libcurl4-openssl-dev\n"
apt install -y libssl-dev libcurl4-openssl-dev
fi
echo -e "done\n"
exit 0
fi
FOUND_GTK2_DEV=$(dpkg -l libgtk* | grep gtk2.0-dev || echo '')
FOUND_GTK3_DEV=$(dpkg -l libgtk* | grep gtk-3-dev || echo '')
echo "FOUND_GTK2=$FOUND_GTK2)"
if [[ -z "$FOUND_GTK2_DEV" ]]
then
if [[ -z "$FOUND_GTK3_DEV" ]]
then
echo "Error, you must install the dependencies before."
echo "Use option -u with sudo"
exit 0
fi
fi
echo "[1/9] Updating submodules..."
{
# update submodule profiles
pushd resources/profiles
git submodule update --init
popd
}
echo "[2/9] Changing date in version..."
{
# change date in version
sed -i "s/+UNKNOWN/_$(date '+%F')/" version.inc
}
echo "done"
# mkdir in deps
if [ ! -d "deps/build" ]
then
mkdir deps/build
fi
check_available_memory_and_disk
if [[ -n "$BUILD_DEPS" ]]
then
echo "[3/9] Configuring dependencies..."
BUILD_ARGS=""
if [[ -n "$FOUND_GTK3_DEV" ]]
then
BUILD_ARGS="-DDEP_WX_GTK3=ON"
fi
if [[ -n "$BUILD_DEBUG" ]]
then
# have to build deps with debug & release or the cmake won't find evrything it needs
mkdir deps/build/release
pushd deps/build/release
cmake ../.. -DDESTDIR="../destdir" $BUILD_ARGS
make -j$NCORES
popd
BUILD_ARGS="${BUILD_ARGS} -DCMAKE_BUILD_TYPE=Debug"
fi
# cmake deps
pushd deps/build
cmake .. $BUILD_ARGS
echo "done"
# make deps
echo "[4/9] Building dependencies..."
make -j$NCORES
echo "done"
# rename wxscintilla # TODO: DeftDawg: Does BambuStudio need this?
# echo "[5/9] Renaming wxscintilla library..."
# pushd destdir/usr/local/lib
# if [[ -z "$FOUND_GTK3_DEV" ]]
# then
# cp libwxscintilla-3.1.a libwx_gtk2u_scintilla-3.1.a
# else
# cp libwxscintilla-3.1.a libwx_gtk3u_scintilla-3.1.a
# fi
# popd
# echo "done"
# FIXME: only clean deps if compiling succeeds; otherwise reruns waste tonnes of time!
# clean deps
# echo "[6/9] Cleaning dependencies..."
# rm -rf dep_*
popd
echo "done"
fi
if [[ -n "$BUILD_BAMBU_STUDIO" ]]
then
echo "[7/9] Configuring Slic3r..."
BUILD_ARGS=""
if [[ -n "$FOUND_GTK3_DEV" ]]
then
BUILD_ARGS="-DSLIC3R_GTK=3"
fi
if [[ -n "$BUILD_DEBUG" ]]
then
BUILD_ARGS="${BUILD_ARGS} -DCMAKE_BUILD_TYPE=Debug"
else
BUILD_ARGS="${BUILD_ARGS} -DBBL_RELEASE_TO_PUBLIC=1"
fi
# cmake
pushd build
cmake .. -DCMAKE_PREFIX_PATH="$PWD/../deps/build/destdir/usr/local" -DSLIC3R_STATIC=1 ${BUILD_ARGS}
echo "done"
# make Slic3r
echo "[8/9] Building Slic3r..."
make -j$NCORES BambuStudio # Slic3r
# make .mo
# make gettext_po_to_mo # FIXME: DeftDawg: complains about msgfmt not existing even in SuperSlicer, did this ever work?
popd
echo "done"
fi
if [[ -e $ROOT/build/src/BuildLinuxImage.sh ]]; then
# Give proper permissions to script
chmod 755 $ROOT/build/src/BuildLinuxImage.sh
echo "[9/9] Generating Linux app..."
pushd build
if [[ -n "$BUILD_IMAGE" ]]
then
$ROOT/build/src/BuildLinuxImage.sh -i
else
$ROOT/build/src/BuildLinuxImage.sh
fi
popd
echo "done"
fi

View File

@@ -507,6 +507,7 @@ add_custom_target(gettext_make_pot
COMMAND xgettext --keyword=L --keyword=_L --keyword=_u8L --keyword=L_CONTEXT:1,2c --keyword=_L_PLURAL:1,2 --add-comments=TRN --from-code=UTF-8 --no-location --debug --boost
-f "${BBL_L18N_DIR}/list.txt"
-o "${BBL_L18N_DIR}/BambuStudio.pot"
COMMAND hintsToPot ${SLIC3R_RESOURCES_DIR} ${BBL_L18N_DIR}
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
COMMENT "Generate pot file from strings in the source tree"
)
@@ -660,6 +661,8 @@ endfunction()
add_subdirectory(src)
set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT BambuStudio_app_gui)
add_dependencies(gettext_make_pot hintsToPot)
# Perl bindings, currently only used for the unit / integration tests of libslic3r.
# Also runs the unit / integration tests.
#FIXME Port the tests into C++ to finally get rid of the Perl!
@@ -675,6 +678,11 @@ if(SLIC3R_BUILD_TESTS)
add_subdirectory(tests)
endif()
if (NOT WIN32 AND NOT APPLE)
set(SLIC3R_APP_CMD "bambu-studio")
configure_file(${LIBDIR}/platform/unix/build_appimage.sh.in ${CMAKE_CURRENT_BINARY_DIR}/build_appimage.sh @ONLY)
endif()
option(BUILD_BBS_TEST_TOOLS "Build bbs test tools" OFF)
if(BUILD_BBS_TEST_TOOLS)
add_subdirectory(bbs_test_tools)

71
Containerfile Normal file
View File

@@ -0,0 +1,71 @@
# Build Bambu Slicer in a container
#
# Build an AppImage using rootless Podman (refer to https://github.com/containers/podman/blob/main/docs/tutorials/rootless_tutorial.md):
# rm -rf build; podman build . -t bambu-studio-builder && podman run --rm localhost/bambu-studio-builder /bin/bash -c 'tar -c $(find build | grep ubu64.AppImage | head -1)' | tar -xv
#
# Troubleshooting the build container:
# podman run -it --name bambu-studio-builder localhost/bambu-studio-builder /bin/bash
#
# Debugging the resulting AppImage:
# 1) Install `gdb`
# 2) In a terminal in the same directory as the AppImage, start it with following:
# echo -e "run\nbt\nquit" | gdb ./BambuStudio_ubu64.AppImage
# 3) Find related issue using backtrace output for clues and add backtrace to it on github
#
# Docker alternative AppImage build syntax (use this if you can't install podman):
# rm -rf build; docker build . --file Containerfile -t bambu-studio-builder; docker run --rm bambu-studio-builder /bin/bash -c 'tar -c $(find build | grep ubu64.AppImage | head -1)' | tar -xv
#
#
# TODO: bind mount BambuStudio to inside the container instead of COPY to enable faster rebuilds during dev work.
FROM docker.io/ubuntu:20.04
LABEL maintainer "DeftDawg <DeftDawg@gmail.com>"
# Disable interactive package configuration
RUN apt-get update && \
echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
# Add a deb-src
RUN echo deb-src http://archive.ubuntu.com/ubuntu \
$(cat /etc/*release | grep VERSION_CODENAME | cut -d= -f2) main universe>> /etc/apt/sources.list
RUN apt-get update && apt-get install -y \
git \
build-essential \
autoconf pkgconf m4 \
cmake extra-cmake-modules \
libglu1-mesa-dev libglu1-mesa-dev \
libwayland-dev libxkbcommon-dev wayland-protocols \
eglexternalplatform-dev libglew-dev \
libgtk-3-dev \
libdbus-1-dev \
libcairo2-dev \
libgtk-3-dev libwebkit2gtk-4.0-dev \
libsoup2.4-dev \
libgstreamer1.0-dev libgstreamer-plugins-good1.0-dev libgstreamer-plugins-base1.0-dev libgstreamerd-3-dev \
libmspack-dev \
libosmesa6-dev \
libssl-dev libcurl4-openssl-dev libsecret-1-dev \
libudev-dev \
curl \
wget \
file \
sudo
COPY ./ BambuStudio
WORKDIR BambuStudio
# These can run together, but we run them seperate for podman caching
# Update System dependencies
RUN ./BuildLinux.sh -u
# Build dependencies in ./deps
RUN ./BuildLinux.sh -d
# Build slic3r
RUN ./BuildLinux.sh -s
# Build AppImage
ENV container podman
RUN ./BuildLinux.sh -i

150
README.md
View File

@@ -1,61 +1,146 @@
# Bambu Studio - SoftFever
A modified version of Bambu Studio.
It has following changes:
A modified version of Bambu Studio with many handy features.
It's fully compatible with Bambulab X1/X1-C printers.
It also supports Voron and Prusa MK3S printers.
You can download it here: https://github.com/SoftFever/BambuStudio-SoftFever/releases
- ## Support third-party printers:
- Voron 2.4
- Voron Trident
- Voron 0.1
- Prusa MK3S
- ## Export to to .gcode file.
![image](./SoftFever_doc/export_gcode.png)
## BambuStudio SoftFever change notes:
- ## Send gcode file to printer
1. Setup connection
<img src="./SoftFever_doc/print_host.png" width="1024">
2. Send to print
<img src="./SoftFever_doc/send_to_print.png" width="1024">
- ## Support single wall mode on first layer
![image](./SoftFever_doc/single_wall_first_layer.png)
- ## Support Chamber temperature. This setting can be use in machine start G-Gcode
![image](./SoftFever_doc/chamber_temperature.png)
<img src="./SoftFever_doc/chamber_temperature_custom_gcode.png" width="686">
- ## Thumbview is supported
### [V1.3.4 changes](https://github.com/SoftFever/BambuStudio-SoftFever/releases/tag/v1.3.4):
1. Add a new printer order - sandwich mode:
This new order is similar to the outer-wall-first mode in achieving the best dimensional accuracy. This new approach however avoids printing outer walls right after a long travel, which may cause artifacts on the surface in many cases.
sandwich-mode1
sandwich-mode2
2. Support RRF firmware(experimental)
3. Fix a compatibility issue for gcode-preview
4. Merge upstream changes
### [V1.3.3 changes](https://github.com/SoftFever/BambuStudio-SoftFever/releases/tag/v1.3.3):
1. Improve top surface quality.
Fix a bug that internal solid infills didn't use monotonic when top surface is using monotonic lines
2. New feature: filter out tiny gaps.
Note: for aesthetic considerations, this setting won't affect top/bottom layers. In other words, gap fills that can be seen from outside won't be filtered out
3. PA(pressure advance) now support multi-color printing. A new PA value from the selected filament profile will be applied whenever there is
a filament/extruder change action. This change only affects multi-color printing.
5. Users can now set float values of layer time in Filament->Cooling tab.
6. Allow to set target bed temp to 0
7. Fix a bug that layer number is not displayed correctly in klipper UIs
8. Force using linear PA model when manual PA override is enabled for Bambu machines
9. Remember the last used filament
10. Skip checking BL network plugin for third-party printers.
### [V1.3.2 changes](https://github.com/SoftFever/BambuStudio-SoftFever/releases/tag/v1.3.2-sf):
1. Support device control view for 3rd party printers
2. Port `Small perimeters` feature from PrusaSlicer. I also add an extra option to adjust the small perimeter threshold
You might want to reduce speed for small perimeter parts to prevent failures like bellow:
3. Add fan speed preview mode
4. Fix an issue that print time estimation is inaccurate when `Klipper` g-code style is used.
### [V1.3.1 changes](https://github.com/SoftFever/BambuStudio-SoftFever/releases/tag/v1.3.1-sf):
1. Support change bed size and nozzle diameter
2. Allow users to specify the bridge infill direction
3. bridge_infill_direction1
4. bridge_infill_direction2
5. Change to ISO view angle for preview image
6. Add an option to change Z Hop action: NormalLift/SpiralLift
7. Optimise g-code generation for both Bambu printers and 3rd party printers
8. Support Klipper Exclude Objects
9. Better support for Moonraker's metadata.
### [V1.2.5.3 changes](https://github.com/SoftFever/BambuStudio-SoftFever/releases/tag/v1.2.5.3-sf):
1. Label objects to support Klipper Exclude Objects feature
2. Allow users to change output file name format
3. Fix a bug that pressure advance value was not saved in the profile
4. Optimize non-Bambu printer profiles
5. Remove M900 S0 which is not necessary.
### [V1.2.5 changes](https://github.com/SoftFever/BambuStudio-SoftFever/releases/tag/v1.2.5-sf):
1. Add options to adjust jerk for different line types
2. Add an option to adjust acceleration for travel. Higher acceleration for travel and lower acceleration for the outer wall makes it possible to print faster and nicer.
3. Add an option to manually override the Pressure Advance / Linear Advance for each filament.
### [V1.2.4 changes](https://github.com/SoftFever/BambuStudio-SoftFever/releases/tag/v1.2.4-sf):
1. Allow users to adjust accelerations for inner/outer walls separately.
2. Allow users to adjust the bottom surface flow-rate
3. Fix an issue that bed temperature for other layers is not set properly. This bug exists in the upstream as well. My PR here(bambulab#319)
### [V1.2 changes](https://github.com/SoftFever/BambuStudio-SoftFever/releases/tag/v1.2-sf):
1. Allow user to change machine limits
2. Allow users to adjust the top surface flow-rate.
3. Unlock some cool hidden features in BambuStudio.
4. Fix an issue that the software connected to Bambulab's staging server by default. (Only Bambulab machines were affected)
### [V1.1 changes](https://github.com/SoftFever/BambuStudio-SoftFever/releases/tag/v1.1):
1. Support third-party printers:
- Voron 2.4
- Voron Trident
- Voron 0.1
- Prusa MK3S
2. Export to to .gcode file.
3. Send gcode file to printer
4. Support single wall mode on first layer
5. Support Chamber temperature. This setting can be use in machine start G-Gcode
6. Support thumbview for third-party printers
Demo video: https://youtu.be/vSNE9iGj2II
# NOTE:
## - If you have troubles to run the build, you might need to install following runtimes:
## NOTE:
## 1. For Apple M1 users, please take a look at this [article](https://www.howtogeek.com/803598/app-is-damaged-and-cant-be-opened/ ) about how to run unsigned applications on your machine. Or better, you can build it from the source codes if you want:)
Apple requires a subscription(costs 99$ yearly) for developers to sign their app. I don't do a lot of dev work on Mac, and this is a nonprofit open-source project, so I decided not to pay the money ;)
## 2. If you have troubles to run the build, you might need to install following runtimes:
- [MicrosoftEdgeWebView2RuntimeInstallerX64](https://github.com/SoftFever/BambuStudio-SoftFever/releases/download/v1.0.10-sf2/MicrosoftEdgeWebView2RuntimeInstallerX64.exe)
- [vcredist2019_x64](https://github.com/SoftFever/BambuStudio-SoftFever/releases/download/v1.0.10-sf2/vcredist2019_x64.exe)
## - BambuStudio use G2/G3 commands by default. You need to turn on ARC support in your printer's firmware use with this slicer.
## 3. BambuStudio use G2/G3 commands by default. You need to turn on ARC support in your printer's firmware use with this slicer.
- For Voron and any Klipper based printers:
You can enable gcode_arcs(G2/G3) support by adding following section into you printer.cfg file:
```
[gcode_arcs]
resolution: 0.1
[gcode_macro m201]
gcode:
{% if 'X' in params or 'Y' in params %}
{% set accel = (params.X|default(params.Y)|float,
params.Y|default(params.X)|float)|min %}
SET_VELOCITY_LIMIT ACCEL={accel} ACCEL_TO_DECEL={accel * 0.5}
{% else %}
SET_VELOCITY_LIMIT
{% endif %}
[gcode_macro m203]
gcode:
{% if 'X' in params or 'Y' in params %}
{% set speed = (params.X|default(params.Y)|float,
params.Y|default(params.X)|float)|min %}
SET_VELOCITY_LIMIT VELOCITY={speed}
{% else %}
SET_VELOCITY_LIMIT
{% endif %}
[gcode_macro M205]
gcode:
{% set x_jerk = params.X|default(5)|float %}
{% set y_jerk = params.Y|default(5)|float %}
SET_VELOCITY_LIMIT SQUARE_CORNER_VELOCITY={x_jerk}
{% if 'X' in params or 'Y' in params %}
{% set corner_speed = (params.X|default(params.Y)|float,
params.Y|default(params.X)|float)|min %}
SET_VELOCITY_LIMIT SQUARE_CORNER_VELOCITY={corner_speed}
{% else %}
SET_VELOCITY_LIMIT
{% endif %}
[gcode_macro M900]
gcode:
SET_PRESSURE_ADVANCE ADVANCE={params.K}
```
It's also recommended to add followinging dummy macros to make Klipper happy
~~ It's also recommended to add followinging dummy macros to make Klipper happy ~~
Update: latest Klipper has supported G17 command. Don't add following macro if you are running on latest Klipper.
```
# Make BambuStudio happy
[gcode_macro G17]
gcode:
[gcode_macro M981]
gcode:
[gcode_macro M1003]
gcode:
```
- For Prusa MK3S:
@@ -63,6 +148,7 @@ ARC movement are supported by default.
# Gallery
![image](./SoftFever_doc/accelerations.png)
![image](./SoftFever_doc/printers1.png)
![image](./SoftFever_doc/printers2.png)
![image](./SoftFever_doc/printers3.png)

Binary file not shown.

After

Width:  |  Height:  |  Size: 98 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 136 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 211 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 228 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 214 KiB

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -25,6 +25,8 @@ src/slic3r/GUI/GUI_ObjectTable.hpp
src/slic3r/GUI/GUI_ObjectTableSettings.cpp
src/slic3r/GUI/GUI_ObjectTableSettings.hpp
src/slic3r/GUI/GUI_Preview.cpp
src/slic3r/GUI/HintNotification.cpp
src/slic3r/GUI/IMSlider.cpp
src/slic3r/GUI/Widgets/SideTools.cpp
src/slic3r/GUI/Widgets/AMSControl.cpp
src/slic3r/GUI/ImGuiWrapper.cpp
@@ -36,6 +38,7 @@ src/slic3r/GUI/Jobs/PlaterJob.cpp
src/slic3r/GUI/Jobs/RotoptimizeJob.cpp
src/slic3r/GUI/Jobs/BindJob.cpp
src/slic3r/GUI/Jobs/PrintJob.cpp
src/slic3r/GUI/Jobs/SendJob.cpp
src/slic3r/GUI/Jobs/UpgradeNetworkJob.cpp
src/slic3r/GUI/AboutDialog.cpp
src/slic3r/GUI/AMSMaterialsSetting.cpp
@@ -85,6 +88,8 @@ src/slic3r/GUI/Search.cpp
src/slic3r/GUI/Selection.cpp
src/slic3r/GUI/SelectMachine.cpp
src/slic3r/GUI/SendSystemInfoDialog.cpp
src/slic3r/GUI/SendToPrinter.cpp
src/slic3r/GUI/SetBedTypeDialog.cpp
src/slic3r/GUI/BindDialog.cpp
src/slic3r/GUI/Tab.cpp
src/slic3r/GUI/Tab.hpp
@@ -99,6 +104,7 @@ src/slic3r/GUI/KBShortcutsDialog.hpp
src/slic3r/GUI/KBShortcutsDialog.cpp
src/slic3r/GUI/ReleaseNote.cpp
src/slic3r/GUI/ReleaseNote.hpp
src/slic3r/GUI/UpgradePanel.cpp
src/slic3r/Utils/FixModelByWin10.cpp
src/slic3r/Utils/PresetUpdater.cpp
src/slic3r/Utils/Http.cpp

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -2,12 +2,12 @@
#include <fstream>
#include <math.h>
#include <map>
#include <string.h>
namespace BambuStudio {
//BBS: only check wodth when dE is longer than this value
const double CHECK_WIDTH_E_THRESHOLD = 0.0025;
const double WIDTH_THRESHOLD = 0.012;
const double WIDTH_THRESHOLD = 0.02;
const double RADIUS_THRESHOLD = 0.005;
const double filament_diameter = 1.75;
@@ -19,6 +19,11 @@ const std::string Wipe_Start_Tag = " WIPE_START";
const std::string Wipe_End_Tag = " WIPE_END";
const std::string Layer_Change_Tag = " CHANGE_LAYER";
const std::string Height_Tag = " LAYER_HEIGHT: ";
const std::string filament_flow_ratio_tag = " filament_flow_ratio";
const std::string nozzle_temperature_Tag = " nozzle_temperature =";
const std::string nozzle_temperature_initial_layer_Tag = " nozzle_temperature_initial_layer";
const std::string Z_HEIGHT_TAG = " Z_HEIGHT: ";
const std::string Initial_Layer_Ptint_Height_Tag = " initial_layer_print_height =";
GCodeCheckResult GCodeChecker::parse_file(const std::string& path)
{
@@ -105,6 +110,19 @@ GCodeCheckResult GCodeChecker::parse_comment(GCodeLine& line)
// extrusion role tag
if (starts_with(comment, Extrusion_Role_Tag)) {
m_role = string_to_role(comment.substr(Extrusion_Role_Tag.length()));
if (m_role == erExternalPerimeter) {
if (z_height == initial_layer_height && nozzle_temp != nozzle_temperature_initial_layer[filament_id]) {
std::cout << "invalid filament nozzle initial layer temperature comment with invalid value!" << std::endl;
return GCodeCheckResult::ParseFailed;
}
if (z_height != initial_layer_height && nozzle_temp != nozzle_temperature[filament_id]) {
std::cout << "invalid filament nozzle temperature comment with invalid value!" << std::endl;
return GCodeCheckResult::ParseFailed;
}
}
} else if (starts_with(comment, Wipe_Start_Tag)) {
m_wiping = true;
} else if (starts_with(comment, Wipe_End_Tag)) {
@@ -123,7 +141,41 @@ GCodeCheckResult GCodeChecker::parse_comment(GCodeLine& line)
}
} else if (starts_with(comment, Layer_Change_Tag)) {
m_layer_num++;
} else if (starts_with(comment, filament_flow_ratio_tag))
{
std::string str = comment.substr(filament_flow_ratio_tag.size()+3);
if (!parse_double_from_str(str, filament_flow_ratio))
{
std::cout << "invalid filament flow ratio comment with invalid value!" << std::endl;
return GCodeCheckResult::ParseFailed;
}
}
else if (starts_with(comment, nozzle_temperature_Tag)) {
std::string str = comment.substr(nozzle_temperature_Tag.size() + 1);
if (!parse_double_from_str(str, nozzle_temperature)) {
std::cout << "invalid nozzle temperature comment with invalid value!" << std::endl;
return GCodeCheckResult::ParseFailed;
}
}
else if (starts_with(comment, nozzle_temperature_initial_layer_Tag)) {
std::string str = comment.substr(nozzle_temperature_initial_layer_Tag.size() + 3);
if (!parse_double_from_str(str, nozzle_temperature_initial_layer)) {
std::cout << "invalid nozzle temperature initial layer comment with invalid value!" << std::endl;
return GCodeCheckResult::ParseFailed;
}
} else if (starts_with(comment, Z_HEIGHT_TAG)) {
std::string str = comment.substr(Z_HEIGHT_TAG.size());
if (!parse_double_from_str(str, z_height)) {
std::cout << "invalid z height comment with invalid value!" << std::endl;
return GCodeCheckResult::ParseFailed;
}
} else if (starts_with(comment, Initial_Layer_Ptint_Height_Tag)) {
std::string str = comment.substr(Initial_Layer_Ptint_Height_Tag.size());
if (!parse_double_from_str(str, initial_layer_height)) {
std::cout << "invalid initial layer height comment with invalid value!" << std::endl;
return GCodeCheckResult::ParseFailed;
}
}
return GCodeCheckResult::Success;
}
@@ -153,11 +205,32 @@ GCodeCheckResult GCodeChecker::parse_command(GCodeLine& gcode_line)
{
case 82: { ret = parse_M82(gcode_line); break; } // Set to Absolute extrusion
case 83: { ret = parse_M83(gcode_line); break; } // Set to Relative extrusion
case 104: {
ret = parse_M104_M109(gcode_line);
break;
} // Set to nozzle temperature
case 109: {
ret = parse_M104_M109(gcode_line);
break;
} // Set to nozzle temperature
default: { break; }
}
break;
}
case 'T':{
int pt = ::atoi(&cmd[1]);
if (pt == 1000 || pt == 1100 || pt == 255) {
break;
}
if (pt < 0 || pt > 254 || pt >= filament_flow_ratio.size()) {
std::cout << "Invalid T command"<<std::endl;
ret = GCodeCheckResult::ParseFailed;
break;
}
filament_id = pt;
flow_ratio = filament_flow_ratio[pt];
break;
}
default: {
@@ -189,6 +262,7 @@ GCodeCheckResult GCodeChecker::parse_axis(GCodeLine& gcode_line)
case 'F': axis = F; break;
case 'I': axis = I; break;
case 'J': axis = J; break;
case 'P': axis = P; break;
default:
//BBS: invalid command which has invalid axis
std::cout << "Invalid gcode because of invalid axis!" << std::endl;
@@ -266,8 +340,7 @@ GCodeCheckResult GCodeChecker::parse_G2_G3(GCodeLine& gcode_line)
return GCodeCheckResult::ParseFailed;
}
//BBS: invalid G2_G3 command which has no X and Y axis at same time
if (!gcode_line.has(X) &&
!gcode_line.has(Y)) {
if (!gcode_line.has(X) && !gcode_line.has(Y) && !gcode_line.has(I) && !gcode_line.has(J)) {
if (!gcode_line.has(X) || !gcode_line.has(P) || (int)gcode_line.get(P) != 1) {
std::cout << "Invalid G2_G3 gcode because of no X and Y axis at same time!" << std::endl;
return GCodeCheckResult::ParseFailed;
@@ -358,11 +431,30 @@ GCodeCheckResult GCodeChecker::parse_M83(const GCodeLine& gcode_line)
return GCodeCheckResult::Success;
}
GCodeCheckResult GCodeChecker::parse_M104_M109(const GCodeLine &gcode_line)
{
const char *c = gcode_line.m_raw.c_str();
const char *rs = strchr(c,'S');
std::string str=rs;
str = str.substr(1);
for (int i = 0; i < str.size(); i++) {
if (str[i] == ' ')
str=str.substr(0,i);
}
if (!parse_double_from_str(str, nozzle_temp)) {
std::cout << "invalid nozzle temperature comment with invalid value!" << std::endl;
return GCodeCheckResult::ParseFailed;
}
return GCodeCheckResult::Success;
}
double GCodeChecker::calculate_G1_width(const std::array<double, 3>& source,
const std::array<double, 3>& target,
double e, double height, bool is_bridge) const
{
double volume = e * Pi * (filament_diameter/2.0f) * (filament_diameter/2.0f);
double volume = (e / flow_ratio) * Pi * (filament_diameter / 2.0f) * (filament_diameter / 2.0f);
std::array<double, 3> delta = { target[0] - source[0],
target[1] - source[1],
target[2] - source[2] };
@@ -389,8 +481,9 @@ double GCodeChecker::calculate_G2_G3_width(const std::array<double, 2>& source,
(radian < 0 ? -radian : 2 * Pi - radian);
double radius = sqrt(v1[0] * v1[0] + v1[1] * v1[1]);
double length = radius * radian;
double volume = e * Pi * (filament_diameter/2) * (filament_diameter/2);
double volume = (e / flow_ratio) * Pi * (filament_diameter / 2) * (filament_diameter / 2);
double mm3_per_mm = volume / length;
return is_bridge? 2 * sqrt(mm3_per_mm/Pi) :
(mm3_per_mm / height) + height * (1 - 0.25 * Pi);
}
@@ -481,12 +574,15 @@ GCodeCheckResult GCodeChecker::check_G0_G1_width(const GCodeLine& line)
std::array<double, 3> target = { m_end_position[X], m_end_position[Y], m_end_position[Z] };
bool is_bridge = m_role == erOverhangPerimeter || m_role == erBridgeInfill;
double width_real = calculate_G1_width(source, target, delta_pos[E], m_height, is_bridge);
if (fabs(width_real - m_width) > WIDTH_THRESHOLD) {
std::cout << "Invalid G0_G1 because has abnormal line width." << std::endl;
std::cout << "Width: " << m_width << " Width_real: " << width_real << std::endl;
return GCodeCheckResult::CheckFailed;
if (!is_bridge) {
double width_real = calculate_G1_width(source, target, delta_pos[E], m_height, is_bridge);
if (fabs(width_real - m_width) > WIDTH_THRESHOLD) {
std::cout << "Invalid G0_G1 because has abnormal line width." << std::endl;
std::cout << "Width: " << m_width << " Width_real: " << width_real << std::endl;
return GCodeCheckResult::CheckFailed;
}
}
}
return GCodeCheckResult::Success;
@@ -556,12 +652,16 @@ GCodeCheckResult GCodeChecker::check_G2_G3_width(const GCodeLine& line)
m_role != erGapFill &&
delta_e > CHECK_WIDTH_E_THRESHOLD) {
bool is_bridge = m_role == erOverhangPerimeter || m_role == erBridgeInfill;
double width_real = calculate_G2_G3_width(source, target, center, is_ccw, delta_e, m_height, is_bridge);
if (fabs(width_real - m_width) > WIDTH_THRESHOLD) {
std::cout << "Invalid G2_G3 because has abnormal line width." << std::endl;
std::cout << "Width: " << m_width << " Width_real: " << width_real << std::endl;
return GCodeCheckResult::CheckFailed;
if (!is_bridge) {
double width_real = calculate_G2_G3_width(source, target, center, is_ccw, delta_e, m_height, is_bridge);
if (fabs(width_real - m_width) > WIDTH_THRESHOLD) {
std::cout << "Invalid G2_G3 because has abnormal line width." << std::endl;
std::cout << "Width: " << m_width << " Width_real: " << width_real << std::endl;
return GCodeCheckResult::CheckFailed;
}
}
}
return GCodeCheckResult::Success;

View File

@@ -108,6 +108,7 @@ private:
GCodeCheckResult parse_G92(GCodeLine& gcode_line);
GCodeCheckResult parse_M82(const GCodeLine& gcode_line);
GCodeCheckResult parse_M83(const GCodeLine& gcode_line);
GCodeCheckResult parse_M104_M109(const GCodeLine &gcode_line);
GCodeCheckResult parse_comment(GCodeLine& gcode_line);
@@ -160,6 +161,38 @@ public:
}
}
static bool parse_double_from_str(const std::string &input, std::vector<double> &out)
{
std::string cmd=input;
size_t read = 0;
while (cmd.size() >= 5)
{
int pt = 0;
for (pt = 0; pt < cmd.size(); pt++) {
char temp = cmd[pt];
if (temp == ',')
{
try {
double num = std::stod(cmd.substr(0, pt), &read);
out.push_back(num);
cmd = cmd.substr(pt+1);
break;
} catch (...) {
return false;
}
}
}
}
double num = std::stod(cmd, &read);
out.push_back(num);
return true;
}
private:
EPositioningType m_global_positioning_type = EPositioningType::Absolute;
EPositioningType m_e_local_positioning_type = EPositioningType::Absolute;
@@ -174,6 +207,14 @@ private:
int m_layer_num = 0;
double m_height = 0.0;
double m_width = 0.0;
double z_height=0.0f;
double initial_layer_height=0.0f;
int filament_id;
double flow_ratio = 0;
double nozzle_temp = 0.0f;
std::vector<double> filament_flow_ratio;
std::vector<double> nozzle_temperature;
std::vector<double> nozzle_temperature_initial_layer;
};
}

View File

@@ -9,6 +9,6 @@ cmake --build . --config Release --target ALL_BUILD -- -m
cd %WP%
mkdir build
cd build
cmake .. -G "Visual Studio 16 2019" -DBBL_RELEASE_TO_PUBLIC=0 -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./BambuStudio-SoftFever" -DCMAKE_BUILD_TYPE=Release -DWIN10SDK_PATH="C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0"
cmake .. -G "Visual Studio 16 2019" -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./BambuStudio-SoftFever" -DCMAKE_BUILD_TYPE=Release -DWIN10SDK_PATH="C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0"
cmake --build . --config Release --target ALL_BUILD -- -m
cmake --build . --target install --config Release

View File

@@ -1,15 +0,0 @@
#!/bin/sh
WD=$(pwd)
cd deps
mkdir build
cd build
DEPS=$PWD/BambuStudio_dep
cmake ../ -DDESTDIR="$DEPS" -DOPENSSL_ARCH="darwin64-arm64-cc"
# make -j
cd $WD
mkdir build
cd build
cmake .. -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="$DEPS/usr/local" -DCMAKE_INSTALL_PREFIX="$PWD/BambuStudio_SoftFever" -DCMAKE_BUILD_TYPE=Release -DCMAKE_MACOSX_RPATH=ON -DCMAKE_INSTALL_RPATH="$DEPS/usr/local" -DCMAKE_MACOSX_BUNDLE=on
cmake --build . --target install --config Release -j

20
build_release_macos.sh Executable file
View File

@@ -0,0 +1,20 @@
#!/bin/sh
WD="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
cd $WD/deps
mkdir -p build
cd build
DEPS=$PWD/BambuStudio_dep
mkdir -p $DEPS
cmake ../ -DDESTDIR="$DEPS" -DOPENSSL_ARCH="darwin64-$(uname -m)-cc" -DCMAKE_BUILD_TYPE=Release
make -j10
cd $WD
mkdir -p build
cd build
cmake .. -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="$DEPS/usr/local" -DCMAKE_INSTALL_PREFIX="$PWD/BambuStudio-SoftFever" -DCMAKE_BUILD_TYPE=Release -DCMAKE_MACOSX_RPATH=ON -DCMAKE_INSTALL_RPATH="$DEPS/usr/local" -DCMAKE_MACOSX_BUNDLE=ON
cmake --build . --config Release --target all -j10
cmake --build . --target install --config Release -j10
cd BambuStudio-SoftFever
cp -r bin/BambuStudio.app/Contents/MacOS BambuStudio.app/Contents
cp -r bin/BambuStudio.app/Contents/Info.plist BambuStudio.app/Contents/

View File

@@ -9,6 +9,6 @@ cmake --build . --config Release --target ALL_BUILD -- -m
cd %WP%
mkdir build
cd build
cmake .. -G "Visual Studio 16 2019" -DBBL_RELEASE_TO_PUBLIC=0 -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./BambuStudio-SoftFever" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DWIN10SDK_PATH="C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0"
cmake .. -G "Visual Studio 16 2019" -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="%DEPS%/usr/local" -DCMAKE_INSTALL_PREFIX="./BambuStudio-SoftFever" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DWIN10SDK_PATH="C:/Program Files (x86)/Windows Kits/10/Include/10.0.19041.0"
cmake --build . --config RelWithDebInfo --target ALL_BUILD -- -m
@REM cmake --build . --target install --config RelWithDebInfo

View File

@@ -116,8 +116,6 @@
</array>
<key>CSResourcesFileMapped</key>
<true/>
<key>NSRequiresAquaSystemAppearance</key>
<true/>
<key>NSHumanReadableCopyright</key>
<string>${MACOSX_BUNDLE_COPYRIGHT}</string>
</dict>

View File

@@ -31,8 +31,8 @@ elseif (APPLE)
${_curl_platform_flags}
-DCMAKE_USE_SECTRANSP:BOOL=ON
-DCMAKE_USE_OPENSSL:BOOL=OFF
#-DCMAKE_USE_SECTRANSP:BOOL=ON
-DCMAKE_USE_OPENSSL:BOOL=ON
-DCURL_CA_PATH:STRING=none
)

View File

@@ -7,6 +7,9 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
set(_gtk_ver 3)
endif ()
set(_wx_toolkit "-DwxBUILD_TOOLKIT=gtk${_gtk_ver}")
set(_wx_private_font "-DwxUSE_PRIVATE_FONTS=1")
else ()
set(_wx_private_font "-DwxUSE_PRIVATE_FONTS=0")
endif()
if (MSVC)
@@ -30,6 +33,7 @@ bambustudio_add_cmake_project(wxWidgets
-DwxUSE_MEDIACTRL=ON
-DwxUSE_DETECT_SM=OFF
-DwxUSE_UNICODE=ON
${_wx_private_font}
-DwxUSE_OPENGL=ON
-DwxUSE_WEBVIEW=ON
${_wx_edge}

18
doc/release_notes_cn.md Normal file
View File

@@ -0,0 +1,18 @@
**新功能**
1. 3D文字工具
2. 对象和拷贝间的数据共享
3. 参数表格
4. 用户指南
5. 支持Arachne特性
**改进**
1. 支持导出通用的3mf格式兼容其他切片软件
2. 优化混合支撑和树状支撑的生成速度
3. 支持不停靠工具头的延迟摄影
4. 支持纹理PEI热床
5. 支持导入和导出预设
6. 支持随机位置的接缝设置
7. 支持匈牙利语
8. 一些关键问题修复
详细信息请查看https://github.com/bambulab/BambuStudio/releases

18
doc/release_notes_en.md Normal file
View File

@@ -0,0 +1,18 @@
**New Features**
1. 3D text tool
2. Shared data between an object and its copies
3. Parameter table
4. User manual
5. Arachne feature
**Improvements**
1. Added support for exporting generic 3mf that is compatible with other slicers
2. Optimized the performance of hybrid and tree support
3. Added traditional timelapse mode
4. Added support for Textured PEI plate
5. Added support for export/import preset
6. Added random seam position
7. Added Magyar translations
8. Fixed some known bugs
For details, please check https://github.com/bambulab/BambuStudio/releases

View File

@@ -43,6 +43,7 @@
},
"download": {
"folder": "bbl/i18n",
"includeSourceLang" : "true",
"files": {
"output": "${lang}/BambuStudio_${lang}.po"
}

View File

@@ -1,14 +1,50 @@
{
"printers": [
{
"display_name": "Bambu Lab P1P",
"func": {
"FUNC_CHAMBER_TEMP": false,
"FUNC_FIRSTLAYER_INSPECT": false,
"FUNC_AI_MONITORING": false,
"FUNC_BUILDPLATE_MARKER_DETECT": false,
"FUNC_FLOW_CALIBRATION": false,
"FUNC_MONITORING": false,
"FUNC_TIMELAPSE": false,
"FUNC_MEDIA_FILE": false,
"FUNC_REMOTE_TUNNEL": false,
"FUNC_LOCAL_TUNNEL": true,
"FUNC_VIRTUAL_CAMERA" : false,
"FUNC_PRINT_WITHOUT_SD": false,
"FUNC_ALTER_RESOLUTION": false,
"FUNC_AUTO_SWITCH_FILAMENT": false,
"FUNC_CHAMBER_FAN" : false,
"FUNC_SEND_TO_SDCARD": false
},
"camera_resolution":["720p"],
"bed_temperature_limit": 100,
"model_id": "C11",
"printer_type": "C11",
"printer_thumbnail_image": "printer_thumbnail_p1p"
},
{
"display_name": "Bambu Lab X1",
"func": {
"FUNC_LOCAL_TUNNEL": false
},
"camera_resolution":["720p","1080p"],
"model_id": "BL-P002",
"printer_type": "3DPrinter-X1"
"printer_type": "3DPrinter-X1",
"printer_thumbnail_image": "printer_thumbnail"
},
{
"display_name": "Bambu Lab X1 Carbon",
"func": {
"FUNC_LOCAL_TUNNEL": false
},
"model_id": "BL-P001",
"printer_type": "3DPrinter-X1-Carbon"
"camera_resolution":["720p","1080p"],
"printer_type": "3DPrinter-X1-Carbon",
"printer_thumbnail_image": "printer_thumbnail"
}
]
}

171
resources/data/hints.ini Normal file
View File

@@ -0,0 +1,171 @@
# THIS DOCUMENT CONTAINS DATA FOR HINTS NOTIFICATIONS
#
# Each notification is divided by
# [hint:*name of notification*]
#
# Each notification MUST have text var in format:
# text = Headline of hint\nBody of hint.
# Headline is divided by new line (\n) from body.
# Headline is automaticaly printed as Bold.
# Body can contain bold marks: <b>text to be bold</b> (currently rendered as different color, not bold due to font limitations)
# Body can contain hypertext: <a>hypertext text</a>
# Hypertext must be max one per notification and must be closed by </a>
#
# Notification can have documentation link
#
# If notification contains hypertext, it needs to be specified by hypertext_type var.
# each type needs to be supported with one or more additional vars.
# These types are possible:
#
# Settings highlight (like search feature)
# hypertext_type = settings
# hypertext_settings_opt = name_of_settings (hover over settings value and copy last line of hover text)
# hypertext_settings_type = 1 (1 - 5 according to settings tab - to be channged to name of tabs instead of numbers)
# hypertext_settings_category = Infill (name of panel - written on left in settings)
#
# Plater top toolbar highlight
# hypertext_type = plater
# hypertext_plater_item = nameofbutton (internal name of GLToolbar items)
#
# Plater gizmos (left) toolbar highlight
# hypertext_type = gizmo
# hypertext_gizmo_item = name (name of svg icon of gizmo in resources without .svg suffix)
#
# Open preferences (might add item to highlight)
# hypertext_type = preferences
# hypertext_preferences_page = name of the prefernces tab
# hypertext_preferences_item = show_collapse_button (name of variable saved in prusaslicer.ini connected to the setting in preferences)
#
# Open gallery (no aditional var)
# hypertext_type = gallery
#
#Open top menubar item
#hypertext_menubar_menu_name = (Name in english visible as menu name: File, )
#hypertext_menubar_item_name = (Name of item in english, if there are three dots at the end of name, put name without three dots)
#
#
# Each notification can have disabled and enabled modes and techs - divided by ; and space
# enabled_tags = ...
# disabled_tags = ...
# supported tags are: simple; advanced; expert; FFF; MMU; SLA; Windows; Linux; OSX;
# and all filament types: PLA; PET; ABS; ASA; FLEX; HIPS; EDGE; NGEN; NYLON; PVA; PC; PP; PEI; PEEK; PEKK; POM; PSU; PVDF; SCAFF;
# Tags are case sensitive.
# FFF is affirmative for both one or more extruder printers.
# Algorithm shows hint only if ALL enabled tags are affirmative. (so never do enabled_tags = FFF; SLA;)
# Algorithm shows hint only if not in all disabled tags.
# if there are both disabled and preferred, only preferred that are not in disabled are valid.
#
#
# Notifications shows in random order, already shown notifications are saved at cache/hints.cereal (as binary - human non-readable)
# You can affect random ordering by seting weigh
# weight = 5
# Weight must be larger or equal to 1. Default weight is 1.
# Weight defines probability as weight : sum_of_all_weights.
[hint:3D Scene Operations]
text = 3D Scene Operations\nDid you know how to control view and object/part selection with mouse and touchpanel in the 3D scene?
documentation_link = https://wiki.bambulab.com/en/software/bambu-studio/3d-scene-operations
[hint:Cut Tool]
text = Cut Tool\nDid you know that you can cut a model at any angle and position with the cutting tool?
documentation_link = https://wiki.bambulab.com/en/software/bambu-studio/cut-tool
[hint:Fix Model]
text = Fix Model\nDid you know that you can fix a corrupted 3D model to avoid a lot of slicing problems?
documentation_link = https://wiki.bambulab.com/en/software/bambu-studio/fix-model
[hint:Timelapse]
text = Timelapse\nDid you know that you can generate a timelapse video during each print?
documentation_link = https://wiki.bambulab.com/en/software/bambu-studio/Timelapse
[hint:Auto-Arrange]
text = Auto-Arrange\nDid you know that you can auto-arrange all objects in your project?
documentation_link = https://wiki.bambulab.com/en/software/bambu-studio/auto-arranging
[hint:Auto-Orient]
text = Auto-Orient\nDid you know that you can rotate objects to an optimal orientation for printing by a simple click?
documentation_link = https://wiki.bambulab.com/en/software/bambu-studio/auto-orientation
[hint:Lay on Face]
text = Lay on Face\nDid you know that you can quickly orient a model so that one of its faces sits on the print bed? Select the \"Place on face\" function or press the <b>F</b> key.
documentation_link = https://wiki.bambulab.com/en/software/bambu-studio/lay-on-face
[hint:Object List]
text = Object List\nDid you know that you can view all objects/parts in a list and change settings for each object/part?
documentation_link = https://wiki.bambulab.com/en/software/bambu-studio/object-list
#[hint:Search Functionality]
#text = Search Functionality\nDid you know that you use the Search tool to quickly find a specific Bambu Studio setting? Or use the familiar shortcut <b>Ctrl+F</b>.
[hint:Simplify Model]
text = Simplify Model\nDid you know that you can reduce the number of triangles in a mesh using the Simplify mesh feature? Right-click the model and select Simplify model. Read more in the documentation.
documentation_link = https://wiki.bambulab.com/en/software/bambu-studio/simplify-model
[hint:Slicing Parameter Table]
text = Slicing Parameter Table\nDid you know that you can view all objects/parts on a table and change settings for each object/part?
documentation_link = https://wiki.bambulab.com/en/software/bambu-studio/parameter-table
[hint:Split to Objects/Parts]
text = Split to Objects/Parts\nDid you know that you can split a big object into small ones for easy colorizing or printing?
documentation_link = https://wiki.bambulab.com/en/software/bambu-studio/split-to-objects-parts
[hint:Subtract a Part]
text = Subtract a Part\nDid you know that you can subtract one mesh from another using the Negative part modifier? That way you can, for example, create easily resizable holes directly in Bambu Studio. Read more in the documentation.
documentation_link = https://wiki.bambulab.com/en/software/bambu-studio/subtract-a-part
[hint:STEP]
text = STEP\nDid you know that you can improve your print quality by slicing a STEP file instead of an STL?\nBambu Studio supports slicing STEP files, providing smoother results than a lower resolution STL. Give it a try!
documentation_link= https://wiki.bambulab.com/en/software/bambu-studio/step
[hint:Z seam location]
text = Z seam location\nDid you know that you can customize the location of the Z seam, and even paint it on your print, to have it in a less visible location? This improves the overall look of your model. Check it out!
documentation_link= https://wiki.bambulab.com/en/software/bambu-studio/Seam
[hint:Fine-tuning for flow rate]
text = Fine-tuning for flow rate\nDid you know that flow rate can be fine-tuned for even better-looking prints? Depending on the material, you can improve the overall finish of the printed model by doing some fine-tuning.
documentation_link= https://wiki.bambulab.com/en/x1/manual/manual-flow-rate-tuning
[hint:Split your prints into plates]
text = Split your prints into plates\nDid you know that you can split a model that has a lot of parts into individual plates ready to print? This will simplify the process of keeping track of all the parts.
documentation_link= https://wiki.bambulab.com/en/software/bambu-studio/plates_management
[hint:Speed up your print with Adaptive Layer Height]
text = Speed up your print with Adaptive Layer Height\nDid you know that you can print a model even faster, by using the Adaptive Layer Height option? Check it out!
documentation_link= https://wiki.bambulab.com/en/software/bambu-studio/adaptive-layer-height
[hint:Support painting]
text = Support painting\nDid you know that you can paint the location of your supports? This feature makes it easy to place the support material only on the sections of the model that actually need it.
documentation_link= https://wiki.bambulab.com/en/software/bambu-studio/support-painting
[hint:Different types of supports]
text = Different types of supports\nDid you know that you can choose from multiple types of supports? Tree supports work great for organic models, while saving filament and improving print speed. Check them out!
documentation_link= https://wiki.bambulab.com/en/software/bambu-studio/support
[hint:Printing Silk Filament]
text = Printing Silk Filament\nDid you know that Silk filament needs special consideration to print it successfully? Higher temperature and lower speed are always recommended for the best results.
documentation_link= https://wiki.bambulab.com/en/x1/manual/printing-with-silk-filaments
[hint:Brim for better adhesion]
text = Brim for better adhesion\nDid you know that when printing models have a small contact interface with the printing surface, it's recommended to use a brim?
documentation_link= https://wiki.bambulab.com/en/software/bambu-studio/auto-brim
[hint:Set parameters for multiple objects]
text = Set parameters for multiple objects\nDid you know that you can set slicing parameters for all selected objects at one time?
documentation_link= https://wiki.bambulab.com/en/software/bambu-studio/set-parameters-for-selected-objects
[hint:Stack objects]
text = Stack objects\nDid you know that you can stack objects as a whole one?
documentation_link= https://wiki.bambulab.com/e/en/software/bambu-studio/stacking-objects
[hint:Flush into support/objects/infill]
text = Flush into support/objects/infill\nDid you know that you can save the wasted filament by flushing them into support/objects/infill during filament change?
documentation_link= https://wiki.bambulab.com/en/software/bambu-studio/reduce-wasting-during-filament-change
[hint:Improve strength]
text = Improve strength\nDid you know that you can use more wall loops and higher sparse infill density to improve the strength of the model?
#[hint:]
#text =
#hypertext =
#follow_text =

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -0,0 +1,3 @@
<svg width="26" height="11" viewBox="0 0 26 11" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M25.0877 5.97153C25.3595 5.69978 25.3595 5.2592 25.0877 4.98746L20.6594 0.55913C20.3877 0.287386 19.9471 0.287386 19.6753 0.55913C19.4036 0.830875 19.4036 1.27146 19.6753 1.5432L23.6116 5.47949L19.6753 9.41578C19.4036 9.68753 19.4036 10.1281 19.6753 10.3999C19.9471 10.6716 20.3877 10.6716 20.6594 10.3999L25.0877 5.97153ZM0.90332 6.17534H24.5957V4.78365H0.90332V6.17534Z" fill="#00AE42"/>
</svg>

After

Width:  |  Height:  |  Size: 502 B

View File

@@ -0,0 +1,3 @@
<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M3.10031 1.86719C2.27188 1.86719 1.60031 2.53877 1.60031 3.36719V9.01149C0.843171 9.08758 0.252106 9.72671 0.252106 10.5039V15.6221C0.252106 16.4506 0.923676 17.1221 1.7521 17.1221H9.05122C10.1743 18.3923 11.8161 19.1931 13.6449 19.1931C17.0303 19.1931 19.7747 16.4487 19.7747 13.0633C19.7747 10.6147 18.339 8.50146 16.2634 7.51942V3.36719C16.2634 2.53877 15.5918 1.86719 14.7634 1.86719H3.10031ZM15.2634 7.14953V3.36719C15.2634 3.09105 15.0395 2.86719 14.7634 2.86719H3.10031C2.82417 2.86719 2.60031 3.09105 2.60031 3.36719V9.00377H3.15292V3.96484H5.79236H6.79239H8.43182H9.43183H11.0713H12.0713H14.7107V7.02592C14.898 7.05876 15.0824 7.1001 15.2634 7.14953ZM13.7107 6.93394V4.96484H12.0713V7.13745C12.5735 7.00446 13.1009 6.93359 13.6449 6.93359C13.6669 6.93359 13.6888 6.93371 13.7107 6.93394ZM11.0713 7.49841V4.96484H9.43182L9.43183 8.61091C9.91152 8.15685 10.4645 7.77947 11.0713 7.49841ZM8.3317 10.0045H5.79236V10.0045H3.15292V10.0039H1.75211C1.47596 10.0039 1.25211 10.2278 1.25211 10.5039V15.6221C1.25211 15.8983 1.47596 16.1221 1.7521 16.1221H8.33162C7.81228 15.2219 7.51514 14.1773 7.51514 13.0633C7.51514 11.9493 7.81231 10.9047 8.3317 10.0045ZM8.43183 4.96484V9.00377H6.79239V4.96484H8.43183ZM5.79236 4.96484H4.15292V9.00377H5.79236V4.96484ZM18.7747 13.0633C18.7747 15.8964 16.478 18.1931 13.6449 18.1931C10.8118 18.1931 8.51514 15.8964 8.51514 13.0633C8.51514 10.2302 10.8118 7.93359 13.6449 7.93359C16.478 7.93359 18.7747 10.2302 18.7747 13.0633ZM14.455 10.2226C14.6503 10.0273 14.9669 10.0273 15.1621 10.2226L16.6376 11.698C16.7806 11.841 16.8234 12.0561 16.746 12.2429C16.6686 12.4298 16.4863 12.5516 16.284 12.5516H11.0631C10.787 12.5516 10.5631 12.3277 10.5631 12.0516C10.5631 11.7754 10.787 11.5516 11.0631 11.5516H15.0769L14.455 10.9297C14.2598 10.7344 14.2598 10.4178 14.455 10.2226ZM12.1276 15.9053C12.3229 16.1005 12.6395 16.1005 12.8347 15.9053C13.03 15.71 13.03 15.3934 12.8347 15.1982L12.2128 14.5762H16.2266C16.5028 14.5762 16.7266 14.3524 16.7266 14.0762C16.7266 13.8001 16.5028 13.5762 16.2266 13.5762H11.0057C10.8035 13.5762 10.6212 13.6981 10.5438 13.8849C10.4664 14.0717 10.5092 14.2868 10.6522 14.4298L12.1276 15.9053Z" fill="#262E30"/>
</svg>

After

Width:  |  Height:  |  Size: 2.3 KiB

View File

@@ -0,0 +1,11 @@
<svg width="20" height="18" viewBox="0 0 20 18" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M9.08898 10.1857L9.30352 10.6374L9.58898 10.5018V10.1857H9.08898ZM12.3748 10.1857H11.8748V10.5018L12.1602 10.6374L12.3748 10.1857ZM9.58898 2.69759C9.58898 2.06638 10.1007 1.55469 10.7319 1.55469V0.554688C9.54839 0.554688 8.58898 1.5141 8.58898 2.69759H9.58898ZM9.58898 10.1857V2.69759H8.58898V10.1857H9.58898ZM7.39844 13.6503C7.39844 12.3213 8.17616 11.1729 9.30352 10.6374L8.87443 9.73412C7.41154 10.4291 6.39844 11.9209 6.39844 13.6503H7.39844ZM10.7319 16.9837C8.89087 16.9837 7.39844 15.4913 7.39844 13.6503H6.39844C6.39844 16.0436 8.33859 17.9837 10.7319 17.9837V16.9837ZM14.0653 13.6503C14.0653 15.4913 12.5729 16.9837 10.7319 16.9837V17.9837C13.1252 17.9837 15.0653 16.0436 15.0653 13.6503H14.0653ZM12.1602 10.6374C13.2876 11.1729 14.0653 12.3213 14.0653 13.6503H15.0653C15.0653 11.9209 14.0522 10.4291 12.5893 9.73412L12.1602 10.6374ZM11.8748 2.69759V10.1857H12.8748V2.69759H11.8748ZM10.7319 1.55469C11.3631 1.55469 11.8748 2.06638 11.8748 2.69759H12.8748C12.8748 1.5141 11.9154 0.554688 10.7319 0.554688V1.55469Z" fill="#898989"/>
<path d="M1 9.0855C1 7.8533 2.76767 3.91794 3.28007 3.91797C3.79246 3.918 5.48331 8.02917 5.48331 9.0855C5.48331 10.1418 4.81114 11.6037 3.28007 11.6037C1.74899 11.6037 1 10.3177 1 9.0855Z" stroke="#898989"/>
<path d="M2.46231 8.4579C2.3916 8.85061 2.43422 9.73572 3.17033 10.1345" stroke="#898989" stroke-linecap="round"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M11.2772 11.5284C12.222 11.7716 12.9201 12.6293 12.9201 13.65C12.9201 14.8598 11.9394 15.8405 10.7296 15.8405C9.5198 15.8405 8.53906 14.8598 8.53906 13.65C8.53906 12.6293 9.23717 11.7716 10.182 11.5284L10.182 3.2449C10.182 2.94245 10.4272 2.69727 10.7296 2.69727C11.0321 2.69727 11.2772 2.94245 11.2772 3.2449L11.2772 11.5284Z" fill="#FF6F00"/>
<path d="M19.1211 15.8398H16.4358" stroke="#898989" stroke-linecap="round"/>
<path d="M19.1211 12.5547H16.8833" stroke="#C2C2C2" stroke-linecap="round"/>
<path d="M19.1211 9.26953L15.9882 9.26953" stroke="#C2C2C2" stroke-linecap="round"/>
<path d="M19.1211 5.98242L15.9882 5.98242" stroke="#C2C2C2" stroke-linecap="round"/>
<path d="M19.1211 2.69727H15.9882" stroke="#C2C2C2" stroke-linecap="round"/>
</svg>

After

Width:  |  Height:  |  Size: 2.2 KiB

View File

@@ -0,0 +1,12 @@
<svg width="20" height="18" viewBox="0 0 20 18" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M8.75695 10.1311L8.97149 10.5827L9.25695 10.4471V10.1311H8.75695ZM12.0428 10.1311H11.5428V10.4471L11.8282 10.5827L12.0428 10.1311ZM9.25695 2.64291C9.25695 2.0117 9.76864 1.5 10.3999 1.5V0.5C9.21636 0.5 8.25695 1.45941 8.25695 2.64291H9.25695ZM9.25695 10.1311V2.64291H8.25695V10.1311H9.25695ZM7.06641 13.5956C7.06641 12.2666 7.84413 11.1182 8.97149 10.5827L8.5424 9.67943C7.07951 10.3744 6.06641 11.8662 6.06641 13.5956H7.06641ZM10.3999 16.929C8.55884 16.929 7.06641 15.4366 7.06641 13.5956H6.06641C6.06641 15.9889 8.00656 17.929 10.3999 17.929V16.929ZM13.7333 13.5956C13.7333 15.4366 12.2409 16.929 10.3999 16.929V17.929C12.7931 17.929 14.7333 15.9889 14.7333 13.5956H13.7333ZM11.8282 10.5827C12.9556 11.1182 13.7333 12.2666 13.7333 13.5956H14.7333C14.7333 11.8662 13.7202 10.3744 12.2573 9.67943L11.8282 10.5827ZM11.5428 2.6429V10.1311H12.5428V2.6429H11.5428ZM10.3999 1.5C11.0311 1.5 11.5428 2.0117 11.5428 2.6429H12.5428C12.5428 1.45941 11.5833 0.5 10.3999 0.5V1.5Z" fill="#898989"/>
<path d="M0.667969 9.03081C0.667969 7.79861 2.43564 3.86325 2.94804 3.86328C3.46043 3.86331 5.15128 7.97448 5.15128 9.03081C5.15128 10.0871 4.47911 11.549 2.94804 11.549C1.41696 11.549 0.667969 10.263 0.667969 9.03081Z" stroke="#898989"/>
<path d="M2.13028 8.40322C2.05957 8.79592 2.10218 9.68104 2.8383 10.0798" stroke="#898989" stroke-linecap="round"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M10.9452 11.4737C11.89 11.7169 12.5881 12.5746 12.5881 13.5953C12.5881 14.8051 11.6074 15.7858 10.3976 15.7858C9.18777 15.7858 8.20703 14.8051 8.20703 13.5953C8.20703 12.5746 8.90514 11.7169 9.84994 11.4737L9.84994 3.19021C9.84994 2.88776 10.0951 2.64258 10.3976 2.64258C10.7 2.64258 10.9452 2.88776 10.9452 3.19021L10.9452 11.4737Z" fill="#C2C2C2"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M10.9452 11.4743C11.89 11.7174 12.5881 12.5751 12.5881 13.5958C12.5881 14.8056 11.6074 15.7863 10.3976 15.7863C9.18777 15.7863 8.20703 14.8056 8.20703 13.5958C8.20703 12.5751 8.90514 11.7174 9.84994 11.4743L9.84994 6.11599C9.84994 5.81354 10.0951 5.56836 10.3976 5.56836C10.7 5.56836 10.9452 5.81354 10.9452 6.11599L10.9452 11.4743Z" fill="#FF6F00"/>
<path d="M18.7891 15.7852H16.1038" stroke="#898989" stroke-linecap="round"/>
<path d="M18.7891 12.5H16.5513" stroke="#898989" stroke-linecap="round"/>
<path d="M18.7891 9.21484L15.6562 9.21484" stroke="#C2C2C2" stroke-linecap="round"/>
<path d="M18.7891 5.92773L15.6562 5.92773" stroke="#C2C2C2" stroke-linecap="round"/>
<path d="M18.7891 2.64258H15.6562" stroke="#C2C2C2" stroke-linecap="round"/>
</svg>

After

Width:  |  Height:  |  Size: 2.6 KiB

View File

@@ -0,0 +1,12 @@
<svg width="20" height="18" viewBox="0 0 20 18" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M9.42491 10.1311L9.63946 10.5827L9.92491 10.4471V10.1311H9.42491ZM12.7107 10.1311H12.2107V10.4471L12.4962 10.5827L12.7107 10.1311ZM9.92491 2.64291C9.92491 2.0117 10.4366 1.5 11.0678 1.5V0.5C9.88432 0.5 8.92491 1.45941 8.92491 2.64291H9.92491ZM9.92491 10.1311V2.64291H8.92491V10.1311H9.92491ZM7.73438 13.5956C7.73438 12.2666 8.5121 11.1182 9.63946 10.5827L9.21037 9.67943C7.74748 10.3744 6.73438 11.8662 6.73438 13.5956H7.73438ZM11.0678 16.929C9.22681 16.929 7.73438 15.4366 7.73438 13.5956H6.73438C6.73438 15.9889 8.67452 17.929 11.0678 17.929V16.929ZM14.4013 13.5956C14.4013 15.4366 12.9088 16.929 11.0678 16.929V17.929C13.4611 17.929 15.4013 15.9889 15.4013 13.5956H14.4013ZM12.4962 10.5827C13.6235 11.1182 14.4013 12.2666 14.4013 13.5956H15.4013C15.4013 11.8662 14.3882 10.3744 12.9253 9.67943L12.4962 10.5827ZM12.2107 2.6429V10.1311H13.2107V2.6429H12.2107ZM11.0678 1.5C11.699 1.5 12.2107 2.0117 12.2107 2.6429H13.2107C13.2107 1.45941 12.2513 0.5 11.0678 0.5V1.5Z" fill="#898989"/>
<path d="M1.33594 9.03081C1.33594 7.79861 3.10361 3.86325 3.616 3.86328C4.1284 3.86331 5.81925 7.97448 5.81925 9.03081C5.81925 10.0871 5.14708 11.549 3.616 11.549C2.08493 11.549 1.33594 10.263 1.33594 9.03081Z" stroke="#898989"/>
<path d="M2.79824 8.40322C2.72754 8.79592 2.77015 9.68104 3.50627 10.0798" stroke="#898989" stroke-linecap="round"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M11.6171 11.4737C12.5619 11.7169 13.26 12.5746 13.26 13.5953C13.26 14.8051 12.2792 15.7858 11.0694 15.7858C9.85964 15.7858 8.87891 14.8051 8.87891 13.5953C8.87891 12.5746 9.57702 11.7169 10.5218 11.4737L10.5218 3.19021C10.5218 2.88776 10.767 2.64258 11.0694 2.64258C11.3719 2.64258 11.6171 2.88776 11.6171 3.19021L11.6171 11.4737Z" fill="#C2C2C2"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M10.5218 11.4743L10.5218 9.31717C10.5218 9.01472 10.767 8.76953 11.0694 8.76953C11.3719 8.76953 11.6171 9.01472 11.6171 9.31717L11.6171 11.4743C12.5619 11.7175 13.26 12.5752 13.26 13.5959C13.26 14.8057 12.2792 15.7864 11.0694 15.7864C9.85964 15.7864 8.87891 14.8057 8.87891 13.5959C8.87891 12.5751 9.57702 11.7175 10.5218 11.4743Z" fill="#00AE42"/>
<path d="M19.4609 15.7852H16.7756" stroke="#898989" stroke-linecap="round"/>
<path d="M19.4609 12.5H17.2232" stroke="#898989" stroke-linecap="round"/>
<path d="M19.4609 9.21484L16.3281 9.21484" stroke="#898989" stroke-linecap="round"/>
<path d="M19.4609 5.92773L16.3281 5.92773" stroke="#C2C2C2" stroke-linecap="round"/>
<path d="M19.4609 2.64258H16.3281" stroke="#C2C2C2" stroke-linecap="round"/>
</svg>

After

Width:  |  Height:  |  Size: 2.6 KiB

View File

@@ -0,0 +1,12 @@
<svg width="20" height="18" viewBox="0 0 20 18" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M9.06554 10.1311L9.28009 10.5827L9.56554 10.4471V10.1311H9.06554ZM12.3513 10.1311H11.8513V10.4471L12.1368 10.5827L12.3513 10.1311ZM9.56554 2.64291C9.56554 2.0117 10.0772 1.5 10.7084 1.5V0.5C9.52495 0.5 8.56554 1.45941 8.56554 2.64291H9.56554ZM9.56554 10.1311V2.64291H8.56554V10.1311H9.56554ZM7.375 13.5956C7.375 12.2666 8.15272 11.1182 9.28009 10.5827L8.85099 9.67943C7.3881 10.3744 6.375 11.8662 6.375 13.5956H7.375ZM10.7084 16.929C8.86743 16.929 7.375 15.4366 7.375 13.5956H6.375C6.375 15.9889 8.31515 17.929 10.7084 17.929V16.929ZM14.0419 13.5956C14.0419 15.4366 12.5495 16.929 10.7084 16.929V17.929C13.1017 17.929 15.0419 15.9889 15.0419 13.5956H14.0419ZM12.1368 10.5827C13.2642 11.1182 14.0419 12.2666 14.0419 13.5956H15.0419C15.0419 11.8662 14.0288 10.3744 12.5659 9.67943L12.1368 10.5827ZM11.8513 2.64291V10.1311H12.8513V2.64291H11.8513ZM10.7084 1.5C11.3397 1.5 11.8513 2.0117 11.8513 2.64291H12.8513C12.8513 1.45941 11.8919 0.5 10.7084 0.5V1.5Z" fill="#898989"/>
<path d="M0.976562 9.03081C0.976562 7.79861 2.74423 3.86325 3.25663 3.86328C3.76903 3.86331 5.45988 7.97448 5.45988 9.03081C5.45988 10.0871 4.78771 11.549 3.25663 11.549C1.72555 11.549 0.976562 10.263 0.976562 9.03081Z" stroke="#898989"/>
<path d="M2.43887 8.40322C2.36816 8.79592 2.41078 9.68104 3.14689 10.0798" stroke="#898989" stroke-linecap="round"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M11.2538 11.4737C12.1986 11.7169 12.8967 12.5746 12.8967 13.5953C12.8967 14.8051 11.916 15.7858 10.7062 15.7858C9.49636 15.7858 8.51562 14.8051 8.51562 13.5953C8.51562 12.5746 9.21373 11.7169 10.1585 11.4737L10.1585 3.19021C10.1585 2.88776 10.4037 2.64258 10.7062 2.64258C11.0086 2.64258 11.2538 2.88776 11.2538 3.19021L11.2538 11.4737Z" fill="#C2C2C2"/>
<path d="M12.8967 13.5948C12.8967 14.8046 11.916 15.7854 10.7062 15.7854C9.49636 15.7854 8.51562 14.8046 8.51562 13.5948C8.51562 12.385 9.49636 11.4043 10.7062 11.4043C11.916 11.4043 12.8967 12.385 12.8967 13.5948Z" fill="#00AE42"/>
<path d="M19.1016 15.7852H16.4163" stroke="#898989" stroke-linecap="round"/>
<path d="M19.1016 12.5H16.8638" stroke="#898989" stroke-linecap="round"/>
<path d="M19.1016 9.21484L15.9687 9.21484" stroke="#898989" stroke-linecap="round"/>
<path d="M19.1016 5.92773L15.9687 5.92773" stroke="#898989" stroke-linecap="round"/>
<path d="M19.1016 2.64258H15.9687" stroke="#C2C2C2" stroke-linecap="round"/>
</svg>

After

Width:  |  Height:  |  Size: 2.4 KiB

View File

@@ -0,0 +1,12 @@
<svg width="21" height="18" viewBox="0 0 21 18" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M9.48351 10.1311L9.69805 10.5827L9.98351 10.4471V10.1311H9.48351ZM12.7693 10.1311H12.2693V10.4471L12.5548 10.5827L12.7693 10.1311ZM9.98351 2.64291C9.98351 2.0117 10.4952 1.5 11.1264 1.5V0.5C9.94292 0.5 8.98351 1.45941 8.98351 2.64291H9.98351ZM9.98351 10.1311V2.64291H8.98351V10.1311H9.98351ZM7.79297 13.5956C7.79297 12.2666 8.57069 11.1182 9.69805 10.5827L9.26896 9.67943C7.80607 10.3744 6.79297 11.8662 6.79297 13.5956H7.79297ZM11.1264 16.929C9.2854 16.929 7.79297 15.4366 7.79297 13.5956H6.79297C6.79297 15.9889 8.73312 17.929 11.1264 17.929V16.929ZM14.4599 13.5956C14.4599 15.4366 12.9674 16.929 11.1264 16.929V17.929C13.5197 17.929 15.4599 15.9889 15.4599 13.5956H14.4599ZM12.5548 10.5827C13.6821 11.1182 14.4599 12.2666 14.4599 13.5956H15.4599C15.4599 11.8662 14.4468 10.3744 12.9839 9.67943L12.5548 10.5827ZM12.2693 2.6429V10.1311H13.2693V2.6429H12.2693ZM11.1264 1.5C11.7576 1.5 12.2693 2.0117 12.2693 2.6429H13.2693C13.2693 1.45941 12.3099 0.5 11.1264 0.5V1.5Z" fill="#898989"/>
<path d="M1.39453 9.03081C1.39453 7.79861 3.1622 3.86325 3.6746 3.86328C4.18699 3.86331 5.87785 7.97448 5.87785 9.03081C5.87785 10.0871 5.20568 11.549 3.6746 11.549C2.14352 11.549 1.39453 10.263 1.39453 9.03081Z" stroke="#898989"/>
<path d="M2.85684 8.40322C2.78613 8.79592 2.82875 9.68104 3.56486 10.0798" stroke="#898989" stroke-linecap="round"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M11.6718 11.4737C12.6166 11.7169 13.3147 12.5746 13.3147 13.5953C13.3147 14.8051 12.3339 15.7858 11.1241 15.7858C9.91433 15.7858 8.93359 14.8051 8.93359 13.5953C8.93359 12.5746 9.6317 11.7169 10.5765 11.4737L10.5765 3.19021C10.5765 2.88776 10.8217 2.64258 11.1241 2.64258C11.4266 2.64258 11.6718 2.88776 11.6718 3.19021L11.6718 11.4737Z" fill="#C2C2C2"/>
<path d="M13.3147 13.596C13.3147 14.8058 12.3339 15.7866 11.1241 15.7866C9.91433 15.7866 8.93359 14.8058 8.93359 13.596C8.93359 13.1677 9.58237 13.8695 10.7922 13.8695C12.002 13.8695 13.3147 12.3862 13.3147 13.596Z" fill="#00AE42"/>
<path d="M19.5156 15.7871H16.8303" stroke="#898989" stroke-linecap="round"/>
<path d="M19.5156 12.5H17.2779" stroke="#898989" stroke-linecap="round"/>
<path d="M19.5156 9.21484L16.3828 9.21484" stroke="#898989" stroke-linecap="round"/>
<path d="M19.5156 5.92969L16.3828 5.92969" stroke="#898989" stroke-linecap="round"/>
<path d="M19.5156 2.64258H16.3828" stroke="#898989" stroke-linecap="round"/>
</svg>

After

Width:  |  Height:  |  Size: 2.4 KiB

View File

@@ -0,0 +1,6 @@
<svg width="54" height="33" viewBox="0 0 54 33" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect width="50" height="30" rx="4.63896" fill="#EA4E38"/>
<path d="M0 19H50V25.361C50 27.9231 47.9231 30 45.361 30H4.63896C2.07693 30 0 27.9231 0 25.361V19Z" fill="#C041C2"/>
<path d="M16.0526 4.96415C16.6934 4.96415 17.2649 5.08971 17.7672 5.34084C18.2781 5.59196 18.6764 5.94266 18.9622 6.39295C19.2479 6.83458 19.3908 7.34116 19.3908 7.91268C19.3908 8.4842 19.2479 8.9951 18.9622 9.44539C18.6851 9.88702 18.2911 10.2334 17.7801 10.4845C17.2779 10.727 16.7021 10.8482 16.0526 10.8482H14.2861V14.4722H13.1301V4.96415H16.0526ZM15.9097 9.83506C16.6371 9.83506 17.1956 9.65754 17.5853 9.30251C17.975 8.93881 18.1698 8.47554 18.1698 7.91268C18.1698 7.34982 17.975 6.88654 17.5853 6.52284C17.1956 6.15915 16.6371 5.9773 15.9097 5.9773H14.2861V9.83506H15.9097ZM20.8423 4.96415H21.9984V13.433H26.6874V14.4722H20.8423V4.96415ZM31.7844 4.96415L35.6032 14.4722H34.3173L33.2652 11.7445H29.3295L28.3293 14.4722H27.1603L30.8102 4.96415H31.7844ZM32.8625 10.7053L31.2519 6.50985L29.7192 10.7053H32.8625Z" fill="white"/>
<path d="M21.3664 20.7625L24.0941 27.554H23.0086L22.3128 25.7355H19.5572L18.8892 27.554H17.8872L20.5129 20.7625H21.3664ZM21.9788 24.8634L20.9025 22.0614L19.882 24.8634H21.9788ZM25.0369 22.9057V21.913L27.0502 20.7532H27.8203V27.554H26.809V21.9037L25.0369 22.9057Z" fill="white"/>
</svg>

After

Width:  |  Height:  |  Size: 1.4 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 14 KiB

View File

@@ -1,2 +1,2 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1659672294109" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1371" width="16" height="16" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
</style></defs><path d="M512 255.78c-194.98 0-360.39 106.95-421.96 256 61.57 149.05 226.98 256 421.96 256s360.39-106.95 421.96-256c-61.57-149.05-226.98-256-421.96-256z m0 448c-106.04 0-192-85.96-192-192s85.96-192 192-192 192 85.96 192 192-85.96 192-192 192z" fill="#323a3d" p-id="1372"></path><path d="M512 511.78m-128 0a128 128 0 1 0 256 0 128 128 0 1 0-256 0Z" fill="#323a3d" p-id="1373"></path></svg>
</style></defs><path d="M512 255.78c-194.98 0-360.39 106.95-421.96 256 61.57 149.05 226.98 256 421.96 256s360.39-106.95 421.96-256c-61.57-149.05-226.98-256-421.96-256z m0 448c-106.04 0-192-85.96-192-192s85.96-192 192-192 192 85.96 192 192-85.96 192-192 192z" fill="#323A3D" p-id="1372"></path><path d="M512 511.78m-128 0a128 128 0 1 0 256 0 128 128 0 1 0-256 0Z" fill="#323A3D" p-id="1373"></path></svg>

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 40 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 6.5 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 40 KiB

View File

@@ -2,7 +2,7 @@
<g>
<title>Layer 1</title>
<path id="svg_1" stroke-linecap="round" stroke-width="2" stroke="#262e30" d="m1,12.5l23,0"/>
<path id="svg_2" stroke-linecap="round" stroke-width="2" stroke="#262e30" d="m12.5,24l0,-23"/>
<path id="svg_1" stroke-linecap="round" stroke-width="2" stroke="#262E30" d="m1,12.5l23,0"/>
<path id="svg_2" stroke-linecap="round" stroke-width="2" stroke="#262E30" d="m12.5,24l0,-23"/>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 311 B

After

Width:  |  Height:  |  Size: 311 B

View File

@@ -2,6 +2,6 @@
<g>
<title>Layer 1</title>
<path id="svg_1" stroke-linecap="round" stroke-width="2" stroke="#262e30" d="m1,12.5l23,0"/>
<path id="svg_1" stroke-linecap="round" stroke-width="2" stroke="#262E30" d="m1,12.5l23,0"/>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 214 B

After

Width:  |  Height:  |  Size: 214 B

View File

@@ -0,0 +1,43 @@
<svg width="732" height="760" viewBox="0 0 732 760" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_4523_22675)">
<path d="M391.699 733.699L371.799 753.499H377.499L397.299 733.699H391.699Z" fill="#CFD2D3"/>
<path d="M402.898 733.699L383.098 753.499H388.698L408.598 733.699H402.898Z" fill="#CFD2D3"/>
<path d="M414.198 733.699L394.398 753.499H400.098L419.898 733.699H414.198Z" fill="#CFD2D3"/>
<path d="M425.599 733.699L405.699 753.499H411.399L431.199 733.699H425.599Z" fill="#CFD2D3"/>
<path d="M436.898 733.699L417.098 753.499H422.698L442.598 733.699H436.898Z" fill="#CFD2D3"/>
<path d="M448.298 733.699L428.398 753.499H434.098L453.898 733.699H448.298Z" fill="#CFD2D3"/>
<path d="M459.599 733.699L439.799 753.499H445.399L465.299 733.699H459.599Z" fill="#CFD2D3"/>
<path d="M470.898 733.699L451.098 753.499H456.698L476.598 733.699H470.898Z" fill="#CFD2D3"/>
<path d="M482.298 733.699L462.398 753.499H468.098L487.898 733.699H482.298Z" fill="#CFD2D3"/>
<path d="M493.599 733.699L473.699 753.499H479.399L499.299 733.699H493.599Z" fill="#CFD2D3"/>
<path d="M277.998 733.699L258.098 753.499H263.798L283.698 733.699H277.998Z" fill="#CFD2D3"/>
<path d="M289.198 733.699L269.398 753.499H274.998L294.898 733.699H289.198Z" fill="#CFD2D3"/>
<path d="M300.599 733.699L280.699 753.499H286.399L306.199 733.699H300.599Z" fill="#CFD2D3"/>
<path d="M311.898 733.699L292.098 753.499H297.698L317.598 733.699H311.898Z" fill="#CFD2D3"/>
<path d="M323.198 733.699L303.398 753.499H309.098L328.898 733.699H323.198Z" fill="#CFD2D3"/>
<path d="M334.599 733.699L314.699 753.499H320.399L340.199 733.699H334.599Z" fill="#CFD2D3"/>
<path d="M345.898 733.699L326.098 753.499H331.698L351.598 733.699H345.898Z" fill="#CFD2D3"/>
<path d="M357.198 733.699L337.398 753.499H343.098L362.898 733.699H357.198Z" fill="#CFD2D3"/>
<path d="M368.599 733.699L348.699 753.499H354.399L374.199 733.699H368.599Z" fill="#CFD2D3"/>
<path d="M379.898 733.699L360.098 753.499H365.698L385.598 733.699H379.898Z" fill="#CFD2D3"/>
<path d="M490.798 753.5L502.098 742.2V736.5L485.098 753.5H490.798Z" fill="#CFD2D3"/>
<path d="M502.098 753.5V747.9L496.398 753.5H502.098Z" fill="#CFD2D3"/>
<path d="M265.198 733.699L253.898 744.999V750.699L270.898 733.699H265.198Z" fill="#CFD2D3"/>
<path d="M45.6992 41H17.6992V219.8H45.6992V41Z" fill="#535656"/>
<path d="M35.5988 105.399V87.1992H22.2988V90.7992H32.2988C32.4988 90.7992 32.6988 90.9992 32.6988 91.1992V95.9992C32.6988 96.1992 32.4988 96.3992 32.2988 96.3992H22.2988V99.9992H32.2988C32.4988 99.9992 32.6988 100.199 32.6988 100.399V105.199C32.6988 105.399 32.4988 105.599 32.2988 105.599H22.2988V109.199H31.8988C33.9988 108.899 35.5988 107.399 35.5988 105.399Z" fill="#CFD2D3"/>
<path d="M25.5988 143.2C25.3988 143.2 25.1988 143 25.1988 142.8V134.2C25.1988 134 25.3988 133.8 25.5988 133.8H35.5988V130.5H25.9988C23.9988 130.5 22.2988 132.1 22.2988 134.1V143C22.2988 145 23.8988 146.6 25.9988 146.6H35.5988V143.3H25.5988V143.2Z" fill="#CFD2D3"/>
<path d="M35.5992 80.3996V67.4996L32.6992 68.5996V80.2996C32.6992 80.4996 32.4992 80.6996 32.2992 80.6996H30.5992V70.1996C30.5992 68.1996 28.9992 66.5996 26.8992 66.5996H25.8992C23.8992 66.5996 22.1992 68.1996 22.1992 70.1996V83.9996H31.7992C33.9992 83.9996 35.5992 82.3996 35.5992 80.3996ZM25.1992 80.5996V70.2996C25.1992 70.0996 25.3992 69.8996 25.5992 69.8996H27.4992C27.6992 69.8996 27.8992 70.0996 27.8992 70.2996V80.5996H25.1992Z" fill="#CFD2D3"/>
<path d="M35.5988 123.9V115.5H38.8988V111.9H22.2988V115.6V124C22.2988 126 23.8988 127.6 25.9988 127.6H31.8988C33.9988 127.5 35.5988 125.9 35.5988 123.9ZM25.5988 123.9C25.3988 123.9 25.1988 123.7 25.1988 123.5V115.5H32.6988V123.5C32.6988 123.7 32.4988 123.9 32.2988 123.9H25.5988Z" fill="#CFD2D3"/>
<path d="M27.7988 63.9C29.0988 63.8 30.1988 63.2 30.9988 62.2C31.6988 62.7 32.5988 63 33.5988 63.1C33.6988 63.1 34.5988 63.1 34.6988 63.1C37.4988 62.9 39.5988 60.2 39.5988 57C39.5988 57 39.5988 52.9 39.5988 49.7H36.5988L35.1988 46H22.2988V59.2C22.2988 59.2 22.2988 59.4 22.2988 59.5C22.4988 61.8 24.3988 63.7 26.7988 63.8C26.9988 63.9 27.5988 63.9 27.7988 63.9ZM36.5988 49.7V57.5C36.5988 57.7 36.4988 57.9 36.4988 58.2C36.1988 58.9 35.4988 59.5 34.5988 59.5C34.5988 59.5 34.2988 59.5 34.1988 59.5C33.4988 59.4 32.9988 59 32.7988 58.4C32.6988 58.1 32.5988 57.9 32.5988 57.6V49.9H36.5988V49.7ZM25.1988 58V49.7H29.5988V58C29.5988 59.2 28.5988 60.1 27.3988 60.1C26.1988 60.2 25.1988 59.2 25.1988 58Z" fill="#CFD2D3"/>
<path d="M39.5992 49.6996H43.1992L41.6992 46.0996H38.1992L39.5992 49.6996Z" fill="#CFD2D3"/>
<path d="M25.4988 161.5H38.8988V157.9H22.2988V171.3L25.4988 170.1V161.5Z" fill="#CFD2D3"/>
<path d="M35.5992 186.8V173.9L32.6992 175V186.7C32.6992 186.9 32.4992 187.1 32.2992 187.1H30.5992V176.6C30.5992 174.6 28.9992 173 26.8992 173H25.8992C23.8992 173 22.1992 174.6 22.1992 176.6V190.4H31.7992C33.9992 190.4 35.5992 188.8 35.5992 186.8ZM25.1992 187.1V176.8C25.1992 176.6 25.3992 176.4 25.5992 176.4H27.4992C27.6992 176.4 27.8992 176.6 27.8992 176.8V187.1H25.1992Z" fill="#CFD2D3"/>
<path d="M35.5988 205.7V197.3H38.8988V197.2V193.6H22.2988V197.3V205.7C22.2988 207.7 23.8988 209.3 25.9988 209.3H31.8988C33.9988 209.3 35.5988 207.7 35.5988 205.7ZM25.5988 205.7C25.3988 205.7 25.1988 205.5 25.1988 205.3V197.3H32.6988V205.3C32.6988 205.5 32.4988 205.7 32.2988 205.7H25.5988Z" fill="#CFD2D3"/>
<path d="M253.898 733.699V739.399L259.598 733.699H253.898Z" fill="#CFD2D3"/>
</g>
<defs>
<clipPath id="clip0_4523_22675">
<rect width="732" height="760" fill="white"/>
</clipPath>
</defs>
</svg>

After

Width:  |  Height:  |  Size: 5.4 KiB

View File

@@ -0,0 +1,71 @@
<svg width="420" height="36" viewBox="0 0 420 36" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M326.098 28.599H324.298C323.998 28.599 323.698 28.899 323.698 29.199C323.698 29.499 323.998 29.799 324.298 29.799H326.098C326.398 29.799 326.698 29.499 326.698 29.199C326.698 28.799 326.398 28.599 326.098 28.599Z" fill="#CFD2D3"/>
<path d="M376.798 29.3H377.398V29.1H380.898V29.3H381.498V27.5H376.698V29.3H376.798ZM377.398 28H380.898V28.5H377.398V28Z" fill="#CFD2D3"/>
<path d="M416.6 5H1V6H416.6V5Z" fill="#CFD2D3"/>
<path d="M228.9 10.099L209 29.999H214.7L234.5 10.099H228.9Z" fill="#CFD2D3"/>
<path d="M240.199 10.099L220.399 29.999H225.999L245.899 10.099H240.199Z" fill="#CFD2D3"/>
<path d="M251.498 10.099L231.698 29.999H237.398L257.198 10.099H251.498Z" fill="#CFD2D3"/>
<path d="M262.9 10.099L243 29.999H248.7L268.5 10.099H262.9Z" fill="#CFD2D3"/>
<path d="M274.199 10.099L254.399 29.999H259.999L279.899 10.099H274.199Z" fill="#CFD2D3"/>
<path d="M285.598 10.099L265.698 29.999H271.398L291.198 10.099H285.598Z" fill="#CFD2D3"/>
<path d="M282.7 30L294.1 18.6V13L277.1 30H282.7Z" fill="#CFD2D3"/>
<path d="M294.099 30.001V24.301L288.399 30.001H294.099Z" fill="#CFD2D3"/>
<path d="M217.7 10.099L206.6 21.199V15.799L212.3 10.099H31.3996C30.6996 10.099 30.0996 10.699 30.0996 11.399V28.599C30.0996 29.299 30.6996 29.899 31.3996 29.899H51.0996H206.6V27.099V26.899L223.4 10.099H217.7ZM40.0996 20.199C40.0996 20.699 39.6996 20.999 39.2996 20.999H35.2996V23.099H33.9996V16.599H39.2996C39.7996 16.599 40.0996 16.999 40.0996 17.399V20.199ZM45.8996 17.599H42.4996C42.3996 17.599 42.2996 17.699 42.2996 17.899V19.399H45.9996V20.299H42.5996C42.4996 20.299 42.3996 20.399 42.3996 20.499V22.199H46.0996V23.099H41.0996V16.599H46.0996V17.599H45.8996ZM52.3996 17.599H50.1996V23.199H48.7996V17.599H46.5996V16.699H52.3996V17.599ZM58.6996 22.299C58.6996 22.799 58.2996 23.099 57.8996 23.099H53.8996C53.3996 23.099 53.0996 22.699 53.0996 22.299V17.299C53.0996 16.799 53.4996 16.499 53.8996 16.499H58.4996V17.399H54.5996C54.4996 17.399 54.3996 17.499 54.3996 17.599V21.899C54.3996 21.999 54.4996 22.099 54.5996 22.099H57.0996C57.1996 22.099 57.2996 21.999 57.2996 21.899V20.199H55.8996V19.199H58.5996V22.299H58.6996ZM60.6996 23.199H59.9996L61.8996 16.699H62.6996L60.6996 23.199ZM70.0996 23.199H68.7996V20.599H65.2996V23.199H63.9996V17.499C63.9996 16.999 64.3996 16.699 64.7996 16.699H69.2996C69.7996 16.699 70.0996 17.099 70.0996 17.499V23.199ZM76.8996 22.299C76.8996 22.799 76.4996 23.099 76.0996 23.099H70.7996V16.699H75.6996C76.1996 16.699 76.4996 17.099 76.4996 17.499V19.399C76.6996 19.599 76.7996 19.799 76.7996 19.999V22.299H76.8996ZM83.8996 22.299C83.8996 22.799 83.4996 23.099 83.0996 23.099H77.9996V22.199H82.3996C82.4996 22.199 82.6996 22.099 82.6996 21.899V20.699C82.6996 20.599 82.5996 20.499 82.3996 20.499H78.5996C78.0996 20.499 77.7996 20.099 77.7996 19.699V17.499C77.7996 16.999 78.1996 16.699 78.6996 16.699H83.7996V17.599H79.3996C79.2996 17.599 79.1996 17.699 79.1996 17.899V19.399C79.1996 19.499 79.2996 19.599 79.3996 19.599H83.0996C83.5996 19.599 83.8996 19.999 83.8996 20.399V22.299ZM85.9996 23.199H85.1996L87.0996 16.699H87.8996L85.9996 23.199ZM94.8996 17.599H92.6996V23.199H91.2996V17.599H89.0996V16.699H94.8996V17.599ZM101.6 20.199C101.6 20.699 101.2 20.999 100.8 20.999H96.7996V23.099H95.4996V16.599H100.8C101.3 16.599 101.6 16.999 101.6 17.399V20.199ZM108.6 22.399C108.6 22.899 108.2 23.299 107.7 23.299H103.2C102.7 23.299 102.3 22.899 102.3 22.399V16.699H103.7V21.999C103.7 22.099 103.8 22.199 103.9 22.199H106.9C107 22.199 107.1 22.099 107.1 21.999V16.699H108.5V22.399H108.6ZM110.7 23.199H109.9L111.8 16.699H112.6L110.7 23.199ZM120 20.199C120 20.699 119.6 20.999 119.2 20.999H115.2V23.099H113.9V16.599H119.2C119.7 16.599 120 16.999 120 17.399V20.199ZM126.8 23.199H125.5V20.599H122V23.199H120.7V17.499C120.7 16.999 121.1 16.699 121.5 16.699H126C126.5 16.699 126.8 17.099 126.8 17.499V23.199ZM128.8 23.199H128L129.9 16.699H130.7L128.8 23.199ZM138.1 20.199C138.1 20.699 137.7 20.999 137.3 20.999H133.3V23.099H132V16.599H137.3C137.8 16.599 138.1 16.999 138.1 17.399V20.199ZM143.9 17.599H140.5C140.4 17.599 140.3 17.699 140.3 17.799V21.899C140.3 21.999 140.4 22.099 140.5 22.099H143.9V23.099H139.8C139.3 23.099 139 22.699 139 22.299V17.499C139 16.999 139.4 16.699 139.8 16.699H143.9V17.599ZM174.7 27.799H169.1V22.899L174.7 20.699V27.799ZM169.2 21.999V12.199H174.8V19.799L169.2 21.999ZM181.1 27.799H175.5V17.999L181.1 20.199V27.799ZM175.6 17.099V12.199H181.2V19.299L175.6 17.099ZM202.4 19.999V27.799H194.6H186.8V19.999V12.199H194.6H202.4V19.999Z" fill="#CFD2D3"/>
<path d="M333.398 16.1H336.298V15.4H332.798C332.398 15.4 332.198 15.7 332.198 16V19.8C332.198 20.2 332.498 20.4 332.798 20.4H335.798C336.198 20.4 336.398 20.1 336.398 19.8V17.4H334.298V18.1H335.398V19.5C335.398 19.6 335.298 19.7 335.198 19.7H333.298C333.198 19.7 333.098 19.6 333.098 19.5V16.2C333.198 16.2 333.298 16.1 333.398 16.1Z" fill="#CFD2D3"/>
<path d="M337.5 15.5V19.8C337.5 20.2 337.8 20.4 338.1 20.4H340.6V19.7H338.6C338.5 19.7 338.4 19.6 338.4 19.5V15.4H337.5V15.5Z" fill="#CFD2D3"/>
<path d="M345.3 19.6C345.3 19.7 345.2 19.8 345.1 19.8H342.8C342.7 19.8 342.6 19.7 342.6 19.6V15.5H341.6V19.8C341.6 20.2 341.9 20.4 342.2 20.4H345.6C346 20.4 346.2 20.1 346.2 19.8V15.5H345.2V19.6H345.3Z" fill="#CFD2D3"/>
<path d="M347.301 20.499H351.101V19.799H348.301V18.499C348.301 18.399 348.401 18.299 348.501 18.299H351.101V17.599H348.301V16.499C348.301 16.399 348.401 16.299 348.501 16.299H351.101V15.599H347.301V20.499Z" fill="#CFD2D3"/>
<path d="M355.8 16.2H359.1V15.5H355.2C354.8 15.5 354.5 15.8 354.5 16.1V17.7C354.5 18 354.8 18.3 355.1 18.3H358C358.1 18.3 358.2 18.4 358.2 18.5V19.4C358.2 19.5 358.1 19.6 358 19.6H354.7V20.3H358.6C359 20.3 359.2 20 359.2 19.7V18.2C359.2 17.8 358.9 17.6 358.6 17.6H355.7C355.6 17.6 355.5 17.5 355.5 17.4V16.3C355.7 16.3 355.7 16.2 355.8 16.2Z" fill="#CFD2D3"/>
<path d="M363.001 20.5V16.2H364.701V15.5H360.301V16.2H362.001V20.5H363.001Z" fill="#CFD2D3"/>
<path d="M366.698 15.5H365.698V20.5H366.698V15.5Z" fill="#CFD2D3"/>
<path d="M371.398 19.8H368.798C368.698 19.8 368.598 19.7 368.598 19.6V16.4C368.598 16.3 368.698 16.2 368.798 16.2H371.398V15.5H368.298C367.898 15.5 367.698 15.8 367.698 16.1V19.8C367.698 20.2 367.998 20.4 368.298 20.4H371.398V19.8Z" fill="#CFD2D3"/>
<path d="M375.799 17.9L376.699 15.5H375.699L374.899 17.5H373.399V15.5H372.399V20.5H373.399V18.2H374.899L375.799 20.5H376.799L375.799 17.9Z" fill="#CFD2D3"/>
<path d="M380.399 16.1V19.8C380.399 20.2 380.699 20.4 380.999 20.4H384.099V19.7H381.499C381.399 19.7 381.299 19.6 381.299 19.5V16.3C381.299 16.2 381.399 16.1 381.499 16.1H384.099V15.4H380.999C380.699 15.5 380.399 15.8 380.399 16.1Z" fill="#CFD2D3"/>
<path d="M389.198 15.5H385.798C385.398 15.5 385.198 15.8 385.198 16.1V20.4H386.198V18.4H388.898V20.4H389.898V16.1C389.798 15.8 389.498 15.5 389.198 15.5ZM388.798 17.8H386.098V16.4C386.098 16.3 386.198 16.2 386.298 16.2H388.598C388.698 16.2 388.798 16.3 388.798 16.4V17.8Z" fill="#CFD2D3"/>
<path d="M391.801 16.7L394.401 20.5H395.501V15.5H394.501V19.3L391.901 15.5H390.801V20.5H391.801V16.7Z" fill="#CFD2D3"/>
<path d="M399 15.5V20.5H400V18.3H402.3V20.5H403.3V15.5H402.3V17.6H400V15.5H399Z" fill="#CFD2D3"/>
<path d="M405.501 16.2H408.101V15.5H404.301V20.5H408.101V19.8H405.301V18.5C405.301 18.4 405.401 18.3 405.501 18.3H408.101V17.6H405.301V16.5C405.301 16.3 405.401 16.2 405.501 16.2Z" fill="#CFD2D3"/>
<path d="M410 19.6V15.5H409V19.8C409 20.2 409.3 20.4 409.6 20.4H412.1V19.7H410.1C410.1 19.8 410 19.7 410 19.6Z" fill="#CFD2D3"/>
<path d="M417.2 15.5H413.1V20.5H414.1V18.9H417.1C417.5 18.9 417.7 18.6 417.7 18.3V16.2C417.9 15.8 417.6 15.5 417.2 15.5ZM416.8 18C416.8 18.1 416.7 18.2 416.6 18.2H414.1V16.2H416.6C416.7 16.2 416.8 16.3 416.8 16.4V18Z" fill="#CFD2D3"/>
<path d="M391 19.7H390V20.5H391V19.7Z" fill="#CFD2D3"/>
<path d="M322.1 28.6009H315.3L325.1 18.8009C325.8 18.1009 325.8 16.901 325.1 16.201L320.1 11.201C319.4 10.501 318.2 10.501 317.5 11.201L305.6 23.1009C305.3 23.4009 305.1 23.901 305.1 24.401C305.1 24.901 305.3 25.301 305.6 25.701L309.6 29.701H310.5H311.9H314.2H322.2C322.5 29.701 322.8 29.4009 322.8 29.1009C322.8 28.8009 322.4 28.6009 322.1 28.6009ZM318.2 11.901C318.5 11.601 318.9 11.601 319.2 11.901L324.2 16.901C324.5 17.201 324.5 17.601 324.2 17.901L316.6 25.501L310.6 19.501L318.2 11.901ZM313.6 28.6009H310.3H310L306.3 24.901C306.2 24.801 306.1 24.601 306.1 24.401C306.1 24.201 306.2 24.001 306.3 23.901L309.8 20.401L315.8 26.401L313.6 28.6009Z" fill="#CFD2D3"/>
<path d="M334.6 24.9V24.8C334.7 24.6 334.7 24.5 334.8 24.3H337.9V23.7H335C335 23.6 335.1 23.3 335.2 23L334.5 22.9C334.5 23 334.4 23.3 334.3 23.7H332.4V24.3H334.1C334 24.5 334 24.7 333.8 25.1H332V25.7H333.6C333.5 26 333.3 26.3 333.2 26.5V27H336.6C336.2 27.4 335.8 27.8 335.4 28.1C334.4 27.7 333.6 27.5 333.1 27.3L332.9 27.9C333.5 28.1 334.2 28.3 335 28.6C335.8 28.9 336.5 29.2 337.1 29.4L337.4 28.8C337.1 28.7 336.7 28.5 336.1 28.3C336.7 27.8 337.1 27.4 337.5 26.9V26.3H334C334.1 26.1 334.2 25.9 334.3 25.6H338.2V25H334.5C334.5 25 334.5 24.9 334.6 24.9Z" fill="#CFD2D3"/>
<path d="M339.901 26.099C339.901 26.599 339.901 27.099 339.901 27.299C339.901 27.599 339.801 27.899 339.701 28.099C339.601 28.299 339.501 28.599 339.301 28.999L339.901 29.299C340.101 28.899 340.301 28.599 340.401 28.199C340.501 27.899 340.601 27.499 340.601 27.099H342.301V28.999H342.901V27.199H344.601V28.099C344.601 28.299 344.601 28.399 344.501 28.399C344.501 28.499 344.401 28.499 344.201 28.499C344.001 28.499 343.801 28.499 343.501 28.399L343.601 29.099C343.901 29.099 344.101 29.099 344.301 29.099C344.501 29.099 344.701 29.099 344.901 28.999C345.001 28.999 345.101 28.899 345.201 28.699C345.301 28.599 345.301 28.399 345.301 28.199V23.199H340.101V26.099H339.901ZM342.901 23.799H344.601V24.899H342.901V23.799ZM342.901 25.599H344.601V26.599H342.901V25.599ZM340.601 23.799H342.201V24.899H340.601V23.799ZM340.601 26.299V25.499H342.201V26.499H340.601V26.299Z" fill="#CFD2D3"/>
<path d="M352.3 26.001L351.7 25.801C351.5 26.301 351.3 26.801 351.1 27.101C350.9 26.801 350.7 26.301 350.5 25.801L349.9 26.001C350.1 26.601 350.4 27.201 350.7 27.601C350.3 28.001 349.8 28.401 349.1 28.701L349.5 29.301C350.2 29.001 350.7 28.601 351.1 28.101C351.5 28.501 352.1 28.901 352.7 29.201L353.1 28.601C352.4 28.301 351.9 28.001 351.5 27.601C351.8 27.201 352 26.701 352.3 26.001Z" fill="#CFD2D3"/>
<path d="M349.5 26.4C349.9 25.9 350.3 25.4 350.7 24.8L350.2 24.5C349.8 25.1 349.4 25.6 349.1 26.1L349.5 26.4Z" fill="#CFD2D3"/>
<path d="M347 25.899C347 26.499 347 26.999 347 27.399C347 27.799 346.9 28.099 346.8 28.299C346.7 28.499 346.6 28.799 346.5 29.099L347.1 29.399C347.3 29.099 347.4 28.799 347.5 28.399C347.6 27.999 347.6 27.599 347.7 27.099H348.5V28.299C348.5 28.399 348.5 28.499 348.5 28.599C348.5 28.699 348.4 28.699 348.3 28.699C348.1 28.699 348 28.699 347.8 28.699L347.9 29.299C348.1 29.299 348.3 29.299 348.4 29.299C348.7 29.299 348.8 29.199 348.9 29.099C349 28.999 349.1 28.799 349.1 28.499V23.199H347.1V25.899H347ZM347.6 23.899H348.4V24.899H347.6V23.899ZM347.6 26.199V25.499H348.4V26.499H347.6V26.199Z" fill="#CFD2D3"/>
<path d="M351.399 24.8C351.699 25.2 352.099 25.7 352.599 26.3L353.099 25.9C352.699 25.4 352.299 24.9 351.899 24.4L351.399 24.8Z" fill="#CFD2D3"/>
<path d="M352.801 23.701H351.401C351.301 23.301 351.101 23.001 351.101 22.801L350.501 23.001C350.601 23.301 350.701 23.501 350.801 23.801H349.301V24.401H352.801V23.701Z" fill="#CFD2D3"/>
<path d="M359.2 26H360.3V25.5H357.9C357.9 25.4 358 25.3 358.1 25.1H360V24.6H358.2C358.2 24.5 358.3 24.4 358.3 24.1H360.1V23.6H358.3L358.4 23H357.8C357.8 23.2 357.8 23.4 357.7 23.6H356.2V24.1H357.6L357.5 24.6H356.3V25.1H357.3C357.3 25.2 357.2 25.4 357.1 25.5H356V26H356.8C356.5 26.5 356.1 26.9 355.5 27.3L355.8 27.8C356.1 27.5 356.4 27.3 356.7 27V27.4H357.6V27.9H356.1V28.4H357.6V29.3H358.2V28.4H359.7V27.9H358.2V27.4H359.1V27C359.4 27.3 359.7 27.6 360 27.8L360.3 27.3C360 27.1 359.8 27 359.6 26.8C359.6 26.5 359.4 26.2 359.2 26ZM358.4 26.8V26.2H357.8V26.8H357C357.2 26.5 357.4 26.2 357.6 25.9H358.6C358.8 26.2 359 26.5 359.2 26.8H358.4Z" fill="#CFD2D3"/>
<path d="M355.901 26.7L356.201 26.2C355.901 25.8 355.601 25.5 355.401 25.2V24.8H356.101V24.2H355.401V22.9H354.801V24.2H354.001V24.8H354.701C354.601 25.2 354.401 25.6 354.301 26C354.101 26.4 354.001 26.8 353.801 27.1L354.101 27.8C354.301 27.4 354.601 26.9 354.801 26.4V29.3H355.401V26.1C355.601 26.3 355.701 26.5 355.801 26.6L355.901 26.7Z" fill="#CFD2D3"/>
<path d="M365 24.801H362.1V27.601H365V24.801ZM364.4 27.101H362.7V25.501H364.4V27.101Z" fill="#CFD2D3"/>
<path d="M361.399 23.899H366.199V27.999C366.199 28.199 366.199 28.399 366.099 28.499C365.999 28.599 365.899 28.599 365.699 28.599C365.399 28.599 365.099 28.599 364.699 28.499L364.799 29.099C365.099 29.099 365.399 29.099 365.699 29.099C365.999 29.099 366.199 29.099 366.399 28.999C366.599 28.899 366.699 28.799 366.699 28.699C366.699 28.599 366.799 28.299 366.799 28.099V23.799H367.699V23.199H361.399V23.899Z" fill="#CFD2D3"/>
<path d="M371.201 27.3L369.601 28.1V26.2H371.101V23.4H368.801V24.1H370.501V25.6H369.001V28.2C369.001 28.3 368.901 28.5 368.801 28.6L369.101 29.2C369.201 29.1 369.501 29 369.801 28.8C370.301 28.6 370.801 28.3 371.401 28.1L371.201 27.3Z" fill="#CFD2D3"/>
<path d="M374.098 26.201C374.298 25.701 374.398 25.201 374.398 24.601H374.898V23.901H372.698C372.798 23.601 372.898 23.301 372.998 22.901L372.298 22.801C372.198 23.201 372.098 23.701 371.798 24.201C371.598 24.701 371.298 25.101 371.098 25.501L371.498 26.001C371.598 25.801 371.698 25.701 371.798 25.601C371.998 26.201 372.198 26.801 372.598 27.401C372.198 27.901 371.498 28.301 370.698 28.801L371.098 29.401C371.898 28.901 372.498 28.501 372.998 28.001C373.398 28.501 373.998 29.001 374.598 29.401L374.998 28.801C374.298 28.401 373.798 28.001 373.398 27.501C373.798 27.001 373.998 26.601 374.098 26.201ZM372.398 24.801L372.498 24.501H373.798C373.698 25.001 373.698 25.401 373.498 25.801C373.398 26.201 373.198 26.501 372.998 26.801C372.698 26.301 372.498 25.601 372.398 24.801Z" fill="#CFD2D3"/>
<path d="M381.298 25.9H382.198V25.4H379.498V25H381.798V24.5H379.498V24.1H382.098V23.6H380.598C380.698 23.4 380.798 23.3 380.898 23.2L380.998 23.1L380.398 22.9C380.298 23.1 380.098 23.4 379.898 23.7H378.598C378.498 23.6 378.398 23.3 378.198 23L377.598 23.2C377.598 23.3 377.698 23.4 377.798 23.6C377.798 23.6 377.798 23.6 377.798 23.7C377.798 23.7 377.798 23.8 377.898 23.8H376.398V24.3H378.998V24.7H376.698V25.2H378.998V25.6H376.298V26.1H377.198C377.298 26.3 377.398 26.5 377.498 26.7H376.198V27.2H382.498V26.7H380.998C381.098 26.4 381.198 26.2 381.298 25.9ZM378.898 26.6H377.998L377.698 26H378.898V26.6ZM380.398 26.6H379.498V26H380.698C380.598 26.1 380.498 26.3 380.398 26.6Z" fill="#CFD2D3"/>
<path d="M387.998 22.9H387.298V25.9H386.198V29.3H386.798V28.9H388.698V29.3H389.298V25.9H387.998V24.6H389.698V24H387.998V22.9ZM388.698 26.5V28.2H386.798V26.5H388.698Z" fill="#CFD2D3"/>
<path d="M386.298 23.6L385.798 23.4C385.698 23.6 385.698 23.9 385.498 24.1C385.298 24.3 385.298 24.6 385.198 24.8L385.698 25C385.798 24.8 385.898 24.6 385.998 24.3C386.098 24 386.198 23.8 386.298 23.6Z" fill="#CFD2D3"/>
<path d="M383.899 23.4L383.399 23.6C383.499 23.8 383.599 24 383.699 24.3C383.799 24.6 383.899 24.8 383.899 25L384.399 24.8C384.299 24.6 384.299 24.3 384.199 24C383.999 23.8 383.999 23.5 383.899 23.4Z" fill="#CFD2D3"/>
<path d="M385.098 22.9H384.498V25.3H383.298V25.9H384.398C384.298 26.2 384.098 26.5 383.898 26.9C383.698 27.2 383.498 27.5 383.198 27.8L383.598 28.4C383.998 27.9 384.298 27.4 384.498 26.9V29.3H385.098V27.1C385.298 27.3 385.498 27.5 385.698 27.8L386.098 27.3C385.798 27 385.498 26.6 385.098 26.3V25.9H386.098V25.3H385.098V22.9Z" fill="#CFD2D3"/>
<path d="M392.698 25.6C392.498 25.7 392.298 25.7 392.198 25.8V24.7H392.798V24.1H392.198V22.9H391.598V24.1H390.798V24.7H391.598V26C391.298 26.1 390.998 26.2 390.698 26.3L390.798 26.9L391.598 26.6V28.2C391.598 28.3 391.598 28.4 391.498 28.4C391.498 28.4 391.398 28.5 391.298 28.5C391.098 28.5 390.898 28.5 390.798 28.5L390.898 29.1C391.098 29.1 391.298 29.1 391.498 29.1C391.698 29.1 391.798 29.1 391.898 29C391.998 29 392.098 28.9 392.098 28.8C392.098 28.7 392.198 28.5 392.198 28.3V26.3L392.698 26.1V25.6Z" fill="#CFD2D3"/>
<path d="M396.201 24.101H396.901V23.501H395.401C395.401 23.401 395.301 23.301 395.301 23.301C395.301 23.201 395.201 23.201 395.201 23.101C395.201 23.001 395.101 22.901 395.101 22.801L394.401 23.001C394.501 23.101 394.501 23.301 394.601 23.601H393.001V24.201H393.601L393.801 25.101H392.801V25.701H397.001V25.101H396.001L396.201 24.101ZM395.301 25.001H394.401L394.201 24.101H395.501C395.501 24.401 395.401 24.701 395.301 25.001Z" fill="#CFD2D3"/>
<path d="M394.8 25.799L394.2 25.699C394.2 25.799 394.1 26.099 393.9 26.299H392.7V26.899H393.6C393.4 27.199 393.3 27.399 393.1 27.599C393.6 27.799 394 27.999 394.4 28.099C394 28.299 393.4 28.499 392.6 28.599L392.8 29.199C393.3 29.099 393.8 28.999 394.1 28.799C394.5 28.699 394.8 28.499 395 28.299C395.5 28.499 396 28.799 396.6 29.099L396.9 28.499C396.5 28.299 396.1 28.099 395.5 27.799C395.8 27.499 396 27.099 396.2 26.699H396.9V26.099H394.4C394.7 26.099 394.7 25.999 394.8 25.799ZM395.7 26.899C395.5 27.299 395.3 27.599 395.1 27.799C394.7 27.599 394.3 27.499 394.1 27.399C394.2 27.299 394.3 27.099 394.4 26.899H395.7Z" fill="#CFD2D3"/>
<path d="M401.499 29.1H402.099V28.5H403.499V29H404.099V23.4H401.399V29.1H401.499ZM402.099 24.1H403.499V27.9H402.099V24.1Z" fill="#CFD2D3"/>
<path d="M399.999 25.7V25.4H401.099V24.8H399.999V23.8C400.499 23.7 400.799 23.6 400.999 23.6L400.799 23C400.399 23.1 399.999 23.2 399.499 23.3C398.999 23.4 398.499 23.5 398.099 23.5L398.199 24.1C398.499 24.1 398.799 24 399.199 24V24.8H397.999V25.4H399.099C398.999 25.7 398.799 26.1 398.599 26.5C398.399 26.9 398.199 27.2 397.899 27.5L398.299 28.1C398.699 27.6 398.999 27 399.299 26.4V29.3H399.899V26.5C400.199 26.8 400.399 27.1 400.699 27.4L401.099 26.9C400.799 26.5 400.399 26.1 399.999 25.7Z" fill="#CFD2D3"/>
<path d="M409.499 23.901C409.399 23.701 409.299 23.501 409.199 23.301C409.099 23.101 408.999 23.001 408.899 22.801L408.399 23.101C408.499 23.201 408.499 23.301 408.699 23.501C408.799 23.701 408.899 23.901 408.999 24.101L409.499 23.901Z" fill="#CFD2D3"/>
<path d="M405.799 25.8C405.799 26.4 405.799 26.9 405.799 27.3C405.799 27.7 405.699 27.9 405.699 28.2C405.599 28.4 405.499 28.7 405.399 29L405.899 29.3C406.099 29 406.199 28.6 406.299 28.3C406.399 28 406.399 27.6 406.499 27.1H407.199V28.3C407.199 28.4 407.199 28.5 407.099 28.6C407.099 28.6 406.999 28.7 406.899 28.7C406.799 28.7 406.699 28.7 406.499 28.7L406.599 29.3C406.799 29.3 406.999 29.3 407.099 29.3C407.299 29.3 407.499 29.2 407.599 29.1C407.699 29 407.699 28.8 407.699 28.6V23.4H405.799V25.8ZM406.399 23.9H407.099V24.9H406.399V23.9ZM406.399 25.5H407.099V26.5H406.399V25.5Z" fill="#CFD2D3"/>
<path d="M411.299 27.801C411.299 28.001 411.299 28.201 411.299 28.201C411.299 28.301 411.299 28.401 411.299 28.501C411.299 28.601 411.199 28.601 411.099 28.601H410.999H410.899C410.799 28.601 410.799 28.601 410.699 28.501C410.699 28.401 410.699 28.401 410.699 28.201V26.601H411.499V24.201H410.699C410.899 23.901 410.999 23.601 411.099 23.401L411.299 23.101L410.699 22.801C410.599 23.001 410.499 23.201 410.399 23.401C410.299 23.701 410.099 23.901 409.999 24.101H408.299V26.601H408.899C408.899 27.001 408.899 27.301 408.799 27.501C408.699 27.701 408.599 28.001 408.499 28.101C408.299 28.301 408.099 28.501 407.899 28.601L408.299 29.101C408.599 28.901 408.799 28.601 408.999 28.401C409.199 28.201 409.299 27.901 409.399 27.601C409.499 27.301 409.499 26.901 409.499 26.501H410.099V28.201C410.099 28.501 410.099 28.601 410.199 28.801C410.299 28.901 410.399 29.001 410.599 29.001C410.699 29.001 410.799 29.001 410.899 29.001C410.999 29.001 411.099 29.001 411.199 29.001C411.399 29.001 411.599 28.901 411.699 28.801C411.799 28.701 411.899 28.501 411.899 28.301C411.899 28.201 411.899 28.001 411.899 27.801C411.899 27.601 411.899 27.501 411.899 27.401V27.201L411.299 27.101C411.299 27.501 411.299 27.601 411.299 27.801ZM408.799 26.101V24.801H410.699V26.101H408.799Z" fill="#CFD2D3"/>
<path d="M417.501 27.799H419.101V27.199H417.301V26.899H418.701V24.699H415.301V26.899H416.701C416.701 27.099 416.701 27.199 416.701 27.199V27.299H414.901V27.799H416.501C416.401 27.999 416.201 28.199 415.901 28.299C415.601 28.499 415.201 28.599 414.801 28.699L415.001 29.299C416.001 28.999 416.701 28.599 417.001 28.099C417.401 28.699 418.101 29.099 419.001 29.299L419.201 28.699C418.801 28.599 418.401 28.499 418.101 28.299C417.901 28.199 417.601 27.999 417.501 27.799ZM415.901 25.099H418.201V25.499H415.901V25.099ZM415.901 26.299V25.899H418.201V26.299H415.901Z" fill="#CFD2D3"/>
<path d="M417.5 22.9V23.5H416.5V22.9H415.9V23.5H415V24H415.9V24.4H416.5V24H417.5V24.4H418.1V24H419.1V23.5H418.1V22.9H417.5Z" fill="#CFD2D3"/>
<path d="M414.498 25.4L414.298 25.1V24.7H414.998V24.2H414.298V22.9H413.698V24.2H412.898V24.8H413.698C413.598 25.2 413.398 25.6 413.298 26C413.098 26.4 412.898 26.8 412.698 27.1L413.098 27.7C413.398 27.3 413.598 26.8 413.798 26.1V29.3H414.398V26C414.698 26.4 414.798 26.6 414.898 26.7L415.198 26.1L414.498 25.4Z" fill="#CFD2D3"/>
<path d="M118.398 17.599H115.198V20.099H118.498C118.598 20.099 118.698 19.999 118.698 19.899V17.799C118.598 17.699 118.498 17.599 118.398 17.599Z" fill="#CFD2D3"/>
<path d="M125.2 17.599H122.2C122.1 17.599 122 17.699 122 17.899V19.699H125.5V17.899C125.4 17.699 125.3 17.599 125.2 17.599Z" fill="#CFD2D3"/>
<path d="M75.2982 19.301V18.001C75.2982 17.901 75.1982 17.801 75.0982 17.801H72.1982V19.601H75.0982C75.1982 19.501 75.2982 19.401 75.2982 19.301Z" fill="#CFD2D3"/>
<path d="M136.501 17.599H133.301V20.099H136.601C136.701 20.099 136.801 19.999 136.801 19.899V17.799C136.801 17.699 136.701 17.599 136.501 17.599Z" fill="#CFD2D3"/>
<path d="M75.3982 20.4H72.1982V22.2H75.3982C75.4982 22.2 75.5982 22.1 75.5982 22V20.7C75.5982 20.5 75.4982 20.4 75.3982 20.4Z" fill="#CFD2D3"/>
<path d="M100.099 17.599H96.8994V20.099H100.199C100.299 20.099 100.399 19.999 100.399 19.899V17.799C100.299 17.699 100.199 17.599 100.099 17.599Z" fill="#CFD2D3"/>
<path d="M68.5008 17.599H65.5008C65.4008 17.599 65.3008 17.699 65.3008 17.899V19.699H68.8008V17.899C68.7008 17.699 68.6008 17.599 68.5008 17.599Z" fill="#CFD2D3"/>
<path d="M38.5008 17.599H35.3008V20.099H38.6008C38.7008 20.099 38.8008 19.999 38.8008 19.899V17.799C38.8008 17.699 38.7008 17.599 38.5008 17.599Z" fill="#CFD2D3"/>
<path d="M189.399 17.4V21.3V25.2H190.699H191.999V22.6V20H194.599H197.199V21.3V22.6H198.499H199.799V20V17.4H194.599H189.399Z" fill="#CFD2D3"/>
<path d="M194.6 22.599V23.899V25.199H195.9H197.2V23.899V22.599H195.9H194.6Z" fill="#CFD2D3"/>
</svg>

After

Width:  |  Height:  |  Size: 22 KiB

View File

@@ -0,0 +1,26 @@
<svg width="36" height="436" viewBox="0 0 36 436" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M35.7832 0H0V433.785H35.7832V0Z" fill="#535656"/>
<path d="M11.8736 135.851H18.7736C19.5236 135.851 20.2736 136.451 20.2736 137.351V149.501H22.6736V136.001H28.8236C29.5736 136.001 30.3236 136.601 30.3236 137.501V149.651H32.7236V131.951H9.47363V149.351H11.8736V135.851Z" fill="#CFD2D3"/>
<path d="M27.0236 167.951V152.201H9.47363V156.101H25.0736V166.751H9.47363V170.651H24.3236C25.8236 170.651 27.0236 169.451 27.0236 167.951Z" fill="#CFD2D3"/>
<path d="M5.12481 192.551H24.1748C25.6748 192.551 26.8748 191.351 26.8748 189.851V175.901C26.8748 175.151 26.5748 174.551 26.1248 174.101C25.6748 173.651 24.9248 173.351 24.3248 173.351H12.0248C10.5248 173.351 9.3248 174.551 9.3248 176.051V188.651H4.37481V173.651H2.4248V190.001C2.4248 191.351 3.62481 192.551 5.12481 192.551ZM11.4248 177.251H24.7748V188.651H11.4248V177.251Z" fill="#CFD2D3"/>
<path d="M32.576 195.399H30.626V199.299H32.576V195.399Z" fill="#CFD2D3"/>
<path d="M26.8736 195.399H9.47363V199.299H26.8736V195.399Z" fill="#CFD2D3"/>
<path d="M9.47363 216.55V220.45H24.3236C25.8236 220.45 27.0236 219.25 27.0236 217.75V202H9.47363V205.9H25.0736V216.55H9.47363Z" fill="#CFD2D3"/>
<path d="M9.47363 241.449H11.4236V227.199H16.6736V241.749H24.3236C25.8236 241.749 27.0236 240.549 27.0236 239.049V225.999C27.0236 224.499 25.8236 223.299 24.3236 223.299H12.1736C10.6736 223.299 9.47363 224.499 9.47363 225.999V241.449ZM18.6236 227.199H25.0736V237.849H18.6236V227.199Z" fill="#CFD2D3"/>
<path d="M9.47363 262.751H11.4236V248.501H16.6736V263.051H24.3236C25.8236 263.051 27.0236 261.851 27.0236 260.351V247.301C27.0236 245.801 25.8236 244.601 24.3236 244.601H12.1736C10.6736 244.601 9.47363 245.801 9.47363 247.301V262.751ZM18.6236 248.501H25.0736V259.151H18.6236V248.501Z" fill="#CFD2D3"/>
<path d="M9.47363 269.649H22.9736V277.599H26.7236V274.599C26.7236 273.099 25.9736 271.749 24.7736 270.849L22.9736 269.649H26.7236V265.899H9.47363V269.649Z" fill="#CFD2D3"/>
<path d="M32.576 280H30.626V283.9H32.576V280Z" fill="#CFD2D3"/>
<path d="M26.8736 280H9.47363V283.9H26.8736V280Z" fill="#CFD2D3"/>
<path d="M9.47363 301.151V305.051H24.3236C25.8236 305.051 27.0236 303.851 27.0236 302.351V286.601H9.47363V290.501H25.0736V301.151H9.47363Z" fill="#CFD2D3"/>
<path d="M26.7248 324.549V310.599C26.7248 309.849 26.4248 309.249 25.9748 308.799C25.5248 308.349 24.7748 308.049 24.1748 308.049H12.0248C10.5248 308.049 9.3248 309.249 9.3248 310.749V323.349H4.37481V308.349H2.4248V324.549C2.4248 326.049 3.62481 327.249 5.12481 327.249H24.1748C25.6748 327.099 26.7248 325.899 26.7248 324.549ZM11.4248 311.799H24.7748V323.199H11.4248V311.799Z" fill="#CFD2D3"/>
<path d="M19.8236 362.351H30.0236C31.5236 362.351 32.5736 361.151 32.5736 359.801V340.601H9.47363V344.501H17.2736V359.951C17.2736 361.151 18.4736 362.351 19.8236 362.351ZM19.6736 344.351H30.1736V356.951C30.1736 357.701 29.5736 358.451 28.6736 358.451H21.0236C20.2736 358.451 19.5236 357.851 19.5236 356.951V344.351H19.6736Z" fill="#CFD2D3"/>
<path d="M9.47363 367.749V374.049H11.4236V368.949H32.7236V365.049H12.1736C10.6736 365.199 9.47363 366.399 9.47363 367.749Z" fill="#CFD2D3"/>
<path d="M17.2736 376.899H12.1736C10.6736 376.899 9.47363 378.099 9.47363 379.599V395.349H24.0236C25.6736 395.349 27.0236 393.549 27.0236 391.449V378.549H25.0736V391.449H19.9736V379.599C19.8236 378.099 18.6236 376.899 17.2736 376.899ZM17.8736 391.449H11.4236V380.799H17.8736V391.449Z" fill="#CFD2D3"/>
<path d="M26.8742 397.149H24.9242V401.049H12.0242C10.5242 401.049 9.32422 402.249 9.32422 403.749V408.849H11.4242V406.749C11.4242 405.849 12.1742 404.949 13.2242 404.949H24.9242V408.849H26.8742V404.949H32.5742V401.049H26.8742V397.149Z" fill="#CFD2D3"/>
<path d="M24.3236 429.401C25.8236 429.401 27.0236 428.201 27.0236 426.701V413.651C27.0236 412.151 25.8236 410.951 24.3236 410.951H12.1736C10.6736 410.951 9.47363 412.151 9.47363 413.651V429.101H11.4236V414.851H16.6736V429.401H24.3236ZM18.6236 414.851H25.0736V425.501H18.6236V414.851Z" fill="#CFD2D3"/>
<path d="M12.4736 26.2H20.4236C21.3236 26.2 22.2236 25.75 22.8236 25.15L22.9736 25H29.8736C31.5236 25 32.8736 23.65 32.8736 22V4H9.47363V23.2C9.47363 24.85 10.8236 26.2 12.4736 26.2ZM22.8236 8.8H29.4236V19.15C29.4236 19.6 28.9736 20.05 28.5236 20.05H23.7236C23.2736 20.05 22.8236 19.6 22.8236 19.15V8.8ZM12.9236 8.8H19.5236V20.5C19.5236 20.95 19.0736 21.4 18.6236 21.4H13.8236C13.2236 21.4 12.9236 20.95 12.9236 20.5V8.8Z" fill="#CFD2D3"/>
<path d="M27.6236 43.599V30.3994H24.6236V42.999H20.7236V32.0494C20.7236 30.3994 19.3736 28.8994 17.5736 28.8994H12.6236C10.9736 28.8994 9.47363 30.2494 9.47363 32.0494V47.949H24.1736C26.1236 47.949 27.6236 45.999 27.6236 43.599ZM17.7236 42.999H12.4736V33.8494H17.5736V42.999H17.7236Z" fill="#CFD2D3"/>
<path d="M27.6236 73.449V50.799H9.47363V55.749H24.6236V61.299H9.47363V66.099H24.6236V71.649H9.47363V76.599H24.4736C26.2736 76.599 27.6236 75.099 27.6236 73.449Z" fill="#CFD2D3"/>
<path d="M9.47363 94.9C9.47363 96.7 10.8236 98.05 12.6236 98.05H24.4736C26.1236 98.05 27.6236 96.7 27.6236 94.9V83.95H33.1736V79H9.47363V94.9ZM12.4736 83.95H24.6236V93.1H12.4736V83.95Z" fill="#CFD2D3"/>
<path d="M27.6236 114.099H12.3236V105.099H27.6236V100.299H12.4736C10.8236 100.299 9.47363 101.649 9.47363 103.299V118.599H27.6236V114.099Z" fill="#CFD2D3"/>
</svg>

After

Width:  |  Height:  |  Size: 5.2 KiB

View File

@@ -0,0 +1,67 @@
<svg width="440" height="36" viewBox="0 0 440 36" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M428.299 2.40002H12.699V3.40002H428.299V2.40002Z" fill="#CFD2D3"/>
<path d="M338.999 13.7H341.899V13H338.399C337.999 13 337.799 13.3 337.799 13.6V17.4C337.799 17.8 338.099 18 338.399 18H341.399C341.799 18 341.999 17.7 341.999 17.4V15H339.899V15.7H340.999V17.1C340.999 17.2 340.899 17.3 340.799 17.3H338.999C338.899 17.3 338.799 17.2 338.799 17.1V13.8C338.899 13.8 338.899 13.7 338.999 13.7Z" fill="#CFD2D3"/>
<path d="M346.3 17.3H344.3C344.2 17.3 344.1 17.2 344.1 17.1V13H343.1V17.3C343.1 17.7 343.4 17.9 343.7 17.9H346.2V17.3H346.3Z" fill="#CFD2D3"/>
<path d="M350.999 17.2C350.999 17.3 350.899 17.4 350.799 17.4H348.499C348.399 17.4 348.299 17.3 348.299 17.2V13.1H347.299V17.4C347.299 17.8 347.599 18 347.899 18H351.299C351.699 18 351.899 17.7 351.899 17.4V13.1H350.899V17.2H350.999Z" fill="#CFD2D3"/>
<path d="M352.898 18H356.698V17.3H353.998V16C353.998 15.9 354.098 15.8 354.198 15.8H356.798V15.1H353.998V14C353.998 13.9 354.098 13.8 354.198 13.8H356.798V13.1H352.998V18H352.898Z" fill="#CFD2D3"/>
<path d="M361.499 13.8H364.799V13.1H360.899C360.499 13.1 360.199 13.4 360.199 13.7V15.3C360.199 15.6 360.499 15.9 360.799 15.9H363.699C363.799 15.9 363.899 16 363.899 16.1V17C363.899 17.1 363.799 17.2 363.699 17.2H360.399V17.9H364.299C364.699 17.9 364.899 17.6 364.899 17.3V15.8C364.899 15.4 364.599 15.2 364.299 15.2H361.399C361.299 15.2 361.199 15.1 361.199 15V14C361.299 13.9 361.399 13.8 361.499 13.8Z" fill="#CFD2D3"/>
<path d="M368.7 18V13.8H370.4V13.1H366V13.8H367.6V18H368.7Z" fill="#CFD2D3"/>
<path d="M372.299 13.1H371.299V18.1H372.299V13.1Z" fill="#CFD2D3"/>
<path d="M377.098 17.3H374.498C374.398 17.3 374.298 17.2 374.298 17.1V14C374.298 13.9 374.398 13.8 374.498 13.8H377.098V13.1H373.998C373.598 13.1 373.398 13.4 373.398 13.7V17.4C373.398 17.8 373.698 18 373.998 18H377.098V17.3Z" fill="#CFD2D3"/>
<path d="M381.4 15.4L382.4 13.1H381.3L380.6 15.1H379.1V13.1H378V18H379.1V15.8H380.6L381.4 18H382.5L381.4 15.4Z" fill="#CFD2D3"/>
<path d="M386 13.7V17.4C386 17.8 386.3 18 386.6 18H389.7V17.3H387.1C387 17.3 386.9 17.2 386.9 17.1V14C386.9 13.9 387 13.8 387.1 13.8H389.7V13.1H386.6C386.3 13.1 386 13.4 386 13.7Z" fill="#CFD2D3"/>
<path d="M394.799 13.1H391.399C390.999 13.1 390.799 13.4 390.799 13.7V18H391.799V16H394.499V18H395.499V13.7C395.499 13.4 395.199 13.1 394.799 13.1ZM394.499 15.4H391.799V14C391.799 13.9 391.899 13.8 391.999 13.8H394.299C394.399 13.8 394.499 13.9 394.499 14V15.4Z" fill="#CFD2D3"/>
<path d="M397.398 14.3L399.998 18H401.098V13.1H400.098V16.9L397.598 13.1H396.398V18H397.398V14.3Z" fill="#CFD2D3"/>
<path d="M404.699 13.1V18H405.699V15.8H407.899V18H408.899V13.1H407.899V15.1H405.699V13.1H404.699Z" fill="#CFD2D3"/>
<path d="M411.098 13.8H413.698V13.1H409.898V18.1H413.698V17.4H410.898V16C410.898 15.9 410.998 15.8 411.098 15.8H413.698V15.1H410.898V14C410.898 13.9 410.998 13.8 411.098 13.8Z" fill="#CFD2D3"/>
<path d="M415.699 17.1V13H414.699V17.3C414.699 17.7 414.999 17.9 415.299 17.9H417.799V17.2H415.799C415.799 17.3 415.699 17.2 415.699 17.1Z" fill="#CFD2D3"/>
<path d="M422.899 13.1H418.799V18.1H419.799V16.5H422.799C423.199 16.5 423.399 16.2 423.399 15.9V13.8C423.499 13.4 423.199 13.1 422.899 13.1ZM422.499 15.5C422.499 15.6 422.399 15.7 422.299 15.7H419.799V13.8H422.299C422.399 13.8 422.499 13.9 422.499 14V15.5Z" fill="#CFD2D3"/>
<path d="M425.6 17.301H424.6V18.101H425.6V17.301Z" fill="#CFD2D3"/>
<path d="M327.699 26.101H320.899L330.699 16.301C331.399 15.601 331.399 14.401 330.699 13.701L325.699 8.70096C324.999 8.00096 323.799 8.00096 323.099 8.70096L311.199 20.601C310.899 20.901 310.699 21.401 310.699 21.901C310.699 22.401 310.899 22.801 311.199 23.201L315.199 27.201H316.099H317.499H319.799H327.799C328.099 27.201 328.399 26.901 328.399 26.601C328.399 26.301 327.999 26.101 327.699 26.101ZM323.899 9.50095C324.199 9.20095 324.599 9.20095 324.899 9.50095L329.899 14.501C330.199 14.801 330.199 15.201 329.899 15.501L322.299 23.101L316.299 17.101L323.899 9.50095ZM319.299 26.101H315.999H315.599L311.899 22.401C311.799 22.301 311.699 22.101 311.699 21.901C311.699 21.701 311.799 21.501 311.899 21.401L315.399 17.901L321.399 23.901L319.299 26.101Z" fill="#CFD2D3"/>
<path d="M331.798 26.1H329.998C329.698 26.1 329.398 26.4 329.398 26.7C329.398 27 329.698 27.3 329.998 27.3H331.798C332.098 27.3 332.398 27 332.398 26.7C332.298 26.4 332.098 26.1 331.798 26.1Z" fill="#CFD2D3"/>
<path d="M340.1 22.4V22.3C340.2 22.1 340.2 22 340.3 21.8H343.4V21.2H340.5C340.5 21.1 340.6 20.8 340.7 20.5L340 20.4C340 20.5 339.9 20.8 339.8 21.2H337.9V21.8H339.6C339.5 22 339.5 22.2 339.3 22.6H337.5V23.2H339.1C339 23.5 338.8 23.8 338.7 24V24.5H342.1C341.7 24.9 341.3 25.3 340.9 25.6C339.9 25.2 339.1 25 338.6 24.8L338.4 25.4C339 25.6 339.7 25.8 340.5 26.1C341.3 26.4 342 26.7 342.6 26.9L342.9 26.3C342.6 26.2 342.2 26 341.6 25.8C342.2 25.3 342.6 24.9 343 24.4V23.8H339.5C339.6 23.6 339.7 23.4 339.8 23.1H343.7V22.5H340C340.1 22.5 340.1 22.5 340.1 22.4Z" fill="#CFD2D3"/>
<path d="M345.498 23.6C345.498 24.1 345.498 24.6 345.498 24.8C345.498 25.1 345.398 25.4 345.298 25.6C345.198 25.8 345.098 26.1 344.898 26.5L345.498 26.8C345.698 26.4 345.898 26.1 345.998 25.7C346.098 25.4 346.198 25 346.198 24.6H347.898V26.5H348.498V24.6H350.198V25.5C350.198 25.7 350.198 25.8 350.098 25.8C350.098 25.9 349.998 25.9 349.798 25.9C349.598 25.9 349.398 25.9 349.098 25.8L349.198 26.5C349.498 26.5 349.698 26.5 349.898 26.5C350.098 26.5 350.298 26.5 350.498 26.4C350.598 26.4 350.698 26.3 350.798 26.1C350.898 26 350.898 25.8 350.898 25.6V20.4H345.698V23.6H345.498ZM348.398 21.4H350.098V22.5H348.398V21.4ZM348.398 23.1H350.098V24.1H348.398V23.1ZM346.098 21.4H347.698V22.5H346.098V21.4ZM346.098 23.9V23.1H347.698V24.1H346.098V23.9Z" fill="#CFD2D3"/>
<path d="M357.8 23.6L357.2 23.4C357 23.9 356.8 24.4 356.6 24.7C356.4 24.4 356.2 23.9 356 23.4L355.4 23.6C355.6 24.2 355.9 24.8 356.2 25.2C355.8 25.6 355.3 26 354.6 26.3L355 26.9C355.7 26.6 356.2 26.2 356.6 25.7C357 26.1 357.6 26.5 358.2 26.8L358.6 26.2C357.9 25.9 357.4 25.6 357 25.2C357.3 24.8 357.6 24.2 357.8 23.6Z" fill="#CFD2D3"/>
<path d="M355.099 23.9C355.499 23.4 355.899 22.9 356.299 22.3L355.799 22C355.399 22.6 354.999 23.1 354.699 23.6L355.099 23.9Z" fill="#CFD2D3"/>
<path d="M352.6 23.501C352.6 24.101 352.6 24.601 352.6 25.001C352.6 25.401 352.5 25.701 352.4 25.901C352.3 26.101 352.2 26.401 352.1 26.701L352.7 27.001C352.9 26.701 353 26.401 353.1 26.001C353.2 25.601 353.2 25.201 353.3 24.701H354.1V25.901C354.1 26.001 354.1 26.101 354.1 26.201C354.1 26.301 354 26.301 353.9 26.301C353.7 26.301 353.6 26.301 353.4 26.301L353.5 26.901C353.7 26.901 353.9 26.901 354 26.901C354.3 26.901 354.4 26.801 354.5 26.701C354.6 26.601 354.7 26.401 354.7 26.101V20.801H352.7V23.501H352.6ZM353.1 21.401H353.9V22.401H353.1V21.401ZM353.1 23.701V23.001H353.9V24.001H353.1V23.701Z" fill="#CFD2D3"/>
<path d="M356.898 22.3C357.198 22.7 357.598 23.2 358.098 23.8L358.598 23.4C358.198 22.9 357.798 22.4 357.398 21.9L356.898 22.3Z" fill="#CFD2D3"/>
<path d="M358.398 21.3H356.998C356.898 20.9 356.698 20.6 356.698 20.4L356.098 20.6C356.198 20.9 356.298 21.1 356.398 21.4H354.898V22H358.398V21.3Z" fill="#CFD2D3"/>
<path d="M364.8 23.5H365.9V23H363.5C363.5 22.9 363.6 22.8 363.7 22.6H365.6V22H363.8C363.8 21.9 363.9 21.8 363.9 21.5H365.7V21H363.9L364 20.4H363.4C363.4 20.6 363.4 20.8 363.3 21H361.8V21.5H363.2L363.1 22H361.9V22.5H362.9C362.9 22.6 362.8 22.8 362.7 22.9H361.6V23.4H362.4C362.1 23.9 361.7 24.3 361.1 24.7L361.4 25.2C361.7 24.9 362 24.7 362.3 24.4V24.8H363.2V25.3H361.7V25.8H363.2V26.7H363.8V25.8H365.3V25.3H363.8V24.8H364.7V24.4C365 24.7 365.3 25 365.6 25.2L365.9 24.7C365.6 24.5 365.4 24.4 365.2 24.2C365.1 24 364.9 23.8 364.8 23.5ZM363.9 24.4V23.8H363.3V24.4H362.5C362.7 24.1 362.9 23.8 363.1 23.5H364.1C364.3 23.8 364.5 24.1 364.7 24.4H363.9Z" fill="#CFD2D3"/>
<path d="M361.498 24.3L361.798 23.8C361.498 23.4 361.198 23.1 360.998 22.8V22.4H361.698V21.8H360.998V20.5H360.398V21.8H359.598V22.4H360.298C360.198 22.8 359.998 23.2 359.898 23.6C359.698 24 359.598 24.4 359.398 24.7L359.698 25.4C359.898 25 360.198 24.5 360.398 24V26.9H360.998V23.7C361.198 23.9 361.298 24.1 361.398 24.2L361.498 24.3Z" fill="#CFD2D3"/>
<path d="M370.599 22.4H367.699V25.2H370.599V22.4ZM369.899 24.6H368.199V23H369.899V24.6Z" fill="#CFD2D3"/>
<path d="M366.898 21.401H371.698V25.501C371.698 25.701 371.698 25.901 371.598 26.001C371.498 26.101 371.398 26.101 371.198 26.101C370.898 26.101 370.598 26.101 370.198 26.001L370.298 26.601C370.598 26.601 370.898 26.601 371.198 26.601C371.498 26.601 371.698 26.601 371.898 26.501C372.098 26.401 372.198 26.301 372.198 26.201C372.198 26.101 372.298 25.801 372.298 25.601V21.301H373.198V20.701H366.898V21.401Z" fill="#CFD2D3"/>
<path d="M376.798 24.9L375.198 25.7V23.8H376.698V21H374.398V21.7H376.098V23.2H374.598V25.8C374.598 25.9 374.498 26.1 374.398 26.2L374.698 26.8C374.798 26.7 375.098 26.6 375.398 26.4C375.898 26.2 376.398 25.9 376.998 25.7L376.798 24.9Z" fill="#CFD2D3"/>
<path d="M379.699 23.701C379.899 23.201 379.999 22.701 379.999 22.101H380.499V21.401H378.299C378.399 21.101 378.499 20.801 378.599 20.401L377.899 20.301C377.799 20.701 377.699 21.201 377.399 21.701C377.199 22.201 376.899 22.601 376.699 23.001L377.099 23.501C377.199 23.301 377.299 23.201 377.399 23.101C377.599 23.701 377.799 24.301 378.199 24.901C377.799 25.401 377.099 25.801 376.299 26.301L376.699 26.901C377.499 26.401 378.099 26.001 378.599 25.501C378.999 26.001 379.599 26.501 380.199 26.901L380.599 26.301C379.899 25.901 379.399 25.501 378.999 25.001C379.299 24.601 379.499 24.201 379.699 23.701ZM377.899 22.401L377.999 22.101H379.299C379.199 22.601 379.199 23.001 378.999 23.401C378.899 23.801 378.699 24.101 378.499 24.401C378.299 23.901 378.099 23.201 377.899 22.401Z" fill="#CFD2D3"/>
<path d="M382.299 26.8H382.899V26.6H386.399V26.8H386.999V25H382.199V26.8H382.299ZM382.999 25.5H386.499V26H382.999V25.5Z" fill="#CFD2D3"/>
<path d="M386.899 23.5H387.799V23H385.099V22.6H387.399V22.1H385.099V21.7H387.699V21.2H386.199C386.299 21 386.399 20.9 386.499 20.8L386.599 20.7L385.999 20.5C385.899 20.7 385.699 21 385.499 21.3H384.199C384.099 21.2 383.999 20.9 383.799 20.6L383.199 20.8C383.199 20.9 383.299 21 383.399 21.2C383.399 21.2 383.399 21.2 383.399 21.3C383.399 21.3 383.399 21.4 383.499 21.4H381.999V21.9H384.599V22.3H382.299V22.8H384.599V23.2H381.899V23.7H382.799C382.899 23.9 382.999 24.1 383.099 24.3H381.799V24.8H388.099V24.3H386.799C386.699 24 386.699 23.7 386.899 23.5ZM384.399 24.1H383.499L383.199 23.5H384.399V24.1ZM385.999 24.1H385.099V23.5H386.299C386.199 23.7 386.099 23.9 385.999 24.1Z" fill="#CFD2D3"/>
<path d="M393.599 20.5H392.899V23.5H391.799V26.9H392.399V26.5H394.299V26.9H394.899V23.5H393.499V22.2H395.199V21.6H393.499V20.5H393.599ZM394.299 24.1V25.8H392.399V24.1H394.299Z" fill="#CFD2D3"/>
<path d="M391.799 21.1L391.299 20.9C391.199 21.1 391.199 21.4 390.999 21.6C390.799 21.8 390.799 22.1 390.699 22.3L391.199 22.5C391.299 22.3 391.399 22.1 391.499 21.8C391.699 21.6 391.799 21.3 391.799 21.1Z" fill="#CFD2D3"/>
<path d="M389.398 20.9L388.898 21.1C388.998 21.3 389.098 21.5 389.198 21.8C389.298 22.1 389.398 22.3 389.398 22.5L389.898 22.3C389.798 22.1 389.798 21.8 389.698 21.5C389.598 21.3 389.498 21.1 389.398 20.9Z" fill="#CFD2D3"/>
<path d="M390.599 20.5H389.999V22.9H388.799V23.5H389.899C389.799 23.8 389.599 24.1 389.399 24.5C389.199 24.8 388.999 25.1 388.699 25.4L389.099 26C389.499 25.5 389.799 25 389.999 24.5V26.9H390.599V24.7C390.799 24.9 390.999 25.1 391.199 25.4L391.599 24.9C391.299 24.6 390.999 24.2 390.599 23.9V23.5H391.599V22.9H390.599V20.5Z" fill="#CFD2D3"/>
<path d="M398.199 23.2C397.999 23.3 397.799 23.3 397.699 23.4V22.3H398.299V21.7H397.699V20.5H397.099V21.7H396.299V22.3H397.099V23.6C396.799 23.7 396.499 23.8 396.199 23.9L396.299 24.5L397.099 24.2V25.8C397.099 25.9 397.099 26 396.999 26C396.999 26 396.899 26.1 396.799 26.1C396.599 26.1 396.399 26.1 396.299 26.1L396.399 26.7C396.599 26.7 396.799 26.7 396.999 26.7C397.199 26.7 397.299 26.7 397.399 26.6C397.499 26.6 397.599 26.5 397.599 26.4C397.599 26.3 397.699 26.1 397.699 25.9V23.9L398.199 23.7V23.2Z" fill="#CFD2D3"/>
<path d="M401.699 21.601H402.399V21.001H400.899C400.899 20.901 400.799 20.801 400.799 20.801C400.799 20.701 400.699 20.701 400.699 20.601C400.699 20.501 400.599 20.401 400.599 20.301L399.899 20.501C399.999 20.601 399.999 20.801 400.099 21.101H398.499V21.701H399.099L399.299 22.601H398.299V23.201H402.499V22.601H401.399L401.699 21.601ZM400.899 22.601H399.999L399.799 21.701H401.099C400.999 22.001 400.999 22.301 400.899 22.601Z" fill="#CFD2D3"/>
<path d="M400.3 23.401L399.7 23.301C399.7 23.401 399.6 23.701 399.4 23.901H398.2V24.501H399.1C398.9 24.801 398.8 25.001 398.6 25.201C399.1 25.401 399.5 25.601 399.9 25.701C399.5 25.901 398.9 26.101 398.1 26.201L398.3 26.801C398.8 26.701 399.3 26.601 399.6 26.401C400 26.301 400.3 26.101 400.5 25.901C401 26.101 401.5 26.401 402.1 26.701L402.4 26.101C402 25.901 401.6 25.701 401 25.401C401.3 25.101 401.5 24.701 401.7 24.301H402.4V23.701H399.9C400.2 23.701 400.3 23.501 400.3 23.401ZM401.2 24.501C401 24.901 400.8 25.201 400.6 25.401C400.2 25.201 399.8 25.101 399.6 25.001C399.7 24.901 399.8 24.701 399.9 24.501H401.2Z" fill="#CFD2D3"/>
<path d="M407 26.6H407.6V26H409V26.5H409.6V21H407V26.6ZM407.6 21.6H409V25.4H407.6V21.6Z" fill="#CFD2D3"/>
<path d="M405.6 23.3V23H406.7V22.4H405.6V21.4C406.1 21.3 406.4 21.2 406.6 21.2L406.4 20.6C406 20.7 405.6 20.8 405.1 20.9C404.6 21 404.1 21.1 403.7 21.1L403.8 21.7C404.1 21.7 404.4 21.6 404.8 21.6V22.4H403.6V23H404.7C404.6 23.3 404.4 23.7 404.2 24.1C404 24.5 403.8 24.8 403.5 25.1L403.9 25.7C404.3 25.2 404.6 24.6 404.9 24V26.9H405.5V24C405.8 24.3 406 24.6 406.3 24.9L406.7 24.4C406.4 24 406 23.6 405.6 23.3Z" fill="#CFD2D3"/>
<path d="M414.998 21.401C414.898 21.201 414.798 21.001 414.698 20.801C414.598 20.601 414.498 20.501 414.398 20.301L413.898 20.601C413.998 20.701 413.998 20.801 414.198 21.001C414.298 21.201 414.398 21.401 414.498 21.601L414.998 21.401Z" fill="#CFD2D3"/>
<path d="M411.4 23.4C411.4 24 411.4 24.5 411.4 24.9C411.4 25.3 411.3 25.5 411.3 25.8C411.2 26 411.1 26.3 411 26.6L411.5 26.9C411.7 26.6 411.8 26.2 411.9 25.9C412 25.6 412 25.2 412.1 24.7H412.8V25.9C412.8 26 412.8 26.1 412.7 26.2C412.7 26.2 412.6 26.3 412.5 26.3C412.4 26.3 412.3 26.3 412.1 26.3L412.2 26.9C412.4 26.9 412.6 26.9 412.7 26.9C412.9 26.9 413.1 26.8 413.2 26.7C413.3 26.6 413.3 26.4 413.3 26.2V21H411.4V23.4ZM411.9 21.4H412.6V22.4H411.9V21.4ZM411.9 23H412.6V24H411.9V23Z" fill="#CFD2D3"/>
<path d="M416.798 25.401C416.798 25.601 416.798 25.801 416.798 25.801C416.798 25.901 416.798 26.001 416.798 26.101C416.798 26.201 416.698 26.201 416.598 26.201H416.498H416.398C416.298 26.201 416.298 26.201 416.198 26.101C416.198 26.001 416.198 26.001 416.198 25.801V24.201H416.998V21.701H416.198C416.398 21.401 416.498 21.101 416.598 20.901L416.798 20.601L416.198 20.301C416.098 20.501 415.998 20.701 415.898 20.901C415.798 21.201 415.598 21.401 415.498 21.601H413.798V24.101H414.398C414.398 24.501 414.398 24.801 414.298 25.001C414.198 25.201 414.098 25.501 413.998 25.601C413.798 25.801 413.598 26.001 413.398 26.101L413.798 26.601C414.098 26.401 414.298 26.101 414.498 25.901C414.698 25.701 414.798 25.401 414.898 25.101C414.998 24.801 414.998 24.401 414.998 24.001H415.598V25.701C415.598 26.001 415.598 26.101 415.698 26.301C415.798 26.401 415.898 26.501 416.098 26.501C416.198 26.501 416.298 26.501 416.398 26.501C416.498 26.501 416.598 26.501 416.698 26.501C416.898 26.501 417.098 26.401 417.198 26.301C417.298 26.201 417.398 26.001 417.398 25.801C417.398 25.701 417.398 25.501 417.398 25.301C417.398 25.101 417.398 25.001 417.398 24.901V24.701L416.798 24.601C416.798 25.001 416.798 25.201 416.798 25.401ZM414.398 23.701V22.401H416.298V23.701H414.398Z" fill="#CFD2D3"/>
<path d="M422.999 25.301H424.599V24.801H422.799V24.701V24.401H424.199V22.201H420.799V24.401H422.199C422.199 24.601 422.199 24.701 422.199 24.701V24.801H420.399V25.301H421.999C421.899 25.501 421.699 25.701 421.399 25.801C421.099 26.001 420.699 26.101 420.299 26.201L420.499 26.801C421.499 26.501 422.199 26.101 422.499 25.601C422.899 26.201 423.599 26.601 424.499 26.801L424.699 26.201C424.299 26.101 423.899 26.001 423.599 25.801C423.399 25.801 423.199 25.601 422.999 25.301ZM421.399 22.601H423.699V23.001H421.399V22.601ZM421.399 23.901V23.501H423.699V23.901H421.399Z" fill="#CFD2D3"/>
<path d="M423 20.4V21H422V20.4H421.5V21H420.5V21.6H421.5V21.9H422V21.6H423V21.9H423.6V21.6H424.6V21H423.6V20.4H423Z" fill="#CFD2D3"/>
<path d="M419.999 23L419.799 22.7V22.3H420.499V21.7H419.799V20.4H419.199V21.7H418.399V22.3H419.199C419.099 22.7 418.899 23.1 418.799 23.5C418.599 23.9 418.399 24.3 418.199 24.6L418.599 25.2C418.899 24.8 419.099 24.3 419.299 23.6V26.8H419.899V23.5C420.199 23.9 420.299 24.1 420.399 24.2L420.699 23.6L419.999 23Z" fill="#CFD2D3"/>
<path d="M214.798 7.5L203.598 18.7V13L209.098 7.5H203.598H203.498H197.898H192.198H186.498H180.798H175.398H169.498H40.498H37.598C36.898 7.6 36.3979 8.09999 36.3979 8.79999V26C36.3979 26.7 36.898 27.2 37.598 27.3H37.798H169.798H172.398H178.098H183.698H189.398H195.098H200.798H203.798V24.3L220.698 7.40002H214.798V7.5ZM47.498 25.2H41.8979V20.3L47.498 18.1V25.2ZM41.8979 19.4V17.4V9.59998H47.498V17.2L41.8979 19.4ZM53.8979 25.2H48.298V15.4L53.8979 17.6V25.2ZM53.8979 16.7L48.298 14.5V9.59998H49.698H53.8979V16.7ZM75.0979 17.4V25.2H67.298H59.4979V17.4V9.59998H67.298H75.0979V17.4ZM93.898 17.7C93.898 18.3 93.398 18.8 92.798 18.8H87.398V21.6H85.798H85.5979V12.8H90.298H91.398H92.798C93.398 12.8 93.898 13.3 93.898 13.9V17.7ZM100.798 21.6H96.298C95.698 21.6 95.198 21.1 95.198 20.5V12.9H96.9979V20.1C96.9979 20.3 97.098 20.4 97.298 20.4H100.798V21.6ZM110.398 21.6H109.598H108.598V18.1H103.898V21.6H102.898H102.098V14C102.098 13.4 102.598 12.9 103.198 12.9H109.298C109.898 12.9 110.398 13.4 110.398 14V21.6Z" fill="#CFD2D3"/>
<path d="M226.199 7.5L206.299 27.3H211.999L231.799 7.5H226.199Z" fill="#CFD2D3"/>
<path d="M237.499 7.5L217.699 27.3H223.299L243.199 7.5H237.499Z" fill="#CFD2D3"/>
<path d="M248.9 7.5L229 27.3H234.7L254.5 7.5H248.9Z" fill="#CFD2D3"/>
<path d="M260.199 7.5L240.299 27.3H245.999L265.899 7.5H260.199Z" fill="#CFD2D3"/>
<path d="M271.499 7.5L251.699 27.3H257.299L277.199 7.5H271.499Z" fill="#CFD2D3"/>
<path d="M282.8 7.5L263 27.3H268.7L288.5 7.5H282.8Z" fill="#CFD2D3"/>
<path d="M294.199 7.5L274.299 27.3H279.999L299.899 7.5H294.199Z" fill="#CFD2D3"/>
<path d="M291.399 27.301L302.699 16.001V10.301L285.699 27.301H291.399Z" fill="#CFD2D3"/>
<path d="M302.7 27.301V21.701L297 27.301H302.7Z" fill="#CFD2D3"/>
<path d="M108.298 14.1H104.998H104.198C103.998 14.1 103.898 14.3 103.898 14.4V16.8H108.598V14.4C108.598 14.3 108.498 14.1 108.298 14.1Z" fill="#CFD2D3"/>
<path d="M91.6991 14.1H87.2991V17.5H91.6991C91.8991 17.5 91.9991 17.4 91.9991 17.2V14.4C92.0991 14.3 91.8991 14.1 91.6991 14.1Z" fill="#CFD2D3"/>
<path d="M67.2991 13.501V14.801H68.5991H69.899V16.101V17.401H68.5991H67.2991V20.001V22.601H68.5991H69.899V21.301V20.001H71.1991H72.4991V16.101V12.201H69.899H67.2991V13.501Z" fill="#CFD2D3"/>
<path d="M67.299 14.801H65.999H64.699V16.101V17.401H65.999H67.299V16.101V14.801Z" fill="#CFD2D3"/>
<path d="M64.7001 12.201H63.4001H62.1001V13.501V14.801H63.4001H64.7001V13.501V12.201Z" fill="#CFD2D3"/>
</svg>

After

Width:  |  Height:  |  Size: 19 KiB

View File

@@ -0,0 +1,18 @@
<svg width="30" height="320" viewBox="0 0 30 320" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M29.3965 7H1V313.877H29.3965V7Z" fill="#535656"/>
<path d="M17.8082 221.66H3.4082V222.46H17.8082V221.66Z" fill="#CFD2D3"/>
<path d="M6.00859 138.262H24.0086C25.5086 138.262 26.5586 139.462 26.5586 140.812V155.662H24.1586V143.662C24.1586 142.912 23.5586 142.162 22.6586 142.162H7.20859C6.45859 142.162 5.70859 142.762 5.70859 143.662V155.662H3.30859V140.812C3.45859 139.462 4.50859 138.262 6.00859 138.262Z" fill="#CFD2D3"/>
<path d="M18.457 158.512C19.807 158.512 21.007 159.712 21.007 161.062V173.662C21.007 175.162 19.807 176.212 18.457 176.212H6.00703C4.65703 176.212 3.45703 175.012 3.45703 173.662V161.062C3.45703 159.712 4.65703 158.512 6.00703 158.512H18.457ZM19.057 162.262H5.40703V172.462H19.057V162.262Z" fill="#CFD2D3"/>
<path d="M18.457 179.061C19.807 179.061 21.007 180.261 21.007 181.611V194.211C21.007 195.711 19.807 196.761 18.457 196.761H6.00703C4.65703 196.761 3.45703 195.561 3.45703 194.211V181.611C3.45703 180.261 4.65703 179.061 6.00703 179.061H18.457ZM19.057 182.811H5.40703V193.011H19.057V182.811Z" fill="#CFD2D3"/>
<path d="M6.15859 199.762H26.8586V203.662H5.40859V208.762H3.30859V202.462C3.45859 200.962 4.65859 199.762 6.15859 199.762Z" fill="#CFD2D3"/>
<path d="M26.557 221.961V241.161C26.557 242.661 25.357 243.711 24.007 243.711H13.807C12.307 243.711 11.257 242.511 11.257 241.161V225.711H3.45703V221.811H26.557V221.961ZM15.007 239.961H22.657C23.407 239.961 24.157 239.361 24.157 238.461V225.861H13.657V238.461C13.657 239.361 14.257 239.961 15.007 239.961Z" fill="#CFD2D3"/>
<path d="M6.15859 246.713H26.8586V250.613H5.40859V255.713H3.30859V249.413C3.45859 247.913 4.65859 246.713 6.15859 246.713Z" fill="#CFD2D3"/>
<path d="M11.257 258.412C12.757 258.412 13.957 259.612 13.957 261.112V272.962H19.057V260.062H21.007V272.962C21.007 275.062 19.657 276.862 18.007 276.862H3.45703V261.112C3.45703 259.612 4.65703 258.412 6.15703 258.412H11.257ZM11.857 262.312H5.40703V272.962H11.857V262.312Z" fill="#CFD2D3"/>
<path d="M5.40703 288.262V290.362H3.45703V285.262C3.45703 283.762 4.65703 282.562 6.15703 282.562H18.907V278.662H20.857V282.562H26.557V286.462H20.857V290.362H18.907V286.462H7.20703C6.15703 286.462 5.40703 287.212 5.40703 288.262Z" fill="#CFD2D3"/>
<path d="M18.307 292.463C19.807 292.463 21.007 293.663 21.007 295.163V308.213C21.007 309.713 19.807 310.913 18.307 310.913H10.657V296.363H5.40703V310.613H3.45703V295.163C3.45703 293.663 4.65703 292.463 6.15703 292.463H18.307ZM19.057 296.363H12.607V307.013H19.057V296.363Z" fill="#CFD2D3"/>
<path d="M27.0074 10.459V28.309C27.0074 29.959 25.6574 31.309 24.0074 31.309H17.1074L16.9574 31.459C16.3574 32.209 15.4574 32.509 14.5574 32.509H6.60742C4.95742 32.509 3.60742 31.159 3.60742 29.509V10.459H27.0074ZM13.6574 26.809V15.109H7.05742V26.809C7.05742 27.259 7.50742 27.709 7.95742 27.709H12.7574C13.2074 27.709 13.6574 27.409 13.6574 26.809ZM16.9574 25.609C16.9574 26.059 17.4074 26.509 17.8574 26.509H22.6574C23.1074 26.509 23.5574 26.059 23.5574 25.609V15.259H16.9574V25.609Z" fill="#CFD2D3"/>
<path d="M11.7074 35.3575C13.3574 35.3575 14.8574 36.7075 14.8574 38.5075V49.4574H18.7574V36.8575H21.7574V50.0574C21.7574 52.4574 20.2574 54.4075 18.3074 54.4075H3.60742V38.5075C3.60742 36.8575 4.95742 35.3575 6.75742 35.3575H11.7074ZM11.8574 49.4574V40.1575H6.60742V49.3074H11.8574V49.4574Z" fill="#CFD2D3"/>
<path d="M18.6074 82.9078H3.60742V77.9578H18.7574V72.4078H3.60742V67.6078H18.7574V62.0578H3.60742V57.1078H21.7574V79.7578C21.7574 81.5578 20.4074 82.9078 18.6074 82.9078Z" fill="#CFD2D3"/>
<path d="M27.3074 85.3108V90.2608H21.7574V101.211C21.7574 103.011 20.4074 104.361 18.6074 104.361H6.75742C5.10742 104.361 3.60742 103.011 3.60742 101.211V85.3108H27.3074ZM18.7574 99.4108V90.2608H6.60742V99.4108H18.7574Z" fill="#CFD2D3"/>
<path d="M21.7574 125.21H3.60742V109.91C3.60742 108.26 4.95742 106.91 6.60742 106.91H21.7574V111.71H6.60742V120.71H21.9074V125.21H21.7574Z" fill="#CFD2D3"/>
</svg>

After

Width:  |  Height:  |  Size: 3.9 KiB

View File

@@ -0,0 +1,68 @@
<svg width="416" height="36" viewBox="0 0 416 36" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M415.6 5H0V6H415.6V5Z" fill="#CFD2D3"/>
<path d="M329.2 20.401C329.6 20.401 329.8 20.101 329.8 19.801V17.401H327.7V18.101H328.8V19.501C328.8 19.601 328.7 19.701 328.6 19.701H326.7C326.6 19.701 326.5 19.601 326.5 19.501V16.201C326.5 16.101 326.6 16.001 326.7 16.001H329.6V15.401H326.1C325.7 15.401 325.5 15.701 325.5 16.001V19.801C325.5 20.201 325.8 20.401 326.1 20.401H329.2Z" fill="#CFD2D3"/>
<path d="M330.801 15.401V19.701C330.801 20.101 331.101 20.301 331.401 20.301H333.901V19.601H331.901C331.801 19.601 331.701 19.501 331.701 19.401V15.401H330.801Z" fill="#CFD2D3"/>
<path d="M338.6 19.501C338.6 19.601 338.5 19.701 338.4 19.701H336.1C336 19.701 335.9 19.601 335.9 19.501V15.401H334.9V19.701C334.9 20.101 335.2 20.301 335.5 20.301H338.9C339.3 20.301 339.5 20.001 339.5 19.701V15.401H338.5V19.501H338.6Z" fill="#CFD2D3"/>
<path d="M340.6 20.401H344.4V19.701H341.6V18.401C341.6 18.301 341.7 18.201 341.8 18.201H344.4V17.501H341.6V16.401C341.6 16.301 341.7 16.201 341.8 16.201H344.4V15.401H340.6V20.401Z" fill="#CFD2D3"/>
<path d="M349.2 16.201H352.5V15.401H348.6C348.2 15.401 347.9 15.701 347.9 16.001V17.601C347.9 17.901 348.2 18.201 348.5 18.201H351.4C351.5 18.201 351.6 18.301 351.6 18.401V19.301C351.6 19.401 351.5 19.501 351.4 19.501H348.1V20.201H352C352.4 20.201 352.6 19.901 352.6 19.601V18.101C352.6 17.701 352.3 17.501 352 17.501H349.1C349 17.501 348.9 17.401 348.9 17.301V16.401C349 16.301 349.1 16.201 349.2 16.201Z" fill="#CFD2D3"/>
<path d="M356.4 20.401V16.201H358V15.401H353.6V16.201H355.3V20.401H356.4Z" fill="#CFD2D3"/>
<path d="M360 15.401H359V20.401H360V15.401Z" fill="#CFD2D3"/>
<path d="M362.2 16.201H364.8V15.401H361.7C361.3 15.401 361.1 15.701 361.1 16.001V19.701C361.1 20.101 361.4 20.301 361.7 20.301H364.8V19.601H362.2C362.1 19.601 362 19.501 362 19.401V16.401C362 16.301 362.1 16.201 362.2 16.201Z" fill="#CFD2D3"/>
<path d="M369.099 17.801L370.099 15.401H368.999L368.199 17.501H366.799V15.401H365.699V20.401H366.799V18.201H368.299L369.099 20.401H370.199L369.099 17.801Z" fill="#CFD2D3"/>
<path d="M373.699 16.101V19.801C373.699 20.201 373.999 20.401 374.299 20.401H377.399V19.701H374.799C374.699 19.701 374.599 19.601 374.599 19.501V16.401C374.599 16.301 374.699 16.201 374.799 16.201H377.399V15.401H374.299C373.999 15.401 373.699 15.701 373.699 16.101Z" fill="#CFD2D3"/>
<path d="M383.2 20.4V16.1C383.2 15.7 382.9 15.5 382.6 15.5H379.2C378.8 15.5 378.6 15.8 378.6 16.1V20.4H379.6V18.4H382.3V20.4H383.2ZM379.5 17.7V16.4C379.5 16.3 379.6 16.2 379.7 16.2H382C382.1 16.2 382.2 16.3 382.2 16.4V17.8H379.5V17.7Z" fill="#CFD2D3"/>
<path d="M385.1 16.601L387.7 20.401H388.8V15.401H387.8V19.201L385.2 15.401H384.1V20.401H385.1V16.601Z" fill="#CFD2D3"/>
<path d="M392.4 15.401V20.401H393.4V18.201H395.6V20.401H396.6V15.401H395.6V17.501H393.4V15.401H392.4Z" fill="#CFD2D3"/>
<path d="M398.8 16.201H401.4V15.401H397.6V20.401H401.4V19.701H398.6V18.401C398.6 18.301 398.7 18.201 398.8 18.201H401.4V17.501H398.6V16.401C398.6 16.301 398.7 16.201 398.8 16.201Z" fill="#CFD2D3"/>
<path d="M402.4 15.401V19.701C402.4 20.101 402.7 20.301 403 20.301H405.5V19.601H403.5C403.4 19.601 403.3 19.501 403.3 19.401V15.401H402.4Z" fill="#CFD2D3"/>
<path d="M410.6 15.401H406.5V20.401H407.5V18.801H410.5C410.9 18.801 411.1 18.501 411.1 18.201V16.101C411.2 15.701 410.9 15.401 410.6 15.401ZM410.2 17.901C410.2 18.001 410.1 18.101 410 18.101H407.5V16.201H410C410.1 16.201 410.2 16.301 410.2 16.401V17.901Z" fill="#CFD2D3"/>
<path d="M413.301 19.6H412.301V20.4H413.301V19.6Z" fill="#CFD2D3"/>
<path d="M315.4 28.5H308.6L318.4 18.7C319.1 18 319.1 16.8 318.4 16.1L313.4 11.1C312.7 10.4 311.5 10.4 310.8 11.1L298.9 23C298.2 23.7 298.2 24.9 298.9 25.6L302.9 29.6H307.5H315.5C315.8 29.6 316.1 29.3 316.1 29C316.1 28.7 315.7 28.5 315.4 28.5ZM311.5 11.8999C311.8 11.5999 312.2 11.5999 312.5 11.8999L317.5 16.8999C317.8 17.1999 317.8 17.5999 317.5 17.8999L309.9 25.5L303.9 19.5L311.5 11.8999ZM307 28.5H303.7H303.3L299.6 24.8C299.3 24.5 299.3 24.1 299.6 23.8L303.1 20.3L309.1 26.3L307 28.5Z" fill="#CFD2D3"/>
<path d="M319.4 28.5H317.6C317.3 28.5 317 28.8 317 29.1C317 29.4 317.3 29.7 317.6 29.7H319.4C319.7 29.7 320 29.4 320 29.1C320 28.8 319.8 28.5 319.4 28.5Z" fill="#CFD2D3"/>
<path d="M328.5 24.801V24.701C328.6 24.501 328.6 24.401 328.7 24.201H331.8V23.6011H328.9C328.9 23.5011 329 23.2011 329.1 22.9011L328.4 22.801C328.4 22.901 328.3 23.2011 328.2 23.6011H326.3V24.201H328C327.9 24.401 327.9 24.601 327.7 25.001H325.9V25.6011H327.5C327.4 25.9011 327.2 26.2011 327.1 26.4011V26.9011H330.5C330.1 27.3011 329.7 27.701 329.3 28.001C328.3 27.601 327.5 27.401 327 27.201L326.8 27.801C327.4 28.001 328.1 28.201 328.9 28.501C329.7 28.801 330.4 29.101 331 29.301L331.3 28.701C331 28.601 330.6 28.401 330 28.201C330.6 27.701 331 27.301 331.4 26.801V26.201H327.9C328 26.001 328.1 25.801 328.2 25.501H332.1V24.9011H328.5C328.5 24.8011 328.5 24.801 328.5 24.801Z" fill="#CFD2D3"/>
<path d="M333.901 26.001C333.901 26.501 333.901 27.001 333.901 27.201C333.901 27.501 333.801 27.801 333.701 28.001C333.601 28.201 333.501 28.5011 333.301 28.9011L333.901 29.201C334.101 28.801 334.301 28.5011 334.401 28.1011C334.501 27.8011 334.601 27.401 334.601 27.001H336.301V28.9011H336.901V27.001H338.601V27.9011C338.601 28.1011 338.601 28.201 338.501 28.201C338.501 28.301 338.401 28.301 338.201 28.301C338.001 28.301 337.801 28.301 337.501 28.201L337.601 28.9011C337.901 28.9011 338.101 28.9011 338.301 28.9011C338.501 28.9011 338.701 28.901 338.901 28.801C339.001 28.801 339.101 28.701 339.201 28.501C339.301 28.401 339.301 28.201 339.301 28.001V22.801H334.101V26.001H333.901ZM336.801 23.701H338.501V24.801H336.801V23.701ZM336.801 25.501H338.501V26.501H336.801V25.501ZM334.501 23.701H336.101V24.801H334.501V23.701ZM334.501 26.201V25.4011H336.101V26.4011H334.501V26.201Z" fill="#CFD2D3"/>
<path d="M341 25.8C341 26.4 341 26.9 341 27.3C341 27.7 340.9 28 340.8 28.2C340.7 28.4 340.6 28.7 340.5 29L341.1 29.3C341.3 29 341.4 28.7 341.5 28.3C341.6 28 341.6 27.5 341.7 27H342.5V28.2C342.5 28.3 342.5 28.4 342.5 28.5C342.5 28.6 342.4 28.6 342.3 28.6C342.1 28.6 342 28.6 341.8 28.6L341.9 29.2C342.1 29.2 342.3 29.2 342.4 29.2C342.7 29.2 342.8 29.1 342.9 29C343 28.9 343.1 28.7 343.1 28.4V23.1H341.1V25.8H341ZM341.6 23.8H342.4V24.8H341.6V23.8ZM341.6 26.1V25.4H342.4V26.4H341.6V26.1Z" fill="#CFD2D3"/>
<path d="M345.301 24.6C345.601 25 346.001 25.5 346.501 26.1L347.001 25.7001C346.601 25.2001 346.201 24.7001 345.801 24.2001L345.301 24.6Z" fill="#CFD2D3"/>
<path d="M346.2 25.9L345.6 25.7001C345.4 26.2001 345.2 26.7001 345 27.0001C344.8 26.7001 344.6 26.2001 344.4 25.7001L343.8 25.9C344 26.5 344.3 27.1001 344.6 27.5001C344.2 27.9001 343.7 28.3 343 28.6L343.4 29.2001C344.1 28.9001 344.6 28.5001 345 28.0001C345.4 28.4001 346 28.8 346.6 29.1L347 28.5001C346.3 28.2001 345.8 27.9001 345.4 27.5001C345.7 27.1001 346 26.6 346.2 25.9Z" fill="#CFD2D3"/>
<path d="M343.5 26.201C343.9 25.701 344.3 25.2011 344.7 24.6011L344.2 24.301C343.8 24.901 343.4 25.4011 343.1 25.9011L343.5 26.201Z" fill="#CFD2D3"/>
<path d="M343.301 24.2001H346.801V23.6H345.401C345.301 23.2 345.101 22.9001 345.101 22.7001L344.501 22.9C344.601 23.2 344.701 23.4001 344.801 23.7001H343.301V24.2001Z" fill="#CFD2D3"/>
<path d="M349.901 26.6011L350.201 26.1011C349.901 25.7011 349.601 25.4011 349.401 25.1011V24.701H350.101V24.1011H349.401V22.801H348.801V24.1011H348.001V24.701H348.701C348.601 25.101 348.401 25.5011 348.301 25.9011C348.101 26.3011 348.001 26.701 347.801 27.001L348.101 27.701C348.301 27.301 348.601 26.801 348.801 26.301V29.201H349.401V26.001C349.601 26.201 349.701 26.401 349.801 26.501L349.901 26.6011Z" fill="#CFD2D3"/>
<path d="M353.2 25.801H354.3V25.301H351.9C351.9 25.201 352 25.1011 352.1 24.9011H354V24.4011H352.2C352.2 24.3011 352.3 24.2011 352.3 23.9011H354.1V23.4011H352.3L352.4 22.801H351.8C351.8 23.001 351.8 23.2011 351.7 23.4011H350.2V23.9011H351.6L351.5 24.4011H350.3V24.9011H351.3C351.3 25.0011 351.2 25.201 351.1 25.301H350V25.801H350.8C350.5 26.301 350.1 26.7011 349.5 27.1011L349.8 27.6011C350.1 27.3011 350.4 27.101 350.7 26.801V27.201H351.6V27.701H350.1V28.201H351.6V29.1011H352.2V28.201H353.7V27.701H352.2V27.201H353.1V26.801C353.4 27.101 353.7 27.4011 354 27.6011L354.3 27.1011C354 26.9011 353.8 26.8011 353.6 26.6011C353.5 26.4011 353.3 26.101 353.2 25.801ZM352.4 26.701V26.1011H351.8V26.701H351C351.2 26.401 351.4 26.101 351.6 25.801H352.6C352.8 26.101 353 26.401 353.2 26.701H352.4Z" fill="#CFD2D3"/>
<path d="M359 24.7001H356.1V27.5001H359V24.7001ZM358.3 26.9H356.6V25.3H358.3V26.9Z" fill="#CFD2D3"/>
<path d="M355.301 23.8H360.101V27.9C360.101 28.1 360.101 28.3 360.001 28.4C359.901 28.5 359.801 28.5 359.601 28.5C359.301 28.5 359.001 28.5 358.601 28.4L358.701 29C359.001 29 359.301 29 359.601 29C359.901 29 360.101 29 360.301 28.9C360.501 28.8 360.601 28.7 360.601 28.6C360.701 28.5 360.701 28.2 360.701 28V23.7H361.601V23.1H355.301V23.8Z" fill="#CFD2D3"/>
<path d="M368.101 26C368.301 25.5 368.401 25 368.501 24.4H369.001V23.7H366.801C366.901 23.4 367.001 23.1 367.101 22.7L366.401 22.6C366.301 23 366.201 23.5 365.901 24C365.701 24.5 365.401 24.9 365.201 25.3L365.601 25.8C365.701 25.6 365.801 25.5 365.901 25.4C366.101 26 366.301 26.6 366.701 27.2C366.301 27.7 365.601 28.1 364.801 28.6L365.201 29.2C366.001 28.7 366.601 28.3 367.101 27.8C367.501 28.3 368.101 28.8 368.701 29.2L369.101 28.6C368.401 28.2 367.901 27.8 367.501 27.3C367.701 26.9 367.901 26.5 368.101 26ZM366.301 24.7L366.401 24.4H367.701C367.601 24.9 367.601 25.3 367.401 25.7C367.301 26.1 367.101 26.4 366.901 26.7C366.701 26.2 366.501 25.5 366.301 24.7Z" fill="#CFD2D3"/>
<path d="M365.201 27.201L363.601 28.001V26.1011H365.101V23.301H362.801V24.001H364.501V25.501H363.001V28.1011C363.001 28.2011 362.901 28.401 362.801 28.501L363.101 29.1011C363.201 29.0011 363.501 28.901 363.801 28.701C364.301 28.501 364.801 28.201 365.401 28.001L365.201 27.201Z" fill="#CFD2D3"/>
<path d="M375.3 25.8H376.2V25.3H373.5V24.9H375.8V24.4H373.5V24.0001H376.1V23.4H374.5C374.6 23.2 374.7 23.1001 374.8 23.0001L374.9 22.9L374.3 22.7001C374.2 22.9001 374 23.2001 373.8 23.5001H372.5C372.4 23.4001 372.3 23.1 372.1 22.8L371.5 23.0001C371.5 23.1001 371.6 23.2 371.7 23.4C371.7 23.4 371.7 23.4001 371.7 23.5001C371.7 23.5001 371.7 23.6 371.8 23.6H370.3V24.1H372.9V24.5001H370.5V25.0001H372.8V25.4H370.1V25.9H371C371.1 26.1 371.2 26.3001 371.3 26.5001H370V27.0001H376.3V26.4H375C375.1 26.3 375.2 26.1 375.3 25.8ZM372.8 26.4H371.9L371.6 25.8H372.8V26.4ZM374.4 26.4H373.5V25.8H374.7C374.6 26 374.5 26.2 374.4 26.4Z" fill="#CFD2D3"/>
<path d="M370.7 29.101H371.3V28.901H374.8V29.101H375.4V27.401H370.6V29.101H370.7ZM371.4 27.901H374.9V28.401H371.4V27.901Z" fill="#CFD2D3"/>
<path d="M377.601 24.1C377.701 24.4 377.801 24.6 377.801 24.8L378.301 24.6C378.201 24.4 378.201 24.1 378.101 23.8C378.001 23.5 377.901 23.3 377.801 23.1L377.301 23.3C377.401 23.6 377.501 23.9 377.601 24.1Z" fill="#CFD2D3"/>
<path d="M379.1 22.801H378.5V25.201H377.3V25.801H378.3C378.2 26.101 378 26.401 377.8 26.801C377.6 27.101 377.4 27.401 377.1 27.701L377.5 28.301C377.9 27.801 378.2 27.301 378.4 26.801V29.201H379V27.001C379.2 27.201 379.4 27.401 379.6 27.701L380 27.201C379.7 26.901 379.4 26.501 379 26.201V25.801H380V25.201H379V22.801H379.1Z" fill="#CFD2D3"/>
<path d="M381.999 22.801H381.299V25.801H380.199V29.201H380.799V28.801H382.699V29.201H383.299V25.801H381.899V24.501H383.599V23.9011H381.899V22.801H381.999ZM382.699 26.4011V28.1011H380.799V26.4011H382.699Z" fill="#CFD2D3"/>
<path d="M379.199 24.701L379.699 24.9011C379.799 24.7011 379.899 24.501 379.999 24.201C380.099 23.901 380.199 23.701 380.299 23.501L379.799 23.301C379.699 23.501 379.699 23.801 379.499 24.001C379.399 24.301 379.299 24.501 379.199 24.701Z" fill="#CFD2D3"/>
<path d="M388.8 25.7L388.2 25.6C388.2 25.7 388.1 26 387.9 26.2H386.7V26.8H387.6C387.4 27.1 387.3 27.3 387.1 27.5C387.6 27.7 388 27.9 388.4 28C388 28.2 387.4 28.4 386.6 28.5L386.8 29.1C387.3 29 387.8 28.9 388.1 28.7C388.5 28.6 388.8 28.4 389 28.2C389.5 28.4 390 28.7 390.6 29L390.9 28.4C390.5 28.2 390.1 28 389.5 27.7C389.8 27.4 390 27 390.2 26.6H390.9V26H388.5C388.6 26 388.7 25.8 388.8 25.7ZM389.6 26.8C389.4 27.2 389.2 27.5 389 27.7C388.6 27.5 388.2 27.4 388 27.3C388.1 27.2 388.2 27 388.3 26.8H389.6Z" fill="#CFD2D3"/>
<path d="M390.099 24.0001H390.799V23.4H389.299C389.299 23.3 389.199 23.2001 389.199 23.2001C389.199 23.1001 389.099 23.1001 389.099 23.0001C389.099 22.9001 388.999 22.8001 388.999 22.7001L388.299 22.9C388.399 23 388.399 23.2001 388.499 23.5001H386.899V24.1H387.499L387.699 25.0001H386.699V25.6H390.899V25.0001H389.799L390.099 24.0001ZM389.299 24.9H388.399L388.199 24.0001H389.499C389.499 24.3001 389.399 24.6 389.299 24.9Z" fill="#CFD2D3"/>
<path d="M386.6 25.501C386.4 25.601 386.2 25.601 386.1 25.701V24.6011H386.7V24.001H386.1V22.801H385.5V24.001H384.7V24.6011H385.5V25.9011C385.2 26.0011 384.9 26.101 384.6 26.201L384.7 26.801L385.5 26.501V28.1011C385.5 28.2011 385.5 28.301 385.4 28.301C385.4 28.301 385.3 28.4011 385.2 28.4011C385 28.4011 384.8 28.4011 384.7 28.4011L384.8 29.001C385 29.001 385.2 29.001 385.4 29.001C385.6 29.001 385.7 29.0011 385.8 28.9011C385.9 28.9011 386 28.801 386 28.701C386 28.601 386.1 28.401 386.1 28.201V26.201L386.6 26.001V25.501Z" fill="#CFD2D3"/>
<path d="M394 25.601V25.301H395.1V24.701H394V23.701C394.5 23.601 394.8 23.501 395 23.501L394.8 22.901C394.5 23.001 394 23.101 393.5 23.201C393 23.301 392.5 23.401 392.1 23.401L392.2 24.001C392.5 24.001 392.8 23.901 393.2 23.901V24.701H392V25.301H393.1C393 25.601 392.8 26.001 392.6 26.401C392.4 26.801 392.2 27.101 391.9 27.401L392.3 28.001C392.7 27.501 393 26.901 393.3 26.301V29.201H393.9V26.401C394.2 26.701 394.4 27.001 394.7 27.301L395.1 26.801C394.8 26.301 394.4 26.001 394 25.601Z" fill="#CFD2D3"/>
<path d="M395.401 29.001H396.001V28.4011H397.401V28.9011H398.001V23.301H395.301V29.001H395.401ZM396.001 24.001H397.401V27.801H396.001V24.001Z" fill="#CFD2D3"/>
<path d="M399.8 25.701C399.8 26.301 399.8 26.801 399.8 27.201C399.8 27.601 399.7 27.8011 399.7 28.1011C399.6 28.3011 399.5 28.6011 399.4 28.9011L399.9 29.201C400.1 28.901 400.2 28.501 400.3 28.201C400.4 27.901 400.4 27.501 400.5 27.001H401.2V28.201C401.2 28.301 401.2 28.401 401.1 28.501C401.1 28.501 401 28.6011 400.9 28.6011C400.8 28.6011 400.7 28.6011 400.5 28.6011L400.6 29.201C400.8 29.201 401 29.201 401.1 29.201C401.3 29.201 401.5 29.101 401.6 29.001C401.7 28.901 401.7 28.701 401.7 28.501V23.301H399.8V25.701ZM400.3 23.701H401V24.701H400.3V23.701ZM400.3 25.301H401V26.301H400.3V25.301Z" fill="#CFD2D3"/>
<path d="M405.201 27.7C405.201 27.9 405.201 28.1 405.201 28.1C405.201 28.2 405.201 28.3 405.201 28.4C405.201 28.5 405.101 28.5 405.001 28.5H404.901H404.801C404.701 28.5 404.701 28.5 404.601 28.4C404.601 28.3 404.601 28.3 404.601 28.1V26.5H405.401V24H404.601C404.801 23.7 404.901 23.4 405.001 23.2L405.201 22.9L404.601 22.6C404.501 22.8 404.401 23 404.301 23.2C404.201 23.5 404.001 23.7 403.901 23.9H402.201V26.4H402.801C402.801 26.8 402.801 27.1 402.701 27.3C402.601 27.5 402.501 27.8 402.401 27.9C402.201 28.1 402.001 28.3 401.801 28.4L402.201 28.9C402.501 28.7 402.701 28.4 402.901 28.2C403.101 28 403.201 27.7 403.301 27.4C403.401 27.1 403.401 26.7 403.401 26.3H404.001V28C404.001 28.3 404.001 28.4 404.101 28.6C404.201 28.7 404.301 28.8 404.501 28.8C404.601 28.8 404.701 28.8 404.801 28.8C404.901 28.8 405.001 28.8 405.101 28.8C405.301 28.8 405.501 28.7 405.601 28.6C405.701 28.5 405.801 28.3 405.801 28.1C405.801 28 405.801 27.8 405.801 27.6C405.801 27.4 405.801 27.3 405.801 27.2V27L405.201 26.9C405.201 27.3 405.201 27.5 405.201 27.7ZM402.801 26V24.7H404.701V26H402.801Z" fill="#CFD2D3"/>
<path d="M402.601 23.5001C402.701 23.7001 402.801 23.9 402.901 24.1L403.401 23.8C403.301 23.6 403.201 23.4001 403.101 23.2001C403.001 23.0001 402.901 22.9001 402.801 22.7001L402.301 23.0001C402.301 23.1001 402.401 23.3001 402.601 23.5001Z" fill="#CFD2D3"/>
<path d="M411.5 22.7001V23.4H410.4V22.7001H409.9V23.4H408.9V23.9H409.9V24.3H410.4V23.9H411.5V24.3H412V23.9H413.1V23.4H412V22.7001H411.5Z" fill="#CFD2D3"/>
<path d="M411.399 27.7H412.999V27.2H411.199V27.1V26.8H412.599V24.6H409.199V26.8H410.599C410.599 27 410.599 27.1 410.599 27.1V27.2H408.799V27.7H410.399C410.299 27.9 410.099 28.1 409.799 28.2C409.499 28.4 409.099 28.5 408.699 28.6L408.899 29.2C409.899 28.9 410.599 28.5 410.899 28C411.299 28.6 411.999 29 412.899 29.2L413.099 28.6C412.699 28.5 412.299 28.4 411.999 28.2C411.799 28.1 411.599 27.9 411.399 27.7ZM409.799 24.9H412.099V25.3H409.799V24.9ZM409.799 26.2V25.8H412.099V26.2H409.799Z" fill="#CFD2D3"/>
<path d="M408.4 25.3L408.2 25.0001V24.6H408.9V24.0001H408.2V22.7001H407.6V24.0001H406.8V24.6H407.6C407.5 25 407.3 25.4 407.2 25.8C407 26.2 406.8 26.6 406.6 26.9L407 27.5001C407.3 27.1001 407.5 26.6 407.7 25.9V29.1H408.3V25.8C408.6 26.2 408.7 26.4001 408.8 26.5001L409.1 25.9L408.4 25.3Z" fill="#CFD2D3"/>
<path d="M257.3 10.1L246.1 21.3V15.6L251.7 10H246.1H248.5H29.4999H26.4999H25.0999C24.9999 10 24.8999 9.99998 24.7999 10.1C24.2999 10.3 23.8999 10.8 23.8999 11.4V12.9V27.1V28.6C23.8999 29.3 24.4999 29.9 25.1999 29.9H29.4999H214.8H220.5H226.2H231.9H237.6H243.3H246.2V27L263.1 10.1H257.3ZM33.5999 27.9H27.9999V23L33.5999 20.8V27.9ZM28.0999 22V12.2H33.6999V19.8L28.0999 22ZM39.9999 27.9H34.4999V18.1L40.0999 20.3L39.9999 27.9ZM34.4999 17.2V12.3H40.0999V19.4L34.4999 17.2ZM61.2999 20.1V27.9H53.4999H45.6999V20.1V12.3H53.4999H61.2999V20.1ZM80.7999 20.4C80.7999 21 80.2999 21.5 79.6999 21.5H74.2999V24.3H73.4999H72.4999V15.5H76.0999H77.1999H79.0999H79.6999C80.2999 15.5 80.7999 16 80.7999 16.6V20.4ZM87.6999 24.4H83.1999C82.5999 24.4 82.0999 23.9 82.0999 23.3V15.7H83.8999V22.9C83.8999 23.1 83.9999 23.2 84.1999 23.2H87.6999V24.4ZM97.3999 24.4H95.4999V20.9H90.7999V24.4H88.9999V16.7C88.9999 16.1 89.4999 15.6 90.0999 15.6H95.2999H96.0999C96.6999 15.6 97.1999 16.1 97.1999 16.7V24.4H97.3999ZM100.3 24.4H99.5999H99.1999L101.7 15.6H102.8L100.3 24.4ZM113.1 20.4C113.1 21 112.6 21.5 112 21.5H106.6V24.3H104.8V15.5H112C112.6 15.5 113.1 16 113.1 16.6V20.4ZM121.2 16.9H116.6C116.4 16.9 116.3 17.1 116.3 17.2V19.2H121.2V20.5H116.6C116.4 20.5 116.3 20.6 116.3 20.8V23.1H121.2V24.4H120.6H116.1H115H114.4V15.6H117.6H118.7H121.2V16.9ZM130.2 16.9H127.2V24.4H127.1H125.4V16.9H122.7H122.5V15.6H127.9H130.3V16.9H130.2ZM138.9 23.3C138.9 23.9 138.4 24.4 137.8 24.4H137.4H132.5C131.9 24.4 131.4 23.9 131.4 23.3V16.6C131.4 16 131.9 15.5 132.5 15.5H138.7V16.7H133.5C133.3 16.7 133.2 16.8 133.2 17V22.8C133.2 23 133.3 23.1 133.5 23.1H136.4H136.8C137 23.1 137.1 23 137.1 22.8V20.4H135.2V19.2H138.9V23.3ZM141.9 24.4H140.8L143.3 15.6H144.4L141.9 24.4ZM154.7 24.4H152.9V20.9H148.2V24.4H147H146.4V16.7C146.4 16.1 146.9 15.6 147.5 15.6H147.8H152.6H153.6C154.2 15.6 154.7 16.1 154.7 16.7V24.4ZM164.2 23.3C164.2 23.9 163.7 24.4 163.1 24.4H160.4H158.5H156V15.7H162.6C163.2 15.7 163.7 16.2 163.7 16.8V19.4L163.8 19.5C164.1 19.7 164.2 20 164.2 20.4V23.3ZM173.9 23.3C173.9 23.9 173.4 24.4 172.8 24.4H166.3H165.9V23.1H171.8C172 23.1 172.1 22.9 172.1 22.7V21.1C172.1 20.9 171.9 20.8 171.7 20.8H166.6C166 20.8 165.5 20.3 165.5 19.7V16.8C165.5 16.2 166 15.7 166.7 15.7H171.6H173.6V17H170.6H167.7C167.5 17 167.4 17.2 167.4 17.3V19.3C167.4 19.5 167.5 19.6 167.7 19.6H172.7C173.3 19.6 173.8 20.1 173.8 20.7V23.3H173.9ZM176.9 24.4H175.8L178.3 15.6H179.4L176.9 24.4ZM189.1 16.9H186.1V24.4H185.3H184.3V16.9H181.3V15.6H186.8H187.9H189.1V16.9ZM198.5 20.4C198.5 21 198 21.5 197.4 21.5H197.1H192V24.3H191.7H190.2V15.5H197.1H197.4C198 15.5 198.5 16 198.5 16.6V20.4ZM208.1 23.3C208.1 23.9 207.6 24.4 207 24.4H200.9C200.3 24.4 199.8 23.9 199.8 23.3V15.7H201.6V22.9C201.6 23.1 201.7 23.2 201.9 23.2H206C206.2 23.2 206.3 23.1 206.3 22.9V15.7H208.1V23.3ZM211.1 24.4H210L212.5 15.6H213.6L211.1 24.4ZM223.9 20.4C223.9 21 223.4 21.5 222.8 21.5H217.4V24.3H215.6V15.5H222.8C223.4 15.5 223.9 16 223.9 16.6V20.4ZM231.9 16.9H227.3C227.1 16.9 227 17 227 17.2V22.8C227 23 227.1 23.1 227.3 23.1H231.9V24.4H226.3C225.7 24.4 225.2 23.9 225.2 23.3V16.8C225.2 16.2 225.7 15.7 226.3 15.7H231.9V16.9Z" fill="#CFD2D3"/>
<path d="M268.601 10.1L248.801 29.9H254.401L274.301 10.1H268.601Z" fill="#CFD2D3"/>
<path d="M279.9 10.1L260.1 29.9H265.8L285.6 10.1H279.9Z" fill="#CFD2D3"/>
<path d="M277.1 29.901L288.4 18.601V12.901L271.4 29.901H277.1Z" fill="#CFD2D3"/>
<path d="M288.401 29.9V24.2001L282.801 29.9H288.401Z" fill="#CFD2D3"/>
<path d="M78.5992 16.901H74.1992V20.301H78.5992C78.7992 20.301 78.8992 20.201 78.8992 20.001V17.201C78.9992 17.001 78.7992 16.901 78.5992 16.901Z" fill="#CFD2D3"/>
<path d="M152.599 16.901H148.499C148.299 16.901 148.199 17.101 148.199 17.201V19.601H152.899V17.201C152.899 17.001 152.799 16.901 152.599 16.901Z" fill="#CFD2D3"/>
<path d="M196.3 16.901H196H191.9V20.301H196H196.3C196.5 20.301 196.6 20.201 196.6 20.001V17.201C196.7 17.001 196.5 16.901 196.3 16.901Z" fill="#CFD2D3"/>
<path d="M162.101 20.7001H157.801V23.1H162.101C162.301 23.1 162.401 23 162.401 22.8V21.0001C162.401 20.9001 162.301 20.7001 162.101 20.7001Z" fill="#CFD2D3"/>
<path d="M162 19.1V17.3C162 17.1 161.8 17 161.7 17H157.9V19.5H161.7C161.8 19.5 162 19.3 162 19.1Z" fill="#CFD2D3"/>
<path d="M221.8 16.901H217.4V20.301H221.8C222 20.301 222.1 20.201 222.1 20.001V17.201C222.1 17.001 222 16.901 221.8 16.901Z" fill="#CFD2D3"/>
<path d="M95.2008 16.901H91.1008C90.9008 16.901 90.8008 17.101 90.8008 17.201V19.601H95.5008V17.201C95.5008 17.001 95.4008 16.901 95.2008 16.901Z" fill="#CFD2D3"/>
<path d="M111 16.901H106.6V20.301H111C111.2 20.301 111.3 20.201 111.3 20.001V17.201C111.3 17.001 111.2 16.901 111 16.901Z" fill="#CFD2D3"/>
<path d="M53.5 14.901V18.801V22.701H54.8H56.1V21.401V20.101H57.4H58.7V17.501V14.901H56.1H53.5Z" fill="#CFD2D3"/>
<path d="M56.1001 25.3H57.4001H58.7001V24.0001V22.7001H57.4001H56.1001V24.0001V25.3Z" fill="#CFD2D3"/>
<path d="M48.1992 22.7001V24.0001V25.3H50.8992H53.4992V24.0001V22.7001H50.8992H48.1992Z" fill="#CFD2D3"/>
</svg>

After

Width:  |  Height:  |  Size: 21 KiB

View File

@@ -0,0 +1,28 @@
<svg width="40" height="540" viewBox="0 0 40 540" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M38.1152 0H1V539.814H38.1152V0Z" fill="#535656"/>
<path d="M22.1988 135.48H11.5488V131.58H34.6488V135.48H24.5988V147.33H34.6488V151.23H11.5488V147.33H22.1988V135.48Z" fill="#CFD2D3"/>
<path d="M29.0988 154.08V157.98H11.5488V154.08H29.0988ZM34.6488 154.08V157.98H32.6988V154.08H34.6488Z" fill="#CFD2D3"/>
<path d="M26.25 160.83C27 160.83 27.6 161.13 28.05 161.58C28.5 162.03 28.8 162.78 28.8 163.38V177.33C28.8 178.83 27.6 180.03 26.1 180.03H7.2C5.7 180.03 4.5 178.83 4.5 177.33V161.13H6.45V176.13H11.4V163.53C11.4 162.03 12.6 160.83 14.1 160.83H26.25ZM26.85 176.13V164.73H13.5V176.13H26.85Z" fill="#CFD2D3"/>
<path d="M34.6488 182.879V186.779H28.9488V198.479C28.9488 199.979 27.7488 201.179 26.2488 201.179H11.5488V197.279H26.9988V186.779H11.5488V182.879H34.6488Z" fill="#CFD2D3"/>
<path d="M11.5488 222.629H32.2488V214.379H34.6488V234.779H32.2488V226.529H11.5488V222.629Z" fill="#CFD2D3"/>
<path d="M26.5488 236.879C28.0488 236.879 29.2488 238.079 29.2488 239.579V252.629C29.2488 254.129 28.0488 255.329 26.5488 255.329H18.7488V240.779H13.4988V255.029H11.5488V239.579C11.5488 238.079 12.7488 236.879 14.2488 236.879H26.5488ZM27.1488 240.779H20.6988V251.429H27.1488V240.779Z" fill="#CFD2D3"/>
<path d="M29.0988 258.181V280.831C29.0988 282.331 27.8988 283.531 26.3988 283.531H11.5488V279.631H26.6988H26.9988V272.881H11.5488V268.831H27.1488V261.931H11.5488V258.031H29.0988V258.181Z" fill="#CFD2D3"/>
<path d="M28.95 286.379V301.979C28.95 303.479 27.75 304.679 26.25 304.679H14.1C12.6 304.679 11.4 303.479 11.4 301.979V290.279H4.5V286.379H28.95ZM27 290.279H13.5V300.779H27V290.279Z" fill="#CFD2D3"/>
<path d="M26.5488 307.08C28.0488 307.08 29.2488 308.28 29.2488 309.78V322.83C29.2488 324.33 28.0488 325.53 26.5488 325.53H18.7488V310.98H13.4988V325.23H11.5488V309.78C11.5488 308.28 12.7488 307.08 14.2488 307.08H26.5488ZM27.1488 310.98H20.6988V321.63H27.1488V310.98Z" fill="#CFD2D3"/>
<path d="M28.7988 337.079V340.079H25.0488V332.129H11.5488V328.379H28.7988V332.129H25.0488L26.8488 333.329C28.0488 334.229 28.7988 335.579 28.7988 337.079Z" fill="#CFD2D3"/>
<path d="M19.3488 342.48C20.8488 342.48 22.0488 343.68 22.0488 345.18V357.03H27.1488V344.13H29.0988V357.03C29.0988 359.13 27.7488 360.93 26.0988 360.93H11.5488V345.18C11.5488 343.68 12.7488 342.48 14.2488 342.48H19.3488ZM19.9488 346.38H13.4988V357.03H19.9488V346.38Z" fill="#CFD2D3"/>
<path d="M13.4988 372.93V375.03H11.5488V369.93C11.5488 368.43 12.7488 367.23 14.2488 367.23H26.9988V363.33H28.9488V367.23H34.6488V371.13H28.9488V375.03H26.9988V371.13H15.2988C14.3988 371.13 13.4988 372.03 13.4988 372.93Z" fill="#CFD2D3"/>
<path d="M11.5488 395.28V380.13C11.5488 378.78 12.7488 377.58 14.0988 377.58H29.0988V381.33H13.4988V391.53H29.0988V395.28H11.5488Z" fill="#CFD2D3"/>
<path d="M28.7988 406.53V409.53H25.0488V401.58H11.5488V397.83H28.7988V401.58H25.0488L26.8488 402.78C28.0488 403.53 28.7988 405.03 28.7988 406.53Z" fill="#CFD2D3"/>
<path d="M26.5488 411.93C28.0488 411.93 29.2488 413.13 29.2488 414.63V427.68C29.2488 429.18 28.0488 430.38 26.5488 430.38H18.7488V415.83H13.4988V430.08H11.5488V414.63C11.5488 413.13 12.7488 411.93 14.2488 411.93H26.5488ZM27.1488 415.83H20.6988V426.48H27.1488V415.83Z" fill="#CFD2D3"/>
<path d="M34.6488 443.73V462.93C34.6488 464.43 33.4488 465.48 32.0988 465.48H21.8988C20.3988 465.48 19.3488 464.28 19.3488 462.93V447.48H11.5488V443.58H34.6488V443.73ZM23.2488 461.58H30.8988C31.6488 461.58 32.3988 460.98 32.3988 460.08V447.48H21.8988V460.08C21.7488 460.98 22.4988 461.58 23.2488 461.58Z" fill="#CFD2D3"/>
<path d="M14.2488 468.33H34.9488V472.23H13.6488V477.33H11.5488V471.03C11.5488 469.53 12.7488 468.33 14.2488 468.33Z" fill="#CFD2D3"/>
<path d="M19.3488 480.18C20.8488 480.18 22.0488 481.38 22.0488 482.88V494.73H27.1488V481.83H29.0988V494.73C29.0988 496.83 27.7488 498.63 26.0988 498.63H11.5488V482.88C11.5488 481.38 12.7488 480.18 14.2488 480.18H19.3488ZM19.9488 484.08H13.4988V494.73H19.9488V484.08Z" fill="#CFD2D3"/>
<path d="M13.4988 509.881V511.981H11.5488V506.881C11.5488 505.381 12.7488 504.181 14.2488 504.181H26.9988V500.281H28.9488V504.181H34.6488V508.081H28.9488V511.981H26.9988V508.081H15.2988C14.3988 508.081 13.4988 508.981 13.4988 509.881Z" fill="#CFD2D3"/>
<path d="M26.5488 514.08C28.0488 514.08 29.2488 515.28 29.2488 516.78V529.83C29.2488 531.33 28.0488 532.53 26.5488 532.53H18.7488V517.98H13.4988V532.23H11.5488V516.78C11.5488 515.28 12.7488 514.08 14.2488 514.08H26.5488ZM27.1488 517.98H20.6988V528.63H27.1488V517.98Z" fill="#CFD2D3"/>
<path d="M34.8 3.48041V21.3304C34.8 22.9804 33.45 24.3304 31.8 24.3304H24.75L24.6 24.4804C24 25.2304 23.1 25.5304 22.2 25.5304H14.25C12.6 25.5304 11.25 24.1804 11.25 22.5304V3.48041H34.8ZM21.3 19.9804V8.28041H14.7V19.9804C14.7 20.4304 15.15 20.8804 15.6 20.8804H20.4C21 20.8804 21.3 20.4304 21.3 19.9804ZM24.75 18.7804C24.75 19.2304 25.2 19.6804 25.65 19.6804H30.45C30.9 19.6804 31.35 19.2304 31.35 18.7804V8.43041H24.75V18.7804Z" fill="#CFD2D3"/>
<path d="M19.4984 28.5289C21.1484 28.5289 22.6484 29.8789 22.6484 31.6789V42.6289H26.5484V30.0289H29.5484V43.2289C29.5484 45.6289 28.0484 47.5789 26.0984 47.5789H11.3984V31.5289C11.3984 29.8789 12.7484 28.3789 14.5484 28.3789H19.4984V28.5289ZM19.4984 42.6289V33.3289H14.3984V42.4789H19.4984V42.6289Z" fill="#CFD2D3"/>
<path d="M26.3984 76.079H11.3984V71.129H26.5484V65.579H11.3984V60.779H26.5484V55.229H11.3984V50.279H29.5484V72.929C29.5484 74.579 28.1984 76.079 26.3984 76.079Z" fill="#CFD2D3"/>
<path d="M35.0984 78.48V83.43H29.5484V94.38C29.5484 96.18 28.1984 97.53 26.3984 97.53H14.5484C12.8984 97.53 11.3984 96.18 11.3984 94.38V78.48H35.0984ZM26.5484 92.58V83.43H14.3984V92.58H26.5484Z" fill="#CFD2D3"/>
<path d="M29.5484 118.382H11.3984V103.082C11.3984 101.432 12.7484 100.082 14.3984 100.082H29.5484V104.882H14.2484V113.882H29.5484V118.382Z" fill="#CFD2D3"/>
</svg>

After

Width:  |  Height:  |  Size: 5.7 KiB

View File

@@ -0,0 +1,33 @@
<svg width="416" height="36" viewBox="0 0 416 36" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M415.6 5H0V6H415.6V5Z" fill="#CFD2D3"/>
<path d="M225.999 10.099L206.199 29.999H211.899L231.699 10.099H225.999Z" fill="#CFD2D3"/>
<path d="M237.4 10.099L217.5 29.999H223.2L243 10.099H237.4Z" fill="#CFD2D3"/>
<path d="M248.7 10.099L228.9 29.999H234.6L254.4 10.099H248.7Z" fill="#CFD2D3"/>
<path d="M260.099 10.099L240.199 29.999H245.899L265.699 10.099H260.099Z" fill="#CFD2D3"/>
<path d="M271.399 10.099L251.599 29.999H257.199L277.099 10.099H271.399Z" fill="#CFD2D3"/>
<path d="M282.7 10.099L262.9 29.999H268.6L288.4 10.099H282.7Z" fill="#CFD2D3"/>
<path d="M294.099 10.099L274.199 29.999H279.899L299.799 10.099H294.099Z" fill="#CFD2D3"/>
<path d="M305.399 10.099L285.599 29.999H291.299L311.099 10.099H305.399Z" fill="#CFD2D3"/>
<path d="M316.8 10.099L296.9 29.999H302.6L322.4 10.099H316.8Z" fill="#CFD2D3"/>
<path d="M328.1 10.099L308.3 29.999H313.9L333.8 10.099H328.1Z" fill="#CFD2D3"/>
<path d="M339.399 10.099L319.599 29.999H325.299L345.099 10.099H339.399Z" fill="#CFD2D3"/>
<path d="M350.8 10.099L330.9 29.999H336.6L356.5 10.099H350.8Z" fill="#CFD2D3"/>
<path d="M362.1 10.099L342.3 29.999H348L367.8 10.199L362.1 10.099Z" fill="#CFD2D3"/>
<path d="M373.499 10.199L353.599 29.999H359.299L379.099 10.199H373.499Z" fill="#CFD2D3"/>
<path d="M384.8 10.199L365 29.999H370.6L390.5 10.199H384.8Z" fill="#CFD2D3"/>
<path d="M396.1 10.199L376.3 29.999H382L401.8 10.199H396.1Z" fill="#CFD2D3"/>
<path d="M407.499 10.199L387.699 29.999H393.299L413.199 10.199H407.499Z" fill="#CFD2D3"/>
<path d="M404.7 30L415.6 19.1V13.4L399 30H404.7Z" fill="#CFD2D3"/>
<path d="M415.5 30L415.6 29.9V24.3L409.8 30H415.5Z" fill="#CFD2D3"/>
<path d="M124.3 20.599H120V22.999H124.3C124.5 22.999 124.6 22.899 124.6 22.699V20.899C124.7 20.699 124.5 20.599 124.3 20.599Z" fill="#CFD2D3"/>
<path d="M52.6 14.9H51.3H50V17.5V20.1H51.3H52.6V17.5V14.9Z" fill="#CFD2D3"/>
<path d="M55.1991 21.399V20.099H53.8991H52.5991V22.699V25.299H55.1991H57.7991V23.999V22.699H56.4991H55.1991V21.399Z" fill="#CFD2D3"/>
<path d="M214.699 10.099L203.599 21.199V15.799L209.299 10.099H25.8991C25.1991 10.099 24.5991 10.699 24.5991 11.399V28.599C24.5991 29.299 25.1991 29.899 25.8991 29.899H55.7991H183.599H189.299H194.999H200.699H203.799V27.099V26.899L220.599 10.099H214.699ZM35.2991 27.899H29.6991V22.999L35.2991 20.799V27.899ZM29.7991 21.999V12.199H35.3991V19.799L29.7991 21.999ZM41.7991 27.899H36.1991V18.099L41.7991 20.299V27.899ZM36.1991 17.199V12.299H41.7991V19.399L36.1991 17.199ZM62.9991 20.099V27.899H55.1991H47.3991V20.099V12.299H55.1991H62.9991V20.099ZM85.0991 20.299C85.0991 20.899 84.5991 21.399 83.9991 21.399H78.5991V24.199H76.7991V15.399H83.9991C84.5991 15.399 85.0991 15.899 85.0991 16.499V20.299ZM91.6991 24.299H87.1991C86.5991 24.299 86.0991 23.799 86.0991 23.199V15.599H87.8991V22.799C87.8991 22.999 87.9991 23.099 88.1991 23.099H91.6991V24.299ZM101.099 24.299H99.2991V20.799H94.5991V24.299H92.7991V16.599C92.7991 15.999 93.2991 15.499 93.8991 15.499H99.9991C100.599 15.499 101.099 15.999 101.099 16.599V24.299ZM104.099 24.299H102.999L105.499 15.499H106.599L104.099 24.299ZM116.899 24.299H115.099V20.799H110.399V24.299H108.599V16.599C108.599 15.999 109.099 15.499 109.699 15.499H115.799C116.399 15.499 116.899 15.999 116.899 16.599V24.299ZM126.399 23.099C126.399 23.699 125.899 24.199 125.299 24.199H118.199V15.499H124.799C125.399 15.499 125.899 15.999 125.899 16.599V19.199L125.999 19.299C126.299 19.499 126.399 19.799 126.399 20.199V23.099ZM136.099 23.099C136.099 23.699 135.599 24.199 134.999 24.199H128.099V22.899H133.999C134.199 22.899 134.299 22.699 134.299 22.499V20.899C134.299 20.699 134.099 20.599 133.899 20.599H128.799C128.199 20.599 127.699 20.099 127.699 19.499V16.599C127.699 15.999 128.199 15.499 128.899 15.499H135.799V16.799H129.899C129.699 16.799 129.599 16.999 129.599 17.099V19.099C129.599 19.299 129.699 19.399 129.899 19.399H134.899C135.499 19.399 135.999 19.899 135.999 20.499V23.099H136.099ZM139.099 24.299H137.999L140.499 15.499H141.599L139.099 24.299ZM151.299 16.799H148.299V24.299H146.499V16.799H143.499V15.499H151.299V16.799ZM160.699 20.299C160.699 20.899 160.199 21.399 159.599 21.399H154.199V24.199H152.399V15.399H159.599C160.199 15.399 160.699 15.899 160.699 16.499V20.299ZM170.299 23.199C170.299 23.799 169.799 24.299 169.199 24.299H163.099C162.499 24.299 161.999 23.799 161.999 23.199V15.599H163.799V22.799C163.799 22.999 163.899 23.099 164.099 23.099H168.199C168.399 23.099 168.499 22.999 168.499 22.799V15.599H170.299V23.199ZM173.299 24.299H172.199L174.699 15.499H175.799L173.299 24.299ZM186.199 20.299C186.199 20.899 185.699 21.399 185.099 21.399H179.699V24.199H177.899V15.399H185.099C185.699 15.399 186.199 15.899 186.199 16.499V20.299ZM194.099 16.799H189.499C189.299 16.799 189.199 16.899 189.199 17.099V22.699C189.199 22.899 189.299 22.999 189.499 22.999H194.099V24.299H188.499C187.899 24.299 187.399 23.799 187.399 23.199V16.699C187.399 16.099 187.899 15.599 188.499 15.599H194.099V16.799Z" fill="#CFD2D3"/>
<path d="M60.3998 20.1V17.5V14.9H59.0998H57.7998V17.5V20.1H59.0998H60.3998Z" fill="#CFD2D3"/>
<path d="M124.199 19V17.2C124.199 17 123.999 16.9 123.899 16.9H120.099V19.4H123.899C123.999 19.3 124.199 19.2 124.199 19Z" fill="#CFD2D3"/>
<path d="M98.9991 16.8H94.8991C94.6991 16.8 94.5991 17 94.5991 17.1V19.5H99.2991V17.1C99.2991 16.9 99.1991 16.8 98.9991 16.8Z" fill="#CFD2D3"/>
<path d="M114.8 16.8H110.7C110.5 16.8 110.4 17 110.4 17.1V19.5H115.1V17.1C115.1 16.9 115 16.8 114.8 16.8Z" fill="#CFD2D3"/>
<path d="M183.999 16.8H179.599V20.2H183.999C184.199 20.2 184.299 20.1 184.299 19.9V17.1C184.299 16.9 184.199 16.8 183.999 16.8Z" fill="#CFD2D3"/>
<path d="M158.599 16.8H154.199V20.2H158.599C158.799 20.2 158.899 20.1 158.899 19.9V17.1C158.899 16.9 158.699 16.8 158.599 16.8Z" fill="#CFD2D3"/>
<path d="M82.9 16.8H78.5V20.2H82.9C83.1 20.2 83.2 20.1 83.2 19.9V17.1C83.3 16.9 83.1 16.8 82.9 16.8Z" fill="#CFD2D3"/>
</svg>

After

Width:  |  Height:  |  Size: 5.8 KiB

View File

@@ -0,0 +1,34 @@
<svg width="30" height="320" viewBox="0 0 30 320" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M27.0312 0H2V320H27.0312V0Z" fill="#535656"/>
<path d="M25.479 65.0754V74.6217C25.479 75.3617 24.439 75.8797 23.269 75.8797H7.66899C6.36899 75.8797 5.45898 75.2877 5.45898 74.6217V65.0754H25.479ZM23.399 73.2156V66.9994H7.53898V73.2156C7.53898 73.5856 8.05899 73.9557 8.83899 73.9557H22.229C22.879 73.9557 23.399 73.6596 23.399 73.2156Z" fill="#CFD2D3"/>
<path d="M5.45898 86.018V78.5437C5.45898 77.8777 6.49899 77.2857 7.66899 77.2857H20.669V79.1358H7.14898V84.1679H20.669V86.018H5.45898Z" fill="#CFD2D3"/>
<path d="M12.219 87.276C13.519 87.276 14.559 87.868 14.559 88.608V94.4542H18.979V88.09H20.669V94.4542C20.669 95.4903 19.499 96.3783 18.069 96.3783H5.45898V88.608C5.45898 87.868 6.49898 87.276 7.79898 87.276H12.219ZM12.739 89.2001H7.14898V94.4542H12.739V89.2001Z" fill="#CFD2D3"/>
<path d="M7.80008 97.7103H25.7401V99.6343H7.15008V102.15H5.33008V99.0423C5.46008 98.3023 6.50008 97.7103 7.80008 97.7103Z" fill="#CFD2D3"/>
<path d="M17.1605 104.371V108.071H15.7305V104.371H17.1605Z" fill="#CFD2D3"/>
<path d="M13.9098 120.8H7.79984C6.49984 120.8 5.58984 120.208 5.58984 119.542V110.439H7.53984V118.21C7.53984 118.58 8.18984 118.95 8.96984 118.95H12.8698C13.5198 118.95 14.1698 118.654 14.1698 118.21V111.327C14.1698 110.661 15.2098 110.069 16.3798 110.069H23.3998C24.5698 110.069 25.6098 110.661 25.6098 111.401V120.504H23.5298V112.659C23.5298 112.289 23.0098 111.919 22.2298 111.919H17.4198C16.7698 111.919 16.1198 112.215 16.1198 112.659V119.542C16.1198 120.208 15.0798 120.8 13.9098 120.8Z" fill="#CFD2D3"/>
<path d="M20.539 122.205V124.129H5.45898V122.205H20.539ZM25.479 122.205V124.129H23.789V122.205H25.479Z" fill="#CFD2D3"/>
<path d="M18.199 125.461C19.499 125.461 20.539 126.053 20.539 126.793V132.639H25.479V134.563H5.45898V126.867C5.45898 126.127 6.49898 125.535 7.79898 125.535H18.199V125.461ZM18.849 132.565V127.385H7.14898V132.565H18.849Z" fill="#CFD2D3"/>
<path d="M18.329 135.895C19.629 135.895 20.669 136.487 20.669 137.227V143.665C20.669 144.405 19.629 144.997 18.329 144.997H11.699V137.819H7.14898V144.849H5.45898V137.227C5.45898 136.487 6.49898 135.895 7.79898 135.895H18.329ZM18.979 137.819H13.389V143.073H18.979V137.819Z" fill="#CFD2D3"/>
<path d="M18.199 146.404C19.499 146.404 20.539 146.996 20.539 147.736V153.583H25.479V155.507H5.45898V147.81C5.45898 147.07 6.49898 146.478 7.79898 146.478H18.199V146.404ZM18.849 153.509V148.328H7.14898V153.509H18.849Z" fill="#CFD2D3"/>
<path d="M5.45898 166.014H23.399V161.944H25.479V172.009H23.399V167.938H5.45898V166.014Z" fill="#CFD2D3"/>
<path d="M18.329 173.045C19.629 173.045 20.669 173.637 20.669 174.377V180.815C20.669 181.555 19.629 182.147 18.329 182.147H11.699V174.969H7.14898V181.999H5.45898V174.377C5.45898 173.637 6.49898 173.045 7.79898 173.045H18.329ZM18.979 175.043H13.389V180.297H18.979V175.043Z" fill="#CFD2D3"/>
<path d="M5.45898 190.139L10.659 187.845L5.45898 185.55V183.552L12.869 186.808L12.999 186.882L20.669 183.552V185.55L15.339 187.845L20.669 190.139V192.137L13.259 188.881L13.129 188.807L5.58899 192.137V190.139H5.45898Z" fill="#CFD2D3"/>
<path d="M7.14898 197.909V198.945H5.45898V196.429C5.45898 195.689 6.49898 195.097 7.79898 195.097H18.849V193.173H20.539V195.097H25.479V197.021H20.539V198.945H18.849V197.021H8.70898C7.79898 197.095 7.14898 197.465 7.14898 197.909Z" fill="#CFD2D3"/>
<path d="M5.45898 209.009V201.461C5.45898 200.795 6.49899 200.203 7.66899 200.203H20.669V202.053H7.14898V207.085H20.669V208.935H5.45898V209.009Z" fill="#CFD2D3"/>
<path d="M20.409 214.486V215.966H17.159V212.044H5.45898V210.194H20.409V212.044H17.159L18.719 212.636C19.759 213.08 20.409 213.746 20.409 214.486Z" fill="#CFD2D3"/>
<path d="M18.329 217.151C19.629 217.151 20.669 217.743 20.669 218.483V224.921C20.669 225.661 19.629 226.253 18.329 226.253H11.699V219.075H7.14898V226.105H5.45898V218.483C5.45898 217.743 6.49898 217.151 7.79898 217.151H18.329ZM18.979 219.149H13.389V224.403H18.979V219.149Z" fill="#CFD2D3"/>
<path d="M18.199 227.658C19.499 227.658 20.539 228.25 20.539 228.99V234.837H25.479V236.761H5.45898V228.99C5.45898 228.25 6.49898 227.658 7.79898 227.658H18.199ZM18.849 234.763V229.582H7.14898V234.763H18.849Z" fill="#CFD2D3"/>
<path d="M25.479 243.272V252.744C25.479 253.484 24.439 254.002 23.269 254.002H14.429C13.129 254.002 12.219 253.41 12.219 252.744V245.122H5.45898V243.198H25.479V243.272ZM15.599 252.152H22.229C22.879 252.152 23.529 251.856 23.529 251.412V245.196H14.429V251.412C14.299 251.782 14.819 252.152 15.599 252.152Z" fill="#CFD2D3"/>
<path d="M25.479 255.409V263.993H23.399V257.999C23.399 257.629 22.879 257.259 22.099 257.259H16.769V263.919H14.689V257.925C14.689 257.555 14.169 257.185 13.389 257.185H7.53898V263.845H5.45898V255.261H25.479V255.409Z" fill="#CFD2D3"/>
<path d="M25.479 265.769V267.693H5.45898V265.769H25.479Z" fill="#CFD2D3"/>
<path d="M25.479 274.28V283.752C25.479 284.492 24.439 285.01 23.269 285.01H14.429C13.129 285.01 12.219 284.418 12.219 283.752V276.204H5.45898V274.28H25.479ZM15.599 283.16H22.229C22.879 283.16 23.529 282.864 23.529 282.42V276.204H14.429V282.42C14.299 282.79 14.819 283.16 15.599 283.16Z" fill="#CFD2D3"/>
<path d="M7.80008 286.416H25.7401V288.34H7.15008V290.856H5.33008V287.748C5.46008 287.008 6.50008 286.416 7.80008 286.416Z" fill="#CFD2D3"/>
<path d="M12.219 292.262C13.519 292.262 14.559 292.854 14.559 293.594V299.441H18.979V293.076H20.669V299.441C20.669 300.477 19.499 301.365 18.069 301.365H5.45898V293.594C5.45898 292.854 6.49898 292.262 7.79898 292.262H12.219ZM12.739 294.186H7.14898V299.441H12.739V294.186Z" fill="#CFD2D3"/>
<path d="M7.14898 307.285V308.321H5.45898V305.805C5.45898 305.065 6.49898 304.473 7.79898 304.473H18.849V302.548H20.539V304.473H25.479V306.397H20.539V308.321H18.849V306.397H8.70898C7.79898 306.397 7.14898 306.767 7.14898 307.285Z" fill="#CFD2D3"/>
<path d="M18.329 309.505C19.629 309.505 20.669 310.097 20.669 310.837V317.276C20.669 318.016 19.629 318.608 18.329 318.608H11.699V311.429H7.14898V318.46H5.45898V310.837C5.45898 310.097 6.49898 309.505 7.79898 309.505H18.329ZM18.979 311.503H13.389V316.758H18.979V311.503Z" fill="#CFD2D3"/>
<path d="M25.4792 1.87903V10.6853C25.4792 11.4993 24.3092 12.1653 22.8792 12.1653H16.8992L16.7692 12.2393C16.2492 12.6094 15.4692 12.7574 14.6892 12.7574H7.79922C6.36922 12.7574 5.19922 12.0913 5.19922 11.2773V1.87903H25.4792ZM13.9092 10.0193V4.2471H8.18922V10.0193C8.18922 10.2413 8.57922 10.4633 8.96922 10.4633H13.1292C13.6492 10.4633 13.9092 10.2413 13.9092 10.0193ZM16.8992 9.35326C16.8992 9.57526 17.2892 9.79727 17.6792 9.79727H21.8392C22.2292 9.79727 22.6192 9.57526 22.6192 9.35326V4.2471H16.8992V9.35326Z" fill="#CFD2D3"/>
<path d="M12.3481 14.1635C13.7781 14.1635 15.0781 14.8295 15.0781 15.7175V21.1197H18.4581V14.9035H21.0581V21.4157C21.0581 22.5997 19.7581 23.5617 18.0681 23.5617H5.32812V15.7175C5.32812 14.9035 6.49812 14.1635 8.05812 14.1635H12.3481ZM12.3481 21.1197V16.6055H7.92813V21.1197H12.3481Z" fill="#CFD2D3"/>
<path d="M18.3281 37.6216H5.32812V35.1795H18.4581V32.4414H5.32812V30.0734H18.4581V27.3356H5.32812V24.8935H21.0581V36.0676C21.0581 36.9556 19.7581 37.6216 18.3281 37.6216Z" fill="#CFD2D3"/>
<path d="M25.8681 38.8802V41.3223H21.0581V46.7244C21.0581 47.6124 19.8881 48.2785 18.3281 48.2785H8.05812C6.62812 48.2785 5.32812 47.6124 5.32812 46.7244V38.8802H25.8681ZM18.4581 45.8364V41.3223H7.92813V45.8364H18.4581Z" fill="#CFD2D3"/>
<path d="M21.0581 58.4919H5.32812V50.9437C5.32812 50.1296 6.49813 49.4636 7.92813 49.4636H21.0581V51.8317H7.79812V56.2718H21.0581V58.4919Z" fill="#CFD2D3"/>
</svg>

After

Width:  |  Height:  |  Size: 7.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 287 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 289 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 276 B

View File

@@ -0,0 +1,4 @@
<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M14.3694 1.92413L18.9283 9.82031L14.3694 17.7165L5.25168 17.7165L0.692819 9.82031L5.25168 1.92413L14.3694 1.92413Z" fill="#00AE42" fill-opacity="0.15" stroke="#00AE42" stroke-width="1.2"/>
<circle cx="9.80791" cy="9.82119" r="2.92782" stroke="#00AE42" stroke-width="1.2"/>
</svg>

After

Width:  |  Height:  |  Size: 385 B

View File

@@ -0,0 +1,4 @@
<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M14.2828 2.06436L18.7551 9.81055L14.2828 17.5567L5.33829 17.5567L0.866025 9.81055L5.33829 2.06436L14.2828 2.06436Z" fill="#00AE42" fill-opacity="0.15" stroke="#00AE42" stroke-width="1.5"/>
<circle cx="9.80791" cy="9.81143" r="2.77782" stroke="#00AE42" stroke-width="1.5"/>
</svg>

After

Width:  |  Height:  |  Size: 385 B

View File

@@ -1,3 +1,3 @@
<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect x="1.5" y="1.5" width="15" height="15" rx="0.5" fill="#EEEEEE" stroke="#ACACAC"/>
<rect x="1.5" y="1.5" width="15" height="15" rx="0.5" fill="#CECECE" stroke="#ACACAC"/>
</svg>

Before

Width:  |  Height:  |  Size: 191 B

After

Width:  |  Height:  |  Size: 191 B

View File

@@ -0,0 +1,3 @@
<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M10 17.3707C14.0707 17.3707 17.3707 14.0707 17.3707 10C17.3707 5.92935 14.0707 2.62939 10 2.62939C5.92935 2.62939 2.62939 5.92935 2.62939 10C2.62939 14.0707 5.92935 17.3707 10 17.3707ZM10 18.3707C14.623 18.3707 18.3707 14.623 18.3707 10C18.3707 5.37706 14.623 1.62939 10 1.62939C5.37706 1.62939 1.62939 5.37706 1.62939 10C1.62939 14.623 5.37706 18.3707 10 18.3707Z" fill="#B6B6B6"/>
</svg>

After

Width:  |  Height:  |  Size: 535 B

View File

@@ -4,5 +4,5 @@
</defs>
<title>Slice 41</title>
<rect fill="none" x="-202.7" y="-112" width="1440" height="909"/>
<path fill="none" stroke="#2b3436" stroke-linecap="round" d="M3.62,3.25l9,9.29"/>
<line fill="none" stroke="#2b3436" stroke-linecap="round" x1="12.37" y1="3.47" x2="3.35" y2="12.75"/></svg>
<path fill="none" stroke="#262E30" stroke-linecap="round" d="M3.62,3.25l9,9.29"/>
<line fill="none" stroke="#262E30" stroke-linecap="round" x1="12.37" y1="3.47" x2="3.35" y2="12.75"/></svg>

Before

Width:  |  Height:  |  Size: 521 B

After

Width:  |  Height:  |  Size: 521 B

View File

@@ -0,0 +1,4 @@
<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M0.329102 7.14591C0.329102 6.7317 0.664888 6.39591 1.0791 6.39591H12.2525C12.6667 6.39591 13.0025 6.7317 13.0025 7.14591C13.0025 7.56013 12.6667 7.89591 12.2525 7.89591H1.0791C0.664888 7.89591 0.329102 7.56013 0.329102 7.14591Z" fill="#828280"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M6.66504 0.809425C7.07925 0.809425 7.41504 1.14521 7.41504 1.55943L7.41504 12.7329C7.41504 13.1471 7.07925 13.4829 6.66504 13.4829C6.25082 13.4829 5.91504 13.1471 5.91504 12.7329L5.91504 1.55943C5.91504 1.14521 6.25083 0.809425 6.66504 0.809425Z" fill="#828280"/>
</svg>

After

Width:  |  Height:  |  Size: 711 B

View File

@@ -0,0 +1,3 @@
<svg width="13" height="13" viewBox="0 0 13 13" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M0.160156 6.5C0.160156 6.08579 0.495943 5.75 0.910156 5.75H12.0836C12.4978 5.75 12.8336 6.08579 12.8336 6.5C12.8336 6.91421 12.4978 7.25 12.0836 7.25H0.910156C0.495943 7.25 0.160156 6.91421 0.160156 6.5Z" fill="#828280"/>
</svg>

After

Width:  |  Height:  |  Size: 374 B

View File

@@ -0,0 +1,11 @@
<svg width="100" height="100" viewBox="0 0 100 100" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_44_12301)">
<path fill-rule="evenodd" clip-rule="evenodd" d="M32.2533 15.2624C37.018 12.8234 42.3505 11.3358 48 11.0504V13.0531C42.7143 13.3347 37.7231 14.7256 33.2549 16.9972L32.2533 15.2624ZM28.791 17.2656C24.1876 20.2544 20.2542 24.1879 17.2655 28.7913L19.0002 29.7929C21.81 25.4912 25.4909 21.8102 29.7926 19.0004L28.791 17.2656ZM11.0504 48C11.3358 42.3506 12.8233 37.0183 15.2623 32.2536L16.997 33.2552C14.7255 37.7233 13.3347 42.7145 13.0532 48H11.0504ZM70.2069 81C74.5088 78.1901 78.1899 74.509 80.9998 70.2072L82.7345 71.2087C79.7457 75.8124 75.8121 79.7459 71.2084 82.7347L70.2069 81ZM88.9496 52C88.6643 57.6494 87.1767 62.9818 84.7377 67.7465L83.003 66.7449C85.2745 62.2768 86.6654 57.2856 86.9469 52H88.9496ZM52 11.0504V13.0531C57.2855 13.3347 62.2765 14.7254 66.7446 16.9969L67.7462 15.2621C62.9816 12.8232 57.6493 11.3358 52 11.0504ZM71.2085 17.2653L70.2069 19C74.5088 21.8099 78.1899 25.491 80.9998 29.7929L82.7346 28.7913C79.7458 24.1877 75.8121 20.2541 71.2085 17.2653ZM29.7926 80.9996C25.491 78.1898 21.81 74.5089 19.0002 70.2072L17.2655 71.2087C20.2542 75.8122 24.1876 79.7456 28.7911 82.7344L29.7926 80.9996ZM13.0532 52C13.3347 57.2856 14.7255 62.2767 16.9971 66.7449L15.2623 67.7465C12.8233 62.9818 11.3358 57.6494 11.0504 52H13.0532ZM84.7378 32.2536L83.003 33.2552C85.2745 37.7233 86.6654 42.7144 86.9469 48H88.9496C88.6643 42.3506 87.1767 37.0182 84.7378 32.2536Z" fill="#00AE42"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M4.46154 50C4.46154 24.8498 24.8498 4.46154 50 4.46154C75.1502 4.46154 95.5385 24.8498 95.5385 50C95.5385 66.1387 87.1432 80.3165 74.4817 88.4047L75.7138 90.5387C89.1106 82.0233 98 67.0498 98 50C98 23.4903 76.5097 2 50 2C23.4903 2 2 23.4903 2 50C2 67.0493 10.8889 82.0225 24.2851 90.538L25.5172 88.404C12.8563 80.3157 4.46154 66.1382 4.46154 50Z" fill="#6B6B6B"/>
</g>
<defs>
<clipPath id="clip0_44_12301">
<rect width="100" height="100" fill="white"/>
</clipPath>
</defs>
</svg>

After

Width:  |  Height:  |  Size: 2.0 KiB

View File

@@ -0,0 +1,6 @@
<svg width="19" height="19" viewBox="0 0 19 19" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M8.74075 11.2603C8.73545 10.9437 8.33311 10.5663 7.82345 10.0884C7.26132 9.56146 6.56204 8.90549 6.07884 8.00648C5.30352 6.5646 3.59261 5.55827 2.45248 5.45239C2.39039 5.44661 2.33024 5.44373 2.27345 5.44373C1.99239 5.44373 1.78063 5.51495 1.67619 5.64393C1.07653 6.38846 0.664082 7.56083 0.600554 8.70384C0.528845 9.99171 0.899422 11.0423 1.64298 11.6622C2.42986 12.3182 3.79185 12.6912 5.28812 12.6594C6.70594 12.6295 7.94473 12.2532 8.52129 11.6766C8.67096 11.527 8.74267 11.3908 8.74075 11.2603ZM7.70361 11.3975C7.15544 11.7123 6.22419 11.9206 5.2732 11.9409C5.22122 11.9418 5.16876 11.9423 5.11727 11.9423C3.85586 11.9423 2.72921 11.6309 2.10404 11.1097C1.53903 10.639 1.26037 9.79873 1.31909 8.74378C1.36866 7.84574 1.67523 6.89619 2.11896 6.26621L2.195 6.15793L2.32735 6.16467C2.5959 6.17814 2.9607 6.2821 3.32743 6.45006C4.23943 6.8678 5.03112 7.57671 5.44549 8.34722C5.74436 8.90309 6.13371 9.419 6.66984 9.97102C6.84214 10.1486 7.24015 10.5269 7.50292 10.7771C7.62901 10.8975 7.70794 10.9721 7.73297 10.9971L7.97216 11.243L7.70361 11.3975Z" fill="#828280"/>
<path d="M10.627 10.8205C10.1 11.3826 9.44404 12.0819 8.54502 12.5651C7.10314 13.3404 6.09681 15.0508 5.99093 16.1914C5.95676 16.5591 6.02654 16.8421 6.18247 16.9677C6.927 17.5679 8.09937 17.9803 9.24238 18.0439C10.5303 18.1156 11.5809 17.745 12.2007 17.0014C12.8567 16.2145 13.2297 14.8521 13.1979 13.3563C13.1681 11.9385 12.7917 10.6997 12.2152 10.1231C12.0674 9.97537 11.9332 9.90367 11.8042 9.90367L11.797 9.80741L11.7984 9.90367C11.4822 9.90848 11.1049 10.3113 10.627 10.8205ZM11.936 10.9403C12.2513 11.4885 12.4592 12.4197 12.4794 13.3707C12.5068 14.6783 12.1882 15.8926 11.6487 16.5404C11.2228 17.0515 10.4792 17.333 9.55521 17.333C9.46569 17.333 9.37425 17.3306 9.28233 17.3253C8.3838 17.2753 7.43473 16.9687 6.80475 16.5254L6.69647 16.4494L6.70321 16.3171C6.71668 16.0485 6.82063 15.6837 6.9886 15.317C7.40634 14.405 8.11525 13.6133 8.88576 13.1989C9.44115 12.9 9.95755 12.5112 10.5096 11.9746C10.6872 11.8018 11.0659 11.4043 11.3162 11.141L11.3292 11.1275C11.4384 11.0125 11.5106 10.9369 11.5356 10.9119C11.5443 10.9033 11.5534 10.8941 11.5626 10.8859L11.7844 10.6761L11.936 10.9403Z" fill="#828280"/>
<path d="M12.9997 1.13739C12.2547 0.537251 11.0823 0.124803 9.9398 0.0612752C9.83536 0.0554999 9.73092 0.0526123 9.62986 0.0526123C8.48684 0.0526123 7.54645 0.426077 6.98144 1.1037C6.32547 1.89058 5.95296 3.25353 5.98425 4.74884C6.01409 6.16666 6.39044 7.40545 6.967 7.98201C7.11619 8.1312 7.25191 8.20195 7.38426 8.20147C7.70045 8.19617 8.07777 7.79383 8.55567 7.28417C9.08266 6.72252 9.73862 6.02324 10.6376 5.53956C12.0795 4.76424 13.0858 3.05381 13.1917 1.9132C13.2254 1.54599 13.1556 1.263 12.9997 1.13739ZM12.4795 1.78807C12.466 2.05662 12.362 2.42142 12.1941 2.78815C11.7763 3.70015 11.0674 4.49184 10.2969 4.90621C9.74103 5.20508 9.22511 5.59443 8.6731 6.13056C8.49647 6.30189 8.11819 6.69942 7.86841 6.9622C7.80056 7.03391 7.74713 7.08973 7.70863 7.12968L7.7096 7.13064L7.6581 7.18214L7.63837 7.22112H7.61815L7.39821 7.42758L7.24661 7.16385C6.93138 6.61568 6.72348 5.68443 6.70326 4.73344C6.67583 3.42631 6.99443 2.21159 7.53393 1.5638C8.00509 0.998307 8.84539 0.719652 9.89985 0.778848C10.7979 0.828419 11.7474 1.13499 12.3774 1.57872L12.4857 1.65524L12.4795 1.78807Z" fill="#828280"/>
<path d="M17.5412 6.44297C16.7601 5.79181 15.3875 5.4145 13.896 5.44578C12.4782 5.47562 11.2394 5.85197 10.6629 6.42853C10.5132 6.57821 10.4415 6.71441 10.4434 6.84531C10.4487 7.16199 10.851 7.53931 11.3607 8.01721C11.9228 8.5442 12.6221 9.20017 13.1053 10.0992C13.8806 11.5411 15.5911 12.5474 16.7317 12.6533C17.0993 12.6874 17.3823 12.6177 17.5079 12.4617C18.1081 11.7172 18.5205 10.5448 18.5841 9.40182C18.6553 8.11346 18.2852 7.06285 17.5412 6.44297ZM17.866 9.36139C17.8164 10.2599 17.5099 11.209 17.0661 11.839L16.9901 11.9473L16.8578 11.941C16.5892 11.928 16.2244 11.824 15.8577 11.6556C14.9457 11.2379 14.154 10.5285 13.7396 9.75844C13.4407 9.20257 13.0514 8.68665 12.5153 8.13464C12.3434 7.95753 11.9459 7.57925 11.6827 7.32851L11.7486 7.25824L11.6822 7.32803C11.5556 7.20771 11.4772 7.13263 11.4526 7.10809C11.4415 7.09702 11.4338 7.08932 11.4266 7.08162L11.2178 6.85975L11.482 6.70767C12.0301 6.39244 12.9614 6.18453 13.9124 6.16432C15.22 6.13737 16.4347 6.45597 17.082 6.99499C17.6456 7.46615 17.9247 8.30645 17.866 9.36139Z" fill="#828280"/>
</svg>

After

Width:  |  Height:  |  Size: 4.3 KiB

View File

@@ -0,0 +1,3 @@
<svg width="60" height="60" viewBox="0 0 60 60" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M32.6757 31.6386L19.3114 49.7398C18.957 50.2199 18.2112 49.7875 18.4515 49.2414L27.5142 28.6531C27.5577 28.5543 27.6321 28.4722 27.7261 28.4191L31.9128 26.0568C32.2415 25.8713 32.6494 26.103 32.6583 26.4804L32.7733 31.3297C32.776 31.4407 32.7416 31.5493 32.6757 31.6386Z" fill="#FF6F00"/>
</svg>

After

Width:  |  Height:  |  Size: 401 B

View File

@@ -0,0 +1,3 @@
<svg width="60" height="60" viewBox="0 0 60 60" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M31.5152 32.6674L10.8908 41.6614C10.3439 41.8999 9.91409 41.1525 10.3953 40.7998L28.538 27.5012C28.6251 27.4373 28.7305 27.4034 28.8385 27.4044L33.6454 27.4519C34.0229 27.4556 34.2602 27.8603 34.0793 28.1916L31.7542 32.4487C31.701 32.5461 31.6169 32.623 31.5152 32.6674Z" fill="#FF6F00"/>
</svg>

After

Width:  |  Height:  |  Size: 401 B

View File

@@ -0,0 +1,3 @@
<svg width="60" height="60" viewBox="0 0 60 60" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M32.8413 28.657L41.8353 49.2814C42.0738 49.8284 41.3264 50.2581 40.9737 49.7769L27.6751 31.6342C27.6112 31.5471 27.5773 31.4417 27.5783 31.3337L27.6258 26.5268C27.6295 26.1493 28.0342 25.912 28.3655 26.0929L32.6226 28.418C32.72 28.4712 32.7969 28.5553 32.8413 28.657Z" fill="#FF6F00"/>
</svg>

After

Width:  |  Height:  |  Size: 398 B

View File

@@ -0,0 +1,3 @@
<svg width="60" height="60" viewBox="0 0 60 60" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M30.0024 32.9817L7.64413 30.4585C7.05119 30.3916 7.05268 29.5295 7.64583 29.4646L30.0071 27.019C30.1145 27.0072 30.2227 27.0306 30.3157 27.0855L34.4549 29.53C34.7799 29.722 34.7832 30.1911 34.4608 30.3875L30.3187 32.9118C30.2239 32.9695 30.1127 32.9941 30.0024 32.9817Z" fill="#FF6F00"/>
</svg>

After

Width:  |  Height:  |  Size: 400 B

View File

@@ -0,0 +1,3 @@
<svg width="60" height="60" viewBox="0 0 60 60" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M28.5379 32.4973L10.4367 19.133C9.95666 18.7786 10.389 18.0327 10.9351 18.2731L31.5234 27.3358C31.6222 27.3793 31.7043 27.4536 31.7574 27.5477L34.1197 31.7343C34.3052 32.0631 34.0735 32.4709 33.6961 32.4799L28.8468 32.5949C28.7358 32.5975 28.6272 32.5632 28.5379 32.4973Z" fill="#FF6F00"/>
</svg>

After

Width:  |  Height:  |  Size: 402 B

View File

@@ -0,0 +1,3 @@
<svg width="60" height="60" viewBox="0 0 60 60" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M27.5093 31.344L18.5153 10.7195C18.2768 10.1726 19.0241 9.74283 19.3769 10.2241L32.6755 28.3667C32.7394 28.4538 32.7733 28.5592 32.7722 28.6672L32.7248 33.4741C32.721 33.8516 32.3164 34.089 31.9851 33.908L27.728 31.5829C27.6306 31.5297 27.5537 31.4457 27.5093 31.344Z" fill="#FF6F00"/>
</svg>

After

Width:  |  Height:  |  Size: 398 B

View File

@@ -0,0 +1,3 @@
<svg width="60" height="60" viewBox="0 0 60 60" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M27.1946 29.8308L29.7178 7.47251C29.7847 6.87958 30.6468 6.88106 30.7116 7.47422L33.1573 29.8355C33.169 29.9429 33.1457 30.0511 33.0908 30.1441L30.6462 34.2833C30.4542 34.6083 29.9851 34.6116 29.7887 34.2892L27.2644 30.1471C27.2067 30.0523 27.1821 29.941 27.1946 29.8308Z" fill="#FF6F00"/>
</svg>

After

Width:  |  Height:  |  Size: 402 B

View File

@@ -0,0 +1,3 @@
<svg width="60" height="60" viewBox="0 0 60 60" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M27.6866 28.3631L41.0509 10.2618C41.4053 9.78179 42.1512 10.2141 41.9108 10.7603L32.8481 31.3485C32.8046 31.4474 32.7302 31.5295 32.6362 31.5825L28.4495 33.9449C28.1208 34.1304 27.7129 33.8986 27.704 33.5213L27.589 28.6719C27.5863 28.561 27.6207 28.4523 27.6866 28.3631Z" fill="#FF6F00"/>
</svg>

After

Width:  |  Height:  |  Size: 401 B

View File

@@ -0,0 +1,3 @@
<svg width="60" height="60" viewBox="0 0 60 60" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M28.8392 27.3343L49.4637 18.3403C50.0106 18.1018 50.4404 18.8491 49.9591 19.2019L31.8165 32.5005C31.7294 32.5643 31.624 32.5983 31.516 32.5972L26.7091 32.5497C26.3316 32.546 26.0943 32.1414 26.2752 31.8101L28.6003 27.5529C28.6535 27.4555 28.7375 27.3786 28.8392 27.3343Z" fill="#FF6F00"/>
</svg>

After

Width:  |  Height:  |  Size: 401 B

View File

@@ -0,0 +1,3 @@
<svg width="60" height="60" viewBox="0 0 60 60" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M30.3521 27.02L52.7104 29.5432C53.3033 29.6101 53.3018 30.4722 52.7087 30.537L30.3474 32.9827C30.24 32.9944 30.1317 32.9711 30.0387 32.9162L25.8996 30.4716C25.5746 30.2796 25.5713 29.8105 25.8936 29.6141L30.0358 27.0898C30.1306 27.0321 30.2418 27.0075 30.3521 27.02Z" fill="#FF6F00"/>
</svg>

After

Width:  |  Height:  |  Size: 397 B

View File

@@ -0,0 +1,3 @@
<svg width="60" height="60" viewBox="0 0 60 60" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M31.8459 27.504L49.9471 40.8683C50.4271 41.2227 49.9948 41.9686 49.4487 41.7282L28.8604 32.6655C28.7616 32.622 28.6795 32.5477 28.6264 32.4536L26.2641 28.267C26.0786 27.9382 26.3103 27.5304 26.6877 27.5214L31.537 27.4064C31.6479 27.4038 31.7566 27.4381 31.8459 27.504Z" fill="#FF6F00"/>
</svg>

After

Width:  |  Height:  |  Size: 399 B

View File

@@ -0,0 +1,7 @@
<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M17.1895 9.86816L8.73591 18.3217C8.54065 18.517 8.22406 18.517 8.0288 18.3217L0.346886 10.6398C0.151624 10.4446 0.151624 10.128 0.346886 9.93272L0.411443 9.86816H17.1895Z" fill="#54545A"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M18.0623 11.3705L17.6241 11.6113L17.1862 11.3701C17.2742 11.2104 17.4421 11.1112 17.6244 11.1113C17.8067 11.1114 17.9745 11.2107 18.0623 11.3705ZM19.8145 15.5488C19.8145 15.5488 19.8145 15.5487 19.8145 15.5488V15.5488ZM19.8145 15.5488C19.9034 16.6116 19.6888 17.3534 19.1836 17.8066C18.6985 18.2419 18.0669 18.2932 17.6241 18.2932C17.1809 18.2932 16.536 18.2389 16.0436 17.8063C15.5228 17.3487 15.3094 16.599 15.4355 15.5317C15.4774 15.1768 15.6202 14.7344 15.7876 14.3012C15.959 13.8575 16.1721 13.3835 16.378 12.9523C16.5844 12.52 16.786 12.1253 16.9359 11.8388C17.0109 11.6954 17.0732 11.5788 17.1168 11.4978C17.1386 11.4573 17.1558 11.4257 17.1676 11.404L17.1812 11.3792L17.1862 11.3701C17.1862 11.37 17.1862 11.3701 17.6241 11.6113C18.0623 11.3705 18.0623 11.3704 18.0623 11.3705L18.0674 11.3798L18.0814 11.4054C18.0935 11.4277 18.1112 11.4602 18.1336 11.5019C18.1784 11.5852 18.2423 11.7051 18.3191 11.852C18.4727 12.1456 18.6788 12.5491 18.8881 12.9871C19.0969 13.424 19.3118 13.9012 19.4811 14.341C19.6449 14.7665 19.7859 15.206 19.8145 15.5488ZM17.6242 12.686C17.5175 12.8961 17.3996 13.1334 17.2804 13.3831C17.0804 13.8022 16.879 14.2508 16.7204 14.6615C16.5577 15.0826 16.4549 15.4264 16.4286 15.6489C16.3218 16.5522 16.5317 16.904 16.7037 17.0551C16.9042 17.2313 17.2218 17.2932 17.6241 17.2932C18.0279 17.2932 18.3252 17.2333 18.5158 17.0623C18.6864 16.9092 18.8947 16.5497 18.818 15.632C18.8023 15.4438 18.7096 15.1204 18.5479 14.7003C18.3917 14.2946 18.189 13.8434 17.9859 13.4183C17.8606 13.1562 17.7363 12.9063 17.6242 12.686Z" fill="#B6B6B6"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M9.22827 2.47085L1.41437 10.2848L8.38918 17.2596L16.2031 9.44566L9.22827 2.47085ZM9.58182 1.41019C9.38656 1.21493 9.06998 1.21493 8.87472 1.41019L0.353714 9.9312C0.158452 10.1265 0.158452 10.443 0.353714 10.6383L8.03563 18.3202C8.23089 18.5155 8.54747 18.5155 8.74273 18.3202L17.2637 9.79921C17.459 9.60395 17.459 9.28737 17.2637 9.09211L9.58182 1.41019Z" fill="#B6B6B6"/>
<path d="M3.92889 1.63263C4.007 1.55453 4.13363 1.55453 4.21173 1.63263L8.48013 5.90103C8.55824 5.97913 8.55824 6.10577 8.48013 6.18387L8.07582 6.58818C7.99771 6.66629 7.87108 6.66629 7.79298 6.58818L3.52458 2.31979C3.44647 2.24168 3.44647 2.11505 3.52458 2.03695L3.92889 1.63263Z" fill="#54545A"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M7.79298 6.58834C7.87108 6.66644 7.99771 6.66644 8.07582 6.58834L8.48013 6.18402C8.55824 6.10592 8.55824 5.97929 8.48013 5.90118L4.21173 1.63278C4.21173 1.63278 4.21173 1.63278 4.21173 1.63278C4.13363 1.55468 4.007 1.55468 3.92889 1.63278L3.52458 2.0371C3.44647 2.1152 3.44647 2.24183 3.52458 2.31994L7.79298 6.58834ZM4.91884 0.925677L9.18724 5.19407C9.65587 5.6627 9.65587 6.4225 9.18724 6.89113L8.78293 7.29544C8.3143 7.76407 7.5545 7.76407 7.08587 7.29544L2.81747 3.02705C2.34884 2.55841 2.34884 1.79862 2.81747 1.32999L3.22178 0.925677C3.69041 0.457047 4.45021 0.457048 4.91884 0.925677Z" fill="#B6B6B6"/>
</svg>

After

Width:  |  Height:  |  Size: 3.3 KiB

View File

@@ -0,0 +1,14 @@
<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M2.37524 7.07324C2.37524 5.41639 3.71839 4.07324 5.37524 4.07324H14.2421C15.899 4.07324 17.2421 5.41639 17.2421 7.07324V13.2871C17.2421 14.944 15.899 16.2871 14.2421 16.2871H5.37524C3.71839 16.2871 2.37524 14.944 2.37524 13.2871V7.07324Z" fill="#54545A"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M14.2421 5.07324H5.37524C4.27067 5.07324 3.37524 5.96867 3.37524 7.07324V13.2871C3.37524 14.3917 4.27067 15.2871 5.37524 15.2871H14.2421C15.3467 15.2871 16.2421 14.3917 16.2421 13.2871V7.07324C16.2421 5.96867 15.3467 5.07324 14.2421 5.07324ZM5.37524 4.07324C3.71839 4.07324 2.37524 5.41639 2.37524 7.07324V13.2871C2.37524 14.944 3.71839 16.2871 5.37524 16.2871H14.2421C15.899 16.2871 17.2421 14.944 17.2421 13.2871V7.07324C17.2421 5.41639 15.899 4.07324 14.2421 4.07324H5.37524Z" fill="#B6B6B6"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M6.48804 1.73156C6.76418 1.7315 6.98809 1.9553 6.98816 2.23145L6.98903 5.91478C6.9891 6.19092 6.76529 6.41483 6.48915 6.41489C6.21301 6.41496 5.9891 6.19116 5.98903 5.91501L5.98816 2.23168C5.98809 1.95554 6.21189 1.73163 6.48804 1.73156Z" fill="#B6B6B6"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M9.89917 1.73156C10.1753 1.7315 10.3992 1.9553 10.3993 2.23145L10.4002 5.91478C10.4002 6.19092 10.1764 6.41483 9.90028 6.41489C9.62414 6.41496 9.40023 6.19116 9.40016 5.91501L9.39929 2.23168C9.39922 1.95554 9.62303 1.73163 9.89917 1.73156Z" fill="#B6B6B6"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M13.3103 1.73156C13.5864 1.7315 13.8104 1.9553 13.8104 2.23145L13.8113 5.91478C13.8114 6.19092 13.5876 6.41483 13.3114 6.41489C13.0353 6.41496 12.8114 6.19116 12.8113 5.91501L12.8104 2.23168C12.8104 1.95554 13.0342 1.73163 13.3103 1.73156Z" fill="#B6B6B6"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M14.9 11.3857C14.9 11.1096 15.1238 10.8857 15.3999 10.8856L19.0832 10.8847C19.3594 10.8847 19.5833 11.1085 19.5834 11.3846C19.5834 11.6608 19.3596 11.8847 19.0835 11.8847L15.4001 11.8856C15.124 11.8857 14.9001 11.6619 14.9 11.3857Z" fill="#B6B6B6"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M14.9 7.97461C14.9 7.69847 15.1238 7.47456 15.3999 7.47449L19.0832 7.47361C19.3594 7.47355 19.5833 7.69735 19.5834 7.9735C19.5834 8.24964 19.3596 8.47355 19.0835 8.47361L15.4001 8.47449C15.124 8.47456 14.9001 8.25075 14.9 7.97461Z" fill="#B6B6B6"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M0.416623 11.3857C0.416557 11.1096 0.640362 10.8857 0.916504 10.8856L4.59983 10.8847C4.87598 10.8847 5.09989 11.1085 5.09995 11.3846C5.10002 11.6608 4.87621 11.8847 4.60007 11.8847L0.916742 11.8856C0.640599 11.8857 0.416688 11.6619 0.416623 11.3857Z" fill="#B6B6B6"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M0.416623 7.97461C0.416557 7.69847 0.640362 7.47456 0.916504 7.47449L4.59983 7.47361C4.87598 7.47355 5.09989 7.69735 5.09995 7.9735C5.10002 8.24964 4.87621 8.47355 4.60007 8.47361L0.916742 8.47449C0.640599 8.47456 0.416688 8.25075 0.416623 7.97461Z" fill="#B6B6B6"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M6.48804 13.5851C6.76418 13.585 6.98809 13.8088 6.98816 14.085L6.98903 17.7683C6.9891 18.0444 6.76529 18.2683 6.48915 18.2684C6.21301 18.2685 5.9891 18.0447 5.98903 17.7685L5.98816 14.0852C5.98809 13.8091 6.21189 13.5851 6.48804 13.5851Z" fill="#B6B6B6"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M9.89917 13.5851C10.1753 13.585 10.3992 13.8088 10.3993 14.085L10.4002 17.7683C10.4002 18.0444 10.1764 18.2683 9.90028 18.2684C9.62414 18.2685 9.40023 18.0447 9.40016 17.7685L9.39929 14.0852C9.39922 13.8091 9.62303 13.5851 9.89917 13.5851Z" fill="#B6B6B6"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M13.3103 13.5851C13.5864 13.585 13.8104 13.8088 13.8104 14.085L13.8113 17.7683C13.8114 18.0444 13.5876 18.2683 13.3114 18.2684C13.0353 18.2685 12.8114 18.0447 12.8113 17.7685L12.8104 14.0852C12.8104 13.8091 13.0342 13.5851 13.3103 13.5851Z" fill="#B6B6B6"/>
</svg>

After

Width:  |  Height:  |  Size: 3.9 KiB

View File

@@ -0,0 +1,4 @@
<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M5.92009 10.2489C6.0542 10.4903 5.96725 10.7947 5.72586 10.9289L2.12609 12.929C2.05004 12.9747 2.01444 13.0139 2.00025 13.0342C2.01465 13.0548 2.05111 13.0949 2.1295 13.1415L9.34396 17.3224C9.50336 17.4167 9.74663 17.479 10.0183 17.479C10.29 17.479 10.5333 17.4167 10.6927 17.3224L10.6975 17.3195L17.8712 13.1843C17.9492 13.1378 17.9856 13.0979 18 13.0773C17.9857 13.0569 17.9498 13.0174 17.8729 12.9713L14.2896 10.9488C14.0492 10.813 13.9642 10.508 14.1 10.2676C14.2357 10.0271 14.5407 9.94217 14.7812 10.0779L18.3782 12.1082C18.7214 12.3112 19.0061 12.6432 19.0061 13.0773C19.0061 13.5114 18.7213 13.8433 18.3781 14.0463L18.3733 14.0492L11.1992 18.1847C10.849 18.3909 10.4195 18.479 10.0183 18.479C9.6169 18.479 9.18718 18.3908 8.83698 18.1844L1.62208 14.0032C1.27887 13.8002 0.994141 13.4683 0.994141 13.0342C0.994141 12.6001 1.27888 12.2682 1.62209 12.0652L1.63371 12.0583L5.24018 10.0547C5.48156 9.92061 5.78597 10.0076 5.92009 10.2489Z" fill="#B6B6B6"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M9.98189 2.521C9.7102 2.521 9.46692 2.58331 9.30752 2.67759L9.2988 2.68274L2.12736 6.73048C2.05044 6.77656 2.01452 6.81608 2.00025 6.8365C2.01465 6.8571 2.0511 6.89716 2.12947 6.94378L9.34396 11.1247C9.50336 11.219 9.74663 11.2813 10.0183 11.2813C10.29 11.2813 10.5333 11.219 10.6927 11.1247L10.6946 11.1236L17.8326 6.94479C17.8329 6.94462 17.8323 6.94495 17.8326 6.94479C17.9116 6.89794 17.9491 6.85718 17.9635 6.8365C17.9493 6.81608 17.9133 6.77656 17.8364 6.73047L10.6562 2.67768C10.4968 2.58339 10.2536 2.521 9.98189 2.521ZM11.1606 1.81407C10.8109 1.60871 10.3823 1.521 9.98189 1.521C9.58147 1.521 9.15289 1.60872 8.80316 1.81409L1.63086 5.86243L1.62209 5.86749C1.27888 6.07049 0.994141 6.40241 0.994141 6.8365C0.994141 7.27058 1.27888 7.60251 1.62209 7.8055L8.83693 11.9866C9.18715 12.1931 9.61688 12.2813 10.0183 12.2813C10.4202 12.2813 10.8504 12.1929 11.2008 11.986C11.2011 11.9858 11.2014 11.9856 11.2018 11.9854L18.3398 7.80664L18.3417 7.8055C18.6849 7.60251 18.9696 7.27058 18.9696 6.8365C18.9696 6.40241 18.6849 6.07049 18.3417 5.86749L11.1606 1.81407Z" fill="#B6B6B6"/>
</svg>

After

Width:  |  Height:  |  Size: 2.2 KiB

View File

@@ -0,0 +1,4 @@
<svg width="15" height="15" viewBox="0 0 15 15" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M5.0166 4.74366C5.22248 4.14249 5.57248 3.67719 6.0666 3.34778C6.56895 3.01013 7.14543 2.84131 7.79601 2.84131C8.2819 2.84131 8.71013 2.93601 9.08072 3.12543C9.45131 3.3066 9.73954 3.5619 9.94543 3.89131C10.1513 4.21248 10.2542 4.57484 10.2542 4.97837C10.2542 5.39013 10.1554 5.73601 9.95778 6.01602C9.76837 6.28778 9.48013 6.59249 9.09307 6.93013C8.82131 7.18543 8.60307 7.40366 8.43837 7.58484C8.27366 7.76602 8.13366 7.98425 8.01837 8.23954C7.91131 8.4866 7.85778 8.77484 7.85778 9.10425C7.85778 9.33484 7.8866 9.56954 7.94425 9.80837H7.0919C6.98484 9.43778 6.93131 9.09602 6.93131 8.78307C6.93131 8.44543 6.98484 8.14896 7.0919 7.89366C7.20719 7.63013 7.34307 7.4119 7.49954 7.23896C7.65601 7.05778 7.86601 6.84366 8.12954 6.5966C8.45072 6.30837 8.68954 6.05719 8.84601 5.84307C9.00248 5.62072 9.08072 5.36131 9.08072 5.06484C9.08072 4.69425 8.95307 4.39778 8.69778 4.17543C8.44248 3.95307 8.10895 3.8419 7.69719 3.8419C6.85719 3.8419 6.24778 4.30719 5.86895 5.23778L5.0166 4.74366ZM7.62307 12.489C7.43366 12.489 7.26895 12.419 7.12895 12.279C6.99719 12.139 6.93131 11.9742 6.93131 11.7848C6.93131 11.5872 6.99719 11.4184 7.12895 11.2784C7.26895 11.1384 7.43366 11.0684 7.62307 11.0684C7.82072 11.0684 7.98543 11.1384 8.11719 11.2784C8.25719 11.4184 8.32719 11.5872 8.32719 11.7848C8.32719 11.9742 8.25719 12.139 8.11719 12.279C7.98543 12.419 7.82072 12.489 7.62307 12.489Z" fill="#FF6F00"/>
<circle cx="7.5" cy="7.5" r="7" stroke="#FF6F00"/>
</svg>

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

@@ -0,0 +1,3 @@
<svg width="13" height="23" viewBox="0 0 13 23" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M12 1L1.7578 10.7766C1.3451 11.1706 1.3451 11.8294 1.7578 12.2234L12 22" stroke="#353535" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
</svg>

After

Width:  |  Height:  |  Size: 268 B

View File

@@ -0,0 +1,3 @@
<svg width="13" height="23" viewBox="0 0 13 23" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M1 22L11.2422 12.2234C11.6549 11.8294 11.6549 11.1706 11.2422 10.7766L1 0.999999" stroke="#353535" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
</svg>

After

Width:  |  Height:  |  Size: 277 B

View File

@@ -0,0 +1,3 @@
<svg width="33" height="31" viewBox="0 0 33 31" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M32.2153 5.96128C31.5988 5.73822 30.922 6.06267 30.7031 6.68294L29.7873 9.2678C28.7152 6.83324 27.022 4.6933 24.8661 3.08297C18.0116 -2.03427 8.24859 -0.636275 3.10974 6.20103C0.622547 9.50995 -0.425811 13.5882 0.15753 17.6832C0.743239 21.7949 2.90148 25.4283 6.2347 27.9153C9.02362 29.9956 12.2917 31 15.5327 31C20.2668 31 24.9454 28.8589 27.9935 24.802C29.3424 23.008 30.2665 20.9969 30.7374 18.8224C30.877 18.1794 30.4736 17.5437 29.8346 17.4029C29.198 17.2645 28.5662 17.6677 28.4265 18.313C28.0278 20.1464 27.248 21.845 26.1074 23.3623C21.7483 29.1595 13.4643 30.3416 7.64158 25.9985C4.82071 23.8931 2.99496 20.8204 2.49918 17.3445C2.00577 13.8853 2.8932 10.4392 4.99465 7.64198C9.35256 1.84243 17.6329 0.655561 23.4581 5.00105C25.5666 6.57558 27.1498 8.75131 28.0053 11.2121L23.9385 9.61134C23.3315 9.37397 22.644 9.67456 22.4062 10.2889C22.1683 10.9032 22.4701 11.5938 23.0782 11.8336L29.0631 14.1894C29.2039 14.2443 29.3495 14.2717 29.4926 14.2717C29.5128 14.2717 29.5305 14.2646 29.5506 14.2634C29.5956 14.2682 29.6405 14.2872 29.6855 14.2872C30.1706 14.2872 30.6274 13.9831 30.7989 13.4952L32.93 7.48691C33.1512 6.86544 32.8306 6.18195 32.2153 5.96128Z" fill="#353535"/>
</svg>

After

Width:  |  Height:  |  Size: 1.3 KiB

View File

@@ -1,11 +1,18 @@
<svg width="272" height="181" viewBox="0 0 272 181" fill="none" xmlns="http://www.w3.org/2000/svg">
<ellipse cx="148.5" cy="171" rx="54.5" ry="10" fill="#DEDEDE"/>
<path d="M118 62L196.5 34V112L118 140V62Z" fill="#C3C3C3"/>
<rect x="42" y="62.5" width="76" height="77" fill="#AEACAC"/>
<path d="M116 36.5L41 63H121.5L196.5 35L116 36.5Z" fill="#E4E4E4"/>
<path d="M84.4247 78.4554L33.1782 74.4793C30.2816 74.2546 28.1192 77.0953 29.1071 79.8275L57.0758 157.178C58.0147 159.775 61.24 160.662 63.3747 158.91L97.9325 130.555C97.9775 130.518 98.0185 130.486 98.0635 130.45C98.8161 129.836 106 123.505 106 105.5C106 88.3036 88.7977 80.118 85.5318 78.7188C85.18 78.5681 84.8063 78.485 84.4247 78.4554Z" fill="#8D8B8B"/>
<path d="M82.1864 103.688C90.8229 127.171 82.7743 151.036 65.1697 157.511C47.5652 163.986 25.9713 151.022 17.3347 127.539C8.69823 104.057 16.7468 80.191 34.3514 73.7163C51.9559 67.2416 73.5499 80.2054 82.1864 103.688Z" fill="#C4C4C4" stroke="#D8D8D8" stroke-width="3"/>
<ellipse cx="65.7356" cy="108.611" rx="14.2976" ry="18.3001" transform="rotate(-20.1927 65.7356 108.611)" fill="#AEACAC"/>
<path d="M222.098 14.75H221.848V15V17.5854V17.8354H222.098H236.77L220.803 38.4069L220.75 38.4746V38.5602V41V41.25H221H242H242.25V41V38.4146V38.1646H242H225.388L241.319 17.6294L241.372 17.5618V17.4762V15V14.75H241.122H222.098Z" fill="#B8B8B8" stroke="#B8B8B8" stroke-width="0.5"/>
<path d="M259.627 0.75H259.377V1V2.4916V2.7416H259.627H267.796L258.802 14.4401L258.75 14.5074V14.5924V16V16.25H259H271H271.25V16V14.5084V14.2584H271H261.723L270.696 2.5809L270.748 2.51353V2.42857V1V0.75H270.498H259.627Z" fill="#B8B8B8" stroke="#B8B8B8" stroke-width="0.5"/>
<svg width="240" height="160" viewBox="0 0 240 160" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_6645_29335)">
<ellipse cx="131.03" cy="150.882" rx="48.0882" ry="8.82353" fill="#DEDEDE"/>
<path d="M104.117 54.7059L173.382 30V98.8235L104.117 123.529V54.7059Z" fill="#C3C3C3"/>
<rect x="37.0586" y="55.1484" width="67.0588" height="67.9412" fill="#AEACAC"/>
<path d="M102.352 32.2063L36.1758 55.5887H107.205L173.382 30.8828L102.352 32.2063Z" fill="#E4E4E4"/>
<path d="M74.493 69.2261L29.2756 65.7179C26.7198 65.5196 24.8118 68.0261 25.6834 70.4368L50.3617 138.688C51.1902 140.979 54.036 141.761 55.9195 140.216L86.4118 115.197C86.4514 115.164 86.4876 115.136 86.5273 115.103C87.1914 114.562 93.5301 108.976 93.5301 93.089C93.5301 77.9158 78.3516 70.6931 75.4699 69.4586C75.1595 69.3256 74.8297 69.2522 74.493 69.2261Z" fill="#8D8B8B"/>
<path d="M72.5174 91.4895C80.1378 112.209 73.0361 133.267 57.5027 138.98C41.9693 144.693 22.9158 133.255 15.2954 112.535C7.67491 91.8149 14.7766 70.7569 30.3101 65.0439C45.8435 59.331 64.897 70.7696 72.5174 91.4895Z" fill="#C4C4C4" stroke="#D8D8D8" stroke-width="2.64706"/>
<ellipse cx="58.0016" cy="95.8333" rx="12.6155" ry="16.1471" transform="rotate(-20.1927 58.0016 95.8333)" fill="#AEACAC"/>
<path d="M195.968 13.0157H195.748V13.2363V15.5176V15.7382H195.968H208.915L194.826 33.8895L194.779 33.9492V34.0248V36.1775V36.3981H195H213.529H213.75V36.1775V33.8962V33.6756H213.529H198.872L212.929 15.5564L212.975 15.4967V15.4212V13.2363V13.0157H212.755H195.968Z" fill="#B8B8B8" stroke="#B8B8B8" stroke-width="0.441176"/>
<path d="M229.083 0.662224H228.862V0.882812V2.19893V2.41952H229.083H236.29L228.354 12.7417L228.309 12.8011V12.8761V14.1181V14.3387H228.529H239.118H239.338V14.1181V12.802V12.5814H239.118H230.932L238.85 2.27772L238.895 2.21828V2.14332V0.882812V0.662224H238.675H229.083Z" fill="#B8B8B8" stroke="#B8B8B8" stroke-width="0.441176"/>
</g>
<defs>
<clipPath id="clip0_6645_29335">
<rect width="240" height="159.706" fill="white"/>
</clipPath>
</defs>
</svg>

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

View File

@@ -1,11 +1,11 @@
<svg width="86" height="104" viewBox="0 0 86 104" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect x="32" y="52" width="22.6316" height="22.6316" fill="url(#paint0_linear_6645_29777)"/>
<path d="M43 18C51.5046 18 59.8182 20.5219 66.8895 25.2468C73.9608 29.9717 79.4723 36.6874 82.7268 44.5446C85.9814 52.4018 86.8329 61.0477 85.1738 69.3889C83.5146 77.7301 79.4193 85.3919 73.4056 91.4056C67.3919 97.4193 59.7301 101.515 51.3889 103.174C43.0477 104.833 34.4018 103.981 26.5446 100.727C18.6874 97.4723 11.9717 91.9608 7.24681 84.8895C2.52191 77.8182 -2.02833e-07 69.5046 0 61H6.50061C6.50061 68.2189 8.64126 75.2757 12.6519 81.278C16.6625 87.2803 22.3629 91.9585 29.0323 94.721C35.7017 97.4836 43.0405 98.2064 50.1207 96.7981C57.2009 95.3897 63.7044 91.9135 68.809 86.809C73.9135 81.7044 77.3897 75.2009 78.7981 68.1207C80.2064 61.0405 79.4836 53.7017 76.721 47.0323C73.9585 40.3629 69.2803 34.6625 63.278 30.6519C57.2757 26.6413 50.2189 24.5006 43 24.5006V18Z" fill="#D9D9D9"/>
<path d="M23.0587 23.5848C22.0187 22.7842 22.0187 21.2158 23.0587 20.4152L42.53 5.42619C43.8452 4.41379 45.75 5.35132 45.75 7.011L45.75 36.989C45.75 38.6487 43.8452 39.5862 42.53 38.5738L23.0587 23.5848Z" fill="#D9D9D9"/>
<svg width="240" height="160" viewBox="0 0 240 160" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect x="109" y="80.1484" width="22.6316" height="22.6316" fill="url(#paint0_linear_8097_31792)"/>
<path d="M120 46.1484C128.505 46.1484 136.818 48.6703 143.89 53.3952C150.961 58.1201 156.472 64.8358 159.727 72.6931C162.981 80.5503 163.833 89.1961 162.174 97.5373C160.515 105.879 156.419 113.54 150.406 119.554C144.392 125.568 136.73 129.663 128.389 131.322C120.048 132.981 111.402 132.13 103.545 128.875C95.6874 125.621 88.9717 120.109 84.2468 113.038C79.5219 105.967 77 97.653 77 89.1484H83.5006C83.5006 96.3673 85.6413 103.424 89.6519 109.426C93.6625 115.429 99.3629 120.107 106.032 122.869C112.702 125.632 120.04 126.355 127.121 124.947C134.201 123.538 140.704 120.062 145.809 114.957C150.913 109.853 154.39 103.349 155.798 96.2691C157.206 89.1889 156.484 81.8501 153.721 75.1807C150.958 68.5113 146.28 62.8109 140.278 58.8003C134.276 54.7897 127.219 52.649 120 52.649V46.1484Z" fill="#CCCCCC"/>
<path d="M100.059 51.7332C99.0187 50.9326 99.0187 49.3642 100.059 48.5636L119.53 33.5746C120.845 32.5622 122.75 33.4998 122.75 35.1594L122.75 65.1374C122.75 66.7971 120.845 67.7346 119.53 66.7222L100.059 51.7332Z" fill="#CCCCCC"/>
<defs>
<linearGradient id="paint0_linear_6645_29777" x1="43.3158" y1="52" x2="43.3158" y2="74.6316" gradientUnits="userSpaceOnUse">
<stop stop-color="#D9D9D9"/>
<stop offset="1" stop-color="#E8E8E8"/>
<linearGradient id="paint0_linear_8097_31792" x1="120.316" y1="80.1484" x2="120.316" y2="102.78" gradientUnits="userSpaceOnUse">
<stop stop-color="#CDCDCD"/>
<stop offset="1" stop-color="#BCBCBC"/>
</linearGradient>
</defs>
</svg>

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Some files were not shown because too many files have changed in this diff Show More