3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' of github.com:Ultimaker/Cura

Browse source
This commit is contained in:
Jaime van Kessel 2017-09-04 17:37:06 +02:00
commit bed74dab37
4 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
plugins/PluginBrowser/PluginBrowser.qml
View file

@ -9,10 +9,10 @@ UM.Dialog
id: base id: base
title: catalog.i18nc("@title:window", "Find & Update plugins") title: catalog.i18nc("@title:window", "Find & Update plugins")
width: 600 width: 600 * Screen.devicePixelRatio
height: 450 height: 450 * Screen.devicePixelRatio
minimumWidth: 350 minimumWidth: 350 * Screen.devicePixelRatio
minimumHeight: 350 minimumHeight: 350 * Screen.devicePixelRatio
Item Item
{ {
anchors.fill: parent anchors.fill: parent

4
resources/definitions/fdmprinter.def.json
View file

@ -3015,7 +3015,7 @@
"unit": "mm", "unit": "mm",
"type": "float", "type": "float",
"default_value": 0.0, "default_value": 0.0,
"minimum_value": "0", "minimum_value": "machine_width / -2 if machine_center_is_zero else 0",
"settable_per_mesh": false, "settable_per_mesh": false,
"settable_per_extruder": true, "settable_per_extruder": true,
"settable_per_meshgroup": true "settable_per_meshgroup": true
@ -3027,7 +3027,7 @@
"unit": "mm", "unit": "mm",
"type": "float", "type": "float",
"default_value": 0.0, "default_value": 0.0,
"minimum_value": "0", "minimum_value": "machine_depth / -2 if machine_center_is_zero else 0",
"settable_per_mesh": false, "settable_per_mesh": false,
"settable_per_extruder": true, "settable_per_extruder": true,
"settable_per_meshgroup": true "settable_per_meshgroup": true

1
resources/themes/cura-light/theme.json
View file

@ -332,6 +332,7 @@
"save_button_specs_icons": [1.4, 1.4], "save_button_specs_icons": [1.4, 1.4],
"modal_window_minimum": [60.0, 45], "modal_window_minimum": [60.0, 45],
"license_window_minimum": [45, 45],
"wizard_progress": [10.0, 0.0], "wizard_progress": [10.0, 0.0],
"message": [30.0, 5.0], "message": [30.0, 5.0],

1
resources/themes/cura/theme.json
View file

@ -278,7 +278,6 @@
"save_button_specs_icons": [1.4, 1.4], "save_button_specs_icons": [1.4, 1.4],
"modal_window_minimum": [60.0, 45], "modal_window_minimum": [60.0, 45],
"license_window_minimum": [45, 45],
"wizard_progress": [10.0, 0.0], "wizard_progress": [10.0, 0.0],
"message": [30.0, 5.0], "message": [30.0, 5.0],