mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-10-19 14:51:11 -06:00
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
commit
35455e6533
278 changed files with 14888 additions and 2414 deletions
|
|
@ -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"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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",
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue