Commit graph

3150 commits

Author SHA1 Message Date
fieldOfView
0b11117d6d Set a property for non-printing-meshes
Remove code duplication
2017-11-09 12:28:55 +01:00
Diego Prado Gesto
1ff2541947 Add nozzle color to the default themes 2017-11-09 10:34:35 +01:00
Lipu Fei
78456d5bc3 Fix clusterSize property check in QML 2017-11-09 09:06:46 +01:00
Mark
1468c3aae5 move undefined/null check 2017-11-09 07:37:09 +01:00
nickthetait
22472675f7 Update formatting on some older changelog data 2017-11-08 17:22:14 -07:00
nickthetait
4a4772a3da Merge an old changelog into the currently used file 2017-11-08 17:16:25 -07:00
Mark
fdcce1780e Also check if base.selectedPrinter is null 2017-11-08 19:24:09 +01:00
Mark
303cf33de1 Made the message more clear 2017-11-08 10:23:19 +01:00
Diego Prado Gesto
b7172ad9e3 Add return values to some functions that cause some crashes 2017-11-07 17:43:27 +01:00
Jack Ha
38670171f5 CURA-4525 party working objects list and build plates 2017-11-07 14:52:22 +01:00
Lipu Fei
2be529668e Fix download for firmware upgrade notification
Same issue as the download for Cura version upgrade in CURA-4464.
2017-11-07 13:04:18 +01:00
Jack Ha
5050124699 CURA-4525 wip objects menu 2017-11-06 14:03:39 +01:00
ChrisTerBeke
d32b7f0091 Merge branch 'master' into container_stack_improvements 2017-11-06 09:49:44 +01:00
Ruben D
c61b9c41ab
Fix translation of Unable to slice message
Previously the {0} would be filled in at runtime, causing the translation to no longer be found in the catalogue.

Contributes to issue CURA-4091.
2017-11-06 03:55:49 +01:00
Diego Prado Gesto
97fd926654 CURA-4526 Add to SimulationView the same behavior than LayerView 2017-11-03 17:46:12 +01:00
Lipu Fei
25c41062e1 Fix material upgrade and version checking
CURA-4519

Less duplicated code, but it's still one of the worst parts...
2017-11-02 13:01:49 +01:00
Ghostkeeper
cf7bad1bbb
Make _profile_name a class method
This way we can execute it statically while getting the metadata.

Contributes to issue CURA-4243.
2017-11-02 10:18:52 +01:00
Ghostkeeper
d369f92020
Make get[ConfigurationType|Version]FromSerialized class methods
This way we can call them before an instance has been created, in order to upgrade the serialized forms.

Contributes to issue CURA-4243.
2017-11-01 16:18:08 +01:00
ChrisTerBeke
142ff4e9dc
Merge pull request #2669 from fieldOfView/feature_jogging
Jogging
2017-11-01 16:15:40 +01:00
Ghostkeeper
07947d5d2c
Override getIdsFromFile to load multiple IDs
This should result in all IDs in the XML file, since there are multiple per file here.

Contributes to issue CURA-4243.
2017-11-01 14:53:52 +01:00
Ghostkeeper
ddf5ab0494
Make _parseCompatibleValue a class method
It might as well be static, since it doesn't need an instance.

Contributes to issue CURA-4243.
2017-11-01 14:52:57 +01:00
Ghostkeeper
74bd527b03
Load product_id_map from file
For now this file is hard-coded. We should eventually try to generate this in the build system.

Contributes to issue CURA-4243.
2017-11-01 14:52:03 +01:00
ChrisTerBeke
e29fdbe76d Cleanup - CURA-4482 2017-11-01 14:32:58 +01:00
Diego Prado Gesto
7f76749e2c Merge branch 'CURA-4062_layerview_laggy' 2017-11-01 13:37:44 +01:00
ChrisTerBeke
97421ecf58 Create container stacks when loading older project file - CURA-4482 2017-11-01 13:31:25 +01:00
Diego Prado Gesto
c85e10f4c5 CURA-4062 Minor changes 2017-11-01 13:31:17 +01:00
ChrisTerBeke
ce896177cb Cleanup 3mf workspace reader - CURA-4482 2017-10-31 16:32:04 +01:00
ChrisTerBeke
7a8d562234 Merge branch 'master' into container_stack_improvements 2017-10-31 16:24:05 +01:00
ChrisTerBeke
8676792ef8 Disable annoying debug message about not found printer definition 2017-10-31 16:23:45 +01:00
ChrisTerBeke
c59e4bb3e1 Cleanup machine settings action - CURA-4482 2017-10-31 16:20:25 +01:00
ChrisTerBeke
cc6be48a79 Always use extruder stack when updating material diameter - CURA-4482 2017-10-31 16:19:16 +01:00
ChrisTerBeke
b8757b46b3 Always use extruder stack in machine settings action plugin, keep support for older project files - CURA-4482 2017-10-31 16:16:51 +01:00
ChrisTerBeke
f421166b18 Clarify 3mf saving multi extrusion setting - CURA-4482 2017-10-31 16:11:27 +01:00
ChrisTerBeke
52782b8d13 Always use the extruder stacks to determine model color in solid view - CURA-4482 2017-10-31 16:08:59 +01:00
ChrisTerBeke
a7383b42d5 Always use extruder stack when adding settings per object - CURA-4482 2017-10-31 16:04:06 +01:00
ChrisTerBeke
77cd10374c Always set the active extruder stack when loading project file settings - CURA-4482 2017-10-31 16:00:22 +01:00
ChrisTerBeke
c23c031152 Always use extruder stacks in slice info - CURA-4482 2017-10-31 14:51:31 +01:00
ChrisTerBeke
cc267646e7 Always use extruder stacks when building slicer message and deprecate otherwise - CURA-4482 2017-10-31 14:48:52 +01:00
Diego Prado Gesto
d7b75cab2e CURA-4502 Minor changes 2017-10-31 11:42:46 +01:00
Lipu Fei
22e36ff3af Fix not supported quality profile list
CURA-4451
2017-10-31 11:21:34 +01:00
Ghostkeeper
a08875c5eb
Remove redundant setting of name
It's just copied along with the rest of the metadata now.

Contributes to issue CURA-4243.
2017-10-31 11:11:56 +01:00
Andreea Scorojitu
e36cefedf6
Update ChangeLog.txt 2017-10-31 10:47:57 +01:00
alekseisasin
055b6ebaab
Merge pull request #2691 from Ultimaker/cleaner_open_project_dialog
Cleaner open project dialog & redering on partial pixels fixes
2017-10-31 09:58:52 +01:00
Ghostkeeper
92cf76b30b
Merge branch '3.0' 2017-10-31 09:57:42 +01:00
Andreea Scorojitu
d7b0583640 Update changelog to the current 3.0.4 version 2017-10-31 09:52:30 +01:00
Chris ter Beke
9806ec7374 Resolve merge conflicts with master - CURA-4482 2017-10-31 09:22:03 +01:00
Ghostkeeper
d24fa3bc3b
Set name directly in metadata when clearing
Because the setName function checks if the name is equal to the previous name, but at that point the previous name doesn't exist.

Contributes to issue CURA-4243.
2017-10-31 08:23:57 +01:00
Ghostkeeper
8eaec149fa
Make sure the ID stays in the metadata when clearing it
Previously the ID was also exempted from the clear.

Contributes to issue CURA-4243.
2017-10-30 15:54:26 +01:00
Aleksei S
7f02ddd6e9 Simplified version for validation need to show user agreement
CURA-4501
2017-10-30 15:43:40 +01:00
Lipu Fei
aab601927c Show Add Machine dialog after User Agreement dialog is closed
CURA-4501
2017-10-30 15:43:40 +01:00