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
Aldo Hoeben
41e30f4424
Merge pull request #844 from thopiekar/master-CURA-1676
...
[CURA-1676] SplashScreen: Using system-default fontfamily
2016-07-03 15:55:24 +02:00
Thomas Karl Pietrowski
cd14a15040
Using the correct placeholder
...
Thanks to Ruben!
2016-07-03 15:17:40 +02:00
Thomas Karl Pietrowski
a38606da4a
SplashScreen: Using system-default fontfamily
...
Contributes to CURA-1676
2016-07-03 15:00:26 +02:00
Thomas Karl Pietrowski
c67d2faac3
CuraEngineBackend: Keep the last 200 lines of logged messages
...
Don't know how much lines we will need exactly, but I think 200 are
enough for the moment.
Contributes to CURA-1775
2016-07-03 14:39:16 +02:00
Thomas Karl Pietrowski
ec41fce7bd
USBPrinting: Let's "Print via USB"
...
Already made that correction in the past. When print monitor was merged it appeared again.
2016-07-03 13:26:51 +02:00
Ghostkeeper
afe0104dc7
Merge pull request #838 from thopiekar/master-bq-hephestos2-preheat-workaround
...
BQ Hephestos2 - Preheating temperature fix
2016-07-03 12:41:17 +02:00
Thomas Karl Pietrowski
19a718205d
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.
2016-07-01 21:27:36 +02:00
Thomas Karl Pietrowski
7f5f22d472
Moving Nvidia workaround to cura_app.py
...
* also added "debian" into the list of distributions
2016-07-01 19:37:24 +02:00
fieldOfView
b7906c9ce7
Fix warning about missing color in theme
...
CURA-1036
2016-07-01 15:26:24 +02:00
fieldOfView
087ebc0768
Automatically show the Print Monitor when starting a print
...
CURA-1036
2016-07-01 15:06:49 +02:00
fieldOfView
6800991fa1
Fix USBPrinterOutputDevice to work with the Print Monitor
...
CURA-1036
2016-07-01 14:32:40 +02:00
fieldOfView
c9b2a1d938
Properly prevent warning when no printer is connected.
...
CURA-1036
2016-07-01 11:51:46 +02:00
Jaime van Kessel
b06e61727c
ZOffset decorator is now correctly copied
...
CURA-1504
2016-07-01 11:39:47 +02:00
Jaime van Kessel
095dbaaa8d
Merge branch 'master' of github.com:Ultimaker/Cura
2016-07-01 11:04:54 +02:00
Jaime van Kessel
91bfd2de27
Force focus instead of requesting it.
...
Fixes CURA-1778
2016-07-01 11:04:23 +02:00
fieldOfView
1466cb961d
Merge branch 'master' of https://github.com/Ultimaker/Cura
2016-07-01 10:12:30 +02:00
fieldOfView
fea534509e
Fix two "critical errors" on startup
...
CuraMachineManager.isGlobalStackValid would return None on startup, which qml does not like.
CURA-1585
2016-07-01 10:12:11 +02:00
Jaime van Kessel
8b46dd197f
Merge branch 'master' of github.com:Ultimaker/Cura
2016-07-01 09:52:52 +02:00
Jaime van Kessel
aaae2aa3d5
Minor check machine action GUI improvements
...
CURA-1385
2016-07-01 09:51:54 +02:00
Tim Kuipers
c8e61a3267
JSON feat: cubic isometric infill (CURA-1723)
2016-07-01 00:56:48 +02:00