3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-20 07:11:12 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge remote-tracking branch 'remote/master' into feature/merge_upstream

Browse source 
# 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
This commit is contained in:
SoftFever 2023-04-19 08:48:07 +08:00
commit 9f598046d1
658 changed files with 70312 additions and 4877 deletions
Download patch file Download diff file Expand all files Collapse all files

42
resources/profiles/BBL.json
View file

@ -1,7 +1,7 @@
{
"name": "Bambulab",
"url": "http://www.bambulab.com/Parameters/vendor/BBL.json",
"version": "01.06.00.02",
"version": "01.06.00.03",
"force_update": "0",
"description": "the initial version of BBL configurations",
"machine_model_list": [
@ -321,6 +321,14 @@
"name": "Bambu PLA Metal @base",
"sub_path": "filament/Bambu PLA Metal @base.json"
},
{
"name": "Bambu PLA Silk @base",
"sub_path": "filament/Bambu PLA Silk @base.json"
},
{
"name": "Bambu PETG Basic @base",
"sub_path": "filament/Bambu PETG Basic @base.json"
},
{
"name": "Bambu ABS @base",
"sub_path": "filament/Bambu ABS @base.json"
@ -541,6 +549,38 @@
"name": "Bambu PLA Sparkle @BBL X1C",
"sub_path": "filament/Bambu PLA Sparkle @BBL X1C.json"
},
{
"name": "Bambu PLA Silk @BBL X1",
"sub_path": "filament/Bambu PLA Silk @BBL X1.json"
},
{
"name": "Bambu PLA Silk @BBL X1C 0.2 nozzle",
"sub_path": "filament/Bambu PLA Silk @BBL X1C 0.2 nozzle.json"
},
{
"name": "Bambu PLA Silk @BBL X1C",
"sub_path": "filament/Bambu PLA Silk @BBL X1C.json"
},
{
"name": "Bambu PLA Silk @BBL P1P",
"sub_path": "filament/P1P/Bambu PLA Silk @BBL P1P.json"
},
{
"name": "Bambu PLA Silk @BBL P1P 0.2 nozzle",
"sub_path": "filament/P1P/Bambu PLA Silk @BBL P1P 0.2 nozzle.json"
},
{
"name": "Bambu PETG Basic @BBL X1C",
"sub_path": "filament/Bambu PETG Basic @BBL X1C.json"
},
{
"name": "Bambu PETG Basic @BBL X1C 0.2 nozzle",
"sub_path": "filament/Bambu PETG Basic @BBL X1C 0.2 nozzle.json"
},
{
"name": "Bambu PETG Basic @BBL X1C 0.8 nozzle",
"sub_path": "filament/Bambu PETG Basic @BBL X1C 0.8 nozzle.json"
},
{
"name": "Bambu ABS @BBL X1C",
"sub_path": "filament/Bambu ABS @BBL X1C.json"