GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-23 22:29:41 +08:00
Code Issues Packages Projects Releases Wiki Activity
14,738 Commits 286 Branches 260 Tags
Commit Graph

14738 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lipu Fei
19b02cd6e8 Use MachineManager to update material container 
CURA-5327

The old update function in ExtruderManager is not functioning correctly.
 2018-06-11 08:13:16 +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
Ian Paschal
dc5a48fb7d
Merge pull request #3908 from Ultimaker/CURA-5444_pva_default_hardware_compatible 
CURA-5444: These are merged, but the branches are not deleted, so that we can also open a new PR to merge into 3.4.
 2018-06-08 14:47:39 +02:00
Ghostkeeper
8438406d8b
Revert "CURA-5342 formulafy speed settings so when changing the main speed, the sub speeds change accordingly" 
This reverts commit 9432252de472c76ef5b7df954d4cb18aefc9fff7. It was assuming the wrong default speed_print value of 60. It's not always 60. We need to find a different solution or modify the script.

Reverts the fix for issue CURA-5342.
 2018-06-08 13:44:40 +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
Ghostkeeper
fd19f8791e
Merge branch '3.4' 2018-06-08 11:47:29 +02:00
Ghostkeeper
79fb1bb2bd
Correction to translation of Retraction Extra Prime Amount 
Thanks to @getget1980.

Fixes #3789.
 2018-06-08 11:47:07 +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
bddd32a5b6 Fix branded materials model binding 
CURA-5336

When the global stack gets changed, the model should update itself
so it refers to the correct extruder stack.
 2018-06-07 15:50:08 +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
Ghostkeeper
af2d05ebfa
Remove superfluous 'enabled' field 2018-06-07 13:40:16 +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
3b46816632 Also check btemporary value 
CURA-5449
 2018-06-07 11:29:21 +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
Lipu Fei
bf9581e068
Merge pull request #3903 from Ultimaker/formulafy_speeds 
CURA-5342 formulafy speed settings
 2018-06-07 10:48:25 +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
971d6306bf Merge branch '3.4' of github.com:Ultimaker/Cura into 3.4 2018-06-06 19:04:29 +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
Jack Ha
9432252de4 CURA-5342 formulafy speed settings so when changing the main speed, the sub speeds change accordingly 2018-06-06 17:07:04 +02:00
Ghostkeeper
c42b275c5d
Merge branch '3.4' 2018-06-06 16:58:01 +02:00
Ghostkeeper
a15831c486
Update translation templates per language 
These are the templates from 3.4.

Contributes to issue CURA-5451.
 2018-06-06 16:57:33 +02:00
Ghostkeeper
0faaf3cd22
Update translation templates for Cura 3.4 
These are the translations for Cura 3.4. Fixed and in-place. Can't change translated texts any more.

Contributes to issue CURA-5451.
 2018-06-06 16:57:32 +02:00
Diego Prado Gesto
343c606df6 Merge branch '3.4' of github.com:Ultimaker/Cura into 3.4 2018-06-06 14:58:23 +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
Jack Ha
17b127e8c1 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-06 11:00:09 +02:00
Ghostkeeper
4b581d09e7
Merge branch '3.4' 2018-06-06 10:59:14 +02:00
Ghostkeeper
da4932435c
Add fan speed to basic setting visibility 
It may not be what the users often want to change, but it is something that they may be expecting to see in the custom settings mode by default. It's something that you often think of as a typical setting but in reality you don't often want to change it. Let's get closer to what the user expects. Requested by the support team of Ultimaker.
 2018-06-06 10:56:58 +02:00
Aleksei S
dbd286e1cc Save as project the extruder counter starts from 1 2018-06-06 10:47:12 +02:00
Ghostkeeper
e152fd641b
Remove trailing slash in Windows configuration path 
It shouldn't matter, but we're getting crash reports from this path so let's try this.
 2018-06-06 09:57:44 +02:00
Diego Prado Gesto
753101a988 Uncomment the code that hides the material tab in the toolbox. Just for 
master.<<
 2018-06-05 15:43:36 +02:00
Lipu Fei
6818342b90 Merge remote-tracking branch 'origin/3.4' 2018-06-05 13:34:04 +02:00
Lipu Fei
4652c3be0f Always try to remove old package files before installing new 
CURA-5442
 2018-06-05 12:47:01 +02:00
Mark
c5929ce26c Revert "The prepare button slices, so it should be a slice button" 
This reverts commit a0263676e1305c2cc4b778ed5cfb7215e938705a.
 2018-06-05 12:00:21 +02:00
Mark
59602d8013 Revert "The prepare button slices, so it should be a slice button" 
This reverts commit a479176c63fe3c53a380b47d0d1abe3b2c80c4a0.
 2018-06-05 11:56:41 +02:00
Diego Prado Gesto
4af107dc81 Merge branch '3.4' of github.com:Ultimaker/Cura into 3.4 2018-06-05 11:00:54 +02:00
Diego Prado Gesto
1285e1b5e5 CURA-5357 Move the plugin info in packages.json only when the 
installation succeeded.
 2018-06-05 11:00:05 +02:00