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

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

3
resources/variants/ultimaker3_aa0.25.inst.cfg
View file

@ -10,9 +10,7 @@ hardware_type = nozzle
[values]
brim_width = 7
infill_line_width = 0.23
layer_height_0 = 0.17
line_width = 0.23
machine_nozzle_cool_down_speed = 0.85
machine_nozzle_heat_up_speed = 1.5
machine_nozzle_id = AA 0.25
@ -46,6 +44,5 @@ support_z_distance = =layer_height * 2
switch_extruder_prime_speed = =switch_extruder_retraction_speeds
switch_extruder_retraction_amount = =machine_heat_zone_length
top_bottom_thickness = 1.2
wall_line_width_x = 0.23
wall_thickness = 1.3
xy_offset_layer_0 = =(-0.2 if adhesion_type == "skirt" or adhesion_type == "none" else 0) + xy_offset