SoftFever
|
54c02521d4
|
Merge branch 'master-remote' 01.06.00.66
# Conflicts:
# .github/workflows/build_ubuntu.yml
# 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/i18n/zh_cn/BambuStudio.mo
# version.inc
|
2023-05-01 10:21:08 +08:00 |
|
SoftFever
|
404f79242d
|
update po files and bump version to 1.6.2
|
2023-04-29 10:30:18 +08:00 |
|
gerrit
|
b91155f8eb
|
ci: update build version to 01.06.00.66
Change-Id: If03ab70b463e8a16bd76992e5608a940281a4c9b
|
2023-04-24 09:11:01 +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 |
|
gerrit
|
1f155868bc
|
ci: update build version to 01.06.00.65
Change-Id: Ic02997afaf94adb5294e3e041df79ccab3a16a1b
|
2023-04-17 15:39:02 +08:00 |
|
gerrit
|
e31b12f5d7
|
ci: update build version to 01.06.00.64
Change-Id: I5d13d3bb5e75745159db7e406c02e3b84c433bba
|
2023-04-17 15:39:02 +08:00 |
|
gerrit
|
1cf688725a
|
ci: update build version to 01.06.00.63
Change-Id: Ic7f9b55de7683565e44fcc7e5969d09b0947e14b
|
2023-04-17 15:39:02 +08:00 |
|
gerrit
|
3af80a8252
|
ci: update build version to 01.06.00.62
Change-Id: I07c035585188c7a244c7f6c703bfce4b70483785
|
2023-04-17 15:39:02 +08:00 |
|
gerrit
|
975aa70651
|
ci: update build version to 01.06.00.61
Change-Id: I6fcbbf51e3550b0f9b163d3fbe061aaa0f51fdab
|
2023-04-17 15:39:02 +08:00 |
|
gerrit
|
763cf8ebfc
|
ci: update build version to 01.06.00.60
Change-Id: Iea950e408c28ece068fbb93bd02f141be16026c6
|
2023-04-17 15:39:02 +08:00 |
|
gerrit
|
e2e1357ff7
|
ci: update build version to 01.06.00.59
Change-Id: Icc76f0be665274630da56bdf756dc3d98196f99e
|
2023-04-17 15:39:02 +08:00 |
|
gerrit
|
56f1a49232
|
ci: update build version to 01.06.00.58
Change-Id: Ifb88521f67f1442eb9aaccd766fa5091a134b5d4
|
2023-04-17 15:39:02 +08:00 |
|
gerrit
|
c51d9c994f
|
ci: update build version to 01.06.00.57
Change-Id: I4dae551184bbb2b296723dbf5b58dee25c69610f
|
2023-04-17 15:39:02 +08:00 |
|
gerrit
|
474e363651
|
ci: update build version to 01.06.00.56
Change-Id: I905ebcc5f734aa95a94e2fe4d2649582a11544c9
|
2023-04-17 15:39:02 +08:00 |
|
gerrit
|
7ba23d7ec7
|
ci: update build version to 01.06.00.55
Change-Id: I8b1ba77a337e78f7e617dcd44edb16aef1a8fa9e
|
2023-04-17 15:39:02 +08:00 |
|
gerrit
|
951be6e471
|
ci: update build version to 01.06.00.54
Change-Id: I9a6afcb3ee5f2545565367e6873846bee52d1bd2
|
2023-04-17 15:39:02 +08:00 |
|
gerrit
|
031d61faca
|
ci: update build version to 01.06.00.53
Change-Id: I5c1a8aef816ebde7b1703b414aa9bffe3922a1a8
|
2023-04-17 15:39:02 +08:00 |
|
gerrit
|
f704dbf8d8
|
ci: update build version to 01.06.00.52
Change-Id: I8c8198714f2252848e1b3ad76f6d4f3275c38088
|
2023-04-17 15:39:02 +08:00 |
|
Stone Li
|
ca4902fb87
|
ENH: update version to 01.06.00.51
Change-Id: Iaddd6c5a0795e95c165b5945470f122d8ebffe0b
|
2023-04-17 15:39:02 +08:00 |
|
gerrit
|
a6bf1c946a
|
ci: update build version to 01.05.05.68
Change-Id: Iff517c101fb4c500f463a93aa74fccf8818eaa1e
|
2023-04-17 15:39:02 +08:00 |
|
gerrit
|
ceea4bb7cb
|
ci: update build version to 01.05.05.67
Change-Id: I69e4c5d72debabc3e24a41f70fc5b02124adb1a0
|
2023-04-17 15:39:02 +08:00 |
|
gerrit
|
49f6e3f3c6
|
ci: update build version to 01.05.05.66
Change-Id: I6f38bddfef8ed5ae13ad355326690c312e0e364e
|
2023-04-17 15:39:02 +08:00 |
|
gerrit
|
fa1be64652
|
ci: update build version to 01.05.05.65
Change-Id: Ia1998a60f0f8970ff6797a2c18136785f2a6b037
|
2023-04-17 15:39:02 +08:00 |
|
gerrit
|
5ec2e91b9d
|
ci: update build version to 01.05.05.64
Change-Id: Ib8a7c5ac4e6c71568534c75292a287f31e48dec2
|
2023-04-17 15:39:02 +08:00 |
|
Stone Li
|
f596a822e2
|
ENH: update version to 01.05.05.63
Change-Id: I79847e97e6f0a85b28e3ca85297249a9c46ef913
|
2023-04-17 15:39:02 +08:00 |
|
Stone Li
|
4a99304c4f
|
ENH: update version to 01.05.04.xx
Change-Id: Ia53270bab7171376883cb01d158f0e0d6bdfc875
|
2023-04-17 15:39:02 +08:00 |
|
gerrit
|
292f7e2c21
|
ci: update build version to 01.05.00.62
Change-Id: I89651401a9397e1221f3367ee6204f8212d70c7b
|
2023-04-17 15:39:02 +08:00 |
|
gerrit
|
1a71757332
|
ci: update build version to 01.05.00.61
Change-Id: Icc5832f25e2c533f5ed3eba87ebfb743462c91f5
|
2023-04-17 15:39:02 +08:00 |
|
gerrit
|
a8d98d87ae
|
ci: update build version to 01.05.00.60
Change-Id: I3887ba41bce97454001005ace28951cbf81ec91a
|
2023-04-17 15:39:02 +08:00 |
|
SoftFever
|
44df0d8308
|
1.6.2-beta
|
2023-04-16 00:39:20 +08:00 |
|
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 |
|