3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-23 22:54:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch 'updateTiZYX' of https://github.com/TiZYX/Cura into TiZYX-updateTiZYX

Browse source 
Conflicts:
	resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_1.0_abs_coarse.inst.cfg -> Deleted in branch, but modified for setting version
	resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_1.0_abs_draft.inst.cfg -> Deleted in branch, but modified for settings version
	resources/quality/tizyx/tizyx_evy/abs/tizyx_evy_1.0_abs_extra_coarse.inst.cfg -> Deleted in branch, but modified for settings version
	resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_0.6_petg_draft.inst.cfg -> Deleted in branch, but modified for settings version
	resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_1.0_petg_coarse.inst.cfg -> Deleted in branch, but modified for settings version
	resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_1.0_petg_draft.inst.cfg -> Deleted in branch, but modified for settings version
	resources/quality/tizyx/tizyx_evy/petg/tizyx_evy_1.0_petg_extra_coarse.inst.cfg -> Deleted in branch, but modified for settings version
	resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_0.8_pla_coarse.inst.cfg -> Deleted in branch, but modified for settings version
	resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_1.0_pla_coarse.inst.cfg -> Deleted in branch, but modified for settings version
	resources/quality/tizyx/tizyx_evy/pla/tizyx_evy_1.0_pla_extra_coarse.inst.cfg -> Deleted in branch, but modified for settings version
	resources/variants/tizyx_evy_dual_direct_drive.inst.cfg -> Modified in branch for new settings, in master for settings version
This commit is contained in:
Ghostkeeper 2019-07-02 17:35:07 +02:00
commit 02b925388a
No known key found for this signature in database
GPG key ID: 86BEF881AE2CF276
87 changed files with 1258 additions and 332 deletions
Download patch file Download diff file Expand all files Collapse all files

4
resources/variants/tizyx_evy_dual_classic.inst.cfg
View file

@ -10,4 +10,6 @@ type = variant
hardware_type = nozzle
[values]
machine_nozzle_size = 0.4
machine_nozzle_size = 0.4
switch_extruder_retraction_amount = 100
switch_extruder_retraction_speeds = 70

4
resources/variants/tizyx_evy_dual_direct_drive.inst.cfg
View file

@ -10,4 +10,6 @@ type = variant
hardware_type = nozzle
[values]
machine_nozzle_size = 0.4
machine_nozzle_size = 0.4
switch_extruder_retractation_amount = 72
switch_extruder_retractation_speeds = 70