Commit graph

120 commits

Author SHA1 Message Date
SoftFever
17d6e63cf9 bump up version 1.6.1 2023-04-06 16:59:24 +08:00
SoftFever
ad655a9f32 bump version to 1.6.0 2023-04-01 22:21:57 +08:00
SoftFever
25f2dd6ebb Merge branch 'bs_1.5.0.61' into SoftFever 2023-03-15 22:29:41 +08:00
gerrit
d54bb63460 ci: update build version to 01.05.00.61
Change-Id: I828de8c355151260da339acc75793f1d10f63ccf
2023-03-14 20:52:40 +08:00
SoftFever
5b0ba1207e Change Application name to OrcaSlicer 2023-03-12 10:05:22 +08:00
SoftFever
81ca7720e9 change BambuStudio to OrcaSlicer 2023-03-10 19:26:01 +08:00
SoftFever
da61839e84 Merge remote-tracking branch 'upstream/v1.5.0' into SoftFever 2023-03-10 18:46:46 +08:00
Lane.Wei
40684c561e
Merge branch 'master' into v1.5.0 2023-03-09 20:21:51 +08:00
gerrit
7f9dc48560 ci: update build version to 01.05.00.60
Change-Id: I326a6f48e8bffbdb961fb02578497250d2339bf6
2023-03-09 19:07:29 +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
gerrit
69573c9b01 ci: update build version to 01.05.00.59
Change-Id: I2f74a48b30833d295fee2a3383e7d46ce9c08720
2023-03-01 15:58:50 +08:00
gerrit
e6acccc5d4 ci: update build version to 01.05.00.59
Change-Id: I2f74a48b30833d295fee2a3383e7d46ce9c08720
2023-03-01 15:20:45 +08:00
gerrit
682e3ef9e8 ci: update build version to 01.05.00.58
Change-Id: I2b88abdb6c599de32ad2e2cf12243c75bf7419e6
2023-02-28 18:44:28 +08:00
gerrit
0e2124e3e2 ci: update build version to 01.05.00.57
Change-Id: Ib92fbe4429bb49ec89babe3ee8a78a77fc6abeb3
2023-02-28 18:44:28 +08:00
gerrit
32edd479df ci: update build version to 01.05.00.56
Change-Id: I5cb6ea659ad270d895c1d53682261eb49687a0ec
2023-02-24 17:44:15 +08:00
gerrit
e0895211e4 ci: update build version to 01.05.00.55
Change-Id: Idbc19650d4c471528ebfba8c5954a184aee8ba03
2023-02-24 17:44:15 +08:00
gerrit
fa5b5d28da ci: update build version to 01.05.00.54
Change-Id: I510b9980893414d5218aa7edf73153633dbdb604
2023-02-24 09:23:57 +08:00
gerrit
971c7f358e ci: update build version to 01.05.00.53
Change-Id: I38187578d7531282d800deb75b6794a2d5882b1c
2023-02-22 20:09:17 +08:00
gerrit
9480b84b64 ci: update build version to 01.05.00.52
Change-Id: Iceceb0507577efdb709a1099615680a971575d33
2023-02-22 20:09:17 +08:00
gerrit
cd45f984ff ci: update build version to 01.05.00.51
Change-Id: I74b5e02ddf32c92a716d9f37066c0828b5fab9a1
2023-02-22 20:09:17 +08:00
lane.wei
c26c9b8602 ENH: update version to 1.5
Change-Id: I114766e4f0304a97cb18e2762be18dae68e667db
2023-02-22 20:09:17 +08:00
SoftFever
04fe631245
bump version to 1.4.5 (#328)
Signed-off-by: SoftFever <softfeverever@gmail.com>
2023-02-18 23:25:48 +08:00
SoftFever
36f4d585bf
hotfix: fix PA calibration issues (#253)
* Fix PA dlg DPI issue

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

* fix PA tower issue

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

* fix locale issue for non English OS

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

* bump to 1.4.4

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

* update mac x64 ci/cd

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

---------

Signed-off-by: SoftFever <softfeverever@gmail.com>
2023-01-29 00:17:25 +08:00
SoftFever
41bd8f1c00
bump (#239)
Signed-off-by: SoftFever <softfeverever@gmail.com>

Signed-off-by: SoftFever <softfeverever@gmail.com>
2023-01-27 00:20:32 +08:00
SoftFever
2492e5d39c merge upstream changes
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
2023-01-21 00:37:10 +08:00
SoftFever
970364cb4f bump version to 1.4.2
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
2023-01-07 22:07:11 +08:00
SoftFever
0d473ed447 update version to 1.4.2-dev 2023-01-05 22:37:13 +08:00
SoftFever
2c4455fb03 bump version 2022-12-31 22:51:49 +08:00
SoftFever
260156648d Merge branch 'master-remote' into SoftFever
# 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/nl/BambuStudio_nl.po
#	bbl/i18n/sv/BambuStudio_sv.po
#	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/BBL.json
#	resources/profiles/Creality.json
#	resources/profiles/Voron.json
#	src/libslic3r/PrintConfig.cpp
#	src/libslic3r/TreeSupport.cpp
#	src/slic3r/GUI/DeviceManager.cpp
#	src/slic3r/GUI/ReleaseNote.cpp
#	version.inc
2022-12-31 15:15:58 +08:00
SoftFever
fb0719b450 update dev version 2022-12-29 22:17:44 +08:00
gerrit
ae8a64f4d5 ci: update build version to 01.04.01.52
Change-Id: I2df45013c155c03e6d64253b7bdf39afe1344e08
2022-12-26 05:31:54 -05:00
gerrit
c663968089 ci: update build version to 01.04.01.51
Change-Id: Ia2c83ec777f803667f1f5398426ba19554e6dc7c
2022-12-26 05:31:54 -05:00
lane.wei
6899947da8 ENH: Update version to 1.4.1
Change-Id: Id21f3ffd8bdeab2cada64c74e87d606cb0ea7856
2022-12-26 05:31:54 -05:00
SoftFever
a8cf77a2b0 small changes 2022-12-23 17:25:04 +08:00
SoftFever
d733ab7e7b Merge branch 'master' into SoftFever
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>

# Conflicts:
#	resources/i18n/zh_cn/BambuStudio.mo
#	src/libslic3r/TreeSupport.cpp
#	version.inc
2022-12-21 16:54:14 +08:00
SoftFever
49982a4497 change version to 1.4.0 official
Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
2022-12-20 11:35:55 +08:00
gerrit
eaf7f87abb ci: update build version to 01.04.00.18
Change-Id: I62b60fc5581dc7a36c5cde20deb974e6ca298606
2022-12-19 06:13:10 -05:00
SoftFever
bafd7356d6 update version to beta3 2022-12-17 11:57:31 +08:00
SoftFever
ab8e0665b6 bump version to 1.4.0 beta2 2022-12-17 00:15:18 +08:00
SoftFever
5d141ee214 fix issues caused by merging 2022-12-16 17:04:19 +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
gerrit
390f68a98b ci: update build version to 01.04.00.17
Change-Id: I146a1e2f421eb54ad8ae1df8f1458468becce319
2022-12-15 08:38:55 -05:00
gerrit
4f5401a0bb ci: update build version to 01.04.00.16
Change-Id: I30c02e8db61f8ac760db63a8560ac7b661938b86
2022-12-15 04:49:14 -05:00
gerrit
8c655aa128 ci: update build version to 01.04.00.15
Change-Id: I7dcf690ab3f80f7f45ca880119dfb19a808e2b79
2022-12-15 04:49:14 -05:00
gerrit
540ecb2fb2 ci: update build version to 01.04.00.14
Change-Id: I6c1a365d1a3c5a873029a700b50d6f8f02dcf7d1
2022-12-15 04:38:15 -05:00
gerrit
1526cb6898 ci: update build version to 01.04.00.13
Change-Id: I8886e0d17d22a29556e39b4ebee65a640aa60197
2022-12-15 04:38:15 -05:00
gerrit
7a40310924 ci: update build version to 01.04.00.12
Change-Id: I0d533aa742fc9213a97a54ac816bffe399cae5a9
2022-12-15 04:38:15 -05:00
gerrit
32b46292b9 ci: update build version to 01.04.00.11
Change-Id: Ifa72f12cc90b097945a18bb6fb7c77b29ef354b9
2022-12-15 04:38:15 -05:00
gerrit
531267abd6 ci: update build version to 01.04.00.10
Change-Id: I7fb9fd5e98c1a634e14ad7407e600a63aee58e7d
2022-12-15 04:38:15 -05:00
gerrit
6d219574a9 ci: update build version to 01.04.00.09
Change-Id: Id6ff0482e59059234ad5839012069c47eb958264
2022-12-15 04:38:15 -05:00