Merge branch 'master-remote' into feature/merge_remote_1.3

# Conflicts:
#	bbl/i18n/zh_cn/BambuStudio_zh_CN.po
#	resources/i18n/zh_cn/BambuStudio.mo
#	resources/profiles/Voron.json
#	resources/profiles/Voron/filament/Voron Generic ABS.json
#	resources/profiles/Voron/filament/Voron Generic ASA.json
#	resources/profiles/Voron/filament/Voron Generic PA-CF.json
#	resources/profiles/Voron/filament/Voron Generic PA.json
#	resources/profiles/Voron/filament/Voron Generic PC.json
#	resources/profiles/Voron/filament/Voron Generic PETG.json
#	resources/profiles/Voron/filament/Voron Generic PLA-CF.json
#	resources/profiles/Voron/filament/Voron Generic PLA.json
#	resources/profiles/Voron/filament/Voron Generic PVA.json
#	resources/profiles/Voron/filament/Voron Generic TPU.json
#	resources/profiles/Voron/filament/fdm_filament_abs.json
#	resources/profiles/Voron/filament/fdm_filament_asa.json
#	resources/profiles/Voron/filament/fdm_filament_common.json
#	resources/profiles/Voron/filament/fdm_filament_pa.json
#	resources/profiles/Voron/filament/fdm_filament_pc.json
#	resources/profiles/Voron/filament/fdm_filament_pet.json
#	resources/profiles/Voron/filament/fdm_filament_pla.json
#	resources/profiles/Voron/filament/fdm_filament_pva.json
#	resources/profiles/Voron/filament/fdm_filament_tpu.json
#	resources/profiles/Voron/machine/Voron 0.1 0.4 nozzle.json
#	resources/profiles/Voron/machine/Voron 0.1.json
#	resources/profiles/Voron/machine/Voron 2.4 250 0.4 nozzle.json
#	resources/profiles/Voron/machine/Voron 2.4 250.json
#	resources/profiles/Voron/machine/Voron 2.4 300 0.4 nozzle.json
#	resources/profiles/Voron/machine/Voron 2.4 300.json
#	resources/profiles/Voron/machine/Voron 2.4 350 0.4 nozzle.json
#	resources/profiles/Voron/machine/Voron 2.4 350.json
#	resources/profiles/Voron/machine/Voron Trident 250 0.4 nozzle.json
#	resources/profiles/Voron/machine/Voron Trident 250.json
#	resources/profiles/Voron/machine/Voron Trident 300 0.4 nozzle.json
#	resources/profiles/Voron/machine/Voron Trident 300.json
#	resources/profiles/Voron/machine/Voron Trident 350 0.4 nozzle.json
#	resources/profiles/Voron/machine/Voron Trident 350.json
#	resources/profiles/Voron/machine/fdm_klipper_common.json
#	resources/profiles/Voron/process/0.08mm Extra Fine @Voron.json
#	resources/profiles/Voron/process/0.12mm Fine @Voron.json
#	resources/profiles/Voron/process/0.15mm Optimal @Voron.json
#	resources/profiles/Voron/process/0.20mm Standard @Voron.json
#	resources/profiles/Voron/process/0.24mm Draft @Voron.json
#	resources/profiles/Voron/process/0.28mm Extra Draft @Voron.json
#	resources/profiles/Voron/process/fdm_process_voron_common.json
#	src/libslic3r/Preset.cpp
#	src/libslic3r/PrintConfig.cpp
#	src/libslic3r/PrintConfig.hpp
#	src/libslic3r/PrintObject.cpp
#	src/slic3r/GUI/BackgroundSlicingProcess.cpp
#	src/slic3r/GUI/Field.cpp
#	src/slic3r/GUI/GLToolbar.cpp
#	src/slic3r/GUI/GLToolbar.hpp
#	src/slic3r/GUI/MainFrame.cpp
#	src/slic3r/GUI/MainFrame.hpp
#	src/slic3r/GUI/NotificationManager.cpp
#	src/slic3r/GUI/PhysicalPrinterDialog.cpp
#	src/slic3r/GUI/PhysicalPrinterDialog.hpp
#	src/slic3r/GUI/Plater.cpp
#	src/slic3r/GUI/Plater.hpp
#	src/slic3r/GUI/PrintHostDialogs.cpp
#	src/slic3r/GUI/PrintHostDialogs.hpp
#	src/slic3r/Utils/PrintHost.cpp
This commit is contained in:
SoftFever 2022-10-20 23:12:00 +08:00
commit 35455e6533
278 changed files with 14888 additions and 2414 deletions

View file

@ -1,7 +1,7 @@
{
"type": "filament",
"filament_id": "GFB99",
"setting_id": "GFSB99",
"setting_id": "GFSB99_VORON_00",
"name": "Voron Generic ABS",
"from": "system",
"instantiation": "true",

View file

@ -1,7 +1,7 @@
{
"type": "filament",
"filament_id": "GFB98",
"setting_id": "GFSB98",
"setting_id": "GFSB98_VORON_00",
"name": "Voron Generic ASA",
"from": "system",
"instantiation": "true",

View file

@ -1,7 +1,7 @@
{
"type": "filament",
"filament_id": "GFN98",
"setting_id": "GFSN99",
"setting_id": "GFSN98_VORON_00",
"name": "Voron Generic PA-CF",
"from": "system",
"instantiation": "true",

View file

@ -1,7 +1,7 @@
{
"type": "filament",
"filament_id": "GFN99",
"setting_id": "GFSN98",
"setting_id": "GFSN99_VORON_00",
"name": "Voron Generic PA",
"from": "system",
"instantiation": "true",

View file

@ -1,7 +1,7 @@
{
"type": "filament",
"filament_id": "GFC99",
"setting_id": "GFSC99",
"setting_id": "GFSC99_VORON_00",
"name": "Voron Generic PC",
"from": "system",
"instantiation": "true",

View file

@ -1,7 +1,7 @@
{
"type": "filament",
"filament_id": "GFG99",
"setting_id": "GFSG99",
"setting_id": "GFSG99_VORON_00",
"name": "Voron Generic PETG",
"from": "system",
"instantiation": "true",

View file

@ -1,7 +1,7 @@
{
"type": "filament",
"filament_id": "GFL98",
"setting_id": "GFSL98",
"setting_id": "GFSL98_VORON_00",
"name": "Voron Generic PLA-CF",
"from": "system",
"instantiation": "true",

View file

@ -1,7 +1,7 @@
{
"type": "filament",
"filament_id": "GFL99",
"setting_id": "GFSL99",
"setting_id": "GFSL99_VORON_00",
"name": "Voron Generic PLA",
"from": "system",
"instantiation": "true",

View file

@ -1,7 +1,7 @@
{
"type": "filament",
"filament_id": "GFS99",
"setting_id": "GFSS99",
"setting_id": "GFSS99_VORON_00",
"name": "Voron Generic PVA",
"from": "system",
"instantiation": "true",

View file

@ -1,7 +1,7 @@
{
"type": "filament",
"filament_id": "GFU99",
"setting_id": "GFSR99",
"setting_id": "GFSU99_VORON_00",
"name": "Voron Generic TPU",
"from": "system",
"instantiation": "true",

View file

@ -13,6 +13,9 @@
"hot_plate_temp" : [
"105"
],
"textured_plate_temp" : [
"105"
],
"cool_plate_temp_initial_layer" : [
"105"
],
@ -22,6 +25,9 @@
"hot_plate_temp_initial_layer" : [
"105"
],
"textured_plate_temp_initial_layer" : [
"105"
],
"slow_down_for_layer_cooling": [
"1"
],

View file

@ -13,6 +13,9 @@
"hot_plate_temp" : [
"105"
],
"textured_plate_temp" : [
"105"
],
"cool_plate_temp_initial_layer" : [
"105"
],
@ -22,6 +25,9 @@
"hot_plate_temp_initial_layer" : [
"105"
],
"textured_plate_temp_initial_layer" : [
"105"
],
"slow_down_for_layer_cooling": [
"1"
],

View file

@ -12,6 +12,9 @@
"hot_plate_temp" : [
"60"
],
"textured_plate_temp" : [
"60"
],
"cool_plate_temp_initial_layer" : [
"60"
],
@ -21,6 +24,9 @@
"hot_plate_temp_initial_layer" : [
"60"
],
"textured_plate_temp_initial_layer" : [
"60"
],
"overhang_fan_threshold": [
"95%"
],

View file

@ -13,6 +13,9 @@
"hot_plate_temp" : [
"100"
],
"textured_plate_temp" : [
"100"
],
"cool_plate_temp_initial_layer" : [
"0"
],
@ -22,6 +25,9 @@
"hot_plate_temp_initial_layer" : [
"100"
],
"textured_plate_temp_initial_layer" : [
"100"
],
"slow_down_for_layer_cooling": [
"1"
],

View file

@ -13,6 +13,9 @@
"hot_plate_temp" : [
"110"
],
"textured_plate_temp" : [
"110"
],
"cool_plate_temp_initial_layer" : [
"0"
],
@ -22,6 +25,9 @@
"hot_plate_temp_initial_layer" : [
"110"
],
"textured_plate_temp_initial_layer" : [
"110"
],
"slow_down_for_layer_cooling": [
"1"
],

View file

@ -13,6 +13,9 @@
"hot_plate_temp" : [
"80"
],
"textured_plate_temp" : [
"80"
],
"cool_plate_temp_initial_layer" : [
"60"
],
@ -22,6 +25,9 @@
"hot_plate_temp_initial_layer" : [
"80"
],
"textured_plate_temp_initial_layer" : [
"80"
],
"slow_down_for_layer_cooling": [
"1"
],

View file

@ -28,6 +28,9 @@
"hot_plate_temp" : [
"60"
],
"textured_plate_temp" : [
"60"
],
"cool_plate_temp_initial_layer" : [
"60"
],
@ -37,6 +40,9 @@
"hot_plate_temp_initial_layer" : [
"60"
],
"textured_plate_temp_initial_layer" : [
"60"
],
"nozzle_temperature_initial_layer": [
"220"
],

View file

@ -13,6 +13,9 @@
"hot_plate_temp" : [
"45"
],
"textured_plate_temp" : [
"45"
],
"cool_plate_temp_initial_layer" : [
"35"
],
@ -22,6 +25,9 @@
"hot_plate_temp_initial_layer" : [
"45"
],
"textured_plate_temp_initial_layer" : [
"45"
],
"fan_cooling_layer_time": [
"100"
],

View file

@ -13,6 +13,9 @@
"hot_plate_temp" : [
"35"
],
"textured_plate_temp" : [
"35"
],
"cool_plate_temp_initial_layer" : [
"30"
],
@ -22,6 +25,9 @@
"hot_plate_temp_initial_layer" : [
"35"
],
"textured_plate_temp_initial_layer" : [
"35"
],
"fan_cooling_layer_time": [
"100"
],

Binary file not shown.

View file

@ -1,6 +1,6 @@
{
"type": "machine",
"setting_id": "VORON-001",
"setting_id": "GM_VORON_001",
"name": "Voron 0.1 0.4 nozzle",
"from": "system",
"instantiation": "true",
@ -17,6 +17,6 @@
"0x120"
],
"printable_height": "120",
"nozzle_type": "hardened_steel",
"nozzle_type": "undefine",
"auxiliary_fan": "0"
}

View file

@ -7,6 +7,6 @@
"family": "VoronDesign",
"bed_model": "",
"bed_texture": "voron_v0_logo.png",
"hotend_model": "bbl-3dp-hotend.stl",
"hotend_model": "hotend.stl",
"default_materials": "Voron Generic ABS;Voron Generic PLA;Voron Generic PLA-CF;Voron Generic PETG;Voron Generic TPU;Voron Generic ASA;Voron Generic PC;Voron Generic PVA;Voron Generic PA;Voron Generic PA-CF"
}

View file

@ -1,6 +1,6 @@
{
"type": "machine",
"setting_id": "VORON-002",
"setting_id": "GM_VORON_002",
"name": "Voron 2.4 250 0.4 nozzle",
"from": "system",
"instantiation": "true",

View file

@ -1,12 +1,12 @@
{
"type": "machine_model",
"name": "Voron 2.4 250",
"model_id": "Voron2-250",
"model_id": "Voron2_250",
"nozzle_diameter": "0.4",
"machine_tech": "FFF",
"family": "VoronDesign",
"bed_model": "",
"bed_texture": "voron_logo.png",
"hotend_model": "bbl-3dp-hotend.stl",
"hotend_model": "hotend.stl",
"default_materials": "Voron Generic ABS;Voron Generic PLA;Voron Generic PLA-CF;Voron Generic PETG;Voron Generic TPU;Voron Generic ASA;Voron Generic PC;Voron Generic PVA;Voron Generic PA;Voron Generic PA-CF"
}

View file

@ -1,6 +1,6 @@
{
"type": "machine",
"setting_id": "VORON-003",
"setting_id": "GM_VORON_003",
"name": "Voron 2.4 300 0.4 nozzle",
"from": "system",
"instantiation": "true",

View file

@ -1,12 +1,12 @@
{
"type": "machine_model",
"name": "Voron 2.4 300",
"model_id": "Voron2-300",
"model_id": "Voron2_300",
"nozzle_diameter": "0.4",
"machine_tech": "FFF",
"family": "VoronDesign",
"bed_model": "",
"bed_texture": "voron_logo.png",
"hotend_model": "bbl-3dp-hotend.stl",
"hotend_model": "hotend.stl",
"default_materials": "Voron Generic ABS;Voron Generic PLA;Voron Generic PLA-CF;Voron Generic PETG;Voron Generic TPU;Voron Generic ASA;Voron Generic PC;Voron Generic PVA;Voron Generic PA;Voron Generic PA-CF"
}

View file

@ -1,6 +1,6 @@
{
"type": "machine",
"setting_id": "VORON-004",
"setting_id": "GM_VORON_004",
"name": "Voron 2.4 350 0.4 nozzle",
"from": "system",
"instantiation": "true",

View file

@ -1,12 +1,12 @@
{
"type": "machine_model",
"name": "Voron 2.4 350",
"model_id": "Voron2-350",
"model_id": "Voron2_350",
"nozzle_diameter": "0.4",
"machine_tech": "FFF",
"family": "VoronDesign",
"bed_model": "",
"bed_texture": "voron_logo.png",
"hotend_model": "bbl-3dp-hotend.stl",
"hotend_model": "hotend.stl",
"default_materials": "Voron Generic ABS;Voron Generic PLA;Voron Generic PLA-CF;Voron Generic PETG;Voron Generic TPU;Voron Generic ASA;Voron Generic PC;Voron Generic PVA;Voron Generic PA;Voron Generic PA-CF"
}

View file

@ -1,6 +1,6 @@
{
"type": "machine",
"setting_id": "VORON-005",
"setting_id": "GM_VORON_005",
"name": "Voron Trident 250 0.4 nozzle",
"from": "system",
"instantiation": "true",

View file

@ -1,12 +1,12 @@
{
"type": "machine_model",
"name": "Voron Trident 250",
"model_id": "Voron2Trident-250",
"model_id": "Voron2_Trident_250",
"nozzle_diameter": "0.4",
"machine_tech": "FFF",
"family": "VoronDesign",
"bed_model": "",
"bed_texture": "voron_logo.png",
"hotend_model": "bbl-3dp-hotend.stl",
"hotend_model": "hotend.stl",
"default_materials": "Voron Generic ABS;Voron Generic PLA;Voron Generic PLA-CF;Voron Generic PETG;Voron Generic TPU;Voron Generic ASA;Voron Generic PC;Voron Generic PVA;Voron Generic PA;Voron Generic PA-CF"
}

View file

@ -1,6 +1,6 @@
{
"type": "machine",
"setting_id": "VORON-006",
"setting_id": "GM_VORON_006",
"name": "Voron Trident 300 0.4 nozzle",
"from": "system",
"instantiation": "true",

View file

@ -1,12 +1,12 @@
{
"type": "machine_model",
"name": "Voron Trident 300",
"model_id": "Voron2Trident-300",
"model_id": "Voron2_Trident_300",
"nozzle_diameter": "0.4",
"machine_tech": "FFF",
"family": "VoronDesign",
"bed_model": "",
"bed_texture": "voron_logo.png",
"hotend_model": "bbl-3dp-hotend.stl",
"hotend_model": "hotend.stl",
"default_materials": "Voron Generic ABS;Voron Generic PLA;Voron Generic PLA-CF;Voron Generic PETG;Voron Generic TPU;Voron Generic ASA;Voron Generic PC;Voron Generic PVA;Voron Generic PA;Voron Generic PA-CF"
}

View file

@ -1,6 +1,6 @@
{
"type": "machine",
"setting_id": "VORON-007",
"setting_id": "GM_VORON_007",
"name": "Voron Trident 350 0.4 nozzle",
"from": "system",
"instantiation": "true",

View file

@ -1,12 +1,12 @@
{
"type": "machine_model",
"name": "Voron Trident 350",
"model_id": "Voron2Trident-350",
"model_id": "Voron2_Trident_350",
"nozzle_diameter": "0.4",
"machine_tech": "FFF",
"family": "VoronDesign",
"bed_model": "",
"bed_texture": "voron_logo.png",
"hotend_model": "bbl-3dp-hotend.stl",
"hotend_model": "hotend.stl",
"default_materials": "Voron Generic ABS;Voron Generic PLA;Voron Generic PLA-CF;Voron Generic PETG;Voron Generic TPU;Voron Generic ASA;Voron Generic PC;Voron Generic PVA;Voron Generic PA;Voron Generic PA-CF"
}

View file

@ -136,6 +136,6 @@
"layer_change_gcode": "",
"before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]\nG92 E0\n",
"scan_first_layer": "0",
"nozzle_type": "hardened_steel",
"nozzle_type": "undefine",
"auxiliary_fan": "0"
}
}

View file

@ -1,6 +1,6 @@
{
"type": "process",
"setting_id": "GP001",
"setting_id": "GP_VORON_001",
"name": "0.08mm Extra Fine @Voron",
"from": "system",
"instantiation": "true",
@ -8,4 +8,4 @@
"layer_height": "0.08",
"bottom_shell_layers": "7",
"top_shell_layers": "9"
}
}

View file

@ -1,6 +1,6 @@
{
"type": "process",
"setting_id": "GP002",
"setting_id": "GP_VORON_002",
"name": "0.12mm Fine @Voron",
"from": "system",
"instantiation": "true",

View file

@ -1,6 +1,6 @@
{
"type": "process",
"setting_id": "GP003",
"setting_id": "GP_VORON_003",
"name": "0.15mm Optimal @Voron",
"from": "system",
"instantiation": "true",

View file

@ -1,6 +1,6 @@
{
"type": "process",
"setting_id": "GP004",
"setting_id": "GP_VORON_004",
"name": "0.20mm Standard @Voron",
"from": "system",
"inherits": "fdm_process_voron_common",

View file

@ -1,6 +1,6 @@
{
"type": "process",
"setting_id": "GP005",
"setting_id": "GP_VORON_005",
"name": "0.24mm Draft @Voron",
"from": "system",
"instantiation": "true",

View file

@ -1,6 +1,6 @@
{
"type": "process",
"setting_id": "GP006",
"setting_id": "GP_VORON_006",
"name": "0.28mm Extra Draft @Voron",
"from": "system",
"instantiation": "true",