Commit Graph

142 Commits

Author SHA1 Message Date
fr3ak2402
03d904e074 Adding the Qidi printer images
Revision of the printer size on the whole image
2023-04-29 10:30:40 +08:00
SoftFever
e1ea97ced4 Revert "Merge pull request #868 from fr3ak2402/main"
This reverts commit 3ee801be50, reversing
changes made to bbbed5e8c3.
2023-04-29 10:30:32 +08:00
SoftFever
d295a97bda Merge pull request #868 from fr3ak2402/main
Adds printer profiles for Qidi printers
2023-04-29 10:30:31 +08:00
fr3ak2402
bc36f0bea7 Change the Qidi printer images size
from 512x512 to 180x180
2023-04-29 10:30:30 +08:00
fr3ak2402
8b4106f79e Merge branch 'SoftFever:main' into main 2023-04-29 10:30:30 +08:00
fr3ak2402
fbaaa02d70 Upload new images for Qidi printers 2023-04-29 10:30:29 +08:00
fr3ak2402
c1f4085a5b Delete Qidi Tech X-CF Pro_cover.png 2023-04-29 10:30:29 +08:00
fr3ak2402
c803fa306a Delete Qidi Tech X-Max 3_cover.png 2023-04-29 10:30:29 +08:00
fr3ak2402
9e058747e3 Delete Qidi Tech X-Max_cover.png 2023-04-29 10:30:28 +08:00
fr3ak2402
f448b8401e Delete Qidi Tech X-Plus 3_cover.png 2023-04-29 10:30:28 +08:00
fr3ak2402
a0254c16cd Delete Qidi Tech X-Smart 3_cover.png 2023-04-29 10:30:28 +08:00
fr3ak2402
0abdc82662 Merge branch 'SoftFever:main' into main 2023-04-29 10:30:28 +08:00
fr3ak2402
9e82a986a0 Changing the Image Size for Qidi Tech Printers 2023-04-29 10:30:27 +08:00
fr3ak2402
0e7cf4dccf Adding Qidi Tech printer images
X-Smart 3
X-Plus 3
x-Max 3
2023-04-29 10:30:26 +08:00
fr3ak2402
dec7191d40 Delete Qidi Tech X-PLUS3_cover.png 2023-04-29 10:30:26 +08:00
fr3ak2402
18bc3a4bd9 Delete Qidi Tech X-MAX3_cover.png 2023-04-29 10:30:26 +08:00
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
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
Heiko Liebscher
02bb0f844f first add j1 2023-03-30 09:34:23 +02:00
SoftFever
a76eb554a9 logo change 2023-03-17 19:16:36 +08:00
SoftFever
6aefed4113 fix pot/po 2023-03-16 21:35:31 +08:00
SoftFever
a8d3e161b4 Change Application name to OrcaSlicer 2023-03-12 10:05:22 +08:00
SoftFever
fe5f391dd6 fix colors 2023-03-09 01:05:51 +08:00
SoftFever
38d5ccb29f 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
45083874ef 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
ec904f533f 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