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

Merge branch 'master' into libArachne_rebased

Browse source 
# Conflicts:
#	resources/texts/change_log.txt
This commit is contained in:
Jelle Spijker 2021-04-24 14:12:33 +02:00
commit 7632f66d23
No known key found for this signature in database
GPG key ID: 6662DC033BE6B99A
101 changed files with 6037 additions and 4382 deletions
Download patch file Download diff file Expand all files Collapse all files

2
resources/definitions/ultimaker_s3.def.json
View file

@ -61,7 +61,7 @@
"machine_max_feedrate_y": { "default_value": 300 },
"machine_max_feedrate_z": { "default_value": 40 },
"machine_acceleration": { "default_value": 3000 },
"gantry_height": { "value": "60" },
"gantry_height": { "value": "55" },
"machine_extruder_count": { "default_value": 2 },
"extruder_prime_pos_abs": { "default_value": true },
"machine_start_gcode": { "default_value": "" },

2
resources/definitions/ultimaker_s5.def.json
View file

@ -63,7 +63,7 @@
"machine_max_feedrate_y": { "default_value": 300 },
"machine_max_feedrate_z": { "default_value": 40 },
"machine_acceleration": { "default_value": 3000 },
"gantry_height": { "value": "60" },
"gantry_height": { "value": "55" },
"machine_extruder_count": { "default_value": 2 },
"extruder_prime_pos_abs": { "default_value": true },
"machine_start_gcode": { "default_value": "" },