diff options
| author | Lipu Fei <lipu.fei815@gmail.com> | 2019-03-28 16:46:19 +0300 |
|---|---|---|
| committer | Lipu Fei <lipu.fei815@gmail.com> | 2019-03-28 16:46:19 +0300 |
| commit | e0102204320b0fbae5949a21feea28705b5f9cd9 (patch) | |
| tree | d755bff6652b8bceeafc7823cc1bf5b5b3050818 /resources/definitions/ultimaker_original.def.json | |
| parent | f4d0e39788a09f0a434fa44114ba702f2c0cefd6 (diff) | |
| parent | 4f5aee629894e8d8f5dd2414affbb155d59a9f4b (diff) | |
Fix merge conflicts
Diffstat (limited to 'resources/definitions/ultimaker_original.def.json')
| -rw-r--r-- | resources/definitions/ultimaker_original.def.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/resources/definitions/ultimaker_original.def.json b/resources/definitions/ultimaker_original.def.json index 81d3261f45..b0637625af 100644 --- a/resources/definitions/ultimaker_original.def.json +++ b/resources/definitions/ultimaker_original.def.json @@ -11,7 +11,7 @@ "platform": "ultimaker_platform.stl", "has_materials": true, "has_machine_quality": true, - "exclude_materials": ["generic_hips", "generic_petg", "generic_bam", "ultimaker_bam", "generic_pva", "ultimaker_pva", "generic_tough_pla", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white"], + "exclude_materials": ["generic_hips", "generic_petg", "generic_bam", "ultimaker_bam", "generic_pva", "ultimaker_pva", "generic_tough_pla", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white", "generic_cffcpe", "generic_cffpa", "generic_gffcpe", "generic_gffpa", "structur3d_dap100silicone" ], "first_start_actions": ["UMOUpgradeSelection", "BedLevel"], "supported_actions": ["UMOUpgradeSelection", "BedLevel"], "machine_extruder_trains": |