3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-28 05:11:04 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge remote-tracking branch 'upstream/master' into mb-group-walls

Browse source
This commit is contained in:
Mark Burton 2017-06-08 10:15:16 +01:00
commit 3584703039
35 changed files with 59494 additions and 59693 deletions
Download patch file Download diff file Expand all files Collapse all files

7
resources/definitions/makeR_pegasus.def.json
View file

@ -11,11 +11,11 @@
"file_formats": "text/x-gcode",
"icon": "icon_ultimaker2",
"platform": "makeR_pegasus_platform.stl",
"platform_offset": [-200,-10,200]
"platform_offset": [-200, -10, 200]
},
"overrides": {
"machine_name": { "default_value": " makeR Pegasus" },
"machine_name": { "default_value": "makeR Pegasus" },
"machine_heated_bed": {
"default_value": true
},
@ -54,9 +54,6 @@
"gantry_height": {
"default_value": -25
},
"machine_platform_offset":{
"default_value":-25
},
"machine_gcode_flavor": {
"default_value": "RepRap (Marlin/Sprinter)"
},

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

@ -70,7 +70,7 @@
"machine_start_gcode": { "default_value": "" },
"machine_end_gcode": { "default_value": "" },
"prime_tower_position_x": { "default_value": 175 },
"prime_tower_position_y": { "default_value": 178 },
"prime_tower_position_y": { "default_value": 177 },
"prime_tower_wipe_enabled": { "default_value": false },
"prime_blob_enable": { "enabled": true },