Commit graph

7337 commits

Author SHA1 Message Date
Jaime van Kessel
28eb4297c6 Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-28 11:38:13 +02:00
Jaime van Kessel
db0fb0c652 Compatible metadata entry is now correctly set for each variant & machine
CURA-2821
2016-10-28 11:37:09 +02:00
Jaime van Kessel
fcf3caba5a Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-10-28 10:46:37 +02:00
Jaime van Kessel
74d8148e0c The right stack is now used for limit to extruder setting property provider for single extrusion machine
This was mostly an issue when switching between printers, where some ids were set to undefined. CURA-2835
2016-10-28 10:44:57 +02:00
Jaime van Kessel
8b4a7a6183 Merge pull request #1088 from fieldOfView/fix_printrbot_simple
Fix printrbot simple mesh alignment to buildplate grid
2016-10-28 09:56:03 +02:00
Ghostkeeper
36fa4afc6c
Remove misguided attempt at representing UTF-8 encode length
It was commented out anyway. I also updated the documentation there.

Contributes to issue CURA-2692.
2016-10-28 09:55:19 +02:00
fieldOfView
6e683dffc5 Fix printrbot simple mesh alignment to buildplate grid 2016-10-27 23:35:29 +02:00
Ghostkeeper
717248bd78
Limit number of special characters
There is also a more advanced attempt that allows more, but I've commented it out because it doesn't quite work yet. Special characters now always count for 12.

Contributes to issue CURA-2652.
2016-10-27 21:55:58 +02:00
Ghostkeeper
37d1c0be36
Add validator for machine names
Currently this validator can't be used in QML due to a PyQt bug. I plan to call the validator manually upon receiving a signal that the text changed in a text box.

Contributes to issue CURA-2692.
2016-10-27 21:55:58 +02:00
Jaime van Kessel
a7f8adb80a Handles now correctly hide selection aura when in x-ray mode
USL-33
2016-10-27 20:14:39 +02:00
Jaime van Kessel
999380cf1b Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-27 17:15:58 +02:00
Arjen Hiemstra
e0b926878f Remove code that sets incompatible materials to invalid type
Instead use the "compatible" metadata entry like we do for nozzles.

Setting the type differently caused all code that looks for materials to
fail because "incompatible_material" is not "material". Since this is
the base file, this meant a lot of materials failed to duplicate
properly which caused crashes.

Contributes to CURA-2821
2016-10-27 15:45:29 +02:00
Jaime van Kessel
af8b7b599d Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-10-27 14:27:23 +02:00
Jaime van Kessel
1aa71d6171 Profiles model is now a singleton, to prevent the agressive garbage collecting to break stuff
CURA-2826
2016-10-27 14:26:43 +02:00
Ghostkeeper
b6464b12a1
Ignore externally loaded plug-ins
We include these plug-ins with the build system, but for development it's easy to have them linked or copied into the plug-ins folder. But don't commit them! So here we ignore these plug-ins.
2016-10-27 13:14:13 +02:00
Jaime van Kessel
4a5d7cbc73 Bindings of inheritance icon now correctly update when switching between machines
CURA-2752
2016-10-27 13:08:10 +02:00
Jaime van Kessel
b381186331 Set um2+ height to same as um2 2016-10-27 13:02:38 +02:00
fieldOfView
740ce1fa0b Fix errors when switching from UM3 to UM2. 2016-10-27 11:34:13 +02:00
Jaime van Kessel
4085404ed7 Merge branch 'master' of github.com:Ultimaker/Cura 2016-10-27 11:33:44 +02:00
Ghostkeeper
4759bccdb8
Update translation templates after merging secret plug-ins
The UM3 Network Printing plug-in was secret because the UM3 wasn't released yet. This update contains all texts to be translated as of this writing.
2016-10-27 11:31:07 +02:00
Jaime van Kessel
e27be7fc4b Travel_avoid_distance and support_offset are only taken into account if respecive feature is active
We used to always add them, but now we check if support_enable and travel_avoid_other_parts are enabled
CURA-2823
2016-10-27 09:59:29 +02:00
Simon Edwards
54182c2b02 Merge branch '2.3' 2016-10-27 09:32:22 +02:00
fieldOfView
3cdf65d36d Fix errors when switching from UM3 to UM2. 2016-10-26 22:58:59 +02:00
Simon Edwards
b41b98f058 OSX would get stuck and act like there was a modal dialog open if we do the callback processing immediately. Delay it slightly.
CURA-2801 CLONE - Cura in freeze mode when printing via WiFi
2016-10-26 16:50:04 +02:00
Ghostkeeper
51263da2e4
Added new fixes for version 2.3.1
These are the latest fixes that will be included in 2.3.1. Not all of these are entirely complete yet as of this writing. These are only the fixes that are worth mentioning in a change log.

Contributes to issue CURA-2755.
2016-10-26 16:06:43 +02:00
Ghostkeeper
58df52ffed
Remove unimportant bugfix
This tweak is so small that it isn't worth even mentioning in the change log.

Contributes to issue CURA-2755.
2016-10-26 16:02:18 +02:00
Ghostkeeper
a61ff7b2df
Reorder items in change log of 2.3.0
This order is closer to what's on the website of Ultimaker, and more closely reflects the relative importance of these features. No 1:1 matching is possible with the website though.

Contributes to issue CURA-2755.
2016-10-26 16:00:27 +02:00
Ghostkeeper
dfb557eb41
Correct change log of version 2.3.0
This is now updated with all that's on the website. In many cases, the wording of the Ultimaker website is also chosen, unless that wording was only to make it fit better within the style of that website.

Contributes to issue CURA-2755.
2016-10-26 16:00:27 +02:00
Ghostkeeper
49603e2f18
Fix spelling
Thesearetwowordssotheymusthaveaspacebetweenthem.

Contributes to issue CURA-2755.
2016-10-26 16:00:27 +02:00
Jaime van Kessel
f35914299b Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-26 15:44:19 +02:00
Jaime van Kessel
02d6b20b34 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-10-26 15:44:05 +02:00
Jaime van Kessel
a8486f88d7 Inheritance icon is correctly shown for single extrusion printers if setting has limit_to_extruder property
CURA-2752
2016-10-26 15:43:26 +02:00
Jaime van Kessel
4900a8f380 Added message to warn user if calibration was not properly done
CURA-2731
2016-10-26 14:52:30 +02:00
Ghostkeeper
07e7521792
Fix spelling mistake
This is not a bijvoeglijk naamwoord, so it must not get an E at the end.

Contributes to issue CURA-2751.
2016-10-26 13:41:23 +02:00
Jaime van Kessel
601bf20a96 Changed the entry point of the material guid to non-depricated spot
We depricated the GUID as entry point, but all printers support both right now.
2016-10-26 13:38:09 +02:00
Jaime van Kessel
a581942869 Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-26 13:13:27 +02:00
Ghostkeeper
8da87a2996 Merge branch 'feature_show_origin' of https://github.com/fieldOfView/Cura into fieldOfView-feature_show_origin 2016-10-26 11:37:32 +02:00
Ghostkeeper
53a4e5e6c0
Remove infill_overlap_mm from Nylon profiles
This is the result of this week's profile updates from our material tests.
2016-10-26 11:15:14 +02:00
Ghostkeeper
2edcf36a83
Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-10-26 10:52:49 +02:00
Simon Edwards
cc33b3be22 Change for the "Advanced" tab to "Custom".
CURA-2751 Change settings label "Simple" to "Recommended"
2016-10-26 10:43:00 +02:00
Ghostkeeper
6c3b4b7f29
Prevent race condition before global container stack is made
Just properly check if there is a global container stack.
2016-10-26 09:50:42 +02:00
Ghostkeeper
861837ef41 Make generic quality profiles global
This way they will also be put in the global profile.

Contributes to issue CURA-2723.
2016-10-26 09:43:11 +02:00
fieldOfView
55191b722a Codestyle & documentation 2016-10-25 23:06:23 +02:00
fieldOfView
fef15c706f Render an indication of the origin of the machine 2016-10-25 22:51:44 +02:00
Jaime van Kessel
dd79be6595 Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-25 16:50:55 +02:00
Ghostkeeper
f72e6be10e Fix setting the quality_type of imported profile
The metadata entry was renamed a while ago.

Contributes to issue CURA-2785.
2016-10-25 16:36:26 +02:00
Ghostkeeper
623f9cb4fc Abort importing profile if we have no global container stack
You shouldn't be able to trigger it anyway, but if you do, it'll give a proper error that the import failed.

Contributes to issue CURA-2785.
2016-10-25 16:36:17 +02:00
Ghostkeeper
7e5ffe79b6 Cache global container stack
We'll need it multiple times. Could be a bit faster.

Contributes to issue CURA-2785.
2016-10-25 16:36:07 +02:00
Jaime van Kessel
b4339bda0e Fixed logger isuse with importing profile
CURA-2785
2016-10-25 16:26:52 +02:00
Arjen Hiemstra
30e14478af Replace quality profiles with optimised versions of Ruben's script
With the global quality profiles merged this now works properly.

CURA-2645
2016-10-25 15:40:52 +02:00