GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-19 05:07:29 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,773 Commits 290 Branches 260 Tags
Commit Graph

896 Commits

Author SHA1 Message Date
Arjen Hiemstra
f92f0c52c6 Another stray conflict marker 2016-07-13 14:33:42 +02:00
Arjen Hiemstra
36c185e921 Remove stray git conflict markers 2016-07-13 14:31:20 +02:00
Arjen Hiemstra
3f1bd5b586 Update changelog with corrections done after release 
Also make sure to include all CureEngine features listed in the
online changelog

Contributes to CURA-1688
 2016-07-13 14:21:59 +02:00
Jaime van Kessel
ec0e19e175 Removed material profiles field from sliceinfo 2016-07-13 14:20:41 +02:00
Ghostkeeper
b33c2f9c25
Even better fallbacks for unknown subprofiles 
These fallbacks specify their types so that they can be found with the filters.

Contributes to issue CURA-844.
 2016-07-13 12:06:18 +02:00
Jaime van Kessel
de408666c3 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-13 11:39:05 +02:00
fieldOfView
7eee1efa14 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-13 11:19:05 +02:00
fieldOfView
c37163059a Update wording to reflect the official HBK is also supported 2016-07-13 11:18:45 +02:00
Jaime van Kessel
726eb97d9f Machine_id instead of definition_id is now used to link extruders 
Contributes to CURA-1898
 2016-07-13 11:17:44 +02:00
Simon Edwards
642ea6791b When saving the quality profile data, also incorporate any user settings/changes. 
Contributes to CURA-1727 GCode Profile reading/writing: Broken and needs update
 2016-07-13 09:29:47 +02:00
Simon Edwards
64ecb114b8 Store the Quality profile for the 'global' and extruders in the gcode. Read in all of the quality profile during import. 
Contributes to CURA-1727 GCode Profile reading/writing: Broken and needs update
 2016-07-12 12:41:49 +02:00
Jaime van Kessel
b5aa7c3545 Remove the extruder id from settingoverride decorator if the machine does not have multi extrusion 
CURA-1876 & CURA-1768
 2016-07-12 10:34:58 +02:00
Arjen Hiemstra
57f63bfc73 Update material container's name when its "material" metadata key changes 
Contributes to CURA-342
 2016-07-11 14:57:28 +02:00
Arjen Hiemstra
f49528b71f Do not try to set base_file metadata if it was never set before 
Contributes to CURA-341
 2016-07-11 14:57:28 +02:00
Jack Ha
0745b3bbf5 Unbreak LayerView. 
CURA-1381
 2016-07-11 10:29:21 +02:00
Jaime van Kessel
b48db45a37 Merge pull request #859 from thopiekar/master-CURA-1831-newer 
[CURA-1831] Adding only the basic workaround for OSX
 2016-07-11 09:22:08 +02:00
Ghostkeeper
6fbac2f7ee Better fallbacks if MachineInstance missing profiles 
They now fallback to "empty" so that it can still construct a valid
instance, albeit with a missing profile (such as material), if some
profile is missing from the original machine instance file.

Contributes to issue CURA-844.
 2016-07-11 00:49:18 +02:00
Thomas-Karl Pietrowski
a854554d94 CURA-1831: Adding only the basic workaround for OSX 2016-07-08 16:56:12 +02:00
Jaime van Kessel
25d13969ee Filename is now correctly set for 3mf 
CURA-1622
 2016-07-08 15:58:33 +02:00
Jaime van Kessel
19933cb4e7 Improved robustness of Platform physics by checking if the hulls are calculated before trying to intersect them. 
fixes CURA-1827
 2016-07-08 15:17:28 +02:00
Jaime van Kessel
1ced206c5d Codestyle 2016-07-08 14:12:44 +02:00
fieldOfView
c36af13daf Fix PerObjectSettings, which were broken due to the material editing merge 
CURA-342
 2016-07-07 18:25:20 +02:00
fieldOfView
8d56d25a8e Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-07 18:11:29 +02:00
fieldOfView
a774f06237 Hide checks if the printer is not connected, hide bed temperature if no bed is installed 
CURA-1385
 2016-07-07 17:54:43 +02:00
awhiemstra
90af9e3986 Merge pull request #846 from Ultimaker/feature_material_editing 
Material Editing Support
 2016-07-07 17:34:57 +02:00
Arjen Hiemstra
571523e0ef Ensure an XML material always has a description and adhesion_info metadata entry 
Contributes to CURA-342
 2016-07-07 17:30:39 +02:00
fieldOfView
66dd4a7a50 Add exception logging 
CURA-1385
 2016-07-07 17:08:03 +02:00
Jack Ha
6374eee7b4 Fix LayerView cursor issue. 
CURA-1381
 2016-07-07 16:55:56 +02:00
Jack Ha
3e869048fd Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-07 16:23:53 +02:00
Jack Ha
342d4f1b82 Changed tooltip extremely small. 
CURA-1671
 2016-07-07 16:23:27 +02:00
Jaime van Kessel
c38797b4fe Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-07 16:15:12 +02:00
Jaime van Kessel
a76f6375c7 Added way to stop the heating of bed / hotend in checkup 
CURA-1385
 2016-07-07 15:56:14 +02:00
Ghostkeeper
9d1ea28b49
Remove old commented-out code 
The function it calls no longer exists. The protobuf message it listens to was renamed and the renamed message is properly listened to in the line above.

Contributes to issue CURA-1687.
 2016-07-07 15:51:25 +02:00
Ghostkeeper
8f5e56c66e
Make documentation specify filename without extension 
Contributes to issue CURA-844.
 2016-07-07 15:22:27 +02:00
Ghostkeeper
e6efba3868
Make version upgrade also translate file names 
This was required since Cura 2.1 produced files with the same filename (bar extension). This then resulted in two containers with the same ID. If you had bad luck, an instance container was chosen as global container (depending on which was first in the unordered dictionary). This gives the current settings the postfix _current_settings, fixing that issue.

Contributes to issue CURA-844.
 2016-07-07 15:13:58 +02:00
Ghostkeeper
1b0974ba9f Rename translation dicts to plural form 
This is more in line with the rest of the code.

Contributes to issue CURA-844.
 2016-07-07 13:51:41 +02:00
Ghostkeeper
19b4ec655e Move some things to metadata section 
Why there is a difference between 'general' and 'metadata', only His Noodleness knows. Also put in a default for the type. It should apparently be 'quality' unless it is a user profile.

Contributes to issue CURA-844.
 2016-07-07 13:51:41 +02:00
Ghostkeeper
8f34186a9b Rename settings section to values 
It should be called 'values' in the new version.

Contributes to issue CURA-844.
 2016-07-07 13:51:41 +02:00
Ghostkeeper
b841738b76 Translate variants in profile 
Contributes to issue CURA-844.
 2016-07-07 13:51:41 +02:00
Ghostkeeper
c50619e363 Add additional settings transformations since 2.1 
These should be all the settings that were changed since Cura 2.1.

Contributes to issue CURA-844.
 2016-07-07 13:51:41 +02:00
Ghostkeeper
93041191c2 Move translateVariant to VersionUpgrade21to22 
Also make it a dictionary look-up, like the rest, instead of a series of if-statements.

Contributes to issue CURA-844.
 2016-07-07 13:51:41 +02:00
Ghostkeeper
439629d0b5 Translate variants and machine names 
I'm not quite pleased with the variant translation being inside this function, so I'll move it to VersionUpgrade21to22 soon I think.

Contributes to issue CURA-844.
 2016-07-07 13:51:41 +02:00
Ghostkeeper
f13db7de10 Make translatePrinter use dict 
A translation dictionary makes it much easier to edit the translations. Also this now just translates one printer, instead of a list.

Contributes to issue CURA-844.
 2016-07-07 13:51:41 +02:00
Ghostkeeper
b5efb2eee8 Make profile translation use new translateSettingName 
Forgot about this one.

Contributes to issue CURA-844.
 2016-07-07 13:51:41 +02:00
Ghostkeeper
88b36ad3d7 Make translateSettingName use dictionary look-up 
This solution is a bit neater in code. It makes the function perform a single purpose, since it no longer translates a list of setting names but just one. Also it now neatly puts the translations in a separate, easy-to-modify dict. Only disadvantage is when simple key look-up is not sufficient, such as when renaming lots of settings at once, where substring matching would make the code a bit shorter. But we shouldn't do such a rename anyway.

Contributes to issue CURA-844.
 2016-07-07 13:51:41 +02:00
Ghostkeeper
f07598a228 Translate profile names too 
Not all profile name translations are entered yet, I think. I just did the material ones.

Contributes to issue CURA-844.
 2016-07-07 13:51:41 +02:00
Ghostkeeper
7939a03114 Fix translating current_settings 
It is not entirely accurate in the translated version, since the new current_settings is not machine-dependent any more. However, without information on the original file name, this is as good as it gets, since that instance profile there only mentions the machine it is dependent on in the file name.

Contributes to issue CURA-844.
 2016-07-07 13:51:41 +02:00
Ghostkeeper
86544d4172 Fix translate function 
It was expected to return a list of translated names, even though it actually translates in-place.

Contributes to issue CURA-844.
 2016-07-07 13:51:41 +02:00
Ghostkeeper
39212a601e Fix import 
Didn't see this due to the sea of errors that it gives.

Contributes to issue CURA-844.
 2016-07-07 13:51:41 +02:00
Ghostkeeper
a87e756a42 Translate machine names 
Some names might be changed. I know of at least one: ultimaker2plus -> ultimaker2_plus.

Contributes to issue CURA-844.
 2016-07-07 13:51:41 +02:00