6996 Commits

Author SHA1 Message Date
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
Jaime van Kessel
8a67f44cf0 We now also write with the preferedSuffix
CURA-1263
2016-11-22 13:38:06 +01:00
Jaime van Kessel
e3eb75ab6e We now get material container by mimetype
CURA-1263
2016-11-22 13:37:11 +01:00
Jaime van Kessel
cba31d95ec Workspace reader now loads from prefered suffix
CURA-1263
2016-11-22 13:33:10 +01:00
Jaime van Kessel
42caf57993 Added "material" to default resolve strategies
CURA-1263
2016-11-22 13:31:58 +01:00
Tim Kuipers
1bc0fdebc9
JSON fix: disable post-wipe on prime tower for UM3 (CURA-2325)
it has nozzle lifting so it's impossible!
2016-11-22 13:23:53 +01:00
Tim Kuipers
e0b4246336
JSON fix: use exponent function ** 2 rather than x * x (CURA-2325) 2016-11-22 13:23:53 +01:00
Tim Kuipers
1e343c26eb
JSON fix: better description dual_pre_wipe (CURA-2325) 2016-11-22 13:23:53 +01:00
Tim Kuipers
61780b4980
make prime_tower_min_volume settable per extruder (CURA-2325) 2016-11-22 13:23:52 +01:00
Tim Kuipers
5e2f055cfe
JSON fix: better defaults hollow prime tower settings (CURA-2325) 2016-11-22 13:23:52 +01:00
Tim Kuipers
8016cb648b
JSOn fix: better language hollow wipe tower settings (CURA-2325) 2016-11-22 13:23:52 +01:00
Tim Kuipers
c95f983b9b
JSON feat: prime_tower_min_volume and prime_tower_wall_thickness (CURA-2325) 2016-11-22 13:23:52 +01:00
Tim Kuipers
64aafcc858
JSON fix: make wiping settable per extruder (CURA-2325) 2016-11-22 13:23:51 +01:00