Merge branch 'master-remote' into SoftFever

# 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/nl/BambuStudio_nl.po
#	bbl/i18n/sv/BambuStudio_sv.po
#	bbl/i18n/zh_cn/BambuStudio_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/nl/BambuStudio.mo
#	resources/i18n/sv/BambuStudio.mo
#	resources/i18n/zh_cn/BambuStudio.mo
#	resources/profiles/BBL.json
#	resources/profiles/Creality.json
#	resources/profiles/Voron.json
#	src/libslic3r/PrintConfig.cpp
#	src/libslic3r/TreeSupport.cpp
#	src/slic3r/GUI/DeviceManager.cpp
#	src/slic3r/GUI/ReleaseNote.cpp
#	version.inc
This commit is contained in:
SoftFever 2022-12-31 15:15:58 +08:00
commit 260156648d
104 changed files with 12137 additions and 1384 deletions

View file

@ -6,7 +6,7 @@
"instantiation": "false",
"inherits": "fdm_filament_pa",
"required_nozzle_HRC": [
"55"
"40"
],
"filament_vendor": [
"Bambu Lab"
@ -30,7 +30,7 @@
"PA-CF"
],
"filament_cost": [
"44.99"
"84.99"
],
"nozzle_temperature": [
"280"

View file

@ -0,0 +1,16 @@
{
"type": "filament",
"setting_id": "GFSN04",
"name": "Bambu PAHT-CF @BBL X1C",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PAHT-CF @base",
"compatible_printers": [
"Bambu Lab X1 Carbon 0.4 nozzle",
"Bambu Lab X1 Carbon 0.6 nozzle",
"Bambu Lab X1 Carbon 0.8 nozzle",
"Bambu Lab X1 0.4 nozzle",
"Bambu Lab X1 0.6 nozzle",
"Bambu Lab X1 0.8 nozzle"
]
}

View file

@ -0,0 +1,56 @@
{
"type": "filament",
"filament_id": "GFN04",
"name": "Bambu PAHT-CF @base",
"from": "system",
"instantiation": "false",
"inherits": "fdm_filament_pa",
"filament_max_volumetric_speed": [
"8"
],
"fan_max_speed": [
"30"
],
"fan_min_speed": [
"10"
],
"fan_cooling_layer_time": [
"5"
],
"full_fan_speed_layer": [
"2"
],
"required_nozzle_HRC": [
"40"
],
"filament_vendor": [
"Bambu Lab"
],
"filament_density": [
"1.06"
],
"filament_flow_ratio": [
"0.96"
],
"nozzle_temperature_initial_layer": [
"290"
],
"overhang_fan_threshold": [
"0%"
],
"overhang_fan_speed": [
"40"
],
"filament_type": [
"PA-CF"
],
"filament_cost": [
"94.99"
],
"temperature_vitrification": [
"180"
],
"nozzle_temperature": [
"290"
]
}

View file

@ -0,0 +1,19 @@
{
"type": "filament",
"setting_id": "GFSA02_02",
"name": "Bambu PLA Metal @BBL X1",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PLA Metal @base",
"filament_max_volumetric_speed": [
"21"
],
"slow_down_layer_time": [
"8"
],
"compatible_printers": [
"Bambu Lab X1 0.4 nozzle",
"Bambu Lab X1 0.6 nozzle",
"Bambu Lab X1 0.8 nozzle"
]
}

View file

@ -0,0 +1,15 @@
{
"type": "filament",
"setting_id": "GFSA02_01",
"name": "Bambu PLA Metal @BBL X1C 0.2 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PLA Metal @base",
"filament_max_volumetric_speed": [
"2"
],
"compatible_printers": [
"Bambu Lab X1 Carbon 0.2 nozzle",
"Bambu Lab X1 0.2 nozzle"
]
}

View file

@ -6,10 +6,11 @@
"instantiation": "true",
"inherits": "Bambu PLA Metal @base",
"filament_max_volumetric_speed": [
"25"
"21"
],
"compatible_printers": [
"Bambu Lab X1 Carbon 0.4 nozzle",
"Bambu Lab X1 0.4 nozzle"
"Bambu Lab X1 Carbon 0.6 nozzle",
"Bambu Lab X1 Carbon 0.8 nozzle"
]
}

View file

@ -9,12 +9,12 @@
"Bambu Lab"
],
"filament_cost": [
"25.4"
"29.99"
],
"filament_flow_ratio": [
"0.95"
"0.98"
],
"filament_density": [
"1.24"
"1.25"
]
}

View file

@ -0,0 +1,23 @@
{
"type": "filament",
"setting_id": "GFSA50_02",
"name": "Bambu PLA-CF @BBL X1C 0.8 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PLA-CF @base",
"filament_max_volumetric_speed": [
"18"
],
"nozzle_temperature_initial_layer": [
"230"
],
"nozzle_temperature": [
"230"
],
"compatible_printers": [
"Bambu Lab X1 Carbon 0.6 nozzle",
"Bambu Lab X1 Carbon 0.8 nozzle",
"Bambu Lab X1 0.6 nozzle",
"Bambu Lab X1 0.8 nozzle"
]
}

View file

@ -0,0 +1,24 @@
{
"type": "filament",
"setting_id": "GFSA50_01",
"name": "Bambu PLA-CF @BBL X1C",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PLA-CF @base",
"filament_max_volumetric_speed": [
"15"
],
"slow_down_layer_time": [
"2"
],
"nozzle_temperature_initial_layer": [
"230"
],
"nozzle_temperature": [
"230"
],
"compatible_printers": [
"Bambu Lab X1 Carbon 0.4 nozzle",
"Bambu Lab X1 0.4 nozzle"
]
}

View file

@ -0,0 +1,35 @@
{
"type": "filament",
"filament_id": "GFA50",
"name": "Bambu PLA-CF @base",
"from": "system",
"instantiation": "false",
"inherits": "fdm_filament_pla",
"filament_vendor": [
"Bambu Lab"
],
"filament_cost": [
"34.99"
],
"filament_flow_ratio": [
"0.98"
],
"filament_density": [
"1.22"
],
"required_nozzle_HRC": [
"40"
],
"nozzle_temperature_range_low": [
"210"
],
"nozzle_temperature_range_high": [
"250"
],
"additional_cooling_fan_speed": [
"0"
],
"filament_type": [
"PLA-CF"
]
}

View file

@ -0,0 +1,13 @@
{
"type": "filament",
"setting_id": "GFSN04_10",
"name": "Bambu PAHT-CF @BBL P1P",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PAHT-CF @base",
"compatible_printers": [
"Bambu Lab P1P 0.4 nozzle",
"Bambu Lab P1P 0.6 nozzle",
"Bambu Lab P1P 0.8 nozzle"
]
}

View file

@ -0,0 +1,32 @@
{
"type": "filament",
"setting_id": "GFSA02_11",
"name": "Bambu PLA Metal @BBL P1P 0.2 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PLA Metal @base",
"filament_max_volumetric_speed": [
"2"
],
"hot_plate_temp" : [
"65"
],
"hot_plate_temp_initial_layer" : [
"65"
],
"textured_plate_temp" : [
"65"
],
"textured_plate_temp_initial_layer" : [
"65"
],
"fan_min_speed": [
"50"
],
"fan_cooling_layer_time": [
"80"
],
"compatible_printers": [
"Bambu Lab P1P 0.2 nozzle"
]
}

View file

@ -0,0 +1,37 @@
{
"type": "filament",
"setting_id": "GFSA02_10",
"name": "Bambu PLA Metal @BBL P1P",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PLA Metal @base",
"filament_max_volumetric_speed": [
"21"
],
"slow_down_layer_time": [
"8"
],
"hot_plate_temp" : [
"65"
],
"hot_plate_temp_initial_layer" : [
"65"
],
"textured_plate_temp" : [
"65"
],
"textured_plate_temp_initial_layer" : [
"65"
],
"fan_min_speed": [
"50"
],
"fan_cooling_layer_time": [
"80"
],
"compatible_printers": [
"Bambu Lab P1P 0.4 nozzle",
"Bambu Lab P1P 0.6 nozzle",
"Bambu Lab P1P 0.8 nozzle"
]
}

View file

@ -0,0 +1,39 @@
{
"type": "filament",
"setting_id": "GFSA50_11",
"name": "Bambu PLA-CF @BBL P1P 0.8 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PLA-CF @base",
"filament_max_volumetric_speed": [
"18"
],
"hot_plate_temp" : [
"65"
],
"hot_plate_temp_initial_layer" : [
"65"
],
"textured_plate_temp" : [
"65"
],
"textured_plate_temp_initial_layer" : [
"65"
],
"fan_min_speed": [
"50"
],
"fan_cooling_layer_time": [
"80"
],
"nozzle_temperature": [
"230"
],
"nozzle_temperature_initial_layer": [
"230"
],
"compatible_printers": [
"Bambu Lab P1P 0.6 nozzle",
"Bambu Lab P1P 0.8 nozzle"
]
}

View file

@ -0,0 +1,41 @@
{
"type": "filament",
"setting_id": "GFSA50_10",
"name": "Bambu PLA-CF @BBL P1P",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PLA-CF @base",
"filament_max_volumetric_speed": [
"15"
],
"slow_down_layer_time": [
"2"
],
"hot_plate_temp" : [
"65"
],
"hot_plate_temp_initial_layer" : [
"65"
],
"textured_plate_temp" : [
"65"
],
"textured_plate_temp_initial_layer" : [
"65"
],
"fan_min_speed": [
"50"
],
"fan_cooling_layer_time": [
"80"
],
"nozzle_temperature": [
"230"
],
"nozzle_temperature_initial_layer": [
"230"
],
"compatible_printers": [
"Bambu Lab P1P 0.4 nozzle"
]
}

File diff suppressed because one or more lines are too long

View file

@ -0,0 +1,11 @@
{
"type": "process",
"setting_id": "GP018",
"name": "0.08mm Extra Fine @BBL P1P",
"from": "system",
"instantiation": "true",
"inherits": "fdm_process_bbl_0.08",
"compatible_printers": [
"Bambu Lab P1P 0.4 nozzle"
]
}

View file

@ -0,0 +1,11 @@
{
"type": "process",
"setting_id": "GP019",
"name": "0.12mm Fine @BBL P1P",
"from": "system",
"instantiation": "true",
"inherits": "fdm_process_bbl_0.12",
"compatible_printers": [
"Bambu Lab P1P 0.4 nozzle"
]
}

View file

@ -0,0 +1,11 @@
{
"type": "process",
"setting_id": "GP020",
"name": "0.16mm Optimal @BBL P1P",
"from": "system",
"instantiation": "true",
"inherits": "fdm_process_bbl_0.16",
"compatible_printers": [
"Bambu Lab P1P 0.4 nozzle"
]
}

View file

@ -0,0 +1,14 @@
{
"type": "process",
"setting_id": "GP021",
"name": "0.20mm Strength @BBL P1P",
"from": "system",
"instantiation": "true",
"inherits": "fdm_process_bbl_0.20",
"outer_wall_speed": "60",
"wall_loops": "6",
"sparse_infill_density": "25%",
"compatible_printers": [
"Bambu Lab P1P 0.4 nozzle"
]
}

View file

@ -0,0 +1,11 @@
{
"type": "process",
"setting_id": "GP022",
"name": "0.24mm Draft @BBL P1P",
"from": "system",
"instantiation": "true",
"inherits": "fdm_process_bbl_0.24",
"compatible_printers": [
"Bambu Lab P1P 0.4 nozzle"
]
}

View file

@ -0,0 +1,11 @@
{
"type": "process",
"setting_id": "GP023",
"name": "0.28mm Extra Draft @BBL P1P",
"from": "system",
"instantiation": "true",
"inherits": "fdm_process_bbl_0.28",
"compatible_printers": [
"Bambu Lab P1P 0.4 nozzle"
]
}

View file

@ -73,6 +73,7 @@
"enable_support": "0",
"resolution": "0.012",
"support_type": "normal(auto)",
"support_style": "default",
"support_on_build_plate_only": "0",
"support_top_z_distance": "0.2",
"support_bottom_z_distance": "0.2",
@ -92,7 +93,7 @@
"support_object_xy_distance": "0.35",
"tree_support_branch_diameter": "2",
"tree_support_branch_angle": "45",
"tree_support_wall_count": "0",
"tree_support_wall_count": "1",
"detect_thin_wall": "0",
"top_surface_pattern": "monotonicline",
"top_surface_line_width": "0.42",