Ghostkeeper
abcac67cee
Improve wording of No. Layers setting
...
Fixes #5741 .
2019-05-17 09:39:51 +02:00
Lipu Fei
be4e05c13f
Merge pull request #5393 from Ultimaker/feature_model_list
...
Add an object list/selector
2019-05-17 07:48:22 +02:00
Jaime van Kessel
f5e31060a6
Fixed unknown reference in qml
2019-05-16 16:44:29 +02:00
Jaime van Kessel
314a6495c4
Merge branch '4.1' of github.com:Ultimaker/Cura
2019-05-16 16:40:10 +02:00
Lipu Fei
961f6403ad
Change preference key to cura/show_list_of_objects
2019-05-16 15:49:08 +02:00
Jaime van Kessel
1c9eab6b2b
Prevent crashes when backup fails to be restored
...
Also add a bit of logging so that we know what / how it went wrong
2019-05-16 15:48:09 +02:00
Jaime van Kessel
915e0e2047
Only add extrudernr to used extruders if it actually exists
...
This can cause issues when a profile got messed up (especially when using profiles between different custom machines)
2019-05-16 15:41:52 +02:00
Jaime van Kessel
186eef0b68
Fix backup causing a crash in specific situations
2019-05-16 15:38:44 +02:00
Jaime van Kessel
ff0a18603b
Remove a few more usages of deprecated functions
2019-05-16 15:20:38 +02:00
Lipu Fei
28172c9ad2
Merge remote-tracking branch 'origin/master' into feature_model_list
2019-05-16 15:17:46 +02:00
Jaime van Kessel
3fe5c9fc6a
Merge branch 'master' of github.com:Ultimaker/Cura
2019-05-16 15:08:47 +02:00
Jaime van Kessel
a0c705e900
Remove usage of some deprecated functions
2019-05-16 14:49:53 +02:00
ChrisTerBeke
60488e9ff6
Merge pull request #5738 from Ultimaker/fixes-for-cloud-discovery
...
Amazing fixes for cloud discovery
2019-05-16 14:37:59 +02:00
Lipu Fei
6a2980ab4f
Merge pull request #5655 from Ultimaker/shader_optimization
...
Shader optimization
2019-05-16 14:30:52 +02:00
Jaime van Kessel
2eb8203c70
Merge branch 'master' of github.com:Ultimaker/Cura
2019-05-16 14:29:24 +02:00
Jaime van Kessel
99e6ec9509
Fix the last material qml warnings
2019-05-16 14:29:05 +02:00
Ghostkeeper
0352553193
Read resolved value for adhesion type
...
We still write to the value property.
We need the resolved value because we want to read from the extruder stacks which may overwrite the adhesion type in a profile.
Contributes to issue CURA-6182.
2019-05-16 14:28:10 +02:00
Ghostkeeper
f3ea522811
Use === to compare strings in JavaScript
2019-05-16 14:28:09 +02:00
Ghostkeeper
1f6a8f2f75
Increment default API version number
2019-05-16 14:27:53 +02:00
Jaime van Kessel
bfe1275d46
Fix a number of QML warnings
2019-05-16 14:23:09 +02:00
Lipu Fei
dab0a43214
Merge remote-tracking branch 'origin/master' into shader_optimization
2019-05-16 14:22:05 +02:00
Remco Burema
d4f891d548
Brim for prime tower fix for resolve. [CURA-6492]
2019-05-16 12:39:12 +02:00
Diego Prado Gesto
2cbdc49539
Merge branch '4.1'
2019-05-16 12:13:04 +02:00
Diego Prado Gesto
cdcb1c15f6
Merge branch '4.1' of github.com:Ultimaker/Cura into 4.1
2019-05-16 12:04:50 +02:00
Diego Prado Gesto
c4044e731a
Fix typo in a log warning message
2019-05-16 12:04:26 +02:00
Jaime van Kessel
843bb6f5a3
Change some of the logging messages to info
...
CURA-6525
2019-05-15 17:25:31 +02:00
Remco Burema
19ce6aa65f
Prime tower brim (unless raft) by default. [CURA-6492]
2019-05-15 13:27:33 +02:00
Simon Edwards
bec7b6546d
Merge pull request #5726 from Ultimaker/CL-1331_use_API_for_UM3NetworkPrinting
...
CL-1331 Extending the Cura API for the Network Printing Plugin
2019-05-15 11:11:49 +02:00
Ian Paschal
51d298cca5
Update Machines.py
...
Contributes to CL-1331
2019-05-15 10:58:56 +02:00
Ghostkeeper
7094b222b1
Remove duplicate translation entry
...
Probably due to a merge conflict being resolved in a less than perfect way. Sorry.
Contributes to issue CURA-6521.
2019-05-15 10:58:48 +02:00
Ian Paschal
20e4142667
Final typing fix
...
Contributes to CL-1331
2019-05-15 10:51:18 +02:00
Ian Paschal
59eb9bbab1
Make connection types list ints
...
Contributes to CL-1331
2019-05-15 10:47:25 +02:00
Ian Paschal
02cb41e007
Improve typings
...
Contributes to CL-1331
2019-05-15 10:31:00 +02:00
Ian Paschal
5774813704
Use class properties
...
Contributes to CL-1331
2019-05-15 10:09:50 +02:00
Ian Paschal
c7f6351903
Add typings
...
Contributes to CL-1331
2019-05-15 10:09:27 +02:00
Lipu Fei
1bed5c9c11
Merge remote-tracking branch 'origin/4.1' into CURA-6497_fix_empty_material_name
2019-05-15 08:40:45 +02:00
ChrisTerBeke
913fac0094
Should be non-human readable string
2019-05-14 21:18:00 +02:00
ChrisTerBeke
b1920b05e9
Remove hacky code that is now not needed anymore
2019-05-14 21:13:29 +02:00
ChrisTerBeke
56c1da2580
printer_type has a default value so cannot be Optional
2019-05-14 21:01:34 +02:00
ChrisTerBeke
70c679859a
Use default value for printer type, allow printer_type field from cloud
2019-05-14 20:56:28 +02:00
Ian Paschal
f81340c14a
Merge pull request #5717 from Ultimaker/CL-1259_hide_useless_override_button
...
CL-1259 Hide the Override button if it is not an option
2019-05-14 15:30:53 +02:00
Ghostkeeper
f4dac40f8b
Merge branch '4.1'
...
Conflicts:
resources/i18n/es_ES/cura.po -> Correction to Spanish translations while we generated new templates on 4.1.
2019-05-14 14:50:36 +02:00
Ghostkeeper
ef707e4bad
Update file headers of translation templates
...
We're in Cura 4.1 now. Also, the reporting e-mail was somehow missing from all the cura.po files.
Contributes to issue CURA-6521.
2019-05-14 14:35:58 +02:00
Ghostkeeper
f845d13514
Update translation templates per language from pot file
...
This is generated with the i18n-update-po CMake target.
Contributes to issue CURA-6521.
2019-05-14 14:31:14 +02:00
Ghostkeeper
51cc2ff701
Remove duplicate entries
...
MSGMerge crashes on these. They are probably caused by the build system being a little bit naive about where it gets its strings from.
2019-05-14 14:30:10 +02:00
Ghostkeeper
1941d5219f
Update translation templates for 4.1
...
These are the new strings for Cura 4.1.
Contributes to issue CURA-6521.
2019-05-14 14:25:01 +02:00
Lipu Fei
d1805d34be
Move background to ScrollView for GcodeTextArea
2019-05-14 11:44:14 +02:00
Lipu Fei
7f8896705f
Merge remote-tracking branch 'origin/4.1'
2019-05-14 10:41:12 +02:00
Lipu Fei
5280ec4af5
Fix Mark2 appearing at the bottom of machine list
2019-05-14 10:38:27 +02:00
Lipu Fei
7c1d589528
Merge remote-tracking branch 'origin/4.1' into CURA-6497_fix_empty_material_name
2019-05-14 09:42:57 +02:00
