Merge remote-tracking branch 'remote/master' into SoftFever

# Conflicts:
#	resources/profiles/BBL/filament/Bambu PC @BBL X1C.json
#	resources/profiles/BBL/filament/Bambu TPU 95A @BBL X1C.json
This commit is contained in:
SoftFever 2022-07-23 20:29:33 +08:00
commit b806df7710
269 changed files with 10330 additions and 32230 deletions

View file

@ -9,6 +9,7 @@
"0.6"
],
"printer_variant": "0.6",
"printer_model": "Bambu Lab X1 Carbon",
"default_filament_profile": [
"Bambu PLA Basic @BBL X1C"
],

View file

@ -3,7 +3,7 @@
"name": "Bambu Lab X1 Carbon",
"model_id": "BL-P001",
"url": "http://www.bambulab.com/Parameters/printer_model/Bambu Lab X1 Carbon.json",
"nozzle_diameter": "0.4; 0.2; 0.6; 0.8",
"nozzle_diameter": "0.4;0.2;0.6;0.8",
"machine_tech": "FFF",
"family": "BBL-3DP",
"bed_model": "bbl-3dp-X1.stl",