5a5955f3bc
FIX: config: update config with correct logic
...
1. remove other vendors
2. set the version to correct one
jira: STUDIO-4009
Change-Id: I804bb1d08a9d241bc323a22b0d3fb40f7c9c3c9a
2023-08-19 01:32:59 +08:00
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
7595775ba5
ENH: update: remove the old cached ota files in some corner case
...
Change-Id: I8039e21045d33827dae096b18feead6150981056
(cherry picked from commit d920b3a57c284422e09c952b103c5f26ae551d2a)
2023-04-17 15:39:02 +08:00
0ca3f27c54
ENH: [STUDIO-2550] config auto sync system presets
...
Change-Id: I83f9baae5793b214f4d1c040f5819ad9a03cd47f
(cherry picked from commit 40fe90e176fc001f54b22375ddb0dd035a6d84cd)
2023-04-17 15:39:02 +08:00
5b0ba1207e
Change Application name to OrcaSlicer
2023-03-12 10:05:22 +08:00
697d945ca1
ENH: add the logic to prompt user to update network plugins
...
Change-Id: I73cce20e58783a365ad2665c8e095dcf2e9c02ea
2022-12-26 05:31:54 -05:00
99043bbb02
Add missing includes for boost::filesystem::load_string_file
...
Deprecated in Boost 1.79.0 and no longer included by
filesystem.hpp.
2022-12-16 22:51:07 -05:00
fcf490028a
ENH: Updater: always update plugin to the newest compatible version
...
Change-Id: Icec343ba4913b9738add9564c78934553a33336c
2022-11-26 15:39:32 +08:00
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
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
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
4138a989af
refine the version update logic
...
1. always copy the system profiles if found version mismatch
2. use AA.BB as the version check rule of presets
Change-Id: I4895f1d765dadcbb906ac6bc2be6b32e48b4f9f2
2022-09-13 19:42:32 +08:00
11a7fe1f32
refine the prompt hint for other vendor's 3mf
...
Change-Id: I8dbb63031a0d32bb19ee67a0091cb80b35424b81
2022-08-05 16:11:42 +08:00
fc659fcf2c
FIX: presetupdater: fix the crash issue when exit app at the early stage
...
Change-Id: Ia6e6e56e09c5d3ebbdd7b9a8d0bb1b898d05935c
2022-08-05 16:11:42 +08:00
e9e4d75877
Update the codes to 01.01.00.10 for the formal release
...
1. first formal version of macos
2. add the bambu networking plugin install logic
3. auto compute the wipe volume when filament change
4. add the logic of wiping into support
5. refine the GUI layout and icons, improve the gui apperance in lots of
small places
6. serveral improve to support
7. support AMS auto-mapping
8. disable lots of unstable features: such as params table, media file download, HMS
9. fix serveral kinds of bugs
10. update the document of building
11. ...
2022-07-22 20:35:34 +08:00
1555904bef
Add the full source of BambuStudio
...
using version 1.0.10
2022-07-15 23:42:08 +08:00