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 |
|
Ghostkeeper
|
bc28189ff5
|
Don't serialize the name of the metadata
It's being serialized in a different place.
Contributes to issue CURA-4243.
|
2017-12-04 10:55:30 +01:00 |
|
Diego Prado Gesto
|
288aba0ec4
|
CURA-4667 Fix simulation view render race. Change the place where the
layer data is reset.
|
2017-12-04 10:18:53 +01:00 |
|
Mark Burton
|
ad4a27db3a
|
Call resetLayerData() before adding LayerDataDecorator to scene node rather than afterwards.
This ensures that the layer data is reset before the scene is rendered.
|
2017-12-04 10:18:21 +01:00 |
|
Diego Prado Gesto
|
c3d9c1b3d8
|
CURA-4667 Fix simulation view render race. Change the place where the
layer data is reset.
|
2017-12-04 09:49:03 +01:00 |
|
Andreea Scorojitu
|
d5c55ae7d3
|
Merge branch '3.1' of https://github.com/Ultimaker/Cura into 3.1
|
2017-12-04 09:34:39 +01:00 |
|
Andreea Scorojitu
|
184bfc9dfd
|
Update_ChangeLog_3.1_CURA-4656
|
2017-12-04 09:34:30 +01:00 |
|
Mark Burton
|
033a4615eb
|
Call resetLayerData() before adding LayerDataDecorator to scene node rather than afterwards.
This ensures that the layer data is reset before the scene is rendered.
|
2017-12-01 17:47:08 +00:00 |
|
Ghostkeeper
|
17ede12573
|
Also set base_file metadata when deserialising just metadata
Contributes to issue CURA-4243.
|
2017-12-01 16:07:30 +01:00 |
|
ChrisTerBeke
|
867836bd76
|
Merge pull request #2773 from fieldOfView/fix_usb_target_temperatures
Show USB target temperatures, (estimated) time and jobname
|
2017-12-01 15:29:37 +01:00 |
|
ChrisTerBeke
|
af2b370921
|
Merge pull request #2857 from fieldOfView/fix_cluster_postprocessing
Allow postprocessing before sending data to the printer
|
2017-12-01 15:12:53 +01:00 |
|
Ghostkeeper
|
ffc439852f
|
Merge branch '3.1'
|
2017-12-01 15:00:34 +01:00 |
|
Lipu Fei
|
a425a1c51b
|
Fix legacy profile loading
CURA-4075
|
2017-12-01 14:57:59 +01:00 |
|
ChrisTerBeke
|
7cc953d8e7
|
Merge pull request #2880 from fieldOfView/fix_machinesettings_diameter_no_materials
Hide material diameter when the machine has no materials
|
2017-12-01 14:56:36 +01:00 |
|
Ghostkeeper
|
2236e0016d
|
Merge branch '3.1'
|
2017-12-01 14:41:41 +01:00 |
|
Diego Prado Gesto
|
21d61ce21e
|
Fix an error that makes Cura crash when introducing commas in the
textfields in the ImageReader panel. Now it's possible to use commas xor
dots for separating decimal values.
|
2017-12-01 14:26:53 +01:00 |
|
Andreea Scorojitu
|
0fe51589ac
|
Merge branch '3.1' of https://github.com/Ultimaker/Cura into 3.1
|
2017-12-01 13:29:05 +01:00 |
|
Andreea Scorojitu
|
5202c8584c
|
Update_ChangeLog_3.1_CURA-4656
|
2017-12-01 13:26:38 +01:00 |
|
Diego Prado Gesto
|
e7ac2e37b4
|
Fix an error when closing USB connection. This error raised several
times in the crash reports in the stats.
|
2017-12-01 13:17:36 +01:00 |
|
Lipu Fei
|
7b4cb11240
|
Fix legacy profile upgrade
CURA-4075
Only for single-extrusion machines just like before.
|
2017-12-01 11:20:52 +01:00 |
|
Lipu Fei
|
7de43e71e0
|
Fix legacy profile upgrade
CURA-4075
Only for single-extrusion machines just like before.
|
2017-12-01 11:06:14 +01:00 |
|
Ghostkeeper
|
96c38bce2b
|
Merge branch '3.1'
|
2017-11-30 16:57:01 +01:00 |
|
ChrisTerBeke
|
47c1c1a8bf
|
Merge pull request #2883 from fieldOfView/fix_machinesettings_gcode_flavor_materials
[regression] Fix material container for extruder when changing gcode flavor
|
2017-11-30 16:30:13 +01:00 |
|
ChrisTerBeke
|
d76081ae1d
|
Only restore global profile based on extruders that are actually in use when loading legacy project file
|
2017-11-30 16:24:46 +01:00 |
|
ChrisTerBeke
|
3abf067d25
|
Fix loading .curaproject files with stack setups from earlier versions - CURA-4646
|
2017-11-30 15:24:51 +01:00 |
|
Jaime van Kessel
|
51c4062f1b
|
Limit the amount of emits happening for PrintJobs changed
CL-541
|
2017-11-30 15:17:08 +01:00 |
|
fieldOfView
|
4b0ff6e5f4
|
Prevent start & end gcode snippets being double encoded
|
2017-11-30 15:16:09 +01:00 |
|
Jaime van Kessel
|
1c1c195b93
|
When an printer gets added / removed, this is now correctly shown
CL-541
|
2017-11-30 15:01:28 +01:00 |
|
Jaime van Kessel
|
339d7ca4c9
|
Cluster shows default controlItem again when a specific printer is selected
CL-541
|
2017-11-30 14:36:53 +01:00 |
|
Jaime van Kessel
|
d8c4834362
|
Aborting & pausing prints is now possible again from the Cluster output device
CL-541
|
2017-11-30 13:20:58 +01:00 |
|
Jaime van Kessel
|
dea13899b3
|
Cluster can now "target" one of it's printers for display
CL-541
|
2017-11-30 13:07:01 +01:00 |
|