3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-07 05:53:59 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10
14767 commits 313 branches 275 tags 718 MiB
Commit graph

14767 commits

This branch
This branch
All branches
Author SHA1 Message Date
Diego Prado Gesto
c31d329657 Remove preference 'arrange models on load' since it was experimental and 
now the arranger makes the job.
 2018-06-12 13:20:20 +02:00
Diego Prado Gesto
c5d48a3a9a CURA-5456 Fix some code-style 2018-06-12 11:21:36 +02:00
Lipu Fei
cc11e0a242 Fix for code style checks 
CURA-5456
 2018-06-12 10:50:09 +02:00
Diego Prado Gesto
e554adc1c8 CURA-5453 Remove duplicate line. 2018-06-12 10:40:02 +02:00
Diego Prado Gesto
3be58e7d6b CURA-5462 Change Low name to Normal 2018-06-11 17:04:18 +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
Andreea Scorojitu
8cd46d2b58 Merge branch 'master' of https://github.com/Ultimaker/Cura 2018-06-11 16:59:21 +02:00
Diego Prado Gesto
bdd215ec8d
Merge pull request #3916 from Ultimaker/formulafy_speed_settings2 
CURA-5342 replace speed setting constants in profiles to formulas
 2018-06-11 16:51:01 +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
Andreea Scorojitu
26fb02e499 Merge branch 'master' of https://github.com/Ultimaker/Cura 2018-06-11 15:48:08 +02:00
Andreea Scorojitu
a8b27905c8 Cleaned_up_profiles_name_UM2, CURA-5462 
Quality was removed from the name and Low Quality is now Normal.
 2018-06-11 15:46:42 +02:00
Ghostkeeper
2eedc96f36
Convert to Doxygen documentation 
Like the rest of Cura and Uranium.
 2018-06-11 15:06:48 +02:00
Lipu Fei
48bac1a0f7 Do not move locked nodes 
CURA-5347
 2018-06-11 14:45:46 +02:00
Jack Ha
359506874a CURA-5342 replace speed setting constants in profiles to formulas; also adds necessary settings for um2p if the setting is also defined in ultimaker2 2018-06-11 13:45:52 +02:00
Lipu Fei
74e3785a03 Fix material update upon loading a machine 
CURA-5327
 2018-06-11 13:42:38 +02:00
Lipu Fei
7a6e711276 Update SettingOverrideDecorator upon extruder enabled/disabled 
CURA-5456

When an extruder gets disabled, the SettingOverrideDecorator should
update its associated extruder to an enabled one so the whole setup can
be sliced.
 2018-06-11 13:29:36 +02:00
Lipu Fei
a04bf7d814 Merge remote-tracking branch 'origin/3.4' 2018-06-11 11:32:51 +02:00
Lipu Fei
310a99fba7 Fix deepcopy in SettingOverrideDecorator 
Obvious mistake...
 2018-06-11 11:32:25 +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
8ea3c879f4 Fix quality profile update 
CURA-5453

Should take into account that the custom profile being updated may not
have a quality_changes container for each stack, and Cura should create
one if this is the case, so the user changes results can be stored.
 2018-06-11 10:48:22 +02:00
Lipu Fei
ef4218830b Fix package manager initialization 2018-06-11 09:37:45 +02:00
Ghostkeeper
b55d2eda4f
Remove Polish translation option 
The translator said he won't be maintaining this language any more. Someone else can pick it up now if he wants to, but we'll disable the language until it is complete again.

Contributes to issue CURA-5451.
 2018-06-11 09:14:48 +02:00
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
Lipu Fei
384618b5c4 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-08 13:54:31 +02:00
Ghostkeeper
8438406d8b
Revert "CURA-5342 formulafy speed settings so when changing the main speed, the sub speeds change accordingly" 
This reverts commit 9432252de4. 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