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

17119 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jack Ha
c97f276583 Merge branch 'master' into CURA-5334_extruder_def_for_all 2018-06-11 16:56:42 +02:00
Jack Ha
955ed00c39 CURA-5334 added big phat error when single extruder printer does not have correct extruder 2018-06-11 16:56:35 +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
Jack Ha
24844edd90 CURA-5334 fix typo in method name _fixSingleExtrusionMachineExtruderDefinition 2018-06-11 16:10:25 +02:00
Ghostkeeper
0da7ad3946
Use material.fdm_material.xml.sig for signature file names 
Just put the .sig after the entire file instead of replacing the extension.

Contributes to issue CURA-5034.
 2018-06-11 16:01:16 +02:00
Ghostkeeper
abf77da4c4
Send to cluster API 
Not the normal printer API. That won't work without authentication.

Contributes to issue CURA-5034.
 2018-06-11 16:01:16 +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
3dc3afb34c Remove all concentric_3d references 
CURA-5450
 2018-06-11 14:51:35 +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
553e9bcdc2
Merge branch 'master' into CURA-5334_extruder_def_for_all 2018-06-11 09:11:38 +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
Lipu Fei
dfdda24093 Update extruder definition if necessary 
CURA-5334
 2018-06-11 07:23:53 +02:00
Mikkel Kroman
4fbb524a98 Add Creality CR-10S machine definition 
The CR-10S is functionally equivalent to the CR-10.
 2018-06-08 18:05:42 +02:00
Lipu Fei
cecd7b55a1 No need to fix material diameter or nozzle size 
CURA-5334
 2018-06-08 17:05:31 +02:00
Lipu Fei
aba3795d0b Add extruder definition for all single-extrusion machines 
CURA-5334

All changed printers:

 - 101Hero
 - 3dator
 - abax_pri3
 - abax_pri5
 - abax_titan
 - alya3dp
 - anycubic_i3_mega
 - bfb
 - bq_hephestos
 - bq_hephestos_2
 - bq_hephestos_xl
 - bq_witbox
 - bq_witbox_2
 - creality_cr10
 - creality_cr10s4
 - creality_cr10s5
 - dagoma_discoeasy200
 - dagoma_neva
 - delta_go
 - deltabot
 - deltacomb
 - easyarts_ares
 - fabtotum
 - folgertech_FT-5
 - gmax15plus
 - grr_neo
 - imade3d_jellybox
 - innovo_inventor
 - julia
 - kemiq_q2_beta
 - kemiq_q2_gama
 - kossel_mini
 - kossel_pro
 - kupido
 - makeR_pegasus
 - makeR_prusa_tairona_i3
 - maker_starter
 - makerbotreplicator
 - malyan_m180
 - malyan_m200
 - mankati_fullscale_xt_plus
 - mendel90
 - monoprice_select_mini_v1
 - monoprice_select_mini_v2
 - peopoly_moai
 - printrbot_play
 - printrbot_play_heated
 - printrbot_simple
 - printrbot_simple_extended
 - printrbot_simple_makers_kit
 - prusa_i3
 - prusa_i3_mk2
 - prusa_i3_xl
 - raise3D_N2_plus_single
 - raise3D_N2_single
 - renkforce_rf100
 - rigid3d
 - rigid3d_3rdgen
 - rigid3d_hobby
 - rigid3d_mucit
 - rigid3d_zero
 - rigid3d_zero2
 - rigidbot
 - rigidbot_big
 - robo_3d_r1
 - seemecnc_artemis
 - seemecnc_v32
 - tam
 - tevo_blackwidow
 - tevo_tarantula
 - ubuild-3d_mr_bot_280
 - ultimaker2
 - ultimaker2_extended
 - ultimaker2_extended_plus
 - ultimaker2_go
 - ultimaker2_plus
 - ultimaker_original
 - ultimaker_original_plus
 - uniqbot_one
 - vertex_delta_k8800
 - vertex_k8400
 - zone3d_printer
 - zyyx_agile
 2018-06-08 17:05:31 +02:00
Diego Prado Gesto
2dfedf3ae4 CURA-5330 Add typing in CuraContainerRegistry and 
QualityProfilesDropDownMenuModel
 2018-06-08 17:02:59 +02:00
Diego Prado Gesto
7f34d7615e CURA-5330 Add typing to CuraSceneNode 2018-06-08 16:56:52 +02:00
Diego Prado Gesto
8c2ba64f32 CURA-5330 Add typing to NetworkedPrinterOutputDevice 2018-06-08 16:47:52 +02:00
Diego Prado Gesto
a6815e7c61 CURA-5330 Add typing to Backup 2018-06-08 16:31:43 +02:00
Ghostkeeper
b9d47f6092
Add function typing 
This allows MyPy to detect mistakes in the typing of these functions.

Contributes to issue CURA-5330.
 2018-06-08 16:31:32 +02:00
Ghostkeeper
adafea73cc
Ignore missing imports 
We don't want to be type checking inside those files.

Contributes to issue CURA-5330.
 2018-06-08 16:19:20 +02:00
Ghostkeeper
4e46963f58
Also send signature file if it exists 
The files are not placed there yet when unpacking a package, as far as I know. Next time.

Contributes to issue CURA-5034.
 2018-06-08 16:07:17 +02:00
Ghostkeeper
4727340ae4
Send only original files 
When we re-serialize them, the XML file will not be exactly the same so the signature will fail to match. We need to send the original bytes.

This changes the behaviour: It now sends all non-default files instead of all files that were loaded fully.

Contributes to issue CURA-5034.
 2018-06-08 16:02:00 +02:00
Diego Prado Gesto
51462b20c3 CURA-5330 Add typing to PrinterOutputModel constructor 2018-06-08 15:56:20 +02:00
Diego Prado Gesto
1982c9b84c CURA-5330 Change TYPE_CHECKING flag 2018-06-08 15:54:28 +02:00
Diego Prado Gesto
fcdb1aef52 CURA-5330 Add typing in ExtruderOutputModel 2018-06-08 15:53:33 +02:00
Diego Prado Gesto
ace7e89ea0 CURA-5330 Add typing to PrintJobOutputModel 2018-06-08 15:48:47 +02:00
Diego Prado Gesto
e1ecbdf8fe CURA-5330 Add typing in QualityGroup 2018-06-08 15:46:24 +02:00
Diego Prado Gesto
e5e96bc600 Merge branch 'master' into mypy_fixes 
Contributes to CURA-5330
 2018-06-08 15:29:22 +02:00
Ghostkeeper
ddb80be1ec
Send materials asynchronously 
This way we won't block the interface while those materials are sending.

Contributes to issue CURA-5034.
 2018-06-08 15:06:06 +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
63f5c8346a
Implement API call to send material profile 
It seems to work now. I don't know if the material actually arrives but from this end it seems to send it at least.

Contributes to issue CURA-5034.
 2018-06-08 14:33:13 +02:00