Lipu Fei
107c10b860
Merge branch '3.3'
2018-04-10 11:41:13 +02:00
Lipu Fei
95f4515e93
Make it possible to skip project file check in readLocalFile()
...
CURA-5203
2018-04-10 11:40:47 +02:00
Lipu Fei
d32ddea678
Merge pull request #3601 from fieldOfView/fix_usb_rapid_commands
...
Fix sending commands in rapid succession over USB
2018-04-09 15:33:44 +02:00
Lipu Fei
95c6258d0f
Handle plugin not found due to mixed plugin metadata
...
CURA-5202
Plugin metadata that comes from the plugin server is also saved into
PluginRegistry's metadata collection, so it's all mixed. Plugins that
are just installed cannot be loaded immediately, and this causes an
error in checkCanUpgrade().
2018-04-09 15:10:25 +02:00
fieldOfView
2def68edab
Merge branch 'master' into fix_usb_rapid_commands
...
# Conflicts:
# cura/PrinterOutput/GenericOutputController.py
2018-04-09 14:49:12 +02:00
alekseisasin
7b9bf23786
Merge pull request #3411 from BagelOrb/support_retraction_setting
...
setting to disable omitting retractions in support
2018-04-09 13:57:49 +02:00
Aleksei S
10ebabb7f6
Home head only by X- and Y axis, do extra bedHome (G28 Z)
...
CURA-4844
2018-04-09 13:13:52 +02:00
Aleksei S
c7b6bb8188
Merge branch '3.3'
2018-04-09 12:53:53 +02:00
Lipu Fei
cadb2c62b7
Fix open file with Cura
...
CURA-5203
When open a file that's associated with Cura, dialogs that need to
pop up may not work because QML is still in the middle of initialization,
so we need to wait for QML to finish before doing anything else such
as opening files.
2018-04-06 11:55:07 +02:00
Lipu Fei
872a029f99
Merge remote-tracking branch 'origin/feature_benchmarking'
2018-04-06 10:47:00 +02:00
Lipu Fei
c47fe52ca5
Merge 3.3 into master
2018-04-06 10:39:38 +02:00
Lipu Fei
19937d1be0
Fix version comparison in plugin browser
...
CURA-5202
It was comparing with itself so there's never a version upgrade.
2018-04-06 10:34:55 +02:00
Diego Prado Gesto
8c0d58c227
CURA-5197 Add Cura booting time to the logs.
2018-04-05 15:28:44 +02:00
Diego Prado Gesto
877d700180
CURA-5197 Add log output with number of models in the buildplate after
...
slice.
2018-04-05 15:27:05 +02:00
Lipu Fei
8c4c52f915
Remove unused functions in PluginBrowser
2018-04-05 15:13:22 +02:00
Diego Prado Gesto
53c7e2a01e
Merge branch 'master' of github.com:Ultimaker/Cura
2018-04-05 08:55:45 +02:00
Diego Prado Gesto
deaff17a32
Merge branch '3.3'
2018-04-05 08:54:50 +02:00
Jaime van Kessel
18551a4a72
Ensure that the "Slice info message disable button" actually disables the sending of info.
2018-04-04 17:39:22 +02:00
Diego Prado Gesto
79a66b43ab
CURA-5175 Add the get_version function to the version upgrade.
2018-04-04 14:43:20 +02:00
Aleksei S
c6c35a98b4
Merge branch 'master' of github.com:Ultimaker/cura
2018-04-04 11:10:50 +02:00
Aleksei S
43e535ea54
Rename expandAll to expandRecursive
...
CURA-5190
2018-04-04 11:04:54 +02:00
Lipu Fei
836cba9c03
Merge pull request #3617 from Ultimaker/feature_try_line_widths
...
Add setting to try multiple line thicknesses
2018-04-04 11:00:30 +02:00
Lipu Fei
04571dcb9b
Merge branch 'feature_try_line_widths'
2018-04-04 10:49:49 +02:00
Ghostkeeper
4ad9867591
Add setting to try multiple line thicknesses
...
Engine implementation pending. This setting is intended for debugging problems with interrupted walls. It should probably not be published in a final release.
Contributes to issue CURA-5189.
2018-04-03 16:38:19 +02:00
Ghostkeeper
6d10ac993e
Add option to collapse or expand all setting categories
...
Sadly it doesn't display on the category headers themselves, but it works just as well.
2018-03-30 15:07:50 +02:00
Ghostkeeper
60a217fc84
Rename expandAll to expandRecursive
...
Because it doesn't expand all settings, just a category.
2018-03-30 15:07:42 +02:00
fieldOfView
059761b781
Home only the head instead of homing both the head and the bed at the same time
2018-03-30 14:09:25 +02:00
fieldOfView
08d4200f92
Prevent sending next command before an "ok" is received
2018-03-30 14:07:53 +02:00
Diego Prado Gesto
1cf87ff12b
Merge branch '3.3' of github.com:Ultimaker/Cura into 3.3
2018-03-29 17:09:46 +02:00
Diego Prado Gesto
f1e33f0cba
CURA-5175 Remove version upgrade of the quality instance containers
...
since they never get updated.
2018-03-29 17:08:59 +02:00
Aleksei S
261945b469
Merge branch 'master' of github.com:Ultimaker/cura
2018-03-29 17:05:51 +02:00
Aleksei S
1a1e65da1e
Remove business case from 'homeHead' function for UM2
...
CURA-4844
2018-03-29 17:03:25 +02:00
Ghostkeeper
d244a37feb
Merge branch '3.3'
2018-03-29 16:57:55 +02:00
Jack Ha
2a3b25265b
CURA-5174 update camera zoom range
2018-03-29 16:57:36 +02:00
Diego Prado Gesto
a5e38bb486
CURA-5175 Add variants to the version upgrade.
...
Upgrade the version number in the variants and add the hardware_type
metadata.
2018-03-29 16:54:30 +02:00
Diego Prado Gesto
41fc807e21
Merge branch 'master' of github.com:Ultimaker/Cura
2018-03-29 14:39:31 +02:00
Diego Prado Gesto
b2950eca51
CURA-5158 Fix some mistakes in previous confict fixing.
2018-03-29 14:37:55 +02:00
Aleksei S
720a85dd06
Remove comment
...
CURA-4844
2018-03-29 14:31:25 +02:00
Jack Ha
2bf3fa35ac
CURA-5174 update camera zoom range
2018-03-29 14:25:00 +02:00
Jack Ha
f9e7d119af
CURA-5019 thumbnail: do not scale the second color of support meshes or the checkboard pattern is not visible anymore
2018-03-29 14:10:50 +02:00
Jack Ha
54c85fd0ea
CURA-4844 fix some typos
2018-03-29 13:25:26 +02:00
Ghostkeeper
a6d7a61c54
Merge branch '3.3'
2018-03-29 12:01:16 +02:00
Ghostkeeper
b3d652839d
Rename quality type from 'low' to 'fast'
...
Not only the profile name was changed, but also the quality type.
See commit 1538486e85
2018-03-29 12:00:59 +02:00
Ghostkeeper
50b4bac672
Upgrade quality profile names
...
These files have been renamed.
Contributes to issue CURA-5177.
2018-03-29 12:00:59 +02:00
Aleksei S
c81d5d9741
Merge branch 'master' of github.com:Ultimaker/cura
2018-03-29 11:54:43 +02:00
Aleksei S
290adbd906
Fix: bed leveling for UM+
...
CURA-4844
2018-03-29 11:53:31 +02:00
Jack Ha
c1bc078813
CURA-5019 support and infill type nodes are now correctly rendered in the thumbnail
2018-03-29 10:59:53 +02:00
Jack Ha
af7af29d6b
Merge branch '3.3'
2018-03-29 10:25:59 +02:00
jack
049bab1341
Merge pull request #3585 from Ultimaker/fix_postprocessing_persistence
...
Fix postprocessing persistence of setting names with uppercase characters
2018-03-29 10:19:38 +02:00
jack
3108741b54
Merge pull request #3579 from Ultimaker/feature_show_config_errors
...
Show configuration errors
2018-03-29 09:22:34 +02:00
