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
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
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
Arjen Hiemstra
d0ad654108
Re-enable selectMultiple for the open file dialog
...
Fixes CURA-2198
2016-09-15 13:40:25 +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
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
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
Ghostkeeper
5c5d188889
Remove support_area_smoothing setting
...
Contributes to issue CURA-2296.
2016-09-14 15:41:32 +02:00
Ghostkeeper
5c49adc52e
Also return tuple if upgrading failed
...
It is checked if the file data is None or empty (the upgrade is then considered 'failed'). But to unpack the file data, it needs to be a tuple.
Contributes to issue CURA-844.
2016-09-14 15:41:32 +02:00
fieldOfView
151fcfdda6
Update method order for readability
2016-09-14 15:15:54 +02:00
fieldOfView
a47ffb2288
Remove commented out code
2016-09-14 14:57:26 +02:00
fieldOfView
549766e5f6
Fix layout of buttons on profile page
...
CURA-2368
2016-09-14 14:15:34 +02:00
fieldOfView
ab50ac0d89
Don't show possibly incorrect materials in print monitor
2016-09-14 13:59:00 +02:00
Jaime van Kessel
98a759196d
Simplified Buildvolume
...
CURA-2245
2016-09-14 13:25:29 +02:00
Jaime van Kessel
02c1a8d069
Fixed wrong indenting
2016-09-14 12:52:15 +02:00
Jaime van Kessel
8b71364ee8
Merge branch 'master' of github.com:Ultimaker/Cura
2016-09-14 11:44:41 +02:00
Jaime van Kessel
e12acb8110
We now remove all material containers instead of the active machine variant
...
CURA-2210
2016-09-14 11:44:08 +02:00
Ghostkeeper
0c760d04d3
Update translation template
...
A string freeze is in effect now.
Contributes to issue CURA-570.
2016-09-14 11:23:51 +02:00
Tim Kuipers
479f9ea6d2
refactor: global_inherits_stack ==> limit_to_extruder (CURA-2308)
2016-09-14 10:46:57 +02:00
fieldOfView
e43dbcd0b7
Code style
...
CURA-2235
2016-09-14 09:37:53 +02:00
fieldOfView
6334f74fc6
Merge branch 'master' of https://github.com/Ultimaker/Cura
2016-09-14 08:52:05 +02:00
fieldOfView
72b4442320
Show warning in layerview that wireprint display is not accurate
...
CURA-2288
2016-09-14 08:50:46 +02:00
fieldOfView
21e413ca4f
Hide extruder, nozzle & material selection in Print Monitor
2016-09-14 08:19:57 +02:00
fieldOfView
e422eb6ee5
Fix sidebar height when switching to UM2
...
When switching from a multiextrusion printer to the UM2, sometimes too much whitespace would be left for the sidebar header
2016-09-14 08:15:43 +02:00
Jaime van Kessel
4d84584f59
Simplified statement as per review
...
CURA-2271
2016-09-13 17:31:15 +02:00
Jaime van Kessel
7caecd0a41
Merge branch 'master' of github.com:Ultimaker/Cura
2016-09-13 17:28:08 +02:00
Jaime van Kessel
76e57c940d
Added more specific error message when trying to slice with incompatible material
...
CURA-2271
2016-09-13 17:27:29 +02:00
Tim Kuipers
ad91c71c2b
Merge branch 'master' of github.com:Ultimaker/Cura
2016-09-13 16:45:45 +02:00
Tim Kuipers
9cd6a8c1ae
JSON feat: machine_name as a setting for the 3D printer model type (CURA-2360)
2016-09-13 16:44:55 +02:00
Jack Ha
bfdb5e68a1
Merge branch 'master' of github.com:Ultimaker/Cura
2016-09-13 15:09:46 +02:00
Jack Ha
31b0f74874
Change url of cura stats. CURA-1445
2016-09-13 15:09:33 +02:00
Ghostkeeper
89fb92edbd
Disable upgrading current settings altogether
...
The current settings in 2.1 specified a machine instance. In 2.2 they specify a machine definition. There is not enough information in one file to be able to translate that.
Contributes to issue CURA-844.
2016-09-13 14:58:13 +02:00
Jaime van Kessel
b707c8d806
XML profile now returns serialization data even if it's read only
...
This way exporting read only profiles is possible again.
CURA-2359
2016-09-13 14:57:00 +02:00
Jaime van Kessel
d6e95d2734
Added error state for container state if serialization data is none
...
CURA-2359
2016-09-13 14:54:17 +02:00
Jaime van Kessel
db512d3b05
Merge branch 'master' of github.com:Ultimaker/Cura
2016-09-13 14:49:09 +02:00
Jaime van Kessel
4db1db302b
Changed guid to GUID in the filter
...
We use the veriable as upper.
2016-09-13 14:35:45 +02:00
