Jaime van Kessel
41acedd4c1
Merge branch 'master' of github.com:Ultimaker/Cura
2017-11-09 13:52:20 +01:00
Jaime van Kessel
f2e7fef747
Update PreviewPass so that only slicable objects are rendered
2017-11-09 13:51:47 +01:00
Andreea Scorojitu
723d593827
Merge branch 'master' of https://github.com/Ultimaker/Cura
2017-11-09 12:02:13 +01:00
Andreea Scorojitu
477e295e70
Change_Color_UI_elements_CURA-4548
2017-11-09 12:02:01 +01:00
Lipu Fei
637d1a1da3
Fix Vertex Delta K8800 definition file
2017-11-09 10:37:51 +01:00
Diego Prado Gesto
1ff2541947
Add nozzle color to the default themes
2017-11-09 10:34:35 +01:00
Lipu Fei
b0144c7f10
Merge pull request #2740 from kaleidoscopeit/master
...
New machine definition : Deltacomb 3D
2017-11-09 10:33:53 +01:00
kaleidoscopeit
714c0f25da
Set all "setting_version" in qualitites to 4
2017-11-09 10:25:30 +01:00
Lipu Fei
78456d5bc3
Fix clusterSize property check in QML
2017-11-09 09:06:46 +01:00
Andreea Scorojitu
d6f856e900
Merge branch 'master' of https://github.com/Ultimaker/Cura
2017-11-09 08:47:09 +01:00
Lipu Fei
183c63f765
Merge pull request #2720 from Ultimaker/Update_Infill_Patern_Description
...
Add_tri-hexagon_and_cross_to_pattern_description
2017-11-09 08:14:35 +01:00
Lipu Fei
cb6c6d51b4
Merge pull request #2751 from Ultimaker/fix_clustersize_null
...
Also check if base.selectedPrinter is null
2017-11-09 08:05:31 +01:00
Lipu Fei
a4f6af900b
Merge pull request #2747 from Velleman/master
...
Update Definiton for K8800 Vertex Delta
2017-11-09 08:03:19 +01:00
Mark
1468c3aae5
move undefined/null check
2017-11-09 07:37:09 +01:00
Mark
fdcce1780e
Also check if base.selectedPrinter is null
2017-11-08 19:24:09 +01:00
Andreea Scorojitu
d8d738be25
Change_Color_UI_elements_CURA-4548
2017-11-08 17:02:49 +01:00
Jaime van Kessel
06045f036e
Added previewPass
2017-11-08 16:37:24 +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
Brecht Nuyttens
873862efd7
Fixed Vertex Delta Definition
2017-11-07 16:54:18 +01:00
Brecht Nuyttens
6c734e15c5
Merge branch 'master' of https://github.com/Velleman/Cura
2017-11-07 16:52:04 +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
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
