Commit graph

256 commits

Author SHA1 Message Date
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
chunmao.guo
a344ebcf81 NEW: Revert "[STUDIO-2476] design_staffpick"
This reverts commit 0063720bbaaa6a680f2d9f395d60cf193d126e11.

Change-Id: Ieb19daf19b38f5e25b78967ee225042988d98c7d
2023-04-17 15:39:02 +08:00
zorro.zhang
cc6bd668ae NEW: Staff Pick UI WebPage
Change-Id: I85c5b5ba28144a75dc231b99d73a8f5c2ce941f4
2023-04-17 15:39:02 +08:00
zorro.zhang
223291452b FIX: Some bug in modelinfo webpage
Change-Id: I182fd0006f92975018012cb52a7093373153f80e
(cherry picked from commit c8341df9b548c0eed8769cb6b6dc80aab10b8827)
2023-04-17 15:39:02 +08:00
zorro.zhang
b4ffa91cb4 ENH: model info display UI
Change-Id: I066c0e7f8ce87ec00b1141a1b44430444a819b42
(cherry picked from commit 05907a1a42da82737090d55046974d401f8af057)
2023-04-17 15:39:02 +08:00
SoftFever
e7ee0effa2 FLSun V400 2023-04-15 23:25:31 +08:00
SoftFever
d4b59ff52b optimized image size 2023-04-15 23:25:13 +08:00
SoftFever
4976e4f91f
Merge pull request #665 from hliebscher/lang_de_fix
fix typo
2023-04-10 17:47:28 +08:00
SoftFever
ab6a77ddf3
Merge pull request #663 from hliebscher/j1
Add Snapmaker J1
2023-04-10 17:46:49 +08:00
Heiko Liebscher
078f240995 fix typo 2023-04-06 10:09:27 +02:00
SoftFever
62556df685
Merge pull request #645 from hliebscher/cz
add czech language (user request)
2023-04-05 22:05:34 +08:00
SoftFever
1a281e99a6 Show help info of setting up connection 2023-04-03 20:02:55 +08:00
Heiko Liebscher
80904f0fc0 first init czech language 2023-04-01 10:46:03 +02:00
Heiko Liebscher
8c1e7eeb35 first add j1 2023-03-30 09:34:23 +02:00
SoftFever
4fab4ebea0 logo change 2023-03-17 19:16:36 +08:00
SoftFever
cdf7a7722a fix pot/po 2023-03-16 21:35:31 +08:00
SoftFever
5b0ba1207e Change Application name to OrcaSlicer 2023-03-12 10:05:22 +08:00
SoftFever
3470460931 fix colors 2023-03-09 01:05:51 +08:00
SoftFever
5ef51f6c8a Merge branch 'master-remote' into feature/1.5
Signed-off-by: SoftFever <softfeverever@gmail.com>

# Conflicts:
#	bbl/i18n/BambuStudio.pot
#	bbl/i18n/de/BambuStudio_de.po
#	bbl/i18n/en/BambuStudio_en.po
#	bbl/i18n/es/BambuStudio_es.po
#	bbl/i18n/fr/BambuStudio_fr.po
#	bbl/i18n/hu/BambuStudio_hu.po
#	bbl/i18n/it/BambuStudio_it.po
#	bbl/i18n/nl/BambuStudio_nl.po
#	bbl/i18n/sv/BambuStudio_sv.po
#	bbl/i18n/zh_cn/BambuStudio_zh_CN.po
#	deps/Boost/Boost.cmake
#	deps/wxWidgets/wxWidgets.cmake
#	resources/config.json
#	resources/i18n/de/BambuStudio.mo
#	resources/i18n/en/BambuStudio.mo
#	resources/i18n/es/BambuStudio.mo
#	resources/i18n/fr/BambuStudio.mo
#	resources/i18n/hu/BambuStudio.mo
#	resources/i18n/it/BambuStudio.mo
#	resources/i18n/nl/BambuStudio.mo
#	resources/i18n/sv/BambuStudio.mo
#	resources/i18n/zh_cn/BambuStudio.mo
#	resources/images/tips_arrow.svg
#	resources/profiles/Anycubic.json
#	resources/profiles/Anycubic/filament/Anycubic Generic ABS.json
#	resources/profiles/Anycubic/filament/Anycubic Generic ASA.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PA-CF.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PA.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PC.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PETG.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PLA-CF.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PLA.json
#	resources/profiles/Anycubic/filament/Anycubic Generic PVA.json
#	resources/profiles/Anycubic/filament/Anycubic Generic TPU.json
#	resources/profiles/Anycubic/filament/fdm_filament_common.json
#	resources/profiles/Anycubic/machine/Anycubic 4Max Pro 0.4 nozzle.json
#	resources/profiles/Anycubic/machine/Anycubic 4Max Pro.json
#	resources/profiles/Anycubic/process/0.20mm Standard @4MaxPro.json
#	resources/profiles/Anycubic/process/fdm_process_common.json
#	resources/profiles/BBL.json
#	resources/profiles/BBL/machine/Bambu Lab P1P 0.2 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab P1P 0.4 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab P1P 0.6 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab P1P 0.8 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 0.2 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 0.4 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 0.6 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 0.8 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.2 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.4 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.6 nozzle.json
#	resources/profiles/BBL/machine/Bambu Lab X1 Carbon 0.8 nozzle.json
#	resources/profiles/BBL/machine/fdm_bbl_3dp_001_common.json
#	resources/profiles/Voron.json
#	resources/web/data/text.js
#	resources/web/image/printer/Anycubic 4Max Pro_cover.png
#	src/BambuStudio.cpp
#	src/libslic3r/GCode.cpp
#	src/libslic3r/GCode.hpp
#	src/libslic3r/GCode/GCodeProcessor.cpp
#	src/libslic3r/GCodeWriter.hpp
#	src/libslic3r/PerimeterGenerator.cpp
#	src/libslic3r/PresetBundle.cpp
#	src/libslic3r/Print.cpp
#	src/libslic3r/Print.hpp
#	src/libslic3r/PrintConfig.cpp
#	src/libslic3r/PrintConfig.hpp
#	src/libslic3r/PrintObject.cpp
#	src/slic3r/GUI/AMSMaterialsSetting.cpp
#	src/slic3r/GUI/AMSMaterialsSetting.hpp
#	src/slic3r/GUI/AmsMappingPopup.cpp
#	src/slic3r/GUI/AmsMappingPopup.hpp
#	src/slic3r/GUI/Auxiliary.cpp
#	src/slic3r/GUI/BackgroundSlicingProcess.cpp
#	src/slic3r/GUI/ConfigManipulation.cpp
#	src/slic3r/GUI/DeviceManager.cpp
#	src/slic3r/GUI/DeviceManager.hpp
#	src/slic3r/GUI/ExtrusionCalibration.cpp
#	src/slic3r/GUI/GCodeViewer.cpp
#	src/slic3r/GUI/GCodeViewer.hpp
#	src/slic3r/GUI/GUI_App.cpp
#	src/slic3r/GUI/IMSlider.cpp
#	src/slic3r/GUI/Jobs/PrintJob.cpp
#	src/slic3r/GUI/Jobs/PrintJob.hpp
#	src/slic3r/GUI/Jobs/SendJob.cpp
#	src/slic3r/GUI/Jobs/SendJob.hpp
#	src/slic3r/GUI/MainFrame.cpp
#	src/slic3r/GUI/MainFrame.hpp
#	src/slic3r/GUI/MediaPlayCtrl.cpp
#	src/slic3r/GUI/OptionsGroup.cpp
#	src/slic3r/GUI/PhysicalPrinterDialog.cpp
#	src/slic3r/GUI/Plater.cpp
#	src/slic3r/GUI/PrintHostDialogs.cpp
#	src/slic3r/GUI/Printer/BambuTunnel.h
#	src/slic3r/GUI/Printer/PrinterFileSystem.cpp
#	src/slic3r/GUI/Printer/gstbambusrc.c
#	src/slic3r/GUI/Printer/gstbambusrc.h
#	src/slic3r/GUI/ReleaseNote.cpp
#	src/slic3r/GUI/ReleaseNote.hpp
#	src/slic3r/GUI/SelectMachine.cpp
#	src/slic3r/GUI/SendToPrinter.cpp
#	src/slic3r/GUI/SetBedTypeDialog.cpp
#	src/slic3r/GUI/StatusPanel.cpp
#	src/slic3r/GUI/StatusPanel.hpp
#	src/slic3r/GUI/Tab.cpp
#	src/slic3r/GUI/Widgets/AMSControl.cpp
#	src/slic3r/GUI/Widgets/AMSControl.hpp
#	src/slic3r/GUI/Widgets/ImageSwitchButton.cpp
#	src/slic3r/GUI/Widgets/Label.cpp
#	src/slic3r/GUI/WipeTowerDialog.cpp
#	src/slic3r/Utils/Process.cpp
#	src/slic3r/Utils/bambu_networking.hpp
#	version.inc
2023-03-08 00:08:26 +08:00
5axes
6191b4b6dd
Update French Translation (#337)
* Update BambuStudio_fr.po

French translation

* Update BambuStudio_fr.po

New modifications

* Update BambuStudio_fr.po

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

* Update French

Change some French initial translation like A-coup in Saccade

* Update BambuStudio_fr.po

Add Jerk(XY)

* Update BambuStudio_fr.po

last modification for today

* Update BambuStudio_fr.po

Last French translation of the Morning
Mainly on the Giszmo

* Update BambuStudio_fr.po

Mainly on Filament parameter

* Update BambuStudio_fr.po

Adjust translation with :

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

* Update BambuStudio.mo

* last modif

Last modif for today

* Update fr

an other one

* Update

Last Modification

* Update

Missing term in the German translation

* update

Changement

* update

TimeLaps

* Update 11/1/2023

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

* Update French Translation

Update for BambuStudio-SoftFever_V1.4.2

* Change some typro

Update some Typo

* Fix some Typo

Fix somme Typo and Label not presnet in the pot file

* Add Calibration SoftFever

Add missing Label on the SoftFever Calibration Menu

* Update BambuStudio_fr.po

Erreur Taper: -> Type:

* Update text.js

Add French Translation for Web interface

* Add Manual Web text

Translate French Manual Web text

* Update text.js

Back to "en"
2023-02-22 23:07:05 +08:00
lane.wei
97acb54695 ENH: remove Christmas cabin from homepage
the codes have been removed from web before

Change-Id: I39c2b63c1a4ffa276b7d406eca9fc1f910fb31a9
2023-02-22 20:09:17 +08:00
zorro.zhang
a934fac180 ENH: remove Christmas cabin menu
Change-Id: Idb01d9f24eacdaec8e2451f6021a8428bae1858f
2023-02-22 20:09:17 +08:00
qing.zhang
8e50744d2a ENH: add ANYCUIC profile which based on SoftFever
Signed-off-by: qing.zhang <qing.zhang@bambulab.com>
Change-Id: I85fc64a25dbb761377c63574b3d3ec10fda9dfd6
2023-02-22 20:09:17 +08:00
zorro.zhang
2b35961960 FIX: correct japanese of logout
Change-Id: Ie7e9e1dce591ac16cbc65398466269912925e7e6
2023-02-22 20:09:17 +08:00
zorro.zhang
2568d52825 NEW: Japanese text in userguide
Change-Id: I5e7e15e8fa255715fa3a08b39bac9bf8e8bd3c05
2023-02-22 20:09:17 +08:00
Heiko Liebscher
0cc7319ac8
fix new features in german after pr (#326) 2023-02-18 09:20:48 +08:00
behold81
2f5bb03023
New printer: TwoTrees SP-5 Klipper (#292)
* Add files via upload

First working version of TwoTrees SP-5 running klipper. this can be the base to start using this slicer. most of the generic materials are OOTB ones and this profile is made for near stock printers just running klipper. roughtly running a max speed of 200mm/s and runs successfully

* Add files via upload

* Delete SP-5.png
2023-02-14 00:02:22 +08:00
SoftFever
1bdedb1c47
Feature/fix more colors (#193)
* fix more colors

* fix more color on Mac

Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>

* fix new windows issue on Mac

Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
#137

* Support more PrusaSlicer variables

Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>

* enhance compatibility: bed_shape and wipe_start_x

* fix more color

* build deps

* only build for PR

Signed-off-by: SoftFever <softfeverever@gmail.com>

Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
Signed-off-by: SoftFever <softfeverever@gmail.com>
2023-01-18 23:06:39 +08:00
Michael Birkler
61d851fc02
ADD Snapmaker A250 and A350 (#171) 2023-01-13 21:48:22 +08:00
Patrice Côté
54f8cb9591
Add RatRig V-Cast printer (#152)
Add RatRig V-Cast printer
2023-01-10 22:28:22 +08:00
zorro.zhang
54aae68874 FIX: optimize text display
Change-Id: I4e44e12786a1af34cca35edb3c32d9f500b933ed
2023-01-10 19:08:26 +08:00
Heiko Liebscher
0ba8f23706
fix typo and color (#138)
* fix typo and color

* fix error
2023-01-08 20:59:33 +08:00
Michael Birkler
32f8901fdb
Tronxy profile revised (#123)
* Add Tronxy X5SA 400 Profile

* Update fdm_klipper_common.json

* Addjust Firmware Flavor to Marlin

* Tronxy profile revised
2023-01-06 23:04:11 +08:00
Heiko Liebscher
964f2163cb
fix_color_to_#009688 and hover btn (#125)
* fix_color_to_#009688 and hover btn

* fix_color_main_menu

* fix double ##

* tooltip_color

* fix bitmapcache.cpp
2023-01-06 21:22:20 +08:00
SoftFever
64281a8cc5 fix wrong css color
#116
2023-01-05 21:12:23 +08:00
SoftFever
9c1a7bbf8b change app color 2023-01-03 22:05:20 +08:00
SoftFever
7ac975475f Revert "Add Tronxy X5SA 400 Profile (#81)"
This reverts commit 022ed78904.
2023-01-03 16:40:54 +08:00
GP3D
7c6418e323
Artillery Sidewinder X2 (#84)
* Fixed deps "directory not found"

* Added Artillery Sidewinder X2

* typo

* forgotten rename

Co-authored-by: GiaPag <120025021+GiaPag@users.noreply.github.com>
2023-01-03 10:02:32 +08:00
Michael Birkler
022ed78904
Add Tronxy X5SA 400 Profile (#81)
* Add Tronxy X5SA 400 Profile

* Update fdm_klipper_common.json

* Addjust Firmware Flavor to Marlin
2023-01-03 10:00:12 +08:00
SoftFever
69a21f09c4 add Anker M5 printer 2022-12-30 18:11:57 +08:00
SoftFever
45b40fd380 add Creality CR-10 Max
#46
2022-12-30 16:54:10 +08:00
erebus04
2266aa4d98
Added RatRig Printer Profiles (#71)
* ADD RatRig V-Core 500 Printer Profile

* ADD Other RatRig Printers

ADD V-Core 200/300/400
ADD V-Minion

* Add Printers to Filament

* Update Ratrig.json

* V-Minion correct PNG

* Correct Bed File for Printers

* Update fdm_process_ratrig_common.json

* Filament Settings Update/ Disable Z-Hop /Activate PA with Parameter

* Remove Bed Modell

The bed model was removed due to a known z bug
2022-12-29 20:13:03 +08:00
SoftFever
7c11aeba96 add Prusa MINI+ 2022-12-18 16:12:32 +08:00
SoftFever
2a2604ea95 Merge branch 'master' into SoftFever 2022-12-16 23:27:00 +08:00
SoftFever
bf8a9fee1f Merge branch 'master' into SoftFever
# Conflicts:
#	bbl/i18n/zh_cn/BambuStudio_zh_CN.po
#	resources/i18n/de/BambuStudio.mo
#	resources/i18n/en/BambuStudio.mo
#	resources/i18n/es/BambuStudio.mo
#	resources/i18n/fr/BambuStudio.mo
#	resources/i18n/hu/BambuStudio.mo
#	resources/i18n/nl/BambuStudio.mo
#	resources/i18n/sv/BambuStudio.mo
#	resources/i18n/zh_cn/BambuStudio.mo
#	resources/profiles/Creality.json
#	resources/profiles/Voron.json
#	resources/web/guide/3/index.html
#	src/libslic3r/AppConfig.cpp
#	src/libslic3r/GCode.cpp
#	src/libslic3r/GCode/GCodeProcessor.cpp
#	src/libslic3r/LayerRegion.cpp
#	src/libslic3r/Preset.cpp
#	src/libslic3r/Print.cpp
#	src/libslic3r/PrintConfig.cpp
#	src/libslic3r/PrintConfig.hpp
#	src/libslic3r/PrintObject.cpp
#	src/slic3r/GUI/AboutDialog.cpp
#	src/slic3r/GUI/BBLTopbar.cpp
#	src/slic3r/GUI/ConfigManipulation.cpp
#	src/slic3r/GUI/ConfigWizard.cpp
#	src/slic3r/GUI/GCodeViewer.cpp
#	src/slic3r/GUI/GUI_App.cpp
#	src/slic3r/GUI/GUI_Factories.cpp
#	src/slic3r/GUI/MainFrame.cpp
#	src/slic3r/GUI/Plater.cpp
#	src/slic3r/GUI/Tab.cpp
#	version.inc
2022-12-16 13:59:30 +08:00
yifan.wu
d472eb7afb ENH: update Bambu Christmas Cabin
Change infill density from 20% to 15% to reduce warp risk for large
objects.

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

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

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

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

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

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

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

Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I39ca064e15f5c7c58e491b1929eb69e4a6692a08
2022-09-02 13:16:54 +08:00
yifan.wu
02f35c1617 ENH: add contents to user guide
Signed-off-by: yifan.wu <yifan.wu@bambulab.com>
Change-Id: I46e943ce40049a80715ba67c4e73a3587991fe82
2022-09-02 13:16:54 +08:00
zorro.zhang
f44a0b88d9 NEW: homepage and UserManual
Change-Id: Iecdb4d0151a0cf76614548aee69e525ad7e1fe68
(cherry picked from commit 4c7403683b334e42d8676a933012e2133cd1ce7f)
2022-09-02 12:52:18 +08:00
liz.li
121dccc59c ENH:close dialog by pressing esc key
Change-Id: Ib883e7119699e06f63c61dd083ad761ba58bc19c
2022-09-02 12:52:18 +08:00
SoftFever
769bc14a8a Merge remote-tracking branch 'remote/master' into SoftFever
# Conflicts:
#	src/libslic3r/PerimeterGenerator.cpp
2022-08-28 12:03:49 +08:00
zorro.zhang
2ac9267e42 ENH: filament just show bundle machine
Change-Id: If0a35037dc4b08df7cd3aaf88662638a334196e3
(cherry picked from commit 5ebd67880a679c3013fe10b63b509761eab30670)
2022-08-26 09:25:59 +08:00
liz.li
cd3a721f86 ENH:add shortcut in macos
Change-Id: I2c2145caab987fcb8073c4e7891769142dab840a
2022-08-26 09:25:59 +08:00
SoftFever
a3b3b368e2
Profile rework (#4)
* default BBL profile

* voron

* wip

* Voron profile

* Prusa MK3S

* add Prusa mk3s

* fix an issue that print_host value was not retrieved.

* add chamber temperature option for filament

* slightly adjust thumbernail angle

* Revert "slightly adjust thumbernail angle"

This reverts commit 6ad38efb36c66abe82c7fdeb23f6a24aac43654e.

* add `one wall on first layer` option

* save preset for connection

* remove unused options

* set default 3000 accl for MK3S

* tweak profile

* update Voron logo

* UI twwaks

* Readme update

* change abs default nozzle temp

* misc

* tweak profiles

* Update README
2022-08-24 15:40:43 +08:00
SoftFever
159ff850e4 Merge branch 'master' into SoftFever 2022-08-11 20:06:32 +08:00
zorro.zhang
cd73537f6f ENH: Optimize some web UI
Change-Id: I91f6691e5e5c19274c1bc3e6a9386e3f76ab259d
2022-08-05 16:11:42 +08:00
liz.li
430021267c ENH:adjust button border color in webview
Change-Id: Iea050335b1f51d95c4f14ab06bc1514b0f7209f4
2022-08-05 16:11:42 +08:00
zorro.zhang
6eb4d671b5 ENH: Login button add Largen UI-Action
Change-Id: I40f668364730205c6cc1b916ef486fce836c08d8
2022-08-05 16:11:42 +08:00
zorro.zhang
e43f80e875 ENH: support 3rd printer model
Change-Id: Ib8c2c846f73a6ac14339e1d0222204d7440de014
2022-08-05 16:11:42 +08:00
liz.li
1a8e5295b2 ENH:keyboard shortcut in macos
1.fix:global shortcut cannot use in webview panel
2.fix:ban original web-shortcut in webview
3.add cmd+q & cmd+h shortcut in macos
4.move some global shortcut to prepare panel

Change-Id: I17ba3c86069dab92df754a319d0c0c3d77b34d74
2022-08-05 16:11:42 +08:00
SoftFever
b806df7710 Merge remote-tracking branch 'remote/master' into SoftFever
# Conflicts:
#	resources/profiles/BBL/filament/Bambu PC @BBL X1C.json
#	resources/profiles/BBL/filament/Bambu TPU 95A @BBL X1C.json
2022-07-23 20:29:33 +08:00
SoftFever
02e8f6c697 Add Anycubic 4Max Pro support 2022-07-23 10:31:41 +08:00