3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-08-08 14:34:04 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix a regression: Generic filament profiles conflicts #981

Browse source
This commit is contained in:
SoftFever 2023-05-07 11:58:49 +08:00 • committed by SoftFever
parent 3d6b59b904
commit ef83e47612
29 changed files with 98 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

110
resources/profiles/OrcaArena.json
View file

@ -1,7 +1,7 @@
{
"name": "Orca Arena Printer",
"url": "",
"version": "01.06.00.03",
"version": "01.06.01.00",
"force_update": "0",
"description": "Orca Arena configuration files",
"machine_model_list": [
@ -306,92 +306,92 @@
"sub_path": "filament/PolyLite PLA @base.json"
},
{
"name": "Generic PLA @base",
"sub_path": "filament/Generic PLA @base.json"
"name": "OrcaArena Generic PLA @base",
"sub_path": "filament/OrcaArena Generic PLA @base.json"
},
{
"name": "Generic PLA",
"sub_path": "filament/Generic PLA.json"
"name": "OrcaArena Generic PLA",
"sub_path": "filament/OrcaArena Generic PLA.json"
},
{
"name": "Generic PLA Silk @base",
"sub_path": "filament/Generic PLA Silk @base.json"
"name": "OrcaArena Generic PLA Silk @base",
"sub_path": "filament/OrcaArena Generic PLA Silk @base.json"
},
{
"name": "Generic PLA Silk",
"sub_path": "filament/Generic PLA Silk.json"
"name": "OrcaArena Generic PLA Silk",
"sub_path": "filament/OrcaArena Generic PLA Silk.json"
},
{
"name": "Generic PLA @0.2 nozzle",
"sub_path": "filament/Generic PLA @0.2 nozzle.json"
"name": "OrcaArena Generic PLA @0.2 nozzle",
"sub_path": "filament/OrcaArena Generic PLA @0.2 nozzle.json"
},
{
"name": "Generic PLA-CF @base",
"sub_path": "filament/Generic PLA-CF @base.json"
"name": "OrcaArena Generic PLA-CF @base",
"sub_path": "filament/OrcaArena Generic PLA-CF @base.json"
},
{
"name": "Generic PLA-CF",
"sub_path": "filament/Generic PLA-CF.json"
"name": "OrcaArena Generic PLA-CF",
"sub_path": "filament/OrcaArena Generic PLA-CF.json"
},
{
"name": "Generic PETG @base",
"sub_path": "filament/Generic PETG @base.json"
"name": "OrcaArena Generic PETG @base",
"sub_path": "filament/OrcaArena Generic PETG @base.json"
},
{
"name": "Generic PETG",
"sub_path": "filament/Generic PETG.json"
"name": "OrcaArena Generic PETG",
"sub_path": "filament/OrcaArena Generic PETG.json"
},
{
"name": "Generic ABS @base",
"sub_path": "filament/Generic ABS @base.json"
"name": "OrcaArena Generic ABS @base",
"sub_path": "filament/OrcaArena Generic ABS @base.json"
},
{
"name": "Generic ABS",
"sub_path": "filament/Generic ABS.json"
"name": "OrcaArena Generic ABS",
"sub_path": "filament/OrcaArena Generic ABS.json"
},
{
"name": "Generic ABS @0.2 nozzle",
"sub_path": "filament/Generic ABS @0.2 nozzle.json"
"name": "OrcaArena Generic ABS @0.2 nozzle",
"sub_path": "filament/OrcaArena Generic ABS @0.2 nozzle.json"
},
{
"name": "Generic TPU",
"sub_path": "filament/Generic TPU.json"
"name": "OrcaArena Generic TPU",
"sub_path": "filament/OrcaArena Generic TPU.json"
},
{
"name": "Generic ASA @base",
"sub_path": "filament/Generic ASA @base.json"
"name": "OrcaArena Generic ASA @base",
"sub_path": "filament/OrcaArena Generic ASA @base.json"
},
{
"name": "Generic ASA @0.2 nozzle",
"sub_path": "filament/Generic ASA @0.2 nozzle.json"
"name": "OrcaArena Generic ASA @0.2 nozzle",
"sub_path": "filament/OrcaArena Generic ASA @0.2 nozzle.json"
},
{
"name": "Generic ASA",
"sub_path": "filament/Generic ASA.json"
"name": "OrcaArena Generic ASA",
"sub_path": "filament/OrcaArena Generic ASA.json"
},
{
"name": "Generic PC @base",
"sub_path": "filament/Generic PC @base.json"
"name": "OrcaArena Generic PC @base",
"sub_path": "filament/OrcaArena Generic PC @base.json"
},
{
"name": "Generic PC @0.2 nozzle",
"sub_path": "filament/Generic PC @0.2 nozzle.json"
"name": "OrcaArena Generic PC @0.2 nozzle",
"sub_path": "filament/OrcaArena Generic PC @0.2 nozzle.json"
},
{
"name": "Generic PC",
"sub_path": "filament/Generic PC.json"
"name": "OrcaArena Generic PC",
"sub_path": "filament/OrcaArena Generic PC.json"
},
{
"name": "Generic PVA @base",
"sub_path": "filament/Generic PVA @base.json"
"name": "OrcaArena Generic PVA @base",
"sub_path": "filament/OrcaArena Generic PVA @base.json"
},
{
"name": "Generic PETG-CF @base",
"sub_path": "filament/Generic PETG-CF @base.json"
"name": "OrcaArena Generic PETG-CF @base",
"sub_path": "filament/OrcaArena Generic PETG-CF @base.json"
},
{
"name": "Generic PETG-CF @Arena X1C",
"sub_path": "filament/Generic PETG-CF @Arena X1C.json"
"name": "OrcaArena Generic PETG-CF @Arena X1C",
"sub_path": "filament/OrcaArena Generic PETG-CF @Arena X1C.json"
},
{
"name": "Arena PETG-CF @base",
@ -402,20 +402,20 @@
"sub_path": "filament/Arena PETG-CF @Arena X1C.json"
},
{
"name": "Generic PVA @0.2 nozzle",
"sub_path": "filament/Generic PVA @0.2 nozzle.json"
"name": "OrcaArena Generic PVA @0.2 nozzle",
"sub_path": "filament/OrcaArena Generic PVA @0.2 nozzle.json"
},
{
"name": "Generic PVA",
"sub_path": "filament/Generic PVA.json"
"name": "OrcaArena Generic PVA",
"sub_path": "filament/OrcaArena Generic PVA.json"
},
{
"name": "Generic PA",
"sub_path": "filament/Generic PA.json"
"name": "OrcaArena Generic PA",
"sub_path": "filament/OrcaArena Generic PA.json"
},
{
"name": "Generic PA-CF",
"sub_path": "filament/Generic PA-CF.json"
"name": "OrcaArena Generic PA-CF",
"sub_path": "filament/OrcaArena Generic PA-CF.json"
},
{
"name": "Arena TPU 95A @Arena X1C",
@ -542,8 +542,8 @@
"sub_path": "filament/PolyLite PLA @Arena X1C 0.2 nozzle.json"
},
{
"name":"Generic PETG @0.2 nozzle",
"sub_path":"filament/Generic PETG @0.2 nozzle.json"
"name":"OrcaArena Generic PETG @0.2 nozzle",
"sub_path":"filament/OrcaArena Generic PETG @0.2 nozzle.json"
},
{
"name":"Arena PLA Metal @Arena X1C 0.2 nozzle",

4
resources/profiles/OrcaArena/filament/Generic ABS @0.2 nozzle.json → resources/profiles/OrcaArena/filament/OrcaArena Generic ABS @0.2 nozzle.json
View file

@ -1,10 +1,10 @@
{
"type": "filament",
"setting_id": "GFSB99_00",
"name": "Generic ABS @0.2 nozzle",
"name": "OrcaArena Generic ABS @0.2 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "Generic ABS @base",
"inherits": "OrcaArena Generic ABS @base",
"filament_max_volumetric_speed": [
"2"
],

2
resources/profiles/OrcaArena/filament/Generic ABS @base.json → resources/profiles/OrcaArena/filament/OrcaArena Generic ABS @base.json
View file

@ -1,7 +1,7 @@
{
"type": "filament",
"filament_id": "GFB99",
"name": "Generic ABS @base",
"name": "OrcaArena Generic ABS @base",
"from": "system",
"instantiation": "false",
"inherits": "fdm_filament_abs",

4
resources/profiles/OrcaArena/filament/Generic ABS.json → resources/profiles/OrcaArena/filament/OrcaArena Generic ABS.json
View file

@ -1,10 +1,10 @@
{
"type": "filament",
"setting_id": "GFSB99",
"name": "Generic ABS",
"name": "OrcaArena Generic ABS",
"from": "system",
"instantiation": "true",
"inherits": "Generic ABS @base",
"inherits": "OrcaArena Generic ABS @base",
"compatible_printers": [
"Orca Arena X1 Carbon 0.4 nozzle",
"Orca Arena X1 Carbon 0.6 nozzle",

4
resources/profiles/OrcaArena/filament/Generic ASA @0.2 nozzle.json → resources/profiles/OrcaArena/filament/OrcaArena Generic ASA @0.2 nozzle.json
View file

@ -1,10 +1,10 @@
{
"type": "filament",
"setting_id": "GFSB98_00",
"name": "Generic ASA @0.2 nozzle",
"name": "OrcaArena Generic ASA @0.2 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "Generic ASA @base",
"inherits": "OrcaArena Generic ASA @base",
"filament_max_volumetric_speed": [
"2"
],

2
resources/profiles/OrcaArena/filament/Generic ASA @base.json → resources/profiles/OrcaArena/filament/OrcaArena Generic ASA @base.json
View file

@ -1,7 +1,7 @@
{
"type": "filament",
"filament_id": "GFB98",
"name": "Generic ASA @base",
"name": "OrcaArena Generic ASA @base",
"from": "system",
"instantiation": "false",
"inherits": "fdm_filament_asa",

4
resources/profiles/OrcaArena/filament/Generic ASA.json → resources/profiles/OrcaArena/filament/OrcaArena Generic ASA.json
View file

@ -1,10 +1,10 @@
{
"type": "filament",
"setting_id": "GFSB98",
"name": "Generic ASA",
"name": "OrcaArena Generic ASA",
"from": "system",
"instantiation": "true",
"inherits": "Generic ASA @base",
"inherits": "OrcaArena Generic ASA @base",
"compatible_printers": [
"Orca Arena X1 Carbon 0.4 nozzle",
"Orca Arena X1 Carbon 0.6 nozzle",

2
resources/profiles/OrcaArena/filament/Generic PA-CF.json → resources/profiles/OrcaArena/filament/OrcaArena Generic PA-CF.json
View file

@ -2,7 +2,7 @@
"type": "filament",
"filament_id": "GFN98",
"setting_id": "GFSN99",
"name": "Generic PA-CF",
"name": "OrcaArena Generic PA-CF",
"from": "system",
"instantiation": "true",
"inherits": "fdm_filament_pa",

2
resources/profiles/OrcaArena/filament/Generic PA.json → resources/profiles/OrcaArena/filament/OrcaArena Generic PA.json
View file

@ -2,7 +2,7 @@
"type": "filament",
"filament_id": "GFN99",
"setting_id": "GFSN98",
"name": "Generic PA",
"name": "OrcaArena Generic PA",
"from": "system",
"instantiation": "true",
"inherits": "fdm_filament_pa",

4
resources/profiles/OrcaArena/filament/Generic PC @0.2 nozzle.json → resources/profiles/OrcaArena/filament/OrcaArena Generic PC @0.2 nozzle.json
View file

@ -1,10 +1,10 @@
{
"type": "filament",
"setting_id": "GFSC99_00",
"name": "Generic PC @0.2 nozzle",
"name": "OrcaArena Generic PC @0.2 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "Generic PC @base",
"inherits": "OrcaArena Generic PC @base",
"filament_max_volumetric_speed": [
"1"
],

2
resources/profiles/OrcaArena/filament/Generic PC @base.json → resources/profiles/OrcaArena/filament/OrcaArena Generic PC @base.json
View file

@ -1,7 +1,7 @@
{
"type": "filament",
"filament_id": "GFC99",
"name": "Generic PC @base",
"name": "OrcaArena Generic PC @base",
"from": "system",
"instantiation": "false",
"inherits": "fdm_filament_pc",

4
resources/profiles/OrcaArena/filament/Generic PC.json → resources/profiles/OrcaArena/filament/OrcaArena Generic PC.json
View file

@ -1,10 +1,10 @@
{
"type": "filament",
"setting_id": "GFSC99",
"name": "Generic PC",
"name": "OrcaArena Generic PC",
"from": "system",
"instantiation": "true",
"inherits": "Generic PC @base",
"inherits": "OrcaArena Generic PC @base",
"compatible_printers": [
"Orca Arena X1 Carbon 0.4 nozzle",
"Orca Arena X1 Carbon 0.6 nozzle",

4
resources/profiles/OrcaArena/filament/Generic PETG @0.2 nozzle.json → resources/profiles/OrcaArena/filament/OrcaArena Generic PETG @0.2 nozzle.json
View file

@ -1,10 +1,10 @@
{
"type": "filament",
"setting_id": "GFSG99_01",
"name": "Generic PETG @0.2 nozzle",
"name": "OrcaArena Generic PETG @0.2 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "Generic PETG @base",
"inherits": "OrcaArena Generic PETG @base",
"filament_max_volumetric_speed": [
"1"
],

2
resources/profiles/OrcaArena/filament/Generic PETG @base.json → resources/profiles/OrcaArena/filament/OrcaArena Generic PETG @base.json
View file

@ -1,7 +1,7 @@
{
"type": "filament",
"filament_id": "GFG99",
"name": "Generic PETG @base",
"name": "OrcaArena Generic PETG @base",
"from": "system",
"instantiation": "false",
"inherits": "fdm_filament_pet",

4
resources/profiles/OrcaArena/filament/Generic PETG-CF @Arena X1C.json → resources/profiles/OrcaArena/filament/OrcaArena Generic PETG-CF @Arena X1C.json
View file

@ -1,10 +1,10 @@
{
"type": "filament",
"setting_id": "GFSG50",
"name": "Generic PETG-CF @Arena X1C",
"name": "OrcaArena Generic PETG-CF @Arena X1C",
"from": "system",
"instantiation": "true",
"inherits": "Generic PETG-CF @base",
"inherits": "OrcaArena Generic PETG-CF @base",
"compatible_printers": [
"Orca Arena X1 Carbon 0.4 nozzle",
"Orca Arena X1 Carbon 0.6 nozzle",

2
resources/profiles/OrcaArena/filament/Generic PETG-CF @base.json → resources/profiles/OrcaArena/filament/OrcaArena Generic PETG-CF @base.json
View file

@ -1,7 +1,7 @@
{
"type": "filament",
"filament_id": "GFG98",
"name": "Generic PETG-CF @base",
"name": "OrcaArena Generic PETG-CF @base",
"from": "system",
"instantiation": "false",
"inherits": "fdm_filament_pet",

4
resources/profiles/OrcaArena/filament/Generic PETG.json → resources/profiles/OrcaArena/filament/OrcaArena Generic PETG.json
View file

@ -1,10 +1,10 @@
{
"type": "filament",
"setting_id": "GFSG99",
"name": "Generic PETG",
"name": "OrcaArena Generic PETG",
"from": "system",
"instantiation": "true",
"inherits": "Generic PETG @base",
"inherits": "OrcaArena Generic PETG @base",
"compatible_printers": [
"Orca Arena X1 Carbon 0.4 nozzle",
"Orca Arena X1 Carbon 0.6 nozzle",

4
resources/profiles/OrcaArena/filament/Generic PLA @0.2 nozzle.json → resources/profiles/OrcaArena/filament/OrcaArena Generic PLA @0.2 nozzle.json
View file

@ -1,10 +1,10 @@
{
"type": "filament",
"setting_id": "GFSL99_00",
"name": "Generic PLA @0.2 nozzle",
"name": "OrcaArena Generic PLA @0.2 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "Generic PLA @base",
"inherits": "OrcaArena Generic PLA @base",
"filament_max_volumetric_speed": [
"2"
],

2
resources/profiles/OrcaArena/filament/Generic PLA @base.json → resources/profiles/OrcaArena/filament/OrcaArena Generic PLA @base.json
View file

@ -1,7 +1,7 @@
{
"type": "filament",
"filament_id": "GFL99",
"name": "Generic PLA @base",
"name": "OrcaArena Generic PLA @base",
"from": "system",
"instantiation": "false",
"inherits": "fdm_filament_pla",

2
resources/profiles/OrcaArena/filament/Generic PLA Silk @base.json → resources/profiles/OrcaArena/filament/OrcaArena Generic PLA Silk @base.json
View file

@ -1,7 +1,7 @@
{
"type": "filament",
"filament_id": "GFA05",
"name": "Generic PLA Silk @base",
"name": "OrcaArena Generic PLA Silk @base",
"from": "system",
"instantiation": "false",
"inherits": "fdm_filament_pla",

4
resources/profiles/OrcaArena/filament/Generic PLA Silk.json → resources/profiles/OrcaArena/filament/OrcaArena Generic PLA Silk.json
View file

@ -1,10 +1,10 @@
{
"type": "filament",
"setting_id": "GFSL99_01",
"name": "Generic PLA Silk",
"name": "OrcaArena Generic PLA Silk",
"from": "system",
"instantiation": "true",
"inherits": "Generic PLA Silk @base",
"inherits": "OrcaArena Generic PLA Silk @base",
"filament_max_volumetric_speed": [
"7.5"
],

2
resources/profiles/OrcaArena/filament/Generic PLA-CF @base.json → resources/profiles/OrcaArena/filament/OrcaArena Generic PLA-CF @base.json
View file

@ -1,7 +1,7 @@
{
"type": "filament",
"filament_id": "GFL98",
"name": "Generic PLA-CF @base",
"name": "OrcaArena Generic PLA-CF @base",
"from": "system",
"instantiation": "false",
"inherits": "fdm_filament_pla",

4
resources/profiles/OrcaArena/filament/Generic PLA-CF.json → resources/profiles/OrcaArena/filament/OrcaArena Generic PLA-CF.json
View file

@ -1,10 +1,10 @@
{
"type": "filament",
"setting_id": "GFSL98",
"name": "Generic PLA-CF",
"name": "OrcaArena Generic PLA-CF",
"from": "system",
"instantiation": "true",
"inherits": "Generic PLA-CF @base",
"inherits": "OrcaArena Generic PLA-CF @base",
"compatible_printers": [
"Orca Arena X1 Carbon 0.4 nozzle",
"Orca Arena X1 Carbon 0.6 nozzle",

4
resources/profiles/OrcaArena/filament/Generic PLA.json → resources/profiles/OrcaArena/filament/OrcaArena Generic PLA.json
View file

@ -1,10 +1,10 @@
{
"type": "filament",
"setting_id": "GFSL99",
"name": "Generic PLA",
"name": "OrcaArena Generic PLA",
"from": "system",
"instantiation": "true",
"inherits": "Generic PLA @base",
"inherits": "OrcaArena Generic PLA @base",
"compatible_printers": [
"Orca Arena X1 Carbon 0.4 nozzle",
"Orca Arena X1 Carbon 0.6 nozzle",

4
resources/profiles/OrcaArena/filament/Generic PVA @0.2 nozzle.json → resources/profiles/OrcaArena/filament/OrcaArena Generic PVA @0.2 nozzle.json
View file

@ -1,10 +1,10 @@
{
"type": "filament",
"setting_id": "GFSS99_00",
"name": "Generic PVA @0.2 nozzle",
"name": "OrcaArena Generic PVA @0.2 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "Generic PVA @base",
"inherits": "OrcaArena Generic PVA @base",
"filament_max_volumetric_speed": [
"0.5"
],

2
resources/profiles/OrcaArena/filament/Generic PVA @base.json → resources/profiles/OrcaArena/filament/OrcaArena Generic PVA @base.json
View file

@ -1,7 +1,7 @@
{
"type": "filament",
"filament_id": "GFS99",
"name": "Generic PVA @base",
"name": "OrcaArena Generic PVA @base",
"from": "system",
"instantiation": "false",
"inherits": "fdm_filament_pva",

4
resources/profiles/OrcaArena/filament/Generic PVA.json → resources/profiles/OrcaArena/filament/OrcaArena Generic PVA.json
View file

@ -1,10 +1,10 @@
{
"type": "filament",
"setting_id": "GFSS99",
"name": "Generic PVA",
"name": "OrcaArena Generic PVA",
"from": "system",
"instantiation": "true",
"inherits": "Generic PVA @base",
"inherits": "OrcaArena Generic PVA @base",
"compatible_printers": [
"Orca Arena X1 Carbon 0.4 nozzle",
"Orca Arena X1 Carbon 0.6 nozzle",

2
resources/profiles/OrcaArena/filament/Generic TPU.json → resources/profiles/OrcaArena/filament/OrcaArena Generic TPU.json
View file

@ -2,7 +2,7 @@
"type": "filament",
"filament_id": "GFU99",
"setting_id": "GFSR99",
"name": "Generic TPU",
"name": "OrcaArena Generic TPU",
"from": "system",
"instantiation": "true",
"inherits": "fdm_filament_tpu",

2
resources/profiles/OrcaArena/machine/Orca Arena X1 Carbon.json
View file

@ -9,5 +9,5 @@
"bed_model": "",
"bed_texture": "",
"hotend_model": "",
"default_materials": "Generic PLA Silk;Generic PLA;Arena PLA Matte @Arena X1C;Arena PLA Basic @Arena X1C;Arena ABS @Arena X1C;Arena PC @Arena X1C;Arena Support W @Arena X1C;Arena TPU 95A @Arena X1C;PolyTerra PLA @Arena X1C;PolyLite PLA @Arena X1C;"
"default_materials": "OrcaArena Generic PLA Silk;OrcaArena Generic PLA;Arena PLA Matte @Arena X1C;Arena PLA Basic @Arena X1C;Arena ABS @Arena X1C;Arena PC @Arena X1C;Arena Support W @Arena X1C;Arena TPU 95A @Arena X1C;PolyTerra PLA @Arena X1C;PolyLite PLA @Arena X1C;"
}