Jaime van Kessel
1e54fcda82
Merge branch 'master' of github.com:Ultimaker/Cura
2016-11-24 17:57:00 +01:00
Jaime van Kessel
823993caaf
ALways add prime areas
...
CURA-2625
2016-11-24 17:56:17 +01:00
Tim Kuipers
2df6de1814
JSON fix: layer_start_x and y description update for better understanding (CURA-1112)
2016-11-24 17:28:34 +01:00
Tim Kuipers
de8e49b247
JSON language fix: start_layers_at_same_position is now Start Layers With The Same Part (CURA-1112)
2016-11-24 17:25:38 +01:00
Jack Ha
c3e086ce82
Merge branch 'master' of github.com:Ultimaker/Cura
2016-11-24 17:05:22 +01:00
Jack Ha
be2a802aa2
Changed ultimaker3 def so relations are retained.
2016-11-24 17:05:06 +01:00
Jaime van Kessel
1d2d31c81b
Update Usbprinter output request write
2016-11-24 16:03:56 +01:00
Jaime van Kessel
79259a2717
Updated requestWrite for new API
2016-11-24 16:00:28 +01:00
jack
84759e5808
Merge pull request #1176 from Ultimaker/rework_file_handler
...
Rework file handler CURA-1263
2016-11-24 14:56:05 +01:00
Jaime van Kessel
f3d0ad2292
Merge branch 'master' of github.com:Ultimaker/Cura
2016-11-24 14:52:10 +01:00
Jaime van Kessel
9a81a24512
Merge branch 'feature_find_settings' of https://github.com/fieldOfView/Cura
2016-11-24 14:47:02 +01:00
Jack Ha
b88ed76b7c
Solve merge conflict PrinterOutputDevice. CURA-1263
2016-11-24 13:55:22 +01:00
Jack Ha
072d33ec68
Fixed profiles by removing double entries and changing math.round to round.
2016-11-24 12:58:33 +01:00
fieldOfView
d045738dc8
Simplify button width logic
2016-11-24 11:51:35 +01:00
Jack Ha
a8d5537487
Fix XmlMaterialProfile setProperty in correct container. Contributes to CURA-2861
2016-11-24 11:19:46 +01:00
Ghostkeeper
44f309226a
Make initial layer speed scale with normal speed
...
All profiles that set the print speed are edited as well to make sure that the initial layer speed is still the same.
Contributes to issue #1170 .
2016-11-24 10:19:49 +01:00
fieldOfView
9dd8a88602
Fix review issues
2016-11-24 10:12:11 +01:00
fieldOfView
21bcb0e434
Create a definition_changes container instead of a second variant
2016-11-23 22:53:03 +01:00
fieldOfView
9e048aa6ad
Get gcode flavor options from propertyprovider instead of hardcoding
2016-11-23 22:04:20 +01:00
fieldOfView
edf4589150
Use fixed width font and no wrapping in start/end gcode editor
2016-11-23 22:04:20 +01:00
fieldOfView
497b6f99a4
Fix finding existing variant by id
...
ContainerStack.findContainer cannot find a container by id directly.
2016-11-23 22:04:19 +01:00
fieldOfView
78475d68b3
Fix creating variants
2016-11-23 22:04:18 +01:00
fieldOfView
c8cedb301a
Use insertContainer instead of adding a parameter to addContainer
2016-11-23 22:04:18 +01:00
fieldOfView
5f147b6c78
Hide nozzle size setting for machines that use variants for nozzle sizes
2016-11-23 22:04:17 +01:00
fieldOfView
b6689870f5
Make Machine Settings compatible with machines that use variants (UM2+)
...
For machines that use variants, a second variant container is added between the machine definition and the variant.
2016-11-23 22:04:16 +01:00
fieldOfView
1325c31882
Remove hardcoded container index
2016-11-23 22:04:16 +01:00
Ghostkeeper
29e04bb825
Don't change the prime tower size based on prime tower enable
...
The prime tower is properly disabled in the engine nowadays if prime_tower_enable is false.
2016-11-23 17:35:17 +01:00
Jaime van Kessel
8c35c8fbc3
Inheritance manager no longer sees settings as setting if they use enum value
2016-11-23 17:27:27 +01:00
Jaime van Kessel
c00775c488
Bounding box will no longer sing first part of batman theme
...
CURA-2963
2016-11-23 16:36:09 +01:00
Jaime van Kessel
b6df2b90dd
Merge branch 'master' of github.com:Ultimaker/Cura
2016-11-23 14:06:17 +01:00
Jaime van Kessel
a8887406ac
ValidationState checking in MachineManager now properly takes functions into account
...
CURA-2840
2016-11-23 14:05:33 +01:00
Jack Ha
06ed55b0ef
Merge branch 'master' of github.com:Ultimaker/Cura
2016-11-23 13:33:27 +01:00
Jack Ha
c3320bb1a4
Change settings to settings/overrides in selected messages. CURA-2898
2016-11-23 13:33:12 +01:00
Jaime van Kessel
f7e9914401
Camera stream is now restored if the printer got a timeout
...
CURA-2411
2016-11-23 13:23:01 +01:00
Jaime van Kessel
e77d7f1f20
PrinterOutput now keeps track of camera state
...
CURA-2411
2016-11-23 13:22:02 +01:00
Jaime van Kessel
8aa5ea5864
Merge branch 'master' of github.com:Ultimaker/Cura
2016-11-23 12:48:24 +01:00
Jaime van Kessel
c1dda7505c
Inheritance manager now also checks for inheritance if enabled property changed
...
CURA-2860
2016-11-23 12:47:54 +01:00
Ghostkeeper
54df4c17e1
Add Dutch translation for 'Information' title
...
This is to make it easier to test whether this title can be translated, both for me and for our QA team.
Contributes to issue CURA-2808.
2016-11-23 12:45:12 +01:00
Jaime van Kessel
c69ffd5b32
Merge branch 'master' of github.com:Ultimaker/Cura
2016-11-23 12:42:17 +01:00
Jaime van Kessel
716ffe94ff
Don't show inheritance icon for resovled values
...
CURA-2860
2016-11-23 12:41:53 +01:00
Jack Ha
124e2b47ea
Fix display issue layer view reset positions, center point in select all. CURA-2925 CURA-3012
2016-11-23 11:56:27 +01:00
Simon Edwards
89d6101bfc
Merge pull request #1157 from Ultimaker/thopiekar-i18n-de-update
...
Correcting German translation
2016-11-23 11:00:22 +01:00
Ghostkeeper
4954e9643a
Merge branch 'feature_anti_support'
2016-11-22 16:37:17 +01:00
Jaime van Kessel
e17eda9a33
Removed debug prints
...
CURA-2860
2016-11-22 15:25:54 +01:00
Jaime van Kessel
75e067cab7
No longer select last_entry that isn't in the list
...
CURA-2860
2016-11-22 15:24:01 +01:00
Jaime van Kessel
fa174763cf
The 3mf workspace reader no longer locks application if it is accedently called from main
...
CURA-1263
2016-11-22 14:57:44 +01:00
Jack Ha
aa718fc013
Merge branch 'master' into feature_config_dir_lock
2016-11-22 14:46:00 +01:00
Jaime van Kessel
60d2d0d092
Workspace reader is now a lot more transactional;
...
Instead of adding the instance containers on the go, we add them right before serializing the stack.
This enables us to remove them if the stack serialization goes wrong
CURA-1263
2016-11-22 14:15:12 +01:00
Jaime van Kessel
88588454c8
Merge branch 'master' of github.com:Ultimaker/Cura into rework_file_handler
2016-11-22 13:58:41 +01:00
fieldOfView
933ed5177f
Toggle visibility of filter field when pressing the "search" icon
2016-11-22 13:44:41 +01:00
