GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-02 01:38:06 +08:00
Code Issues Packages Projects Releases Wiki Activity
14,850 Commits 295 Branches 267 Tags
Commit Graph

4188 Commits

Author SHA1 Message Date
fieldOfView
846c55a99d Simplify detection of url-encoded filepatch 2018-07-31 09:47:18 +02:00
fieldOfView
65ada30c9c Fix flashing "default" firmware 
The url is not QUrl encoded if the "default" firmware is flashed
 2018-07-17 09:01:06 +02:00
fieldOfView
7e90546163 Fix firmware upload on Windows... 
by correctly creating a local path from a url-encoded path

Fixes #3731 and #3987
 2018-06-29 10:34:15 +02:00
Mark
5fe812b4a4 Add downloadnumber to model and plugin view 2018-06-26 15:29:35 +02:00
Ghostkeeper
d4ca3d144e
Use latest temperature instead of a manual resume temperature 
We don't need the user to fill this in. We can just track the resume temperature ourselves.

Contributes to issue CURA-5491.
 2018-06-21 16:07:29 +02:00
Ghostkeeper
e0699a0997
Merge branch '3.4' 2018-06-14 14:57:20 +02:00
Ghostkeeper
7b82421751
Don't disable E steppers when pausing 
There is no such command to disable only the E stepper drivers. This command M84 gets interpreted as disabling ALL stepper drivers, which on some printers would cause the print bed to fall down.
 2018-06-14 14:57:03 +02:00
Diego Prado Gesto
dfd20e1362 CURA-5335 Looking for the actual line number in the gcode when using the filament change script. 2018-06-14 14:35:46 +02:00
Mark
49a3444b13 Unhide label for master 2018-06-14 10:59:05 +02:00
Jack Ha
f5dd7f6e92 CURA-5456 fixed typo, fixed multi objects with disabled extruders in message 2018-06-14 10:27:24 +02:00
Diego Prado Gesto
2c7c167fe0 CURA-5335 Looking for the actual line number in the gcode when using the filament change script. 2018-06-13 20:41:56 +02:00
jack
06f73ac798
Merge pull request #3920 from Ultimaker/CURA-5450_remove_concentric_3d 
CURA-5450 remove concentric 3d
 2018-06-13 16:55:44 +02:00
Jack Ha
5b688fceb1 CURA-5450 update comment 2018-06-13 16:54:55 +02:00
Lipu Fei
439ea79c60 Add message for unable to slice due to disabled extruders 
CURA-5456
 2018-06-13 11:09:20 +02:00
Diego Prado Gesto
b9a94a1025 Adjust the slider label width a bit to look ok in macOS 2018-06-12 13:40:28 +02:00
Diego Prado Gesto
7cd0f57f22 Make the slider label width adjustable depending on the number of digits of 
the total number of layers.
 2018-06-12 13:32:54 +02:00
Lipu Fei
b81635ac8e Update setting_version to 5 and add 34 -> 40 upgrade 
CURA-5450

Also update setting_version for all qualities and variants.
 2018-06-12 10:17:35 +02:00
Jack Ha
fa93d47d5b Merge branch 'master' of github.com:Ultimaker/Cura 2018-06-11 17:00:51 +02:00
Jack Ha
89c84eb93b CURA-5327 fix crash when changing material diameter 2018-06-11 17:00:43 +02:00
Diego Prado Gesto
335d3d4329 Merge branch 'master' of github.com:Ultimaker/Cura 2018-06-11 15:55:22 +02:00
Diego Prado Gesto
6e575c9cf5 CURA-5463 The packages that are scheduled to be removed, are not old 
packages.
 2018-06-11 15:54:11 +02:00
Jack Ha
b3f6e5c9e0 CURA-5327 renamed MachineManager._updateMaterialWithVariant to updateMaterialWithVariant 2018-06-11 15:52:28 +02:00
Diego Prado Gesto
8c9939e797 CURA-5444 Also get the metadata even if the material was marked as not 
compatible.
 2018-06-11 11:20:49 +02:00
Diego Prado Gesto
dc1e36d726 CURA-5444 Always create the instance of the material even if it is not 
compatible, otherwise it will never show as
incompatible if the material profile doesn't define hotends in the
machine.
 2018-06-11 11:20:32 +02:00
Ghostkeeper
54a03723ab
Set encoding correctly when opening files everywhere 
Otherwise the encoding is interpreted differently on Windows and Mac.
 2018-06-11 11:09:07 +02:00
Lipu Fei
c779795618 Remove unnecessary updateMaterialForDiameter() 
CURA-5327
 2018-06-11 10:55:10 +02:00
Lipu Fei
83fcc60bee Show message for unknown machines in project files 
CURA-5337

Do not crash on loading project files with unkown machine types. Show a
message instead.
 2018-06-11 07:52:34 +02:00
Diego Prado Gesto
e5699918ea CURA-5444 Also get the metadata even if the material was marked as not 
compatible.
 2018-06-08 12:03:46 +02:00
Diego Prado Gesto
2a3eed30ab CURA-5444 Always create the instance of the material even if it is not 
compatible, otherwise it will never show as
incompatible if the material profile doesn't define hotends in the
machine.
 2018-06-08 11:21:17 +02:00
Lipu Fei
54c827fd44 Do not run firmware update check jobs in parallel 
CURA-5418

To avoid showing multiple update messages.
 2018-06-07 15:24:21 +02:00
Lipu Fei
12a406529e Fix inconsistent curaproject mimetype definition 
CURA-5334

 - In project file writer, it says the mime type is "application/x-curaproject+xml",
   and we decided to use this as THE mime type.
 - Pass preferred_mimetype to save project file dialog so it
   automatically adds the file extension upon open.
 2018-06-07 14:42:36 +02:00
Jack Ha
d063741d7a Merge branch 'master' of github.com:Ultimaker/Cura 2018-06-07 13:50:50 +02:00
Jack Ha
b2b9de7960 CURA-5396 added timeout options for auto detecting baud rate over USB serial 2018-06-07 13:50:40 +02:00
Lipu Fei
afc5c1fbbd Do not run firmware update check jobs in parallel 
CURA-5418

To avoid showing multiple update messages.
 2018-06-07 13:45:10 +02:00
Lipu Fei
3a7a1dbc6d Fix inconsistent curaproject mimetype definition 
CURA-5334

 - In project file writer, it says the mime type is "application/x-curaproject+xml",
   and we decided to use this as THE mime type.
 - Pass preferred_mimetype to save project file dialog so it
   automatically adds the file extension upon open.
 2018-06-07 12:51:54 +02:00
Ghostkeeper
8202b62343
Merge branch '3.4' 2018-06-07 11:38:13 +02:00
Ghostkeeper
624bbbeb4a
Account for the fact that createMachine can return None 
Contributes to issue CURA-5337.
See also #3787.
 2018-06-07 11:37:48 +02:00
Jack Ha
f828c135f8 CURA-5249 replaced the extruder value of -1 by the more explicit defaultExtruderPosition, so now Cura is aware of the actual extruder position being used. Fixes linked icon next to support settings, like support_angle. 2018-06-07 11:35:09 +02:00
Lipu Fei
04ecc55e3c
Merge pull request #3850 from Ultimaker/uranium_package_manager 
Move package manager to Uranium
 2018-06-07 11:03:45 +02:00
Diego Prado Gesto
97a1aa1a2b Fix a crash in MaterialManager when the brand of the material is None. 
Fix other possible cases when the type or the color are also None.
 2018-06-07 10:54:23 +02:00
Jack Ha
49e49bfa58 Merge branch '3.4' 2018-06-07 09:34:30 +02:00
Diego Prado Gesto
fbdf950a7b
Merge pull request #3899 from fieldOfView/fix_sidebar_monitoringprint 
Remove vestigial references to "monitoringPrint"
 2018-06-06 19:08:58 +02:00
Diego Prado Gesto
ece2729744 CURA-5445 Remove the action when the Finish button is clicked. The 
button will just close the dialog.
 2018-06-06 19:02:40 +02:00
Ghostkeeper
c42b275c5d
Merge branch '3.4' 2018-06-06 16:58:01 +02:00
Diego Prado Gesto
1019f2dd65 CURA-5449 Do not check if the name is the correct group name if the 
output device is manual create device and it is marked as temporary.
Wait until all the information is retrieved when the request finishes.
 2018-06-06 14:54:26 +02:00
Jack Ha
96f2e6e1ed CURA-5402 hopefully solved merge conflicts 2018-06-06 14:39:53 +02:00
Jack Ha
702d23ad0e CURA-5357 set showcase to max 3 items per row 2018-06-06 13:48:04 +02:00
Jack Ha
9fd9bd35dc CURA-5357 show showcased items in downloads page 2018-06-06 13:41:53 +02:00
fieldOfView
19b8ca7c70 Remove vestigial references to "monitoringPrint" 2018-06-06 11:22:35 +02:00
Jack Ha
87293e089d Merge branch 'master' of github.com:Ultimaker/Cura 2018-06-06 11:02:10 +02:00