Commit Graph

300 Commits

Author SHA1 Message Date
fr3ak2402
e35f31b472 Merge branch 'SoftFever:main' into main 2023-04-29 10:30:26 +08:00
Cyril
48b284fbb0 Fix indent 2023-04-29 10:30:18 +08:00
Cyril
dd4cf36a11 Update Translation / Fixed Dark Mode in Machine Tab 2023-04-29 10:30:18 +08:00
SoftFever
35d10e3d48 Merge pull request #839 from TonyK54/Ender5Pro-Profile
Adding Ender 5 Pro
2023-04-29 10:29:01 +08:00
SoftFever
958d5eba8e fix some issues in profiles 2023-04-29 10:29:01 +08:00
SoftFever
17584ff2ef Merge pull request #873 from fr3ak2402/main
Add Qidi Printer Profiles
2023-04-28 19:14:11 +08:00
SoftFever
d10982fc4b Merge pull request #858 from scottmudge/sk-tank-profile
Added profile for SecKit SK-Tank
2023-04-28 13:59:08 +08:00
fr3ak2402
6eec66cbfe Adding the Qidi printer images
Revision of the printer size on the whole image
2023-04-28 01:05:40 +02:00
Scott Mudge
e9f4d10c62 Added profile for SecKit SK-Tank 2023-04-27 16:11:50 -04:00
SoftFever
f6033525a5 Revert "Merge pull request #868 from fr3ak2402/main"
This reverts commit 3ee801be50, reversing
changes made to bbbed5e8c3.
2023-04-27 23:11:47 +08:00
SoftFever
de5a0ff8e1 Merge pull request #868 from fr3ak2402/main
Adds printer profiles for Qidi printers
2023-04-27 22:03:00 +08:00
Cyril
9bcb551163 Fix indent 2023-04-27 12:10:56 +02:00
Cyril
a2536c9326 Update Translation / Fixed Dark Mode in Machine Tab 2023-04-27 12:06:21 +02:00
fr3ak2402
c0fca2574f Change the Qidi printer images size
from 512x512 to 180x180
2023-04-27 09:49:28 +02:00
fr3ak2402
5ed65d1ac1 Merge branch 'SoftFever:main' into main 2023-04-26 19:15:10 +02:00
SoftFever
bc9f4ba5d4 Merge pull request #839 from TonyK54/Ender5Pro-Profile
Adding Ender 5 Pro
2023-04-26 20:09:25 +08:00
fr3ak2402
6f8ce3b499 Upload new images for Qidi printers 2023-04-25 20:00:49 +02:00
fr3ak2402
440b17a378 Delete Qidi Tech X-CF Pro_cover.png 2023-04-25 20:00:19 +02:00
fr3ak2402
6274568dc3 Delete Qidi Tech X-Max 3_cover.png 2023-04-25 20:00:12 +02:00
fr3ak2402
ad770e6e02 Delete Qidi Tech X-Max_cover.png 2023-04-25 20:00:04 +02:00
fr3ak2402
a9a7cab92f Delete Qidi Tech X-Plus 3_cover.png 2023-04-25 19:59:56 +02:00
fr3ak2402
9684ff7d8b Delete Qidi Tech X-Smart 3_cover.png 2023-04-25 19:59:43 +02:00
fr3ak2402
ff0a9b2a34 Merge branch 'SoftFever:main' into main 2023-04-25 18:26:04 +02:00
fr3ak2402
71a19fde5b Changing the Image Size for Qidi Tech Printers 2023-04-25 16:13:32 +02:00
SoftFever
f8321589bd fix some issues in profiles 2023-04-25 00:14:12 +08:00
fr3ak2402
865ca67784 Adding Qidi Tech printer images
X-Smart 3
X-Plus 3
x-Max 3
2023-04-24 12:07:55 +02:00
fr3ak2402
8d0bb63874 Delete Qidi Tech X-PLUS3_cover.png 2023-04-24 12:06:23 +02:00
fr3ak2402
d93271a7a0 Delete Qidi Tech X-MAX3_cover.png 2023-04-24 12:06:15 +02:00
SoftFever
2fb2f5eecc OrcaArena printers 2023-04-24 18:04:46 +08:00
SoftFever
4d175711a1 OrcaArena printers 2023-04-24 10:24:55 +08:00
fr3ak2402
91be45cbee Add more Qidi Tech printers images
Qidi Tech X-CF Pro
Qidi Tech X-Plus3
Qidi Tech X-Max3
2023-04-20 17:24:39 +02:00
fr3ak2402
54ec48a011 Add image for Qidi Tech X-Max 2023-04-19 23:39:20 +02:00
SoftFever
97ac653a9c optimize vzbot bed texture 2023-04-20 00:37:40 +08:00
SoftFever
b2319dad5e optimize vzbot bed texture 2023-04-20 00:37:07 +08:00
SoftFever
8c4954d16b Merge branch 'main' into feature/merge_upstream 2023-04-19 23:22:13 +08:00
SoftFever
91a4cfb422 Merge remote-tracking branch 'remote/master' into feature/merge_upstream
# Conflicts:
#	bbl/i18n/OrcaSlicer.pot
#	bbl/i18n/de/OrcaSlicer_de.po
#	bbl/i18n/en/OrcaSlicer_en.po
#	bbl/i18n/es/OrcaSlicer_es.po
#	bbl/i18n/fr/OrcaSlicer_fr.po
#	bbl/i18n/hu/OrcaSlicer_hu.po
#	bbl/i18n/it/OrcaSlicer_it.po
#	bbl/i18n/ja/OrcaSlicer_ja.po
#	bbl/i18n/nl/OrcaSlicer_nl.po
#	bbl/i18n/sv/OrcaSlicer_sv.po
#	bbl/i18n/zh_cn/OrcaSlicer_zh_CN.po
#	resources/config.json
#	resources/i18n/de/BambuStudio.mo
#	resources/i18n/en/BambuStudio.mo
#	resources/i18n/es/BambuStudio.mo
#	resources/i18n/fr/BambuStudio.mo
#	resources/i18n/hu/BambuStudio.mo
#	resources/i18n/it/BambuStudio.mo
#	resources/i18n/ja/OrcaSlicer.mo
#	resources/i18n/nl/BambuStudio.mo
#	resources/i18n/sv/BambuStudio.mo
#	resources/i18n/zh_cn/BambuStudio.mo
#	resources/images/ams_humidity_2.svg
#	resources/images/ams_humidity_3.svg
#	resources/images/ams_humidity_4.svg
#	resources/images/ams_humidity_tips.svg
#	resources/images/monitor_state_on.svg
#	resources/images/sdcard_state_normal.svg
#	resources/profiles/BBL.json
#	resources/profiles/BBL/filament/Bambu PETG-CF @base.json
#	resources/profiles/BBL/filament/Generic PETG-CF @base.json
#	resources/profiles/BBL/machine/Bambu Lab P1P 0.4 nozzle.json
#	resources/web/data/text.js
#	resources/web/guide/3/index.html
#	resources/web/guide/31/index.html
#	src/BambuStudio.cpp
#	src/libslic3r/AABBTreeLines.hpp
#	src/libslic3r/Brim.cpp
#	src/libslic3r/CMakeLists.txt
#	src/libslic3r/ExPolygon.hpp
#	src/libslic3r/Fill/FillBase.hpp
#	src/libslic3r/Format/bbs_3mf.cpp
#	src/libslic3r/GCodeWriter.cpp
#	src/libslic3r/Line.hpp
#	src/libslic3r/PerimeterGenerator.cpp
#	src/libslic3r/Preset.cpp
#	src/libslic3r/Print.cpp
#	src/libslic3r/Print.hpp
#	src/libslic3r/PrintConfig.cpp
#	src/libslic3r/PrintConfig.hpp
#	src/libslic3r/TreeSupport.cpp
#	src/slic3r/GUI/AmsMappingPopup.cpp
#	src/slic3r/GUI/BackgroundSlicingProcess.cpp
#	src/slic3r/GUI/ConfigManipulation.cpp
#	src/slic3r/GUI/GCodeViewer.cpp
#	src/slic3r/GUI/GCodeViewer.hpp
#	src/slic3r/GUI/GLCanvas3D.cpp
#	src/slic3r/GUI/GUI_App.cpp
#	src/slic3r/GUI/MainFrame.cpp
#	src/slic3r/GUI/PartPlate.cpp
#	src/slic3r/GUI/Plater.cpp
#	src/slic3r/GUI/Preferences.cpp
#	src/slic3r/GUI/SelectMachine.cpp
#	src/slic3r/GUI/Widgets/AMSControl.cpp
#	src/slic3r/GUI/wxMediaCtrl2.cpp
#	src/slic3r/Utils/Process.cpp
#	version.inc
2023-04-19 08:48:07 +08:00
VzBoT
e9a8271207 Adding VzBoT profiles 2023-04-17 22:40:13 -04:00
lane.wei
7475c9ac8f ENH: privacy: refine some text
Change-Id: Id5c9c0b0700ce233e46d6ea39bbb7374f87449fa
2023-04-17 15:39:02 +08:00
chunmao.guo
894aaaebf5 NEW: Revert "[STUDIO-2476] design_staffpick"
This reverts commit 0063720bbaaa6a680f2d9f395d60cf193d126e11.

Change-Id: Ieb19daf19b38f5e25b78967ee225042988d98c7d
2023-04-17 15:39:02 +08:00
zorro.zhang
9bf3f5fe0e NEW: Staff Pick UI WebPage
Change-Id: I85c5b5ba28144a75dc231b99d73a8f5c2ce941f4
2023-04-17 15:39:02 +08:00
zorro.zhang
05d5ba941d FIX: Some bug in modelinfo webpage
Change-Id: I182fd0006f92975018012cb52a7093373153f80e
(cherry picked from commit c8341df9b548c0eed8769cb6b6dc80aab10b8827)
2023-04-17 15:39:02 +08:00
zorro.zhang
241f355199 ENH: model info display UI
Change-Id: I066c0e7f8ce87ec00b1141a1b44430444a819b42
(cherry picked from commit 05907a1a42da82737090d55046974d401f8af057)
2023-04-17 15:39:02 +08:00
SoftFever
da940f96a1 FLSun V400 2023-04-15 23:25:31 +08:00
SoftFever
258ae3a599 optimized image size 2023-04-15 23:25:13 +08:00
SoftFever
83d00a1c7c Merge pull request #665 from hliebscher/lang_de_fix
fix typo
2023-04-10 17:47:28 +08:00
SoftFever
dd5738d8dc Merge pull request #663 from hliebscher/j1
Add Snapmaker J1
2023-04-10 17:46:49 +08:00
Heiko Liebscher
b2353171b0 fix typo 2023-04-06 10:09:27 +02:00
SoftFever
da19f1db26 Merge pull request #645 from hliebscher/cz
add czech language (user request)
2023-04-05 22:05:34 +08:00
SoftFever
f77828d70f Show help info of setting up connection 2023-04-03 20:02:55 +08:00
Heiko Liebscher
5c25f0deeb first init czech language 2023-04-01 10:46:03 +02:00