Commit graph

262 commits

Author SHA1 Message Date
fr3ak2402
51be052388 Merge branch 'SoftFever:main' into main 2023-04-29 10:30:30 +08:00
fr3ak2402
5edb7bd275 Upload new images for Qidi printers 2023-04-29 10:30:29 +08:00
fr3ak2402
8eb06ae936 Delete Qidi Tech X-CF Pro_cover.png 2023-04-29 10:30:29 +08:00
fr3ak2402
969657f0f0 Delete Qidi Tech X-Max 3_cover.png 2023-04-29 10:30:29 +08:00
fr3ak2402
3df3be898e Delete Qidi Tech X-Max_cover.png 2023-04-29 10:30:28 +08:00
fr3ak2402
2de64aed15 Delete Qidi Tech X-Plus 3_cover.png 2023-04-29 10:30:28 +08:00
fr3ak2402
b2dd68af92 Delete Qidi Tech X-Smart 3_cover.png 2023-04-29 10:30:28 +08:00
fr3ak2402
feee22d22a Merge branch 'SoftFever:main' into main 2023-04-29 10:30:28 +08:00
fr3ak2402
6a0a47a93d Changing the Image Size for Qidi Tech Printers 2023-04-29 10:30:27 +08:00
fr3ak2402
b74abebd50 Adding Qidi Tech printer images
X-Smart 3
X-Plus 3
x-Max 3
2023-04-29 10:30:26 +08:00
fr3ak2402
a12e6bcea7 Delete Qidi Tech X-PLUS3_cover.png 2023-04-29 10:30:26 +08:00
fr3ak2402
73c8cbf026 Delete Qidi Tech X-MAX3_cover.png 2023-04-29 10:30:26 +08:00
fr3ak2402
3f486338cc Merge branch 'SoftFever:main' into main 2023-04-29 10:30:26 +08:00
Cyril
4aa0c1f481 Fix indent 2023-04-29 10:30:18 +08:00
Cyril
3736fb0d6e Update Translation / Fixed Dark Mode in Machine Tab 2023-04-29 10:30:18 +08:00
SoftFever
0ea2efa767 Merge pull request #839 from TonyK54/Ender5Pro-Profile
Adding Ender 5 Pro
2023-04-29 10:29:01 +08:00
SoftFever
d85654b540 fix some issues in profiles 2023-04-29 10:29:01 +08:00
SoftFever
411a3ac3b1
Merge pull request #873 from fr3ak2402/main
Add Qidi Printer Profiles
2023-04-28 19:14:11 +08:00
SoftFever
18218c9e68
Merge pull request #858 from scottmudge/sk-tank-profile
Added profile for SecKit SK-Tank
2023-04-28 13:59:08 +08:00
fr3ak2402
a23f5ba4fc
Adding the Qidi printer images
Revision of the printer size on the whole image
2023-04-28 01:05:40 +02:00
Scott Mudge
02e2335337 Added profile for SecKit SK-Tank 2023-04-27 16:11:50 -04:00
SoftFever
e87a447479 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
3ee801be50
Merge pull request #868 from fr3ak2402/main
Adds printer profiles for Qidi printers
2023-04-27 22:03:00 +08:00
Cyril
485d38f57f Fix indent 2023-04-27 12:10:56 +02:00
Cyril
9fb14338f5 Update Translation / Fixed Dark Mode in Machine Tab 2023-04-27 12:06:21 +02:00
fr3ak2402
96f97d4a06
Change the Qidi printer images size
from 512x512 to 180x180
2023-04-27 09:49:28 +02:00
fr3ak2402
e273a35465
Merge branch 'SoftFever:main' into main 2023-04-26 19:15:10 +02:00
SoftFever
ac73fd702f Merge pull request #839 from TonyK54/Ender5Pro-Profile
Adding Ender 5 Pro
2023-04-26 20:09:25 +08:00
fr3ak2402
25de9a1177
Upload new images for Qidi printers 2023-04-25 20:00:49 +02:00
fr3ak2402
4d03361e01
Delete Qidi Tech X-CF Pro_cover.png 2023-04-25 20:00:19 +02:00
fr3ak2402
bdb5d1ebfb
Delete Qidi Tech X-Max 3_cover.png 2023-04-25 20:00:12 +02:00
fr3ak2402
7cf35442ea
Delete Qidi Tech X-Max_cover.png 2023-04-25 20:00:04 +02:00
fr3ak2402
ece02d4d71
Delete Qidi Tech X-Plus 3_cover.png 2023-04-25 19:59:56 +02:00
fr3ak2402
2b1f45431e
Delete Qidi Tech X-Smart 3_cover.png 2023-04-25 19:59:43 +02:00
fr3ak2402
9d33799c5d
Merge branch 'SoftFever:main' into main 2023-04-25 18:26:04 +02:00
fr3ak2402
f87a1753d7
Changing the Image Size for Qidi Tech Printers 2023-04-25 16:13:32 +02:00
SoftFever
bd2ea4ef3b fix some issues in profiles 2023-04-25 00:14:12 +08:00
fr3ak2402
ed18c8d9fd
Adding Qidi Tech printer images
X-Smart 3
X-Plus 3
x-Max 3
2023-04-24 12:07:55 +02:00
fr3ak2402
87d06956a4
Delete Qidi Tech X-PLUS3_cover.png 2023-04-24 12:06:23 +02:00
fr3ak2402
ae00217c37
Delete Qidi Tech X-MAX3_cover.png 2023-04-24 12:06:15 +02:00
SoftFever
e0ac508f6a OrcaArena printers 2023-04-24 18:04:46 +08:00
SoftFever
1347bc9290 OrcaArena printers 2023-04-24 10:24:55 +08:00
fr3ak2402
aee2e06731
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
3c9b466242
Add image for Qidi Tech X-Max 2023-04-19 23:39:20 +02:00
SoftFever
3216c873b5 optimize vzbot bed texture 2023-04-20 00:37:40 +08:00
SoftFever
5485e8729c optimize vzbot bed texture 2023-04-20 00:37:07 +08:00
SoftFever
4098a5267c Merge branch 'main' into feature/merge_upstream 2023-04-19 23:22:13 +08:00
SoftFever
9f598046d1 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
da09ebcc86 Adding VzBoT profiles 2023-04-17 22:40:13 -04:00
lane.wei
07f4297443 ENH: privacy: refine some text
Change-Id: Id5c9c0b0700ce233e46d6ea39bbb7374f87449fa
2023-04-17 15:39:02 +08:00