Commit graph

12694 commits

Author SHA1 Message Date
Aleksei S
6cea9c59e8 Prevent crash handler exception 2017-11-24 11:59:09 +01:00
Jaime van Kessel
57de028608 re-implemented abort & pause for legacy um3
CL-541
2017-11-24 11:26:30 +01:00
Jaime van Kessel
57406100ef Fixed status icon in monitor tab
CL-541
2017-11-24 10:55:24 +01:00
Diego Prado Gesto
bf1ecba641 Add the layer thickness back to the color options in Simulation View 2017-11-24 10:54:20 +01:00
Diego Prado Gesto
1e12258f10 Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-11-24 10:52:51 +01:00
Diego Prado Gesto
c8c2129b7e CURA-4552 Minor changes 2017-11-24 10:51:34 +01:00
Ghostkeeper
9ecfd5510a
Clarify description for when bed temperature is 0
Fixes #2674.
2017-11-24 10:42:09 +01:00
Diego Prado Gesto
0b434978dd CURA-4561 Add tooltip also to the Cancel button. 2017-11-24 10:34:38 +01:00
ChrisTerBeke
46a575b84f Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-11-24 10:31:30 +01:00
ChrisTerBeke
7d1db1b165 Merge branch '3.1' 2017-11-24 10:31:22 +01:00
Lipu Fei
c7667b56e2 Multiple fixes for stacks
CURA-4617
2017-11-24 09:45:59 +01:00
Jaime van Kessel
9d7cd72691 JobData is now shown in monitor screen again
CL-541
2017-11-24 09:38:10 +01:00
Jaime van Kessel
219e285b20 Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite 2017-11-24 09:23:21 +01:00
Jaime van Kessel
c523a6ddf6 Progress is now shown for LegacyPrinter while printing
CL-541
2017-11-24 09:22:50 +01:00
Adam Rumjahn
43c9df5703
Deactivate G32 auto leveling before print
don't need this any more on the new printers
2017-11-23 20:14:43 -05:00
Jaime van Kessel
4597bb09ed Added (short) description & priority to legacy output device.
CL-541
2017-11-23 17:08:22 +01:00
Jaime van Kessel
1c2c4d4163 Added property to indicate if output device accepts commands
Instead of how this was previously done, it's now tied to the auth state.

CL-541
2017-11-23 17:07:24 +01:00
Ghostkeeper
37935a8a90
Load only metadata on start-up
Contributes to issue CURA-4243.
2017-11-23 16:47:55 +01:00
Diego Prado Gesto
7bb82cf56f CURA-4605 Fix render issues when importing a GCode that has empty
layers. Also fix gaps between raft and the model.
2017-11-23 16:47:34 +01:00
Jaime van Kessel
0b91112d72 Fixed postForm
Setting the type of the request to json messed up the multi-part stuff.

CL-541
2017-11-23 16:43:52 +01:00
Lipu Fei
6b3e130349 Fix edge cases with ultimaker2 and whatever other machines that may get affected
CURA-4617
2017-11-23 16:28:36 +01:00
Jaime van Kessel
d0c7352be6 Added missing authentication_succeeded_message attribute to constructor
CL-541
2017-11-23 16:16:57 +01:00
Ghostkeeper
1e07325d8f
Remove unused getIdsFromFile
Since we now return all metadata at once from every file, we don't need this any more. We need to side-load the metadata anyway.

Contributes to issue CURA-4243.
2017-11-23 16:11:02 +01:00
Diego Prado Gesto
f0dca021d8 Merge branch '3.1' of https://github.com/Ultimaker/Cura into 3.1 2017-11-23 15:42:02 +01:00
Diego Prado Gesto
2c6b2b869e CURA-4605 Fix render issues when there are empty layers.
Fix layer gap when raft is enabled.
2017-11-23 15:39:22 +01:00
Lipu Fei
ef37f0d8c7 Fix project loading to reset quality if it doesn't exist
CURA-4617
2017-11-23 15:35:33 +01:00
Ghostkeeper
3ee2e0488f
Only load metadata when finding hotends belonging to material
We only need to have the hotend metadata.

Contributes to issue CURA-4243.
2017-11-23 15:31:22 +01:00
Jack Ha
6f708fef8f Merge branch 'master' of github.com:Ultimaker/Cura 2017-11-23 15:27:32 +01:00
Jack Ha
b6410ecf12 CURA-4561 prepare button upgrades 2017-11-23 15:27:22 +01:00
Ghostkeeper
e3cdcc04fd
Document IRC channels 2017-11-23 14:57:46 +01:00
Mark
49705492ce Merge branch '3.1' 2017-11-23 14:37:31 +01:00
Jaime van Kessel
f03a978781 Sending & compressing g-codes re-added to LegacyUM3
CL-541
2017-11-23 14:19:54 +01:00
Jack Ha
5703f954d4 CURA-4552 fix support for relative extrusion 2017-11-23 14:13:18 +01:00
Lipu Fei
033cc4fbc7 Fix quality update in project loading
CURA-4613
2017-11-23 14:12:41 +01:00
Lipu Fei
dad2dfda89 No need to set currentItem after a material is imported
CURA-4546
2017-11-23 14:08:10 +01:00
Lipu Fei
2397b68cd7 Optimize MaterialsModel update
CURA-4546
2017-11-23 14:07:40 +01:00
Jaime van Kessel
8b8d67b3a8 LegacyUM3 now handles warnings & errors again
CL-541
2017-11-23 13:37:59 +01:00
Lipu Fei
1db448d7d8 Use the correct quality container for global stacks loaded from project files
CURA-4613
2017-11-23 13:04:06 +01:00
Aleksei Sasin
859dae8873 Merge branch '3.1' of https://github.com/Ultimaker/cura into 3.1 2017-11-23 12:58:09 +01:00
Aleksei Sasin
1141368682 Hide icons if monitor view is selected CURA-4527 2017-11-23 12:54:53 +01:00
Lipu Fei
17f09ec21e Fix variant/material/quality handling in stacks
CURA-4613
2017-11-23 12:46:33 +01:00
Lipu Fei
3148027fbe Fix version upgrade for quality_changes
CURA-4613

Explained in the code comments.
2017-11-23 12:43:14 +01:00
Lipu Fei
18c7a5acf3 Pass optional file_name for deserialization
CURA-4613

Some upgrades depend on the file_name, so the file_name is needed in
this case.
2017-11-23 11:28:16 +01:00
Jack Ha
f09f73a586 Merge branch '3.1' 2017-11-23 10:49:42 +01:00
jack
1b76d08f01
Merge pull request #2835 from Ultimaker/simulation_view_minor_improvements
CURA-4609 Minor improvements in Simulation View
2017-11-23 10:49:08 +01:00
Mark
835a0fb5d3 Merge branch 'master' of github.com:Ultimaker/Cura 2017-11-23 10:39:00 +01:00
Mark
aee838c8c1 Merge branch '3.1' 2017-11-23 10:38:48 +01:00
Jaime van Kessel
96d5c7152b Added sending material profiles to LegacyUM3
CL-541
2017-11-23 10:31:39 +01:00
Diego Prado Gesto
b97ed4c211 CURA-4609 Minor improvements in Simulation View:
Increase simulation speed.
Hide Layer Thickness option in color scheme.
Hide nozzle when switching layers.
Set the handles in front of the view.
Name changed back to "Layer View"
2017-11-23 09:59:34 +01:00
Mark
3477b902ab
Merge pull request #2834 from Ultimaker/CURA-4527_view_orientation
Cura 4527 view orientation
2017-11-23 09:56:26 +01:00