Commit graph

12694 commits

Author SHA1 Message Date
Jaime van Kessel
f062322ebf Switching from dual extrusion to single extrusion machine is now possible again
CURA-3497
2017-05-03 10:59:07 +02:00
Lipu Fei
ac560229a1 Fix TypeError in JobSpec.qml due to material cost being undefined 2017-05-03 10:45:39 +02:00
Jaime van Kessel
ab6240bd31 Replace quality(changes) in machine manager now uses new API as well
CURA-3497
2017-05-03 10:38:31 +02:00
Lipu Fei
0b57fa0bcb Hide Top/Bottom and Inner Wall legends in "Material Color"
CURA-3730
2017-05-03 10:37:24 +02:00
Jaime van Kessel
a028297cb2 Machine manager now uses the new specific setters to switch instanceContainers
CURA-3497
2017-05-03 10:15:18 +02:00
Jaime van Kessel
8d80f20db7 Added way to dynamicly set loading order
This is to ensure that Global stacks are loaded before extruders, so once the extruders are deseralized, they can always find the next (global) stack

CURA-3497
2017-05-03 09:54:00 +02:00
Jack Ha
0452cffff9 Fix setting active extruder when changing Custom FDM printer extruders. CURA-3299 2017-05-03 09:37:12 +02:00
Robert Colbert
b6a5e5a1af Added VCP serial device support for USB Printing on Windows. 2017-05-02 12:51:34 -05:00
Tim Kuipers
034f93debc JSON remaining settings limit_to_extruder (CURA-3740) 2017-05-02 18:04:00 +02:00
Tim Kuipers
11d6434b75 JSON speed settings limit_to_extruder (CURA-3740) 2017-05-02 17:53:06 +02:00
Tim Kuipers
e63d9743de JSON shell settings limit_to_extruder (CURA-3740) 2017-05-02 17:46:58 +02:00
Jack Ha
5d15d6e792 Merge branch 'master' into feature_multiextruder_machinesettings 2017-05-02 17:26:27 +02:00
Tim Kuipers
4130308437 JSON infill settings limit_to_extruder (CURA-3740) 2017-05-02 17:26:06 +02:00
Tim Kuipers
202129dc47 JSON resolution settings limit_to_extruder (CURA-3740) 2017-05-02 17:18:02 +02:00
Jaime van Kessel
58ab9dcd09 Fixed wrong typehinting 2017-05-02 17:00:26 +02:00
Tim Kuipers
6744bf192d JSON feat: extruder_nr per feature type (CURA-3740) 2017-05-02 16:51:55 +02:00
Ghostkeeper
745e3cd5bf
Merge branch 'alephobjects-gcode-keywords' 2017-05-02 14:57:22 +02:00
Ghostkeeper
5176b98f6e
Set the correct result in visible settings
Oops.

Contributes to issue CURA-3491.
2017-05-02 13:58:11 +02:00
Ghostkeeper
a988571d2b
Merge branch 'gcode-keywords' of https://github.com/alephobjects/Cura2 into alephobjects-gcode-keywords 2017-05-02 13:50:37 +02:00
Ghostkeeper
d006db5b2c
Slightly reduce minimum window size
This should make it possible to work with Cura on 1024x768 screens. I interpolated this from the 800p screens, since it seems to render smaller on my computer anyway.
2017-05-02 13:39:12 +02:00
Tim Kuipers
c69000da75 Merge branch 'feature_support_stair_width' 2017-05-02 13:22:19 +02:00
Ghostkeeper
7a9a4ae290
Revert "Change Label to Text because of ugle font rendering"
This reverts commit 8c9eccd1f4. This element is in a modal window, where the fonts should get the system themeing.
2017-05-02 12:58:29 +02:00
Mark
39af3aea4c Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-02 12:55:56 +02:00
Mark
0e1748b705 Small layout fix so the comboboxes are aligned 2017-05-02 12:55:37 +02:00
Ghostkeeper
bb0e9c3fdc
Split interface line distance into two in user's profiles
This hasn't been deep-tested yet, but I assume that'll happen when the plug-in is reactivated in the source code.

Contributes to issue CURA-3491.
2017-05-02 12:36:25 +02:00
Jaime van Kessel
3dae6b4bbf Fixed machine not being set 2017-05-02 11:58:48 +02:00
Jaime van Kessel
d7004d3547 Merge branch 'master' of github.com:Ultimaker/Cura into cura_containerstack 2017-05-02 11:42:16 +02:00
Jaime van Kessel
4bdbe42dcb Fixed type hinting issues
CURA-3497
2017-05-02 11:21:17 +02:00
Jaime van Kessel
69c3baf87f Fixed unit test
CURA-3497
2017-05-02 11:06:25 +02:00
Ghostkeeper
f612a53563
Detect more temperature settings in start g-code
Other settings such as the layer 0 temperatures are now also properly detected.
2017-05-02 09:52:38 +02:00
Jaime van Kessel
2bc4355f00 Merge branch 'fix_hover_effects' of https://github.com/fieldOfView/Cura 2017-05-02 09:40:08 +02:00
Jaime van Kessel
c815077278 Fixed the upgraderFileRename test
CURA-3479
2017-05-01 17:28:55 +02:00
Jaime van Kessel
e6e442348b Fixed one of the tests
The test failed due to it not creating the right application CURA-3497
2017-05-01 16:10:05 +02:00
Ghostkeeper
5b8e1f25b7
Don't add prime tower area if single extrusion
Simple papercut fix.
2017-05-01 14:25:08 +02:00
Mark
be21cd7f7d Fix preference category double name 2017-05-01 13:25:13 +02:00
fieldOfView
f18947681a Disambiguate theme name 2017-04-30 23:25:14 +02:00
fieldOfView
93197cd173 Add hover effect to mode switch text labels 2017-04-30 23:21:49 +02:00
fieldOfView
0c6a5328c8 Add hover effect to mode switch control
While simplifying theme additions
2017-04-30 22:52:54 +02:00
fieldOfView
98aca20197 Fix hover effect on "enable support" checkbox 2017-04-30 22:27:07 +02:00
fieldOfView
4dea518c72 Add Upgraded Parts action for UM2 to add support for Olsson block
This adds a set of variants that just set the nozzle diameter and nozzle tip diameter. These variants are not used until the machine action sets the has_variants metadata entry.
2017-04-30 12:38:46 +02:00
fieldOfView
c9039bb6fc Add a field to set the material diameter for the printer
This is used to filter the list of available materials, see https://github.com/Ultimaker/Cura/pull/1685
2017-04-30 11:08:24 +02:00
fieldOfView
d12e323853 Add definition for Alya 3d printer
See https://github.com/Ultimaker/Cura/issues/1759
2017-04-30 10:53:23 +02:00
fieldOfView
577a8d0a3e Fix MaterialView layout issues
Make scrollview look more in line with the scrollview on the profiles page
2017-04-30 10:28:03 +02:00
fieldOfView
a1d9b1a37f Force update after unlinking material. 2017-04-29 21:19:54 +02:00
fieldOfView
67b8302d40 Add a notice to linked materials and allow "unlinking" a material. 2017-04-29 21:08:48 +02:00
fieldOfView
23cd6b1c2c Fix rendering of readonly description/adhesion info 2017-04-29 16:43:26 +02:00
Mark
b05954f99f Merge pull request #1740 from Ultimaker/feature_extruder_buttons
Add Extruder selection buttons to the Toolbar
2017-04-28 15:02:47 +02:00
Lipu Fei
37ec14c239 Merge pull request #1710 from alephobjects/theme-picker
Theme picker
2017-04-27 15:32:14 +02:00
Victor Larchenko
4f446bfcbc Added filament cost keyword replacement 2017-04-27 16:44:43 +06:00
Victor Larchenko
58a857403c Added resetting of theme 2017-04-27 16:37:01 +06:00