10921 Commits

Author SHA1 Message Date
Jaime van Kessel
482ea83284 Hiding a setting forces settingInheritance manager to re-evaluate
CURA-2361
2016-09-16 15:32:16 +02:00
Thomas Karl Pietrowski
755b2e61e4 CURA-1852: Sending material volumina per extruder 2016-09-16 15:16:34 +02:00
Thomas Karl Pietrowski
41248a5133 SliceInfo: Using HTTPS again
The problem seems to be related to our HTTP(S) server.
It is expected that the problem will be solved after the weekend.

Contributes to CURA-1445
2016-09-16 14:36:32 +02:00
Jaime van Kessel
6d2520ffbb _settingIsOverwritingInheritance now also checks if there is a non setting value before it
CURA-2361
2016-09-16 14:25:44 +02:00
Jaime van Kessel
4f547fff8d Category setting icon now becomes invible if clicked
CURA-2361
2016-09-16 13:58:26 +02:00
Jaime van Kessel
132ed1d258 Pressing inheritance button for category now makes all inherited children visible
CURA-2361
2016-09-16 13:10:14 +02:00
Jaime van Kessel
7793cb16d1 Updated documentation
CURA-2361
2016-09-16 12:49:15 +02:00
Jaime van Kessel
615ec67b1b Enabled property is now taken into account for inheritance override
CURA-2361
2016-09-16 11:49:23 +02:00
Jaime van Kessel
9a7057ce65 Use recursive check to add categories to list
CURA-2361
2016-09-16 11:45:57 +02:00
Jaime van Kessel
b43a5a7e31 Change order of initialisation, so we don't overwrite list with empty data
CURA-2361
2016-09-16 11:28:12 +02:00
Jaime van Kessel
e3d78c17ea SettingItem now uses settingInheritanceManager for visibility check
CURA-2361
2016-09-16 11:22:50 +02:00
Jaime van Kessel
e282e35b9c Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-16 11:19:19 +02:00
Jaime van Kessel
5d84490d70 SettingInheritance manager now has a complete list of all settings that have inheritance overridden
CURA-2361
2016-09-16 11:18:20 +02:00
Ghostkeeper
c7b5a0afb3
Improve inheritance of fan speed at height
It compensates for the '- layer_height_0' by adding +1 back after the division. Also use floor, since I find that more intuitive since the break points come up at exactly the slice heights instead of at 0.25, 0.35, 0.45, etc.

Contributes to issue CURA-2314.
2016-09-16 11:09:18 +02:00
TotalRetribution
54e8f34311 Moved outer_inset_first setting in fdmprinter.def.json to the shell category just above Alternate Extra Wall as per BagelOrb suggestion. 2016-09-16 09:57:39 +01:00
Jaime van Kessel
50f7c41ae4 Added SettingsInheritanceManager
CURA-2361
2016-09-16 09:38:52 +02:00
Jaime van Kessel
84997d8c4e Update README.md 2016-09-15 18:05:12 +02:00
Jaime van Kessel
d820587069 Addded the orientation plugin 2016-09-15 18:04:48 +02:00
nickthetait
1c07ac7029 Merge branch 'um-master' into gh-issue-980 2016-09-15 09:58:51 -06:00
fieldOfView
c50cae6d28 Fix showing additional components for UM3Ex
CURA-2276 and CURA-2277
2016-09-15 17:43:25 +02:00
fieldOfView
5024581e2e Fix events for added components
Not sharing the _context variable with the machine action fixes signals and events being sent to the additional components.

CURA-2277 and CURA-2276
2016-09-15 17:42:36 +02:00
nickthetait
4ffcabd856 Standardize formatting of fdmprinter definition
Used custom settings in JSON Editor Plugin for Eclipse and afterwards removed some extra whitespace changes that are not desired
Fixes github #980
2016-09-15 09:11:46 -06:00
Jack Ha
692eb42aa7 When switching nozzle or material, drop mismatching quality changes. CURA-2248 2016-09-15 17:05:14 +02:00
Jack Ha
effddcbc5e Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-15 15:30:16 +02:00
Jack Ha
5c553d7bcd Fix custom profile visibility for different variants, materials and machines. CURA-2248 2016-09-15 15:29:57 +02:00
TotalRetribution
76075c53cf Added setting outer_inset_first to experimental category in fdmprinter.def.json 2016-09-15 14:04:26 +01:00
fieldOfView
2725abd4f4 Don't show Request Access button when no printer is connected
CURA-2276
2016-09-15 14:49:15 +02:00
fieldOfView
7ab7b2f561 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-09-15 14:44:55 +02:00
fieldOfView
04ce21d48e Only show additional components info for the currently active printer
CURA-2276
2016-09-15 14:44:40 +02:00
fieldOfView
cf2c3e79cf Do not show the "Request Access" button when no printer is connected
CURA-2277
2016-09-15 14:17:04 +02:00
fieldOfView
00c328bfe9 Fix qml warnings when no printer is connected 2016-09-15 13:44:12 +02:00
Arjen Hiemstra
d0ad654108 Re-enable selectMultiple for the open file dialog
Fixes CURA-2198
2016-09-15 13:40:25 +02:00
Jaime van Kessel
96e36c0555 Refreshing zeroconf multiple times no longer causes cura crash
CURA-2393
2016-09-15 13:32:13 +02:00
fieldOfView
19b6d716c7 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-09-15 13:15:31 +02:00
fieldOfView
0af26cc4a7 Prevent qml warning when no printer is connected 2016-09-15 13:15:19 +02:00
Ghostkeeper
ef3b6905b7
Translate skin overlap properly
From this dict it also gets updated in other places, such as the preferences.

Contributes to issue CURA-844.
2016-09-15 12:47:39 +02:00
Ghostkeeper
c223044541
Don't modify original dict while iterating over it
Just store the results in a new dict and return that one.
2016-09-15 12:47:39 +02:00
fieldOfView
b914aefac6 Allow fractional input 2016-09-15 11:48:48 +02:00
fieldOfView
34aeb50b6a self._code_style 2016-09-15 10:21:32 +02:00
fieldOfView
6fce94062a Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-09-15 10:20:42 +02:00
fieldOfView
790ad4a09e Show simple extruder names in Printers menu 2016-09-15 10:20:25 +02:00
Jaime van Kessel
a5e6742cfa Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-15 09:43:11 +02:00
Jaime van Kessel
277123d1d3 Brim, raft & skirt settings are now retrieved from correct extruder (if any)
CURA-2245
2016-09-15 09:42:13 +02:00
Thomas Karl Pietrowski
145c483c02 Merge remote-tracking branch 'refs/remotes/Ultimaker/master' 2016-09-14 22:06:04 +02:00
Thomas Karl Pietrowski
35e1062eb9 Merge remote-tracking branch 'refs/remotes/Ultimaker/master' 2016-09-14 22:02:26 +02:00
fieldOfView
35d95c74f0 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-09-14 17:40:12 +02:00
fieldOfView
cf7a6730d1 Add a menuitem to load the nozzle/material loaded on the printer
CURA-2276
2016-09-14 17:39:49 +02:00
fieldOfView
20f76b62fe Hide "Request Access" buttons when access request is active
CURA-2277 & CURA-2276
2016-09-14 16:40:20 +02:00
fieldOfView
f11308e74e Allow syncing materials & printcores from the Printers preference pane
CURA-2276
2016-09-14 16:21:00 +02:00
Ghostkeeper
5c5d188889
Remove support_area_smoothing setting
Contributes to issue CURA-2296.
2016-09-14 15:41:32 +02:00