GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 09:59:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into ui_rework_4_0

Browse Source
This commit is contained in:
Lipu Fei 2018-12-04 11:38:47 +01:00
commit 0d086008ae
5 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
resources/definitions/alfawise_u20.def.json
View File

@ -7,7 +7,7 @@
"author": "Samuel Pinches",
"manufacturer": "Alfawise",
"file_formats": "text/x-gcode",
"preferred_quality_type": "fine",
"preferred_quality_type": "fast",
"machine_extruder_trains":
{
"0": "alfawise_u20_extruder_0"
@ -53,9 +53,6 @@
"material_bed_temperature": {
"default_value": 50
},
"layer_height": {
"default_value": 0.15
},
"layer_height_0": {
"default_value": 0.2
},

5
resources/definitions/jgaurora_a1.def.json
View File

@ -7,7 +7,7 @@
"author": "Samuel Pinches",
"manufacturer": "JGAurora",
"file_formats": "text/x-gcode",
"preferred_quality_type": "fine",
"preferred_quality_type": "fast",
"machine_extruder_trains":
{
"0": "jgaurora_a1_extruder_0"
@ -53,9 +53,6 @@
"material_bed_temperature": {
"default_value": 67
},
"layer_height": {
"default_value": 0.15
},
"layer_height_0": {
"default_value": 0.12
},

5
resources/definitions/jgaurora_a5.def.json
View File

@ -9,7 +9,7 @@
"file_formats": "text/x-gcode",
"platform": "jgaurora_a5.stl",
"platform_offset": [-242, -101, 273],
"preferred_quality_type": "fine",
"preferred_quality_type": "fast",
"machine_extruder_trains":
{
"0": "jgaurora_a5_extruder_0"
@ -55,9 +55,6 @@
"material_bed_temperature": {
"default_value": 67
},
"layer_height": {
"default_value": 0.15
},
"layer_height_0": {
"default_value": 0.12
},

5
resources/definitions/jgaurora_z_603s.def.json
View File

@ -7,7 +7,7 @@
"author": "Samuel Pinches",
"manufacturer": "JGAurora",
"file_formats": "text/x-gcode",
"preferred_quality_type": "fine",
"preferred_quality_type": "fast",
"machine_extruder_trains":
{
"0": "jgaurora_z_603s_extruder_0"
@ -53,9 +53,6 @@
"material_bed_temperature": {
"default_value": 55
},
"layer_height": {
"default_value": 0.15
},
"layer_height_0": {
"default_value": 0.2
},

7
resources/qml/Preferences/SettingVisibilityPage.qml
View File

@ -115,15 +115,16 @@ UM.PreferencesPage
currentIndex:
{
var idx = -1;
for(var i = 0; i < settingVisibilityPresetsModel.items.length; ++i)
{
if(settingVisibilityPresetsModel.items[i].presetId == settingVisibilityPresetsModel.activePreset)
{
currentIndex = i;
return;
idx = i;
break;
}
}
return -1
return idx;
}
onActivated: