4268 Commits

Author SHA1 Message Date
Jaime van Kessel
6bf10bbbb3 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-06 11:23:16 +02:00
Jaime van Kessel
59020fd98c CHeckup action now correctly resets every time you start it
CURA-1385
2016-07-06 11:20:06 +02:00
fieldOfView
c06e5f4d39 Remove unused name/id when importing a profile from a gcode file
A unique name will be set from the filename by ContainerRegistry
CURA-1615
2016-07-05 21:58:47 +02:00
Aldo Hoeben
c865bb13ea Merge pull request #821 from thopiekar/master-CURA-1615
[CURA-1615] GCodeProfileReader/-Export: Rework
2016-07-05 21:19:37 +02:00
Aldo Hoeben
d8e3eef375 Merge pull request #848 from Ultimaker/thopiekar-BH2-preheat-nozzle
BQ Hephestos2: Heat up nozzle while leveling
2016-07-05 20:56:13 +02:00
Thomas Karl Pietrowski
25c81ce1f8 Just a little typo 2016-07-05 18:55:13 +02:00
Thomas Karl Pietrowski
be4cf00835 BQ Hephestos2: Heat up nozzle while leveling
Saves time and preheats the nozzle to the correct temperature (set by Cura).
Btw. the BQ support explained me the reason why they are assuming 210°C needs to set here. The reason is that the printer is just meant to be used with PLA, so they are only expecting to use exactly 210°C. Just explained them why this is incorrect when think about the possibility that Cura can set the temperature on it's own.
2016-07-05 18:22:56 +02:00
Arjen Hiemstra
750ecfc2e1 Remove some now-useless code relating to spool weight
Contributes to CURA-341
2016-07-05 16:51:28 +02:00
Arjen Hiemstra
2bc3a10776 Properly handle machines that have no variants
Contributes to CURA-341
2016-07-05 16:51:02 +02:00
Arjen Hiemstra
aba60b0105 Remove "Rename" button from Materials page and make the other ones work
Since the name is generated from the metadata

Contributes to CURA-341
2016-07-05 16:48:43 +02:00
Arjen Hiemstra
827c7b84fd Do not try to set a property of a read-only material
Contributes to CURA-341
2016-07-05 16:47:26 +02:00
Arjen Hiemstra
e80a999740 Fix up readOnly property of XmlMaterialProfile
Contributes to CURA-341
2016-07-05 16:46:52 +02:00
Arjen Hiemstra
ce065d110d Finish implementation of ContainerManager
Contributes to CURA-341
2016-07-05 16:45:23 +02:00
Arjen Hiemstra
ff9e4c9bb7 Add some more documentation to ContainerManager
Contributes to CURA-341
2016-07-05 16:44:13 +02:00
Jaime van Kessel
aba0392728 Saving g-code no longer crashes 2016-07-05 10:46:38 +02:00
Jaime van Kessel
fc99cac05e Removed update firmware from extensions; This is now handled by machine actions 2016-07-05 09:39:18 +02:00
Jaime van Kessel
08502b9240 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-05 09:37:27 +02:00
Jaime van Kessel
44e4fc383e Changing active extruder no longer trigger re-slice
CURA-1729
2016-07-05 09:37:01 +02:00
fieldOfView
793f7824c7 Quick fix to restore slicing
This list of zeros may have to match the number of extruders
CURA-1687
2016-07-04 19:14:48 +02:00
fieldOfView
8c002877c3 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-04 18:36:28 +02:00
fieldOfView
7b4137ce20 Tweak color and icon logic (add "pre_print" state)
CURA-1036
2016-07-04 18:35:47 +02:00
Jack Ha
012484a4f1 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-04 17:35:32 +02:00
Jaime van Kessel
b3adf8a271 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-04 17:11:50 +02:00
Jaime van Kessel
318182495a We now recieve material estimation per extruder
CURA-1687
2016-07-04 17:11:03 +02:00
U-ULTIMAKER\j.ha
84b736df07 first commit in Cura! fix CURA-1085, time estimate is reset before every slice action 2016-07-04 17:08:35 +02:00
fieldOfView
dd249206ac Fix codestyle
CURA-491
2016-07-04 16:33:32 +02:00
fieldOfView
bff23598c6 Fix simple mode infill to work with multiple extruders
CURA-1778
2016-07-04 16:23:07 +02:00
fieldOfView
3d86ffd575 Fix switching materials/nozzles in Cura when the materials/nozzles in the printer change
CURA-491
2016-07-04 15:14:36 +02:00
fieldOfView
24c5a39962 Fix logic and typo for material container filtering
CURA-491
2016-07-04 13:43:13 +02:00
Arjen Hiemstra
6f3fa19890 Fix up plugins that use ExtruderManager
Since it has been moved to cura.Settings
2016-07-04 13:16:04 +02:00
fieldOfView
90fa0f0564 Make Select Upgrades page look like the other pages
CURA-1385
2016-07-04 13:14:40 +02:00
Jaime van Kessel
0e098e38eb More fixes for changed setting object location 2016-07-04 13:10:29 +02:00
Arjen Hiemstra
6fbe354839 Fix ExtrudersModel to use the right location for ExtruderManager
Contributes to CURA-342
2016-07-04 13:03:10 +02:00
fieldOfView
6933430185 Flow MachineActions on the manage Printes page.
CURA-1385
2016-07-04 12:47:16 +02:00
Tim Kuipers
f679b1ef68 JSON fix: merge went wrong: forgotten comma 2016-07-04 12:24:26 +02:00
Tim Kuipers
43f220278a Merge branch 'feature_retraction_settings_per_extruder' 2016-07-04 12:09:04 +02:00
Arjen Hiemstra
ce3a5f7e48 Update references to moved classes so things work again
Contributes to CURA-342
2016-07-04 12:08:38 +02:00
Arjen Hiemstra
a882c43b2c Move MachineManager to cura/Settings and rename it to MachineManager
Contributes to CURA-342
2016-07-04 12:08:08 +02:00
Arjen Hiemstra
0e28b331fb Move Cura setting related classes to cura/Settings
Contributes to CURA-342
2016-07-04 12:07:29 +02:00
fieldOfView
8e58e88511 Update GUIDs to match the GUIDs in the official repository
CURA-491
2016-07-04 11:50:15 +02:00
fieldOfView
a1a7518317 Switch materials/nozzle when the printer signals a material/nozzle change
CURA-491
2016-07-04 11:49:27 +02:00
Arjen Hiemstra
7008e047f6 Merge branch 'master' of github.com:ultimaker/Cura into feature_material_editing
* 'master' of github.com:ultimaker/Cura: (76 commits)
  Added UMO upgrade selection
  Added stubs for UMO upgrade selection
  Machine action labels are now translatable
  Code style CURA-1676
  Using the correct placeholder
  SplashScreen: Using system-default fontfamily
  USBPrinting: Let's "Print via USB"
  BQ Hephestos2 - Preheating temperature fix When starting a print with the "custom" GCode by BQ, the printer resets the nozzle temperature to 210°C when printing via SD card (no matter what you set on Cura) and only preheats the nozzle to 180°C when printing via USB. So currently the printer begins to print via USB at 180°C and reaches the correct temperature eg.g while printing the brim.
  Fix warning about missing color in theme
  Automatically show the Print Monitor when starting a print
  Fix USBPrinterOutputDevice to work with the Print Monitor
  Properly prevent warning when no printer is connected.
  ZOffset decorator is now correctly copied
  Force focus instead of requesting it.
  Fix two "critical errors" on startup
  Minor check machine action GUI improvements
  Prevent warning when no printer is connected.
  Fix empty material/quality profiles when switching variants
  Disable monitor buttons when there is no job running
  Move message stack "above" the viewport overlay
  ...
2016-07-04 11:45:59 +02:00
Arjen Hiemstra
df3275a10a Update Machine and Profile pages with the changes made to ManagementPage
Since all the individual properties are removed and we now just need to
handle the buttons ourself.

Contributes to CURA-342
2016-07-04 11:43:27 +02:00
Jaime van Kessel
1242d6bf52 Added UMO upgrade selection
CURA-1385
2016-07-04 11:24:31 +02:00
Arjen Hiemstra
c9b1c36cc3 Add some documentation to XmlMaterialProfile
Contributes to CURA-342
2016-07-04 11:00:54 +02:00
Jaime van Kessel
53087bd278 Added stubs for UMO upgrade selection
CURA-1385
2016-07-04 10:28:37 +02:00
Jaime van Kessel
ea9e7f1755 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-04 10:27:46 +02:00
Jaime van Kessel
41147b5128 Machine action labels are now translatable
CURA-1385
2016-07-04 10:26:59 +02:00
fieldOfView
0c23c26ac9 Code style
CURA-1676
2016-07-03 16:01:57 +02:00
Aldo Hoeben
cfad7996f2 Merge pull request #841 from Ultimaker/thopiekar-print-via-usb
USBPrinting: Let's "Print via USB"
2016-07-03 15:55:53 +02:00