mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-14 00:52:04 +00:00
Merge remote-tracking branch 'upstream/main' into dev/h2d-2
# Conflicts: # resources/profiles/BBL.json
This commit is contained in:
@@ -893,10 +893,82 @@
|
||||
}
|
||||
],
|
||||
"filament_list": [
|
||||
{
|
||||
"name": "COEX PCTG PRIME @BBL X1C",
|
||||
"sub_path": "filament/COEX/COEX PCTG PRIME @BBL X1C.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX PCTG PRIME @BBL X1C 0.2 nozzle",
|
||||
"sub_path": "filament/COEX/COEX PCTG PRIME @BBL X1C 0.2 nozzle.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX PCTG PRIME @BBL X1C 0.8 nozzle",
|
||||
"sub_path": "filament/COEX/COEX PCTG PRIME @BBL X1C 0.8 nozzle.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX PETG @BBL X1C",
|
||||
"sub_path": "filament/COEX/COEX PETG @BBL X1C.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX PETG @BBL X1C 0.2 nozzle",
|
||||
"sub_path": "filament/COEX/COEX PETG @BBL X1C 0.2 nozzle.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX PETG @BBL X1C 0.8 nozzle",
|
||||
"sub_path": "filament/COEX/COEX PETG @BBL X1C 0.8 nozzle.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX PLA @BBL A1M",
|
||||
"sub_path": "filament/COEX/COEX PLA @BBL A1M.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX PLA @BBL P1P",
|
||||
"sub_path": "filament/COEX/COEX PLA @BBL P1P.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX PLA @BBL X1C",
|
||||
"sub_path": "filament/COEX/COEX PLA @BBL X1C.json"
|
||||
},
|
||||
{
|
||||
"name": "fdm_filament_common",
|
||||
"sub_path": "filament/fdm_filament_common.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX PCTG PRIME @BBL A1M 0.4 nozzle",
|
||||
"sub_path": "filament/COEX/COEX PCTG PRIME @BBL A1M.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX PCTG PRIME @BBL A1M 0.2 nozzle",
|
||||
"sub_path": "filament/COEX/COEX PCTG PRIME @BBL A1M 0.2 nozzle.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX PCTG PRIME @BBL A1M 0.8 nozzle",
|
||||
"sub_path": "filament/COEX/COEX PCTG PRIME @BBL A1M 0.8 nozzle.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX PETG @BBL A1M 0.4 nozzle",
|
||||
"sub_path": "filament/COEX/COEX PETG @BBL A1M.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX PETG @BBL A1M 0.2 nozzle",
|
||||
"sub_path": "filament/COEX/COEX PETG @BBL A1M 0.2 nozzle.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX PETG @BBL A1M 0.8 nozzle",
|
||||
"sub_path": "filament/COEX/COEX PETG @BBL A1M 0.8 nozzle.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX PLA @BBL A1M 0.2 nozzle",
|
||||
"sub_path": "filament/COEX/COEX PLA @BBL A1M 0.2 nozzle.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX PLA @BBL P1P 0.2 nozzle",
|
||||
"sub_path": "filament/COEX/COEX PLA @BBL P1P 0.2 nozzle.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX PLA @BBL X1C 0.2 nozzle",
|
||||
"sub_path": "filament/COEX/COEX PLA @BBL X1C 0.2 nozzle.json"
|
||||
},
|
||||
{
|
||||
"name": "FusRock ABS-GF @base",
|
||||
"sub_path": "filament/FusRock/FusRock ABS-GF @base.json"
|
||||
@@ -6409,6 +6481,282 @@
|
||||
"name": "AliZ PLA @P1-X1",
|
||||
"sub_path": "filament/AliZ/AliZ PLA @P1-X1.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX ABS @BBL X1",
|
||||
"sub_path": "filament/COEX/COEX ABS @BBL X1.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX ABS @BBL X1 0.2 nozzle",
|
||||
"sub_path": "filament/COEX/COEX ABS @BBL X1 0.2 nozzle.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX ABS @BBL X1C",
|
||||
"sub_path": "filament/COEX/COEX ABS @BBL X1C.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX ABS @BBL X1C 0.2 nozzle",
|
||||
"sub_path": "filament/COEX/COEX ABS @BBL X1C 0.2 nozzle.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX ABS PRIME @BBL X1",
|
||||
"sub_path": "filament/COEX/COEX ABS PRIME @BBL X1.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX ABS PRIME @BBL X1 0.2 nozzle",
|
||||
"sub_path": "filament/COEX/COEX ABS PRIME @BBL X1 0.2 nozzle.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX ABS PRIME @BBL X1C",
|
||||
"sub_path": "filament/COEX/COEX ABS PRIME @BBL X1C.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX ABS PRIME @BBL X1C 0.2 nozzle",
|
||||
"sub_path": "filament/COEX/COEX ABS PRIME @BBL X1C 0.2 nozzle.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX ASA PRIME @BBL X1",
|
||||
"sub_path": "filament/COEX/COEX ASA PRIME @BBL X1.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX ASA PRIME @BBL X1 0.2 nozzle",
|
||||
"sub_path": "filament/COEX/COEX ASA PRIME @BBL X1 0.2 nozzle.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX ASA PRIME @BBL X1C",
|
||||
"sub_path": "filament/COEX/COEX ASA PRIME @BBL X1C.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX ASA PRIME @BBL X1C 0.2 nozzle",
|
||||
"sub_path": "filament/COEX/COEX ASA PRIME @BBL X1C 0.2 nozzle.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX NYLEX PA6-CF @BBL X1C",
|
||||
"sub_path": "filament/COEX/COEX NYLEX PA6-CF @BBL X1C.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX NYLEX UNFILLED @BBL X1C",
|
||||
"sub_path": "filament/COEX/COEX NYLEX UNFILLED @BBL X1C.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX PCTG PRIME @BBL A1",
|
||||
"sub_path": "filament/COEX/COEX PCTG PRIME @BBL A1.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX PCTG PRIME @BBL A1 0.2 nozzle",
|
||||
"sub_path": "filament/COEX/COEX PCTG PRIME @BBL A1 0.2 nozzle.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX PCTG PRIME @BBL A1 0.8 nozzle",
|
||||
"sub_path": "filament/COEX/COEX PCTG PRIME @BBL A1 0.8 nozzle.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX PETG @BBL A1",
|
||||
"sub_path": "filament/COEX/COEX PETG @BBL A1.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX PETG @BBL A1 0.2 nozzle",
|
||||
"sub_path": "filament/COEX/COEX PETG @BBL A1 0.2 nozzle.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX PETG @BBL A1 0.8 nozzle",
|
||||
"sub_path": "filament/COEX/COEX PETG @BBL A1 0.8 nozzle.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX PLA @BBL A1",
|
||||
"sub_path": "filament/COEX/COEX PLA @BBL A1.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX PLA @BBL A1 0.2 nozzle",
|
||||
"sub_path": "filament/COEX/COEX PLA @BBL A1 0.2 nozzle.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX PLA @BBL X1",
|
||||
"sub_path": "filament/COEX/COEX PLA @BBL X1.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX PLA PRIME @BBL A1",
|
||||
"sub_path": "filament/COEX/COEX PLA PRIME @BBL A1.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX PLA PRIME @BBL A1 0.2 nozzle",
|
||||
"sub_path": "filament/COEX/COEX PLA PRIME @BBL A1 0.2 nozzle.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX PLA PRIME @BBL A1M",
|
||||
"sub_path": "filament/COEX/COEX PLA PRIME @BBL A1M.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX PLA PRIME @BBL A1M 0.2 nozzle",
|
||||
"sub_path": "filament/COEX/COEX PLA PRIME @BBL A1M 0.2 nozzle.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX PLA PRIME @BBL P1P",
|
||||
"sub_path": "filament/COEX/COEX PLA PRIME @BBL P1P.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX PLA PRIME @BBL P1P 0.2 nozzle",
|
||||
"sub_path": "filament/COEX/COEX PLA PRIME @BBL P1P 0.2 nozzle.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX PLA PRIME @BBL X1",
|
||||
"sub_path": "filament/COEX/COEX PLA PRIME @BBL X1.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX PLA PRIME @BBL X1 0.2 nozzle",
|
||||
"sub_path": "filament/COEX/COEX PLA PRIME @BBL X1 0.2 nozzle.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX PLA PRIME @BBL X1C",
|
||||
"sub_path": "filament/COEX/COEX PLA PRIME @BBL X1C.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX PLA PRIME @BBL X1C 0.2 nozzle",
|
||||
"sub_path": "filament/COEX/COEX PLA PRIME @BBL X1C 0.2 nozzle.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX PLA+Silk @BBL A1",
|
||||
"sub_path": "filament/COEX/COEX PLA+Silk @BBL A1.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX PLA+Silk @BBL A1 0.2 nozzle",
|
||||
"sub_path": "filament/COEX/COEX PLA+Silk @BBL A1 0.2 nozzle.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX PLA+Silk @BBL A1M",
|
||||
"sub_path": "filament/COEX/COEX PLA+Silk @BBL A1M.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX PLA+Silk @BBL A1M 0.2 nozzle",
|
||||
"sub_path": "filament/COEX/COEX PLA+Silk @BBL A1M 0.2 nozzle.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX PLA+Silk @BBL P1P",
|
||||
"sub_path": "filament/COEX/COEX PLA+Silk @BBL P1P.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX PLA+Silk @BBL P1P 0.2 nozzle",
|
||||
"sub_path": "filament/COEX/COEX PLA+Silk @BBL P1P 0.2 nozzle.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX PLA+Silk @BBL X1",
|
||||
"sub_path": "filament/COEX/COEX PLA+Silk @BBL X1.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX PLA+Silk @BBL X1 0.2 nozzle",
|
||||
"sub_path": "filament/COEX/COEX PLA+Silk @BBL X1 0.2 nozzle.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX PLA+Silk @BBL X1C",
|
||||
"sub_path": "filament/COEX/COEX PLA+Silk @BBL X1C.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX PLA+Silk @BBL X1C 0.2 nozzle",
|
||||
"sub_path": "filament/COEX/COEX PLA+Silk @BBL X1C 0.2 nozzle.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX TPE 30D @BBL A1",
|
||||
"sub_path": "filament/COEX/COEX TPE 30D @BBL A1.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX TPE 30D @BBL A1M",
|
||||
"sub_path": "filament/COEX/COEX TPE 30D @BBL A1M.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX TPE 30D @BBL P1P",
|
||||
"sub_path": "filament/COEX/COEX TPE 30D @BBL P1P.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX TPE 30D @BBL X1",
|
||||
"sub_path": "filament/COEX/COEX TPE 30D @BBL X1.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX TPE 30D @BBL X1C",
|
||||
"sub_path": "filament/COEX/COEX TPE 30D @BBL X1C.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX TPE 40D @BBL A1",
|
||||
"sub_path": "filament/COEX/COEX TPE 40D @BBL A1.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX TPE 40D @BBL A1 0.2 nozzle",
|
||||
"sub_path": "filament/COEX/COEX TPE 40D @BBL A1 0.2 nozzle.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX TPE 40D @BBL A1M",
|
||||
"sub_path": "filament/COEX/COEX TPE 40D @BBL A1M.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX TPE 40D @BBL A1M 0.2 nozzle",
|
||||
"sub_path": "filament/COEX/COEX TPE 40D @BBL A1M 0.2 nozzle.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX TPE 40D @BBL P1P",
|
||||
"sub_path": "filament/COEX/COEX TPE 40D @BBL P1P.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX TPE 40D @BBL P1P 0.2 nozzle",
|
||||
"sub_path": "filament/COEX/COEX TPE 40D @BBL P1P 0.2 nozzle.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX TPE 40D @BBL X1",
|
||||
"sub_path": "filament/COEX/COEX TPE 40D @BBL X1.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX TPE 40D @BBL X1 0.2 nozzle",
|
||||
"sub_path": "filament/COEX/COEX TPE 40D @BBL X1 0.2 nozzle.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX TPE 40D @BBL X1C",
|
||||
"sub_path": "filament/COEX/COEX TPE 40D @BBL X1C.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX TPE 40D @BBL X1C 0.2 nozzle",
|
||||
"sub_path": "filament/COEX/COEX TPE 40D @BBL X1C 0.2 nozzle.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX TPE 60D @BBL A1",
|
||||
"sub_path": "filament/COEX/COEX TPE 60D @BBL A1.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX TPE 60D @BBL A1 0.2 nozzle",
|
||||
"sub_path": "filament/COEX/COEX TPE 60D @BBL A1 0.2 nozzle.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX TPE 60D @BBL A1M",
|
||||
"sub_path": "filament/COEX/COEX TPE 60D @BBL A1M.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX TPE 60D @BBL A1M 0.2 nozzle",
|
||||
"sub_path": "filament/COEX/COEX TPE 60D @BBL A1M 0.2 nozzle.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX TPE 60D @BBL P1P",
|
||||
"sub_path": "filament/COEX/COEX TPE 60D @BBL P1P.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX TPE 60D @BBL P1P 0.2 nozzle",
|
||||
"sub_path": "filament/COEX/COEX TPE 60D @BBL P1P 0.2 nozzle.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX TPE 60D @BBL X1",
|
||||
"sub_path": "filament/COEX/COEX TPE 60D @BBL X1.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX TPE 60D @BBL X1 0.2 nozzle",
|
||||
"sub_path": "filament/COEX/COEX TPE 60D @BBL X1 0.2 nozzle.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX TPE 60D @BBL X1C",
|
||||
"sub_path": "filament/COEX/COEX TPE 60D @BBL X1C.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX TPE 60D @BBL X1C 0.2 nozzle",
|
||||
"sub_path": "filament/COEX/COEX TPE 60D @BBL X1C 0.2 nozzle.json"
|
||||
},
|
||||
{
|
||||
"name": "COEX TPU 60A @BBL X1C",
|
||||
"sub_path": "filament/COEX/COEX TPU 60A @BBL X1C.json"
|
||||
},
|
||||
{
|
||||
"name": "Overture ASA @BBL X1",
|
||||
"sub_path": "filament/Overture/Overture ASA @BBL X1.json"
|
||||
|
||||
Reference in New Issue
Block a user