fieldOfView
717fac3d78
Merge branch 'master' of https://github.com/Ultimaker/Cura
2016-08-10 14:09:10 +02:00
fieldOfView
a0203905b6
Show the right material color for single-extrusion machines
...
CURA-1992
2016-08-10 14:08:58 +02:00
Ghostkeeper
15fef2452b
Limit speeds to max feedrates of the printer
...
Also number of slowdown layers is no longer limited by light speed.
Contributes to issue CURA-1049.
2016-08-10 13:52:28 +02:00
Jack Ha
48792aa8f3
Fixed firmware update screen. CURA-2079.
2016-08-10 12:57:01 +02:00
Jack Ha
9bf4dbd24f
Fix wrong variable name
2016-08-10 09:44:27 +02:00
Jack Ha
decf998d68
Code style, semicolons
2016-08-10 09:17:10 +02:00
fieldOfView
e551898e04
Add a connection string to the printmonitor
...
CURA-2091
2016-08-09 18:43:09 +02:00
Ghostkeeper
a0df0c76de
Use correct material profile in extruder stack
...
The material profile is more specific inside a material profile if the machine has material quality profiles.
Contributes to issue CURA-844.
2016-08-09 18:06:23 +02:00
Ghostkeeper
4d13622a6e
Split profiles also per variant
...
But of course the variant names are strange in the new material profiles.
Contributes to issue CURA-844.
2016-08-09 18:06:23 +02:00
Ghostkeeper
9c7a28fa2d
Don't break if current settings machine is unknown
...
Currently it sets the user profile to 'empty', which is bad because empty is read-only. But it allows me to continue for now. I'll find a solution for that later.
Contributes to issue CURA-844.
2016-08-09 18:06:23 +02:00
Ghostkeeper
36b027b290
Fix copying ConfigParser
...
Turns out that copy.copy() doesn't work on ConfigParsers. It returns a different instance but modifying that instance still modifies the old configs. Deep copy isn't allowed. But this dictionary copy works.
Contributes to issue CURA-844.
2016-08-09 18:06:23 +02:00
Ghostkeeper
71505a8b35
Use normal config only if not material(-specific) profile
...
Other profiles should just return an array with only their single profile.
Contributes to issue CURA-844.
2016-08-09 18:06:23 +02:00
Ghostkeeper
9a555fcab0
Fix call to VersionUpgrade21to22.machinesWithMachineQuality
...
It needs that stupidly long path if we're using imports inside a plug-in.
Contributes to issue CURA-844.
2016-08-09 18:06:23 +02:00
Ghostkeeper
1428f67798
Rename machines_with_machine_quality to machinesWithMachineQuality
...
As per the code style conventions. Sorry, I'm used to other conventions in one of my own projects.
Contributes to issue CURA-844.
2016-08-09 18:06:23 +02:00
Ghostkeeper
36f84017cf
Move _machines_with_machine_quality to VersionUpgrade21to22
...
It's going to need to be used by the upgrader of machine instances as well, that's why.
Contributes to issue CURA-844.
2016-08-09 18:06:23 +02:00
Ghostkeeper
7481f0802e
Split profiles into multiple if new printer has material profiles
...
If the old profile didn't specify any material, it would be global. But if the new machine specifies that its profiles are material-specific, these profiles have to be split into multiple profiles in order to be able to show them in Cura 2.2.
Contributes to issue CURA-844.
2016-08-09 18:06:23 +02:00
Ghostkeeper
af86375ba3
Output arrays of files rather than a single file
...
This is needed because the version upgrade system now allows for a version upgrader to output any number of files.
Contributes to issue CURA-844.
2016-08-09 18:06:23 +02:00
Jaime van Kessel
967591bccb
Infill pattern is now viewed from right stack again
...
CURA-2072
2016-08-09 17:20:37 +02:00
Jaime van Kessel
433db40e9c
Merge branch 'master' of github.com:Ultimaker/Cura
2016-08-09 17:11:23 +02:00
Jaime van Kessel
c381b82ac1
Extruder nr is now sent as string
...
CURA-2071
2016-08-09 17:09:48 +02:00
Jack Ha
223b8f28bb
Update print monitor button labels and enabled. CURA-2060
2016-08-09 16:20:40 +02:00
Jack Ha
2d723cbb57
Comments CURA-2064
2016-08-09 14:54:09 +02:00
Jack Ha
fc462cdf6f
Merge branch 'master' of github.com:Ultimaker/Cura
2016-08-09 10:57:42 +02:00
Jack Ha
f60ba6ddf0
Enable Abort Print button while in pre_print.
2016-08-09 10:57:28 +02:00
fieldOfView
c7a120edd5
Merge branch 'master' of https://github.com/Ultimaker/Cura
2016-08-09 09:56:40 +02:00
fieldOfView
f817d30abc
Change colour to color for consistency
2016-08-09 09:56:23 +02:00
Jaime van Kessel
87a0543d0c
Added bit more logging to USBConnection
...
This should make the debugging easier out in the field.
2016-08-09 09:37:31 +02:00
Tim Kuipers
68798a0c81
Merge branch 'master' of github.com:Ultimaker/Cura
2016-08-08 17:13:44 +02:00
Jack Ha
6d52319ee4
Adjusted visibility of printer monitor progress bar + percentage.
...
CURA-2064
2016-08-08 17:08:01 +02:00
Tim Kuipers
6477e588da
JSON feat: override max z feedrate (CURA-1049)
2016-08-08 17:02:49 +02:00
Jack Ha
b365cdfd0f
Merge branch 'master' of github.com:Ultimaker/Cura
2016-08-08 16:26:20 +02:00
Jack Ha
1bd0d65e0a
Added user feedback after pressing Pause / Resume in network printer.
...
The button displays Pausing... or Resuming... until a new status update.
CURA-2060
2016-08-08 16:25:01 +02:00
fieldOfView
20d2cd56a0
Merge branch 'master' of https://github.com/Ultimaker/Cura
2016-08-08 15:41:33 +02:00
fieldOfView
2c61fe3249
Tweak layout of Per Object Settings
...
CURA-1799
2016-08-08 15:41:20 +02:00
fieldOfView
ca2daae6ab
Add a "show all" toggle to the select per object setting window
...
This way the user can add a setting that is not made visible in the sidebar. Adding a specific setting no longer needs a detour through the setting visibility preference page.
CURA-1799
2016-08-08 15:11:38 +02:00
fieldOfView
36abe075cf
Restyle categories in add per object settings visibility dialog
...
... to match the Setting Visibility preference page
CURA-1799
2016-08-08 14:24:38 +02:00
fieldOfView
7020fd6903
Allow adding multiple per object settings at once
...
This reuses the "GUI pattern" of the main setting visibility page.
CURA-1799
2016-08-08 14:23:39 +02:00
Tim Kuipers
ca8ded6c35
JSON fix: support z dist defaults to 1 layer instead of 2 (CURA-1283)
2016-08-08 13:23:03 +02:00
Ghostkeeper
d98c122bd5
Disable extruder selection drop-downs in single-extrusion machines
...
They don't function in single-extrusion machines.
2016-08-08 12:56:45 +02:00
fieldOfView
7326d77605
Fix broken backend plugin on Windows
2016-08-08 12:30:47 +02:00
fieldOfView
6ab3939f75
Fix broken backend plugin on Windows
2016-08-08 12:12:06 +02:00
fieldOfView
7ec413f24c
Merge branch 'master' of https://github.com/Ultimaker/Cura
2016-08-08 12:01:11 +02:00
fieldOfView
dff90342d2
Improve rendering of notice icon at small sizes
...
CURA-2048
2016-08-08 12:00:56 +02:00
Thomas Karl Pietrowski
9bd59a4eaa
Merge pull request #901 from thopiekar/master-linux-fallback-path
...
Scanning for CuraEngine and stop if it was not found
2016-08-08 10:47:49 +02:00
Thomas Karl Pietrowski
42db29d86a
Removing the stray @awhiemstra mentioned
2016-08-08 10:47:19 +02:00
Thomas Karl Pietrowski
7c3b6814d0
Removing strays
2016-08-08 10:45:41 +02:00
fieldOfView
4de5360ac5
Use Logger.log instead of Logger.logException
...
CURA-1923
2016-08-08 10:43:48 +02:00
Aldo Hoeben
5ea49c14a3
Merge pull request #889 from thopiekar/master-CURA-1923
...
[CURA-1923] SliceInfo: Sending data threaded
2016-08-08 10:18:00 +02:00
Tim Kuipers
c57f13b3d3
JSON fix: turn off flow equalization by default (CURA-2065)
2016-08-08 10:13:14 +02:00
Tim Kuipers
0ca2985293
Merge branch 'master' of github.com:Ultimaker/Cura
2016-08-08 09:52:34 +02:00