Commit graph

5292 commits

Author SHA1 Message Date
Simon Lundell
c393167878 Merge remote-tracking branch 'upstream/master' 2018-02-23 18:36:25 +01:00
Ian Paschal
e3411e9edb CURA-4972 More zen. 2018-02-23 14:52:35 +01:00
Diego Prado Gesto
3c6e94ea81 CURA-4968 Add the support eraser cube to the bottom of the buildplate
when the automatic drop models preference is OFF
2018-02-23 13:08:15 +01:00
Aleksei S
ed7dec0cae Fix: per model settings validation
CURA-4972
2018-02-23 13:05:29 +01:00
Lipu Fei
f51129b103 Remove TestTools plugin 2018-02-22 21:47:06 +01:00
Lipu Fei
68b1a374e0 Merge remote-tracking branch 'origin/master' into refactoring_machine_manager 2018-02-22 16:53:32 +01:00
Diego Prado Gesto
94ca4fffe3 CURA-4946 In the gcode just store the default machine definition 2018-02-22 16:46:48 +01:00
Lipu Fei
881fb0c08c Merge remote-tracking branch 'origin/master' into refactoring_machine_manager 2018-02-22 15:14:31 +01:00
Lipu Fei
f946f62db1 WIP: Cleanup Upgrade 30 to 31 2018-02-21 20:27:33 +01:00
Aleksei S
3ed9ac1e83 Fix: Monitor icon state was not updated properly
CURA-4977
2018-02-21 14:54:05 +01:00
Lipu Fei
9a354efd19 Merge remote-tracking branch 'origin/master' into refactoring_machine_manager 2018-02-21 14:05:19 +01:00
Lipu Fei
c432d4ffbb WIP: Simplify global stack and extruder stack activation and fixes 2018-02-20 11:16:51 +01:00
Diego Prado Gesto
6af5a5d4bc CURA-4946 When storing the gcode profile, the definition must be the
quality definition if the printer has_machine_quality. Otherwise the
fdmprinter definition must be used as a fallback. If there is no
quality_definition then the printer definition is use.
2018-02-20 11:11:21 +01:00
Diego Prado Gesto
6a4f519238 Revert "CURA-4946 Add the quality_definition metadata entry to the gcode so when"
This reverts commit 744313af27.
2018-02-20 09:30:05 +01:00
fieldOfView
c3bf0b834d Fix location of post processing scripts on Linux
On Windows and OSX, resources and preferences are stored in the same folder. On Linux, preferences are in ~/.config, resources are in ~/.local/shared. Postprocessing scripts belong in the latter, along with all the other resources (definitions, plugins, themes).

Fixes #3356
2018-02-20 09:20:01 +01:00
Lipu Fei
62c31c2f6c WIP: Remove old QualityManager 2018-02-19 22:11:47 +01:00
Lipu Fei
3fffc2c621 WIP: Cleanup old QualityManager 2018-02-19 20:50:14 +01:00
Jaime van Kessel
3cf16fd34b Removed sending of material profiles.
It takes a godawfull long time and the machine ignores most of them anyway.
2018-02-19 15:37:08 +01:00
Jack Ha
823ac048fa Merge branch 'master' of github.com:Ultimaker/Cura 2018-02-19 09:14:10 +01:00
Jack Ha
2c689ef03f Log markup 2018-02-19 09:14:04 +01:00
Simon Lundell
112bb260ac Do not send new G-CODEs when the RX buffer is filling up. This is in an attempt to fix #1777 where smoothieware based printers would halt in the middle of the print. 2018-02-18 11:44:04 +01:00
Lipu Fei
495fc8bbd7 WIP: Refactor BuildPlateModel and split MultiBuildPlateModel 2018-02-17 22:24:05 +01:00
Christophe Baribaud
bd1f2922ef Post stretch algorithm fixes
Extract line width from current extruder nozzle size
Change default values of stretch parameters from 0.08 to 0.1
2018-02-17 13:30:08 +01:00
Lipu Fei
a5afaab467 WIP: Fix material duplication and metadata update 2018-02-16 14:23:11 +01:00
Lipu Fei
f024f45cfe WIP: Rework Material management page 2018-02-16 14:23:11 +01:00
Lipu Fei
20e0f8a82a WIP: Fix material serialization 2018-02-16 14:23:11 +01:00
Lipu Fei
4af176dbf3 WIP: Rename function to getVariantNode() 2018-02-16 14:23:11 +01:00
Lipu Fei
bf2317a74d WIP: use new QualityChangesGroups 2018-02-16 14:23:11 +01:00
Lipu Fei
d84ea07e9e WIP: add getQaulityChangesGroup() 2018-02-16 14:23:10 +01:00
Lipu Fei
0f045ce121 WIP: TO BE REMOVED: TestTools plugin 2018-02-16 14:20:03 +01:00
Lipu Fei
55bdc0c853 WIP: Create VariantManager 2018-02-16 14:20:02 +01:00
Lipu Fei
86eb9b925f WIP: Use variant_name in metadata for XMLMaterialProfile 2018-02-16 14:20:02 +01:00
Diego Prado Gesto
cc2cc2a751 Merge branch 'master' of https://github.com/Ultimaker/Cura 2018-02-16 14:02:20 +01:00
Diego Prado Gesto
744313af27 CURA-4946 Add the quality_definition metadata entry to the gcode so when
parsing, the quality definition is taken into account instead of the
definition.
The message when importing a profile to a different machine,
now shows the expected machine and the current machine definition id.!!
2018-02-16 14:01:46 +01:00
Aleksei S
f897930950 Fix: Allow connection button for other printers
CURA-4962
2018-02-16 11:48:08 +01:00
Aleksei S
86b31c3a6c Fix: in 3.0 version we did not save quality type under extruder.cfg in project
for custom fdm pritners. For this case during deserializing share quality stack
between global and extruder's stacks
CURA-4966
2018-02-16 09:12:42 +01:00
Diego Prado Gesto
a2fde9f5f2 Revert "Fix rounded values in qml files"
This reverts commit f11a1341ee.
2018-02-15 14:58:58 +01:00
Diego Prado Gesto
f11a1341ee Fix rounded values in qml files 2018-02-15 13:27:13 +01:00
fieldOfView
a17160f52d Merge branch 'master' into feature_setting_visibility_profiles
# Conflicts:
#	resources/qml/Settings/SettingView.qml
2018-02-15 11:54:45 +01:00
Diego Prado Gesto
e7b1bb6c7a Merge branch 'master' of https://github.com/Ultimaker/Cura 2018-02-14 17:24:07 +01:00
Diego Prado Gesto
68acb13853 CURA-4615 Rename to ChangeAtZ also the file, the class name and
variables.
2018-02-14 17:23:02 +01:00
Ian Paschal
0b62a312c3 CURA-4869 Infill meshes influence layer count in layer view
If a layer is empty, don't add it to the total layer count!
2018-02-14 16:56:07 +01:00
Mark
64ea2399a1 Add tags to urls 2018-02-14 15:15:02 +01:00
Aleksei S
11377d1034 Revert "Added plugin for reading cad files with .step file extension"
This reverts commit 0cebc2e9f3.
2018-02-14 14:05:49 +01:00
Aleksei S
0cebc2e9f3 Added plugin for reading cad files with .step file extension
CURA-4891
2018-02-14 14:03:57 +01:00
Ghostkeeper
ee9de1f11b
Merge branch '3.2'
Lots of conflicts due to rounding vs. flooring of text element positions for weirdness with the font aliasing.
2018-02-14 10:53:51 +01:00
Andreea Scorojitu
4a499ddfec
CURA-4958 Update_3.2.1_changelog
Added the bug fixes done for the 3.2.1
2018-02-14 10:50:14 +01:00
Mark
b531c0550d Change Math.floor to Math.round as a last try to fix garbled fonts
CURA-4941
2018-02-14 09:28:47 +01:00
Ghostkeeper
3c32a1b0f3
Merge branch 'master' of github.com:Ultimaker/Cura 2018-02-13 15:51:14 +01:00
Ghostkeeper
f91c990fed
Streamline usage of g-code (vs. GCode, Gcode, G-code, gcode, etc.)
This makes it all the same. It is something that came up in our translation pass this time.

Contributes to issue CURA-4883.
2018-02-13 15:50:59 +01:00