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
025d080ceb
ENH: [STUDIO-2549] remember my choice on unsaved project/presets
...
Change-Id: Ib9fc9074075bfce19f9a02be3aff7b3d04e3802a
2023-04-17 15:39:02 +08:00
7e717be2e3
ENH: Cut optimization, support for custom connectors
...
Change-Id: I65163314374fb74f0b16df47dacae82caa6fab0d
(cherry picked from commit 7bacc2c2a89be471f6fee51dd07a42222a28b55a)
2023-04-17 15:39:02 +08:00
e68bcf4048
ENH:Update IP address input process
...
Change-Id: Iaf1c187dac117ba10ac16045049a346f7c2b9478
Signed-off-by: Stone Li <stone.li@bambulab.com >
2023-02-01 16:24:44 +08:00
8c675f54ca
FIX:fixed print error has wrong layout
...
Change-Id: I668b32caeba9c3c2256c7a85b7858f98cd97fadc
2023-02-01 16:24:44 +08:00
1cfb771c4e
ENH:Allow clicking to confirm button when the data is complete
...
Change-Id: If28f20e6ce1fac783533cbc595614a909386dfae
2023-02-01 16:24:44 +08:00
46a81a1f87
ENH:show default ip address and access code when user enter
...
Change-Id: Idbe3af1fd13dfe34634b5c7fa2f7ca8791b3e10a
2023-02-01 16:24:44 +08:00
436b5f007e
ENH:enter access code with ip address when lan mode connect
...
Change-Id: I987f953bad20d8ddea299226eb6f49a157fc7be4
2023-02-01 16:24:44 +08:00
9f91a8450b
merge upstream changes
...
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com >
2023-01-21 00:37:10 +08:00
e745ac980e
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
9044b29c09
ENH:allows the user to enter a printed IP address
...
Change-Id: I9d2617d0dd42f53e93d61e98bcf3cc97979a93f6
(cherry picked from commit 24ab56f8568e9637634e97a0632309cfd2762749)
2023-01-10 19:08:26 +08:00
ab1d613f42
change app color
2023-01-03 22:05:20 +08:00
1ec149b4e1
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
73b0e703dc
FIX:fixed 'dont show again' with wrong color in dark mode
...
Change-Id: Icedd3df2f428c9d526633b908d7017c02b4cca3a
2022-12-15 04:38:15 -05:00
a461654b38
NEW:added dark mode
...
Change-Id: I3f61f1d93020e0a9dfba2c7d6cf6bf5194effcfa
2022-12-15 04:38:15 -05:00
df21df5911
NEW:add dont show again button on msgdialog
...
Change-Id: Id532ba9c10f01863dbe0f0319e9c9fd509a818fe
2022-12-15 04:33:48 -05:00
b6c1f101f8
Merge remote-tracking branch 'remote/master' into SoftFever
...
# Conflicts:
# src/libslic3r/PerimeterGenerator.cpp
2022-08-28 12:03:49 +08:00
2979f97b84
FIX:adjust rounding of some buttons
...
Change-Id: I8d1ed2b3d352689ea99fe00f26e405cc63151073
2022-08-26 09:25:59 +08:00
707b3085b3
Support upload g-code to third-party printers
...
* wip
* fix cmake warning
* add UI and config options for Moonraker connection
* wip: copy whole print host UI from PS
* add more needed options
* wip 2
* fix string issue on Mac
* wip3
* fix cmake warning
* working
need tweaks
* cleanup
* support thumbnail
* fix DNS resolving issue in Windows
* code clean up
2022-08-20 23:06:41 +08:00
144fbcebf4
FIX:fix mac MessageDialog layout
...
Change-Id: I8946c1beae3bd3c3167cd9b3777b1f5c4fad294c
2022-08-08 22:19:42 +08:00
af0b3ddb28
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
f8756e6c89
Add the full source of BambuStudio
...
using version 1.0.10
2022-07-15 23:42:08 +08:00
