Merge BS 1.7.7.89

# Conflicts:
#	bbl/i18n/ko/BambuStudio_ko.po
#	localization/i18n/OrcaSlicer.pot
#	localization/i18n/de/OrcaSlicer_de.po
#	localization/i18n/en/OrcaSlicer_en.po
#	localization/i18n/es/OrcaSlicer_es.po
#	localization/i18n/fr/OrcaSlicer_fr.po
#	localization/i18n/hu/OrcaSlicer_hu.po
#	localization/i18n/it/OrcaSlicer_it.po
#	localization/i18n/ja/OrcaSlicer_ja.po
#	localization/i18n/nl/OrcaSlicer_nl.po
#	localization/i18n/sv/OrcaSlicer_sv.po
#	localization/i18n/zh_cn/OrcaSlicer_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/it/BambuStudio.mo
#	resources/i18n/ja/BambuStudio.mo
#	resources/i18n/ko/BambuStudio.mo
#	resources/i18n/nl/BambuStudio.mo
#	resources/i18n/sv/BambuStudio.mo
#	resources/i18n/zh_cn/BambuStudio.mo
#	resources/profiles/Anycubic/machine/Anycubic Kobra Max 0.4 nozzle.json
#	src/OrcaSlicer.cpp
#	src/libnest2d/include/libnest2d/selections/firstfit.hpp
#	src/libslic3r/GCode/GCodeProcessor.cpp
#	src/libslic3r/Print.cpp
#	src/libslic3r/Print.hpp
#	src/libslic3r/PrintConfig.cpp
#	src/slic3r/GUI/CalibrationWizardPresetPage.cpp
#	src/slic3r/GUI/GLCanvas3D.cpp
#	src/slic3r/GUI/PartPlate.cpp
#	src/slic3r/GUI/PartPlate.hpp
#	src/slic3r/GUI/ReleaseNote.cpp
#	src/slic3r/GUI/Tab.cpp
#	version.inc
This commit is contained in:
SoftFever 2023-10-21 19:41:49 +08:00
commit a7729ca83f
213 changed files with 2090 additions and 649 deletions

View file

@ -27,6 +27,7 @@
"Bambu Lab P1S 0.2 nozzle",
"Bambu Lab P1P 0.2 nozzle",
"Bambu Lab X1 0.2 nozzle",
"Bambu Lab X1 Carbon 0.2 nozzle"
"Bambu Lab X1 Carbon 0.2 nozzle",
"Bambu Lab X1E 0.2 nozzle"
]
}

File diff suppressed because one or more lines are too long

View file

@ -10,6 +10,9 @@
],
"printer_model": "Bambu Lab A1 mini",
"printer_variant": "0.6",
"default_filament_profile": [
"Bambu PLA Basic @BBL A1M"
],
"default_print_profile": "0.30mm Standard @BBL A1M 0.6 nozzle",
"max_layer_height": [
"0.42"
@ -28,6 +31,7 @@
"Bambu Lab P1S 0.6 nozzle",
"Bambu Lab P1P 0.6 nozzle",
"Bambu Lab X1 0.6 nozzle",
"Bambu Lab X1 Carbon 0.6 nozzle"
"Bambu Lab X1 Carbon 0.6 nozzle",
"Bambu Lab X1E 0.6 nozzle"
]
}

View file

@ -10,6 +10,9 @@
],
"printer_model": "Bambu Lab A1 mini",
"printer_variant": "0.8",
"default_filament_profile": [
"Bambu PLA Basic @BBL A1M"
],
"default_print_profile": "0.40mm Standard @BBL A1M 0.8 nozzle",
"max_layer_height": [
"0.56"
@ -28,6 +31,7 @@
"Bambu Lab P1S 0.8 nozzle",
"Bambu Lab P1P 0.8 nozzle",
"Bambu Lab X1 0.8 nozzle",
"Bambu Lab X1 Carbon 0.8 nozzle"
"Bambu Lab X1 Carbon 0.8 nozzle",
"Bambu Lab X1E 0.8 nozzle"
]
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -0,0 +1,12 @@
{
"type": "machine_model",
"name": "Bambu Lab X1E",
"nozzle_diameter": "0.4;0.2;0.6;0.8",
"bed_model": "bbl-3dp-X1.stl",
"bed_texture": "bbl-3dp-logo.svg",
"family": "BBL-3DP",
"machine_tech": "FFF",
"model_id": "C13",
"url": "http://www.bambulab.com/Parameters/printer_model/Bambu Lab X1 Carbon.json",
"default_materials": "Bambu ABS @BBL X1E;Bambu PC @BBL X1E;Generic PLA Silk @BBL X1C;Generic PLA @BBL X1C;Bambu PLA Matte @BBL X1C;Bambu PLA Basic @BBL X1C;Bambu Support W @BBL X1C;Bambu TPU 95A @BBL X1C;PolyLite PLA @BBL X1C;PolyTerra PLA @BBL X1C"
}