juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-19 19:33:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

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 Tadeus (Carlos Caruncho)
parent b210c29434
commit 97118f8e94
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
resources/profiles/Creality/filament/Creality Generic PC.json
View File

@@ -1,6 +1,13 @@
{ {
"type": "filament", "type": "filament",
<<<<<<<< HEAD:resources/profiles/Creality/filament/Creality Generic PC.json
"name": "Creality Generic PC", "name": "Creality Generic PC",
========
"filament_id": "GFC99",
"name": "OrcaArena Generic PC @base",
"from": "system",
"instantiation": "false",
>>>>>>>> 7f8855b5b (Fix a regression: Generic filament profiles conflicts #981):resources/profiles/OrcaArena/filament/OrcaArena Generic PC @base.json
"inherits": "fdm_filament_pc", "inherits": "fdm_filament_pc",
"from": "system", "from": "system",
"filament_id": "GFC99", "filament_id": "GFC99",