Commit graph

17030 commits

Author SHA1 Message Date
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
fieldOfView
7011520845 Select the UM3 that we are connected to if it is in the list
CURA-2035
2016-08-09 15:54:20 +02:00
fieldOfView
7e8eb2044a Sort list of discovered printers
CURA-2035
2016-08-09 15:19:58 +02:00
fieldOfView
7f83c22f74 Add "refresh" button to list of network printers
CURA-2035
2016-08-09 15:18:57 +02:00
Jack Ha
2d723cbb57 Comments CURA-2064 2016-08-09 14:54:09 +02:00
fieldOfView
bd6e36f487 Add documentation
CURA-2035
2016-08-09 13:54:13 +02:00
fieldOfView
0816663e16 Merge branch 'master' of https://github.com/Ultimaker/JediWifiPrintingPlugin 2016-08-09 13:50:06 +02:00
fieldOfView
a649bdcb32 Speed up Bonjour discovery and make it slightly more robust
CURA-2035
2016-08-09 13:49:47 +02:00
Jaime van Kessel
86a65e495b Close now resets authentication & timeout data.
CURA-1936
2016-08-09 13:10:13 +02:00
fieldOfView
5f51804ba6 Merge branch 'master' of https://github.com/Ultimaker/JediWifiPrintingPlugin 2016-08-09 11:22:45 +02:00
fieldOfView
a0535a7aaf Add some logging to debug discovery issues
CURA-2035
2016-08-09 11:22:26 +02:00
Jack Ha
3a0b9ccafe Typo CURA-1986 2016-08-09 11:22:24 +02:00
Jack Ha
a288ab321f Display an error message when "Print over network" if printer not idle.
CURA-1986
2016-08-09 11:19:39 +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
70a93ac0a2 Only associate to a Jedi if the MachineAction is currently shown
CURA-2041
2016-08-09 10:27:19 +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
Seva Alekseyev
d32c300ee7 Support for explicit length unit override in X3D header 2016-08-08 14:11:30 -04:00
fieldOfView
7471b00eff Set the material container to a sane default 2016-08-08 18:16:22 +02:00
fieldOfView
5fd476a2f7 Update the has_materials metadata entry when changing gcode flavor 2016-08-08 18:06:39 +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
Seva Alekseyev
bfd7883c87 Initial support for the X3D scene file format (see http://www.web3d.org/).
For now, just mesh import. Supports all geometry nodes in Rendering, Geometry3D, CAD geometry modules. No support for materials, color, or textures. Normals in the file (if any) are ignored. Light sources, viewpoints, sensors, world, shaders, scripts also ignored.
2016-08-08 10:50:38 -04: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
Jack Ha
97f9bcacf1 Tooltip for bed temperature displays values where it resolves from. CURA-2007 2016-08-08 13:39:54 +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
Tim Kuipers
b3fad69605 Merge branch 'markwal-mergeinfillchanges' 2016-08-08 09:51:54 +02:00