11788 Commits

Author SHA1 Message Date
Lipu Fei
d65ae62876
Merge pull request #2743 from Ultimaker/headless_cura
Headless cura
2017-11-07 11:07:43 +01:00
Aleksei S
6e7e859a0a Introduced Lock Position functionality
CURA-4527
2017-11-07 10:59:23 +01:00
Aleksei S
7722e438c9 Changed orientation button location, adjusted call functins
CURA-4527
2017-11-06 10:28:07 +01:00
kaleidoscopeit
5008d63cfe New machine definition : Deltacomb 3D 2017-11-06 10:01:57 +01:00
ChrisTerBeke
d32b7f0091 Merge branch 'master' into container_stack_improvements 2017-11-06 09:49:44 +01:00
ChrisTerBeke
2f0e81a819 Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-11-06 09:49:33 +01:00
ChrisTerBeke
28ce2b1dc6 Ignore VariSlice plugin 2017-11-06 09:49:13 +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
Ruben D
0d71443bd2
Move 'Remove Empty First Layers' setting to mesh fixes category
It used to be in 'support' since it's something you may want to decide on depending on whether you have support or not. It could also go in 'Special Modes', but I think this is more specified.
2017-11-05 23:24:07 +01:00
Diego Prado Gesto
97fd926654 CURA-4526 Add to SimulationView the same behavior than LayerView 2017-11-03 17:46:12 +01:00
Aleksei S
fb8bde6f76 Added view rotation for each click
CURA-4527
2017-11-03 15:29:33 +01:00
Andreea Scorojitu
1d5d8c5ac0 Add_tri-hexagon_and_cross_to_pattern_description 2017-11-03 15:02:03 +01:00
Diego Prado Gesto
74a7f02166 Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-11-02 13:21:25 +01:00
Diego Prado Gesto
a4441e2bdb CURA-4481 Setting description improved 2017-11-02 13:20:25 +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
202f7f87f8
Remove ID from definition files
Sometimes it's out of sync. Sometimes even missing. Let's just not use that any more.

Contributes to issue CURA-4243.
2017-11-02 12:53:06 +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
Diego Prado Gesto
a623c2ae75 Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-11-02 09:53:36 +01:00
Diego Prado Gesto
d503283089 CURA-4509 Minor fix that avoids crashes when there is no specified
material (such as in UM2)
2017-11-02 09:51:57 +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
Ghostkeeper
e48b151d40
Express getConfigurationTypeFromSerialized as function of its parent
This prevents code duplication a bit and allows us to make it a classmethod.

Contributes to issue CURA-4243.
2017-11-01 16:17:26 +01:00
ChrisTerBeke
142ff4e9dc
Merge pull request #2669 from fieldOfView/feature_jogging
Jogging
2017-11-01 16:15:40 +01:00
Aleksei S
87a7bf72a8 Monitor view, "connect" button position
CURA-4509
2017-11-01 15:57:30 +01:00
ChrisTerBeke
4326884f97 Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-11-01 15:54:43 +01:00
alekseisasin
db51054984
Merge pull request #2700 from fieldOfView/feature_cleanup_save_monitor_area
Cleanup save/monitor button area
2017-11-01 15:53:20 +01:00
ChrisTerBeke
e2c62a4609 Revert "Remove unnecessary properties which after update triggered view rendering"
This reverts commit ee228155af1677f3f375fb0b28b53ecef744d4d2.
2017-11-01 15:50:23 +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
ChrisTerBeke
e23e6cfa31 Fix for global quality in case of user created quality profile - CURA-4482 2017-11-01 13:59:21 +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
Mark
3ba7db1420 Merge branch 'master' into headless_cura 2017-11-01 13:25:09 +01:00
ChrisTerBeke
743285f426 Merge branch 'master' into container_stack_improvements 2017-11-01 12:32:37 +01:00
Mark
cb0f94eed0 Resolve merge conflict 2017-11-01 10:57:16 +01:00
Aleksei S
1de61600a7 Checkbox position and warning in log file
CURA-4503
2017-11-01 10:45:09 +01:00
Mark
512541be08 Change the font of the checkbox
CURA-4503
2017-11-01 10:44:46 +01:00
ChrisTerBeke
957009a768 Fix finding global quality for multi extrusion machines - CURA-4482 2017-10-31 17:32:21 +01:00
alekseisasin
fb87b73bbe
Merge pull request #2591 from BagelOrb/trihex_infill
trihex infill
2017-10-31 17:25:31 +01:00
ChrisTerBeke
8f41185f22 Fix extruder manager single instance from qml - CURA-4482 2017-10-31 17:18:19 +01:00
ChrisTerBeke
2e1da58570 Cleanup - CURA-4482 2017-10-31 17:06:34 +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
Lipu Fei
324b39fc39 Fix layout for open project dialog
CURA-4503
2017-10-31 16:20:01 +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