Commit graph

12 commits

Author SHA1 Message Date
SoftFever
da05ae02da Merge some BS1.7 changes:
Boolean operation feature
2023-08-08 22:14:20 +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
liz.li
3c6e68553b ENH: add height_range
Change-Id: Ica4def5d54f9e0906d424eea1efd3545b79ed186
2023-04-17 15:39:02 +08:00
SoftFever
ef3614a21a optimize icon position for circle bed 2023-04-10 18:55:14 +08:00
liz.li
60e408bc59 FIX:delete logic shall be the same as arrange logic
Change-Id: I8c6d06abd7a850147e0e7f731bddbdeafcae777c
2023-02-22 20:09:17 +08:00
zhimin.zeng
915e5a0e69 FIX: model copy problem
Change-Id: I1e32a5a89271a4bdc100599bb6a513e48c545313
(cherry picked from commit eb3755126a2df23045857e4081ba50a42ca5168c)
2022-12-17 03:21:09 -05:00
zhimin.zeng
0a4269f053 FIX: assemble view does not handle model scaling
Change-Id: I4acce82e108128c4eee4e9fb5bcdeb6e74b6147e
(cherry picked from commit 8a9c5fbf11c26b112838c2790b9def9abcee7797)
2022-10-20 19:34:37 +08:00
tao.jin
31ba41ec3e NEW: move selected model to the center of selected plate
Change-Id: I7af49e98e83f5eef690f7d30d10a2cc240046466
2022-09-29 11:16:43 +08:00
Arthur
9edc90704a ENH: unify multi-object copy with single copy
Also adapt empty cell stride with object size plus 1mm.

Change-Id: I47ac98bede196d636ebb3da549c16e393756de0a
2022-09-29 11:16:43 +08:00
Arthur
b8846f675f ENH: do not change relative pos for multi object copy
Change-Id: Id54e119ebb72ca90989c13b221b9be72e4ac2f86
2022-09-08 21:49:36 +08:00
lane.wei
fef0a4944c FIX: fix the position not correct issue after copy
Change-Id: Id7505230f8a46785310b8c49d19705b2de5164af
2022-09-02 12:52:18 +08:00
lane.wei
1555904bef Add the full source of BambuStudio
using version 1.0.10
2022-07-15 23:42:08 +08:00