Commit graph

3495 commits

Author SHA1 Message Date
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
fieldOfView
bff23598c6 Fix simple mode infill to work with multiple extruders
CURA-1778
2016-07-04 16:23:07 +02:00
fieldOfView
90fa0f0564 Make Select Upgrades page look like the other pages
CURA-1385
2016-07-04 13:14:40 +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
Jaime van Kessel
1242d6bf52 Added UMO upgrade selection
CURA-1385
2016-07-04 11:24:31 +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
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
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
fieldOfView
58ae1e923c Prevent warning when no printer is connected.
CURA-1036
2016-06-30 19:13:46 +02:00
fieldOfView
a7939c6f3d Fix empty material/quality profiles when switching variants
CURA-1278
2016-06-30 18:53:50 +02:00
fieldOfView
dc2384c92d Disable monitor buttons when there is no job running
CURA-1036
2016-06-30 11:15:32 +02:00
fieldOfView
43a3ea853a Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-30 11:03:17 +02:00
fieldOfView
3ea4983a23 Move message stack "above" the viewport overlay
CURA-1036
2016-06-30 11:02:15 +02:00
fieldOfView
7ec605579e Introduce printing/busy status and make monitor i18n-aware
CURA-1036
2016-06-30 10:20:19 +02:00
fieldOfView
7d962e97c4 Change monitor progress to percentages
CURA-1036
2016-06-30 10:18:10 +02:00
Simon Edwards
551dc7d757 Fixes for the problem where duplicated objects were broken, missing hull 'shadows' or would fly off the build plate.
Contributes to CURA-1504 Improve performance/simplicity by using Convex Hulls in Scene Graph
2016-06-30 09:35:41 +02:00
Tim Kuipers
4885238103 JSON feat: machine_min_cool_heat_time_window (CURA-1783) 2016-06-29 14:53:13 +02:00
Tim Kuipers
911f80f237 JSON refactor: OCD told me to mode the 'label' property to the top of each machine setting 2016-06-29 14:52:39 +02:00
Ghostkeeper
ac0f743855
Clarify descriptions of jerk settings
This description was established after discussion with several mechanics guys as well as BagelOrb, FieldOfView and RobinMDH.
2016-06-28 17:28:44 +02:00
fieldOfView
9ac5b0ecf7 Fix warning about property id of null in Cura.qml
CURA-1585
2016-06-28 17:04:28 +02:00
fieldOfView
540cc55b65 Fix warning about unknown property "index" in SidebarHeader
CURA-333
2016-06-28 16:59:00 +02:00
fieldOfView
e6bc28c30c Replace "Shell" category icon 2016-06-28 16:08:38 +02:00
Simon Edwards
47de254f97 Fixed up the 3MF reader to use the changed MeshBuilder and MeshData.
CURA-1633 OverflowError: cannot convert float infinity to integer (loading larger models)
2016-06-28 11:43:02 +02:00
Jaime van Kessel
1543e4a6e0 Merge branch 'feature_zhop_over_other_material' of github.com:Ultimaker/Cura 2016-06-28 11:34:25 +02:00
Ghostkeeper
ae9c84c4fb Merge pull request #828 from Ultimaker/thopiekar-print-via-usb-text
Better call it "Print via USB"
2016-06-28 11:21:54 +02:00
Jaime van Kessel
0a3f64ef51 Switching stack now removes focus from all elements
Fixes CURA-1778
2016-06-28 10:55:20 +02:00
fieldOfView
05ff256af4 Add an icon for the experimental category
CURA-1284
2016-06-28 08:56:55 +02:00
Aldo Hoeben
605354272d Merge pull request #830 from thopiekar/master-CURA-1284-new
CURA-1284: Changing icon for experimental category
2016-06-28 08:47:34 +02:00