GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-22 20:50:37 +08:00
Code Issues Packages Projects Releases Wiki Activity
8,975 Commits 290 Branches 263 Tags
Commit Graph

2143 Commits

Author SHA1 Message Date
Ghostkeeper
cbe4891784
Merge branch '2.6' 2017-05-30 13:36:04 +02:00
Mark
6ba2764efc Use .3mf on MacOS as project extension 
CURA-3886
 2017-05-30 09:57:41 +02:00
Tim Kuipers
3b62c4a59a fix: changelog attribution to community members (CURA-3879) 2017-05-29 16:31:11 +02:00
Tim Kuipers
b01f1bdbb3 feat: 2.6 beta changelog (CURA-3879) 2017-05-29 16:27:09 +02:00
Ghostkeeper
b8f290d835
Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-29 15:40:24 +02:00
Ghostkeeper
8ec9337077
Merge branch 'feature_extruder_per_feature' 2017-05-29 15:40:06 +02:00
Lipu Fei
c977a895ee Merge branch '2.6' 2017-05-29 15:29:40 +02:00
Tim Kuipers
8365d866a3 feat: 2.6 beta changelog (CURA-3879) 2017-05-29 15:19:43 +02:00
Lipu Fei
8ede981a2c Set version in <fdmmaterial> when saving XML material files 
CURA-3884
 2017-05-29 14:19:52 +02:00
Jaime van Kessel
ca922e9e9d The monitor item is now actually used to display information on monitor page 
The UM3 now provides camera image in this way

CURA-3826
 2017-05-29 13:47:41 +02:00
Ghostkeeper
ce6814d45d Add default for colour code of material 
Otherwise you get an error that the colour code could not be found.

Fixes #1869.
 2017-05-24 15:20:59 +02:00
Jaime van Kessel
e6f61f3bbc When trying to convert None to RGBA, log it and return a usable default 
contributes to #1869
 2017-05-24 11:38:38 +02:00
Lipu Fei
29c883d489 Fix option_extruder case for per object settings panel 
CURA-3814
 2017-05-24 09:36:07 +02:00
Lipu Fei
9a08e0cc27 Only use <fdmmaterial version> for detecting material file version 
CURA-3540
 2017-05-23 11:51:31 +02:00
Jaime van Kessel
cc3402ab81 Added RunTime exception catching for image_reply 
In some cases the c++ object is already deleted. If we just ignore it, nothing breaks.

CURA-3844
 2017-05-22 14:50:03 +02:00
Jaime van Kessel
f9f0fa852f Added RunTime exception catching for image_reply 
In some cases the c++ object is already deleted. If we just ignore it, nothing breaks.

CURA-3844
 2017-05-22 14:48:42 +02:00
Jaime van Kessel
4b826b747b Added exception handling to XML parsing 
CURA-3843
 2017-05-19 13:54:31 +02:00
Jaime van Kessel
75b3f08318 Removed unneeded logging 
THis caused a massive logging spam
 2017-05-19 13:09:41 +02:00
Ghostkeeper
bd361e500c
Don't keep a copy of currently connected printer 
This QML file was holding a copy of the currently connected printer, stored in connectingToPrinter. This copy got out of sync when you load a project file which had a different connected printer. Instead, ask the manager for the currently connected printer key every time you click the button.

Contributes to issue CURA-3839.
 2017-05-19 12:30:17 +02:00
Lipu Fei
5a6049ddea Change XmlMaterialUpgrader to use UNIX EOLs 
CURA-3756
 2017-05-19 11:06:01 +02:00
Lipu Fei
7089460861 Minor refactoring for XMLMaterial upgrade 
CURA-3756
 2017-05-19 11:05:16 +02:00
Jaime van Kessel
c43a71084c Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-19 10:40:09 +02:00
Jaime van Kessel
475455d473 Definition changes are now also upgraded 
CURA-3837
 2017-05-19 10:39:37 +02:00
Lipu Fei
593697e0ed Fix XML material upgrade 
CURA-3756
 2017-05-19 10:18:13 +02:00
Jaime van Kessel
f2f83750c2 Type is now always added when deserializing profiles to g-code 
CURA-3829
 2017-05-18 16:42:11 +02:00
Lipu Fei
870d6fe76a Use position number to get extruders for overriding in project loading 
CURA-3756
 2017-05-18 14:34:37 +02:00
Lipu Fei
cbdddd0b16 Ignore "quality" and "variant" containers in project loading 
CURA-3756
 2017-05-18 10:28:02 +02:00
Lipu Fei
18dd8dc6cc Simplify ExtruderStack override code in project loading 
CURA-3756
 2017-05-17 17:10:55 +02:00
Lipu Fei
e1455a4551 Fix deserializing ExtruderStacks in project loading 
CURA-3756
 2017-05-17 15:57:13 +02:00
Ghostkeeper
937207a0eb
Merge branch 'fix_machinesettings_negative_offsets' of https://github.com/fieldOfView/Cura into fieldOfView-fix_machinesettings_negative_offsets 2017-05-17 15:42:43 +02:00
Lipu Fei
d02d004986 Correct profile_translations in VersionUpgrade21to22 
CURA-3777
 2017-05-17 13:44:34 +02:00
Lipu Fei
e2e208261e Fix renaming quality_changes and definition containers in project loading 
CURA-3756
 2017-05-17 11:53:13 +02:00
Lipu Fei
a9ec3f2712 Add docs to project loading code 
CURA-3756
 2017-05-17 11:25:48 +02:00
Lipu Fei
8c2fe0951d Refactor project loading 
CURA-3756
 2017-05-17 11:03:52 +02:00
Lipu Fei
ee831928ba Fix overriding extruder stacks for project loading 
CURA-3756
 2017-05-17 10:20:14 +02:00
Lipu Fei
191dfdcb33 Save Cura version to project files 
CURA-3822
 2017-05-17 09:23:43 +02:00
Lipu Fei
40d70b5f39 Fix version upgrade for project loading 
CURA-3756
 2017-05-16 14:38:27 +02:00
fieldOfView
910811810b Allow setting negative values on extruder offset x/y fields 2017-05-16 13:54:45 +02:00
Jaime van Kessel
e40f60a52b Changed profile names 
CURA-3777
 2017-05-15 16:52:25 +02:00
Ghostkeeper
ccda155882
Add setting_version every time we create InstanceContainer 
Except when we fill the instancecontainer via deserialising. Because then we want to retain the original version number.

Contributes to issue CURA-3427.
 2017-05-15 10:39:53 +02:00
Ghostkeeper
c48017e174
Convert all metadata fields to string 
The XML builder expects string, strictly. Only None is handled separately.

Contributes to issue CURA-3808.
 2017-05-15 09:37:53 +02:00
Ghostkeeper
2365267f35
Be robust against older specification version numbers 
1.2 and lower didn't specify a version number. Assume that it was 1.2. We feed this through our translation function for form, mostly, because we know that the setting_version should be 0 then.

Contributes to issue CURA-3427.
 2017-05-12 17:20:49 +02:00
Ghostkeeper
365f7cad4c
Read setting_version from version attribute on root 
As per the new specification for v1.3 of the spec.

Contributes to issue CURA-3427.
 2017-05-12 17:20:49 +02:00
Lipu Fei
598751817a Fix resolve strategy "new" for user instance container 
CURA-3756
 2017-05-12 16:52:37 +02:00
Ghostkeeper
0cc4f90920
Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-12 16:34:19 +02:00
Lipu Fei
3996230ff9 Load GlobalStack before ExtruderStacks for project loading 
CURA-3756
 2017-05-12 15:52:16 +02:00
Ghostkeeper
adefbaf72e
Add more unhappy-path tests 
One for the new setting_version. One for the misconception of version numbers being a major-minor version or something, because it's not stored that way.

Contributes to issue CURA-3427.
 2017-05-12 15:01:27 +02:00
Ghostkeeper
04ef2bf1f0
Update setting_version tests 
Included a bit of a more difficult case.

Contributes to issue CURA-3427.
 2017-05-12 14:58:11 +02:00
Ghostkeeper
55b2392a1d
Load setting version from metadata 
I'm not really awake today, am I? The functionality happened to still work because of how our real data is structured right now, but the tests still failed. Those are successful now.

Contributes to issue CURA-3427.
 2017-05-12 14:55:19 +02:00
Ghostkeeper
9820dac4a6
Actually use setting_version to get the setting version number 
This was sort of hidden because we've always incremented the normal version number up until now.

Contributes to issue CURA-3427.
 2017-05-12 14:51:44 +02:00