Jaime van Kessel
5e94e51e0c
Add default for max_layer setting in postprocessing script
2019-07-23 15:36:04 +02:00
Jaime van Kessel
a330ae12dc
Merge branch 'patch-2' of https://github.com/N95JPL/Cura
2019-07-23 15:28:32 +02:00
Jaime van Kessel
23e295e9e7
Merge branch '4.2' of github.com:Ultimaker/Cura
2019-07-23 15:26:13 +02:00
Diego Prado Gesto
1d6ba3ffb0
Merge branch 'master' into fixes_toolbox
2019-07-23 15:15:02 +02:00
Jaime van Kessel
42abece298
Fix crash when a corrupted and unkown message was returned
...
This is should be pretty rare, but we got a single crash report for it.
2019-07-23 14:54:40 +02:00
Jaime van Kessel
757988a7f4
Merge branch 'master' of github.com:Ultimaker/Cura into fixes_toolbox
2019-07-23 14:04:40 +02:00
Jaime van Kessel
1e7875de48
Merge branch 'prevent_throwing_exception_when_not_connected' of github.com:Ultimaker/Cura
2019-07-23 13:57:31 +02:00
Jaime van Kessel
87666eb6a1
Merge branch 'master' of github.com:Ultimaker/Cura
2019-07-23 13:42:29 +02:00
Jaime van Kessel
d8ddcba091
Fix typing ignore for breath frist iterator
2019-07-23 13:40:40 +02:00
Ghostkeeper
f69eb05636
Merge branch '4.2'
2019-07-23 13:33:58 +02:00
Jaime van Kessel
9ceb9ce18b
Fix typing issues
...
They were caused by upgrading to a higher mypy version, which found more mistakes
2019-07-23 12:58:46 +02:00
Jaime van Kessel
9cdf18525c
Merge branch 'master' of github.com:Ultimaker/Cura into add_42_43_version_upgrader
2019-07-23 11:33:52 +02:00
Jaime van Kessel
57eb47e267
Named the imade profiles back again and added upgrade step for it
...
The proposed new name is better and since we have an upgrader now, it's best to change it.
2019-07-23 11:23:42 +02:00
Jaime van Kessel
e56e355e79
Added upgrader for 4.3
2019-07-23 11:15:13 +02:00
ChrisTerBeke
7300f95a42
Hide incorrect tooltip
...
The preffered solution was to change the copywriting, but since we are after stringfreeze we cannot do this. This is the next best solution to prevent user confusion.
2019-07-22 21:21:18 +02:00
Ghostkeeper
ca48f9171f
Merge branch '4.2'
2019-07-22 17:32:21 +02:00
Ghostkeeper
02ff433c92
Use set for unordered collections of things
...
Contributes to issue CURA-6672.
2019-07-22 17:07:07 +02:00
Jaime van Kessel
203ea2a83f
Merge branch '4.2' of github.com:Ultimaker/Cura
2019-07-22 16:52:16 +02:00
Jaime van Kessel
00f21069e7
Ensure that metadata entries in cura namespace are stored correctly
...
CURA-6672
2019-07-22 16:41:08 +02:00
Lipu Fei
4b8a216771
Fix typing
2019-07-22 09:34:00 +02:00
Jaime van Kessel
e6512e748c
Merge branch '4.2' of github.com:Ultimaker/Cura
2019-07-19 10:58:45 +02:00
Jaime van Kessel
ee05dc7b47
Minor codestyle fixes
2019-07-19 10:55:22 +02:00
Jaime van Kessel
b8d27b9ce3
Fix definition_changes not being updated properly
...
CURA-6667
2019-07-19 10:53:11 +02:00
Jaime van Kessel
a7ddab3c60
Merge branch '4.2' of github.com:Ultimaker/Cura
2019-07-19 10:38:39 +02:00
Jaime van Kessel
c67f2cfcf5
Merge pull request #6004 from Ultimaker/add_camera_view_stats
...
Add camera_view as stats
2019-07-19 10:38:25 +02:00
Jeff Rogers
5ee31a1983
Preserve extruder-only moves in post stretch script
2019-07-18 16:52:59 -07:00
Ghostkeeper
cc9609738c
Show a message when trying to print via USB while already printing
...
Otherwise the button does nothing and gives no feedback of why it does nothing.
Fixes #6026 .
2019-07-18 11:55:26 +02:00
Ghostkeeper
f334fa8578
Spelling of log entries and code style
2019-07-18 11:49:18 +02:00
Jaime van Kessel
ea5c34868e
Merge branch 'revert_correct_depriming_settings' of github.com:Ultimaker/Cura into 4.2
2019-07-17 12:51:56 +02:00
Lipu Fei
0dfa7f1f84
Fix typing
2019-07-16 14:56:30 +02:00
Jaime van Kessel
e8350547b7
Merge pull request #5999 from Ultimaker/CURA-6659_fix_import_quality
...
CURA-6659 Use VersionUpgradeManager to update the imported quality
2019-07-16 14:33:26 +02:00
Jaime van Kessel
2ca39c8e7f
Don't reparse entire file when checking for already extracted version
...
CURA-6659
2019-07-16 14:31:38 +02:00
Lipu Fei
1e7c682382
Use default variant if empty in project loading
...
CURA-6654
2019-07-16 11:24:19 +02:00
Diego Prado Gesto
9590262f18
Change the name of the original depriming settings
...
Change to align with the name in the XML material files.
Contributes to CURA-6662.
2019-07-16 09:55:50 +02:00
Lipu Fei
9da6044a72
Simplify camera_view data collection
2019-07-15 17:00:56 +02:00
Lipu Fei
64b23758c5
Add camera_view as stats
2019-07-12 14:35:06 +02:00
ChrisTerBeke
25130b63e2
Fix logic
2019-07-12 09:19:30 +02:00
ChrisTerBeke
6210135b92
Send the correct action name when using local network
2019-07-12 08:14:28 +02:00
Lipu Fei
6bb3e33c9e
Use VersionUpgradeManager to update the imported quality
...
CURA-6659
2019-07-11 14:27:49 +02:00
ChrisTerBeke
99e2939801
Add defense for when active printer is None
2019-07-10 12:55:12 +02:00
ChrisTerBeke
f1df7b93c4
Fix printer and print job ordering, add back 'move to top'
2019-07-10 12:42:01 +02:00
ChrisTerBeke
9ad89017d0
Add text about cloud connection when no printer can be reached on monitor
2019-07-09 09:09:08 +02:00
ChrisTerBeke
b6a00b9f7f
Hide 'move to top' opion from actions
2019-07-09 08:26:44 +02:00
Jaime van Kessel
7d446722a9
Remove the max-z-speed-override
...
CURA-6625
2019-07-03 16:13:21 +02:00
Lipu Fei
7f824b06bb
Fix typing
2019-07-03 09:09:23 +02:00
Ghostkeeper
bb6e9da526
Fix upgrading custom quality profiles for Creality printers
...
Quite a lot of logic necessary... Oh well.
Contributes to issue CURA-6554.
2019-07-02 16:39:56 +02:00
Ghostkeeper
d5da6e34be
Add version upgrade for Creality printers and CreawsomeMod
...
This should work for both.
Contributes to issue CURA-6554.
2019-07-02 16:00:06 +02:00
Jaime van Kessel
0cb83d2c92
Merge branch 'master' of github.com:Ultimaker/Cura into feature_intent
2019-07-02 13:51:52 +02:00
Lipu Fei
67f10d8bc3
Merge pull request #5885 from Ultimaker/CURA-6329_add_crystallinity_setting
...
Add deprime settings
2019-06-27 16:09:36 +02:00
Ghostkeeper
faf256b2f0
Rename deprime settings with the new name
...
These have been renamed for greater clarity. We also have to rename them on this side now.
Contributes to issue CURA-6329.
2019-06-26 16:41:51 +02:00
