3479 Commits

Author SHA1 Message Date
Lipu Fei
6e6dc493f1 Fix material loading for unknown names 2017-12-13 12:27:55 +01:00
Aleksei S
c6c4c5be34 Merge branch 'master' of github.com:Ultimaker/cura 2017-12-13 12:03:06 +01:00
Aleksei S
5c5f08e9ca Do not slice a model if it is only one on a build plane and has setting from non_printing_mesh
CURA-4703
2017-12-13 11:58:59 +01:00
Lipu Fei
7cd3449781 Fix material loading 2017-12-13 11:26:16 +01:00
Lipu Fei
e14d78b32a Generate more possible machine IDs in XML material profile 2017-12-13 10:16:06 +01:00
Ruben D
e36099a380
Draw backside of travel lines inverted
This adds a front-facing primitive towards the back side of every travel line, causing those lines to be visible from both sides regardless of backface culling. This doubles the number of vertices for travel moves, but due to backface culling it comes down to approximately the same performance as the original.
2017-12-13 01:44:05 +01:00
Ruben D
79d7de050e
Enable backface culling for layer view
This effectively doubles the rendering performance of layer view.
2017-12-13 01:42:24 +01:00
Ruben D
3666b35ff3
Fix winding order of 3D tubes
Adding a copy of the first vertex causes the winding order to reverse.
2017-12-13 01:41:36 +01:00
Jack Ha
e10ba065ca CURA-4707 better signal to connect solving this issue 2017-12-12 17:06:23 +01:00
Jack Ha
a85bea4bae CURA-4707 fix extruder setting not triggering reslice 2017-12-12 16:37:21 +01:00
Diego Prado Gesto
d70bd0ebc9 CURA-4649 Blocking printers that have localhost IP address. 2017-12-12 13:45:35 +01:00
Jaime van Kessel
b61832bc03 Added manual entry to prevent jogging for UM3
I've not had the time to properly build it yet, so disabling it for now

CL-541
2017-12-12 10:41:27 +01:00
Jaime van Kessel
8bc9663294 Removed old & unused code
CL-541
2017-12-12 10:28:55 +01:00
Ghostkeeper
75df653d47
Merge branch 'feature_local_container_server' 2017-12-11 15:51:17 +01:00
Lipu Fei
c6cdc1d1db Container cfg files need to be parsed without interpolation
CURA-4701
2017-12-11 14:35:27 +01:00
Jaime van Kessel
6ad82ee1b0 Added missing name & description for ClusterOutputDevice
CL-541
2017-12-08 17:32:22 +01:00
Jaime van Kessel
1719a7b2fe Fixed preheating for Legacy UM3
CL-541
2017-12-08 17:16:59 +01:00
Ghostkeeper
1029d4509c
Merge branch 'master' into feature_local_container_server 2017-12-08 16:03:05 +01:00
Jaime van Kessel
ae629e2968 Fixed camera for legacy UM3 printer again
CL-541
2017-12-08 14:59:14 +01:00
ChrisTerBeke
baea9eb1e0 Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-12-08 14:56:18 +01:00
ChrisTerBeke
c4d7a33c31 Monitor view component loader should have width and height from parent 2017-12-08 14:56:03 +01:00
Jaime van Kessel
9ccd643f64 Repaired the monitor icon not being updated
CL-541
2017-12-08 14:36:53 +01:00
Ghostkeeper
e621ace3e4
Remove unnecessarily setting definition
This definition is included in the metadata of container 2.

Contributes to issue CURA-4243.
2017-12-08 12:42:19 +01:00
Lipu Fei
b4e7216f5b Always show extruder tabs in Machine Settings dialog
CURA-4693
2017-12-08 11:08:24 +01:00
Jaime van Kessel
a8695db1c8 Fixed displaying of icons in monitor stage tab
CL-541
2017-12-08 10:44:05 +01:00
Jaime van Kessel
c28c20dbd7 Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite 2017-12-08 10:22:16 +01:00
Diego Prado Gesto
012b8aef62 Merge branch 'feature_sidebar_plugin_target' 2017-12-08 09:45:52 +01:00
ChrisTerBeke
9bf954643c Use new method of setting active stage when needing to switch to monitor 2017-12-07 11:56:52 +01:00
ChrisTerBeke
f91a4db617 Set stage icon for monitor depending on output device state, prevent crash when accessing back-end from unloaded component 2017-12-07 10:38:06 +01:00
Jack Ha
a387c10686 Fix serialize hotend id in xml material.
Contributes to issue CURA-4243.
2017-12-07 09:59:00 +01:00
ChrisTerBeke
dd92d8d5e0 Re-implement monitor view overlay when there is no monitor component 2017-12-07 09:22:02 +01:00
ChrisTerBeke
f6b570e299 Back to QUrl, fix monitor view overlay 2017-12-07 09:13:46 +01:00
ChrisTerBeke
548761fcc3 Some cleanup 2017-12-06 18:15:17 +01:00
ChrisTerBeke
ee643610e5 Fix sidebar loading and unloading depending on active stage 2017-12-06 17:46:18 +01:00
Jaime van Kessel
73bae37544 Added missing string to verification failed Message
CL-541
2017-12-06 16:58:41 +01:00
Jaime van Kessel
b3a3c1e371 Camera image is now actually displayed for Legacy
CL-541
2017-12-06 16:46:33 +01:00
Jaime van Kessel
ba782b346f Fixed re-requesting authentication
CL-541
2017-12-06 16:41:07 +01:00
Jaime van Kessel
77e3965fc7 Added videostream to cluster again
CL-541
2017-12-06 14:59:20 +01:00
Lipu Fei
298a659c09 Save is_debug_mode as string
CURA-4683
2017-12-06 14:49:00 +01:00
Lipu Fei
569e040955 Add more complete version info in project files
CURA-4683
2017-12-06 14:46:41 +01:00
Jaime van Kessel
aba8bd89c3 Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite 2017-12-06 13:33:20 +01:00
ChrisTerBeke
2d044a37ae Sidebar and main view via loader 2017-12-06 13:33:05 +01:00
ChrisTerBeke
a57a5aab6b Make sidebar view working for active stage 2017-12-06 12:23:41 +01:00
ChrisTerBeke
0e1c9146cf Implement stage model in top bar 2017-12-06 09:58:50 +01:00
ChrisTerBeke
a5b99bd862 Scaffold monitor stage 2017-12-06 09:36:09 +01:00
ChrisTerBeke
84ba486d57 Add plugins for prepare and monitor stages 2017-12-06 09:34:09 +01:00
Ruben D
aa727df525
Correct description of SOLIDWORKS macro
The original description was factually incorrect.

Fixes #2839.
2017-12-06 00:53:43 +01:00
Ghostkeeper
13c7099e2f
Don't show slice info message if the preference is set to not send it
If the preference was set to not send it but the user never clicked on the message, don't show the message.

Fixes #2840.
2017-12-05 13:30:12 +01:00
Jack Ha
7d24933835 Fix save to file.
Changed order of setting metadata for correct overwriting.

Contributes to issue CURA-4243.
2017-12-05 11:55:54 +01:00
Ghostkeeper
9e62b6e14b
Merge branch '3.1' 2017-12-04 17:13:52 +01:00