Ghostkeeper
61f7b6aa68
Add spaces around binary operator
...
According to our code style.
Contributes to issue CURA-3756.
2017-05-09 13:07:41 +02:00
Lipu Fei
53141303d2
WIP: Fix project loading
...
CURA-3756
2017-05-09 13:07:41 +02:00
Jaime van Kessel
7632b9df79
Removed unused connection
2017-05-09 10:27:50 +02:00
Jaime van Kessel
bb0d534f4a
Revert "Set machine_extruder_count in sync with defined extruders"
...
This reverts commit b69f337ddb50bb8e5dc39107f75d4112b14527d1.
2017-05-08 15:31:44 +02:00
Jaime van Kessel
ac39934336
Revert "Starting machineSettingAction no longer resets extruder count to 1"
...
This reverts commit 452a6a095c0866a080e19d89a71e1857e011456f.
2017-05-08 15:30:39 +02:00
Jaime van Kessel
bd25448021
Changes to make um2 upgrade work with new stack changes
...
CURA-3742
2017-05-08 15:03:39 +02:00
Jaime van Kessel
293f1ac029
Merge branch 'feature_um2_olsson' of https://github.com/fieldOfView/Cura
2017-05-08 14:35:37 +02:00
Jaime van Kessel
452a6a095c
Starting machineSettingAction no longer resets extruder count to 1
2017-05-08 14:25:13 +02:00
Jaime van Kessel
8efbbbb3f3
Merge pull request #1809 from fieldOfView/fix_multiextruder_machinesettings
...
Fix multiextruder machinesettings
2017-05-08 14:08:01 +02:00
Ghostkeeper
a9813146c4
Evaluate global stack first
...
The global stack has 99% of all settings. So most of the times the setting definition we are looking for is here. This should make it a bit faster to find.
Contributes to issue CURA-3772.
2017-05-08 13:35:28 +02:00
Ghostkeeper
281a01dd1f
Remove unused variable
...
Contributes to issue CURA-3772.
2017-05-08 13:35:28 +02:00
Ghostkeeper
2137c30bd6
Also check extruders for definitions of error settings
...
Contributes to issue CURA-3772.
2017-05-08 13:35:28 +02:00
fieldOfView
98b127851b
Fix setting number of extruders when hasVariants is set
2017-05-08 12:54:12 +02:00
Lipu Fei
a3d92d557d
GCodeProfileReader: make deserialization more robust
...
CURA-3770
2017-05-08 11:33:50 +02:00
Lipu Fei
3a5a28cc38
Use CuraStack.qualityChanges to get quality changes
...
CURA-3770
2017-05-08 11:33:50 +02:00
Ghostkeeper
e19d5411c2
Expand log message when getting no definition when listing error settings
...
So that someone reading the log gets a clue where the error message occurs and why.
Contributes to issue CURA-3772.
2017-05-08 11:17:37 +02:00
Jaime van Kessel
8ba0ee126e
Merge branch 'master' of github.com:Ultimaker/Cura
2017-05-08 10:31:10 +02:00
Jaime van Kessel
63eceda75e
Added handling for if definition for error handling was not found
...
CURA-3772
2017-05-08 10:28:31 +02:00
Lipu Fei
a039f9552e
Trigger extruderTabsCount update when MachineSettings dialog shows
...
CURA-3755
2017-05-08 09:47:42 +02:00
Ghostkeeper
6f0b81d046
Merge branch 'master' of https://github.com/rmcolbert/Cura into rmcolbert-master
2017-05-08 09:38:56 +02:00
14bitVoid
f15aa66751
Receive time estimates per feature
2017-05-05 00:05:17 +02:00
Ghostkeeper
81ea9556eb
Fix showing layer view if there is no material
...
The layer view would request the colour of the material. If there is no material, that would give an error.
Contributes to issue CURA-3497.
2017-05-04 17:56:57 +02:00
Lipu Fei
314fa8b1c8
Fix Enter key trigger for UM3 Add Printer dialog
2017-05-04 15:27:29 +02:00
Lipu Fei
0171d9637c
Fix mode switching issue in LayerView
...
CURA-3730
2017-05-04 15:15:38 +02:00
Ghostkeeper
945486ade9
Merge branch 'cura_containerstack'
...
Contributes to issue CURA-3497.
2017-05-03 17:11:55 +02:00
Ghostkeeper
b69f337ddb
Set machine_extruder_count in sync with defined extruders
...
The registry checks if they are in sync and complains if they aren't. The extruder count is set back to default to 1 upon adding the machine.
Contributes to issue CURA-3497.
2017-05-03 17:01:08 +02:00
Ghostkeeper
41e444714f
Fix spacing
...
Minor code style stuff.
2017-05-03 16:54:20 +02:00
Ghostkeeper
cd78ab850d
Remove semicolons
...
Semicolons, a relic of the past.
Contributes to issue CURA-3497.
2017-05-03 16:03:47 +02:00
Ghostkeeper
337be1b9be
Fix setting machine changes profile with new specified container stacks
...
Don't need to insert it, because there's already a slot for it on the stack. In fact, you're not allowed to insert anything.
Contributes to issue CURA-3497.
2017-05-03 15:38:20 +02:00
Ghostkeeper
c42d092b0f
Merge branch 'master' into cura_containerstack
2017-05-03 15:21:01 +02:00
Jaime van Kessel
8d6450111a
Merge branch 'feature_CURA-3730' of github.com:Ultimaker/Cura
2017-05-03 14:15:50 +02:00
Lipu Fei
c2dff9fcd9
Accept Enter key on UM3 Add Printer Dialog
2017-05-03 13:58:58 +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
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
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
