Jack Ha
5d15d6e792
Merge branch 'master' into feature_multiextruder_machinesettings
2017-05-02 17:26:27 +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
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
d7004d3547
Merge branch 'master' of github.com:Ultimaker/Cura into cura_containerstack
2017-05-02 11:42:16 +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
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
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
Victor Larchenko
4f446bfcbc
Added filament cost keyword replacement
2017-04-27 16:44:43 +06:00
fieldOfView
9371b28cb3
Add color swatch for "by material" view style and show proper extruder names
2017-04-25 18:55:25 +02:00
fieldOfView
49880d54ad
Remove code repetition while touching up layout
2017-04-25 18:45:43 +02:00
fieldOfView
0b9f451103
Apply color to layerview legend labels directly
...
The Label style property should not be confused with e TextField style property
2017-04-25 18:15:04 +02:00
fieldOfView
2493bd6fe6
Merge branch 'master' into themed-layer-view
2017-04-25 18:06:12 +02:00
Arjen Hiemstra
0fad973181
Never enable the per-object tool when in simple mode
...
Contributes to CURA-3577
2017-04-25 16:12:36 +02:00
Arjen Hiemstra
7822173881
Remove extruder selection from per-object settings tool
...
Contributes to CURA-3577
2017-04-25 16:12:03 +02:00
fieldOfView
57f936e5ff
Remove definition_changes containers when a stack is removed
2017-04-24 13:56:37 +02:00
fieldOfView
8b5ac81404
Fix extruder_stack global values are moved to
...
ExtruderManager.getMachineExtruders() result is not sorted, the result of getActiveExtruderStacks() is
2017-04-24 13:20:20 +02:00
fieldOfView
3e9fdb5db1
Prevent the DiscardOrKeepProfileChangesDialog from popping up (twice) if there are user changes
2017-04-24 13:11:10 +02:00
fieldOfView
fab0fa1dde
Move setting values that are settable per extruder from/to global stack when setting extruder count
2017-04-24 12:58:20 +02:00
fieldOfView
d2d36b8c98
Lower extruder_nr settings when they exceed the number of extruders
2017-04-22 12:17:16 +02:00
fieldOfView
2ca24ba7e6
Restore both material and variant to match 1st extruder when switching to single extrusion
2017-04-22 11:20:55 +02:00
fieldOfView
8d42f9c187
Move some convoluted logic from QML into Python
2017-04-22 10:13:58 +02:00
fieldOfView
933ee408e4
Code style
2017-04-22 09:47:00 +02:00
fieldOfView
0966ef5338
Fix QML warnings when switching to an extruder tab
2017-04-21 21:48:20 +02:00
fieldOfView
656e7a8046
Change the scope of the head polygon functions to be inside the main tab
2017-04-21 21:27:15 +02:00
fieldOfView
ba229444b7
Pause autoslicing while the MachineSettingsAction is open
...
Each setting-change would cause a reslice, which is unnecessary.
2017-04-21 21:05:28 +02:00
fieldOfView
4d12ab1296
Merge branch 'master' into feature_multiextruder_machinesettings
2017-04-21 19:31:44 +02:00
Victor Larchenko
e47ca7a68d
Merge remote-tracking branch 'um/master' into gcode-keywords
2017-04-21 14:36:22 +06:00
daid
50acaaf91f
Some minor changes on review.
2017-04-20 09:35:48 +02:00
daid
26a2fb80dc
Only update the target bed temperature, without submitting it to the printer. To prevent race conditions.
2017-04-19 15:01:47 +02:00
Jaime van Kessel
c20542b7b8
Merge branch 'feature_CURA-3540_upgrade_for_project' of github.com:Ultimaker/Cura
2017-04-18 15:33:53 +02:00
Ghostkeeper
f1ac1bd876
Add JellyBox to XML material printer name translations
...
Because the automatic translation removes the underscore, and then the definition can't be found any more.
Contributes to issue CURA-3695.
2017-04-18 15:11:24 +02:00
fieldOfView
94545ec4ee
Restore active extruder after forcing an update of the global extruder stack
2017-04-15 20:09:20 +02:00
fieldOfView
6e0221636d
Save definition_changes in their own folder
2017-04-15 20:03:09 +02:00
fieldOfView
813ee65849
Update printer (& disallowed areas) when setting nozzle offsets
2017-04-15 18:58:25 +02:00
fieldOfView
12079fc9da
Add documentation
2017-04-15 18:55:59 +02:00
Lipu Fei
b3f60c461b
Fix type hinting and function name for upgrade profile
...
CURA-3540
2017-04-14 15:40:18 +02:00
Jaime van Kessel
397b08ce6d
Merge branch 'feature_filter_materials_by_diameter' of git://github.com/fieldOfView/Cura
2017-04-14 11:22:35 +02:00
Lipu Fei
4f2c76e462
Update a profile when deserializing it
...
CURA-3540
2017-04-14 10:50:42 +02:00
Jaime van Kessel
d6d6036760
Fixed minor mistake with pull request
...
CURA-3681
2017-04-14 10:29:24 +02:00
Jaime van Kessel
04d2f8d68c
Merge branch 'usbprinting-zparseerror-refactor' of git://github.com/tamarintech/Cura
2017-04-14 10:28:14 +02:00
Jaime van Kessel
bb752fa16f
Added more logging
2017-04-13 19:05:13 +02:00
fieldOfView
e92aaca7b6
Filter materials by the (approximate) material diameter of the printer
...
If a machine defines material diameter of 2.85mm, there is no use to show the 1.75mm materials and vice-versa
2017-04-12 23:03:58 +02:00
Jaime van Kessel
558b446b4a
Fixed UMO g-code files not being loadable
...
The processGcode did not take gcode + comments in the same line into account
CURA-3677
2017-04-12 17:32:47 +02:00
fieldOfView
f15345a0cb
Restore material on global stack when switching back to single extrusion
...
MachineManager._onGlobalContainerChanged removes the global material of multiextruder machines
2017-04-11 12:18:33 +02:00
Elijah Snyder
b4f6ae8c5f
First refactor for section to increase verbosity and move all translated M105s.
2017-04-10 19:01:59 -05:00
fieldOfView
6dd642469a
Set value before activating another extruder
...
Because all extruder tabs share the same SettingPropertyProvider, we want the property provider value to update before its container stack is changed, or the value carries over to the other containerstack, leaving the value for the initial containerstack unchanged
2017-04-10 20:37:41 +02:00
fieldOfView
df7f039826
Store extruder settings in definition_changes containers
2017-04-10 18:26:10 +02:00
fieldOfView
499971d55c
Fix loading values on 1st extruder tab
2017-04-10 17:24:02 +02:00
