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

Merge branch 'libArachne_rebased'

Browse source 
Conflicts:
	plugins/SimulationView/SimulationPass.py -> Reverted layer view optimisation in Master while some whitespace changed in Arachne.
	resources/definitions -> Bunch of conflicts with profile updates.
	resources/quality -> Bunch of conflicts with profile updates.
	resources/texts/change_log.txt -> Removed the Arachne change log (as they are internal versions). It'll have to be re-added when we release this version as stable.
This commit is contained in:
Ghostkeeper 2021-12-14 11:48:58 +01:00
commit 9140b71b19
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
594 changed files with 812 additions and 1608 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/quality/imade3d_jellybox/imade3d_jellybox_coarse.inst.cfg
View file

@ -63,8 +63,6 @@ support_use_towers = False
support_xy_distance = 0.8
support_xy_distance_overhang = =machine_nozzle_size / 2
support_z_distance = 0.2
travel_compensate_overlapping_walls_0_enabled = =travel_compensate_overlapping_walls_enabled
travel_compensate_overlapping_walls_x_enabled = =travel_compensate_overlapping_walls_enabled
travel_retract_before_outer_wall = True
wall_0_wipe_dist = =round(line_width * 1.2,1)
bridge_settings_enabled = True

2
resources/quality/imade3d_jellybox/imade3d_jellybox_fine.inst.cfg
View file

@ -63,8 +63,6 @@ support_use_towers = False
support_xy_distance = 0.8
support_xy_distance_overhang = =machine_nozzle_size / 2
support_z_distance = 0.2
travel_compensate_overlapping_walls_0_enabled = =travel_compensate_overlapping_walls_enabled
travel_compensate_overlapping_walls_x_enabled = =travel_compensate_overlapping_walls_enabled
travel_retract_before_outer_wall = True
wall_0_wipe_dist = =round(line_width * 1.2,1)
bridge_settings_enabled = True

2
resources/quality/imade3d_jellybox/imade3d_jellybox_normal.inst.cfg
View file

@ -63,8 +63,6 @@ support_use_towers = False
support_xy_distance = 0.8
support_xy_distance_overhang = =machine_nozzle_size / 2
support_z_distance = 0.2
travel_compensate_overlapping_walls_0_enabled = =travel_compensate_overlapping_walls_enabled
travel_compensate_overlapping_walls_x_enabled = =travel_compensate_overlapping_walls_enabled
travel_retract_before_outer_wall = True
wall_0_wipe_dist = =round(line_width * 1.2,1)
bridge_settings_enabled = True

2
resources/quality/imade3d_jellybox/imade3d_jellybox_ultrafine.inst.cfg
View file

@ -63,8 +63,6 @@ support_use_towers = False
support_xy_distance = 0.8
support_xy_distance_overhang = =machine_nozzle_size / 2
support_z_distance = 0.2
travel_compensate_overlapping_walls_0_enabled = =travel_compensate_overlapping_walls_enabled
travel_compensate_overlapping_walls_x_enabled = =travel_compensate_overlapping_walls_enabled
travel_retract_before_outer_wall = True
wall_0_wipe_dist = =round(line_width * 1.2,1)
bridge_settings_enabled = True