24754 Commits

Author SHA1 Message Date
Jaime van Kessel
68bc75e7a2
Merge branch 'CURA-7501_fix_warning_preloaded_plugins' of github.com:Ultimaker/Cura 2020-11-16 15:24:31 +01:00
Jaime van Kessel
7970fa1d74
Merge pull request #8723 from Ultimaker/CURA-7833_Add_tests_for_correctPrintSequence
CURA-7833: Add tests for correctPrintSequence
2020-11-13 16:40:43 +01:00
FusedForm
cd1e3bbde6
Double Extruder profiles (#8542)
* Add files via upload

* Add files via upload

* Add files via upload

* Update fusedform_300_draft_abs.inst.cfg

* Add files via upload

* Delete fusedform_300_draft_abs.inst.cfg

* Delete fusedform_300_draft_pla.inst.cfg

* Deletion of old files

* changes in STD quality profiles

* Changes in mini quality files

* Changes in FF600 quality files

* changes in machine definition name

* Changes in definition files

* extruder and definition linking

* ff300 inherits and extruder def

* Update fusedform_300.def.json

* category deprecation in definitions

* inherits

* ff300 extruder definition machine

* extruder machine definitions

* Fused form FF600plus machine profiles

* PETG profiles

* Update fusedform_300.def.json

* changes in start gcode

* machine configuration dynamics on definitions

* speed adjustments

* dynamics modification in petg and flex quality

* Further adjustments on dynamics definitiosn

* Modification of all files under inherits data structure.

* Quality setting version 15 to 16

* These changes are for limiting quality types in the materials defined

* Quality Modification under Global and Material specific structure

Global quality structures and material specific definitions under the global structures

* Addition of double extruder machine definitions

* Machine definitions update according to structure

* Doppia Base definitions erased, Doppia definitions updated to use a single base definition.

* extruder 1 base definition fix

* extruder train overrides

* extruder modifications

* Update fusedform_300_doppia.def.json

* Base settings and extruder definitions

* retraction modification to avoid filament damage

* REdefinition test of second extruder train in doppia

* Update fusedform_300_doppia.def.json

* Update fusedform_base_extruder_1.def.json

* Update fusedform_300_doppia.def.json

* Update fusedform_300_doppia.def.json

* Update fusedform_300_doppia.def.json

* Update fusedform_base_extruder_1.def.json

* Update fusedform_300_doppia.def.json

* Update fusedform_600_doppia.def.json

* Update fusedform_600_doppia.def.json

* Additional updates in Doppia definitions

* Creation of Doppia base definition, doppia extruders. Update in doppia machine definitions

* correction in quality definitions to pull base definitions from a single base

* more corrections
2020-11-11 17:11:16 +01:00
fieldOfView
afa380555f Fix tooltips on actionbuttons 2020-11-11 14:23:50 +01:00
Kostas Karmas
67c6d6da08 Fix assertion
CURA-7833
2020-11-10 16:54:53 +01:00
Kostas Karmas
644c3443b1 Add tests for correctPrintSequence
CURA-7833
2020-11-10 16:47:16 +01:00
Remco Burema
9afbc64934
Merge branch '4.8' 2020-11-10 11:31:53 +01:00
Remco Burema
58bae31d90
Merge branch '4.8' of https://github.com/Ultimaker/Cura into 4.8 4.8.0 2020-11-10 11:30:06 +01:00
Remco Burema
09fe4f8ea6
Updated release notes 4.8 for the final release (as opposed to beta).
part of CURA-7777
2020-11-10 11:26:38 +01:00
Ghostkeeper
1927f78d5a
Publish Ultimaker 2+ Connect profiles
This is the new printer from Ultimaker.
2020-11-10 11:01:08 +01:00
Jelle Spijker
05d98091b0
Merge pull request #8698 from Ultimaker/CURA-7827_Properly_set_print_sequence_when_number_of_enabled_extruder_changes
CURA-7827: Correct print sequence when there are more than one enabled extruders
2020-11-09 19:48:26 +01:00
Kostas Karmas
4b35bd1724 Correct the print sequence when discarding the current changes
CURA-7827
2020-11-09 18:10:50 +01:00
Kostas Karmas
69e0e1c4e5 Remove outdated tests
CURA-7827
2020-11-09 17:50:45 +01:00
Kostas Karmas
fab2c31b4f Cover the last remaining case when setting the print sequence
If for some reason the print sequence is set to one-at-a-time be default in the printer definition
and the number of extruders of the printer is set to >=2, then the print_sequence won't show up in
neither the quality changes nor the user changes, yet it will still have "one-at-a-time" as a
value. In a such case, it will still need to be set to "all-at-once" in the user changes.

This is a theoretical case, as it is very unlikely for a printer to have "one-at-a-time" set by
default in its definition (.def.json) file and still be able to support more than one extruders.
But it is a world full of possibilities out there, so you never know...

CURA-7827
2020-11-09 16:55:43 +01:00
Kostas Karmas
07453e101e Add detailed documentation for _correctPrintSequence function
CURA-7827
2020-11-09 16:32:05 +01:00
Kostas Karmas
2ccdd11098 Properly set the print sequence in the correct container
Previously, the print sequence would be always set to all-at-once in the user container whenever
the second extruder would be enabled. This was causing an interface issue, where the circular
reset-setting arrow would appear next to the setting, even if the quality changes already had the
correct value ("all-at-once").

This is now fixed by checking the following:
- If print_sequence == "one_at_a_time" in the quality (so it is already saved in a quality profile)
then set the print_sequence to "all_at_once" in the user changes so that it will be displayed as
an unsaved change
- If print_sequence == "one_at_a_time" in the user changes container only, meaning that it is not
saved in any quality profiles, then just reset the print_sequence in the user changes, so that it
will have the correct value ("all-at-once") without the reset-setting arrow appearing next to it.

CURA-7827
2020-11-09 16:20:13 +01:00
Ghostkeeper
68422e8be4
Merge branch '4.8' 2020-11-09 14:48:57 +01:00
Ghostkeeper
f3a8282a76
Add missing brackets
Contributes to issue CURA-7782.
2020-11-09 14:32:18 +01:00
Ghostkeeper
dc1eaf3fe5
Merge branch '4.8' of https://github.com/Patola/Cura into Patola-4.8 2020-11-09 14:30:40 +01:00
Ghostkeeper
b08dc949dd
More corrections to German
I forgot to save this file.

Contributes to issue CURA-7782.
2020-11-09 14:28:25 +01:00
jelle Spijker
71bb6e7b19
Small corrections to the formatting of strings
Contributes to issue CURA-7782.
2020-11-09 14:23:59 +01:00
Ghostkeeper
6ebb8fb0bb
Small fixes found by manual check of translations
These were some of the mistakes we found in the Lionbridge translations.

Contributes to issue CURA-7782.
2020-11-09 14:16:31 +01:00
Kostas Karmas
f264a6269e Merge branch 'CURA-7782_Add_translations_in_4.8' of https://github.com/Ultimaker/Cura into CURA-7782_Add_translations_in_4.8 2020-11-09 14:16:08 +01:00
Kostas Karmas
bbd4ccc581 Fix minor issues found through PoEdit
CURA-7782
2020-11-09 14:15:39 +01:00
Ghostkeeper
0821b1bdb1
Disable Czech translations
We didn't receive new translations for Cura 4.8.

Contributes to issue CURA-7782.
2020-11-09 13:55:08 +01:00
Kostas Karmas
e0c58eb30d Merge branch 'CURA-7782_Add_translations_in_4.8' of https://github.com/Ultimaker/Cura into CURA-7782_Add_translations_in_4.8 2020-11-09 13:49:52 +01:00
jelle Spijker
3dd9192ddf
Add missing plural cases from LionBridge import
The import script ignores plural cases since it's harder to parse them.
So we need to do these manually.

Contributes to issue CURA-7782.
2020-11-09 13:49:18 +01:00
Kostas Karmas
6897594363 Add translations for plurals for 4.8
Languages:
 - ja_JP
 - ko_KR
 - nl_NL
 - pt_PT

CURA-7782
2020-11-09 13:47:47 +01:00
Ghostkeeper
08cf37803b
Add missing plural cases from Lionbridge import
The import script ignores plural cases since it's harder to parse them. So we need to do these manually.

Contributes to issue CURA-7782.
2020-11-09 13:47:30 +01:00
Ghostkeeper
a1530aba5c
Import Lionbridge translations for Cura 4.8
These are the new translations we got from Lionbridge as imported by lionbridge_import.py.

Contributes to issue CURA-7782.
2020-11-09 13:34:15 +01:00
Kostas Karmas
481dc4c75a Add Taiwanese translations for 4.8
CURA-7782
2020-11-09 13:11:56 +01:00
Jelle Spijker
02af674c5e
Merge pull request #8685 from Ultimaker/CURA-7793
Also add wall_line_count when adding a infill mesh
2020-11-09 10:10:23 +01:00
Remco Burema
5ab4062ced
Merge branch 'master' of https://github.com/Ultimaker/Cura 2020-11-06 18:10:14 +01:00
Remco Burema
81da89476f
Merge branch 'CURA-7807_squish_and_merge_ZAV_pull' 2020-11-06 17:59:46 +01:00
Kim Evgeniy
a92424dca4
ZAV3D Series printers
Create zav_abs_nozzle_0.40_layer_0.10_visual.inst.inst.cfg

New ZAV intent files

Create zav_petg_nozzle_0.40_layer_0.10_visual.inst.inst.cfg

New ZAV PEtG

Create zav_pla_nozzle_0.40_layer_0.10_visual.inst.inst.cfg

New ZAV Pla files

New material Bestfilament

New FDPlast and Bestfilament materials

ZAV platforms

New ZAV variants

Create zav_layer_0.05.inst.cfg

New ZAV quality files

New ZAV material qualty

Update zav_l_0.60.inst.cfg

Update zav_l_0.80.inst.cfg

Update zav_l_0.50.inst.cfg

Update zav_base.def.json

Update zav_big.def.json

Update zav_bigplus.def.json

Update zav_l.def.json

Update zav_max.def.json

Update zav_maxpro.def.json

Update zav_mini.def.json

Update zav_extruder_2.def.json

Update zav_abs_nozzle_0.40_layer_0.10_visual.inst.inst.cfg

Update zav_abs_nozzle_0.40_layer_0.15_visual.inst.inst.cfg

Update zav_mini_1.00.inst.cfg

Update zav_mini_0.80.inst.cfg

Update zav_mini_0.60.inst.cfg

Update zav_mini_0.50.inst.cfg

Update zav_mini_0.45.inst.cfg

Update zav_mini_0.40.inst.cfg

Update zav_mini_0.35.inst.cfg

Update zav_mini_0.30.inst.cfg

Update zav_mini_0.25.inst.cfg

Update zav_mini_0.20.inst.cfg

Update zav_maxpro_1.00.inst.cfg

Update zav_mini_0.20.inst.cfg

<1mb new ZAV platfoms

Delete ZAV.png

Add files via upload

Update zav_base.def.json

Update zav_big.def.json

Update zav_bigplus.def.json

Update ZAV

Add files via upload

Add files via upload

Add files via upload

Add files via upload

Update zav_big.def.json

Update zav_big.def.json

Update zav_bigplus.def.json

Update zav_big.def.json

Update zav_l.def.json

Update zav_max.def.json

Update zav_maxpro.def.json

Update zav_mini.def.json

Update zav_layer_0.15.inst.cfg

Update zav_layer_0.15.inst.cfg

Update zav_layer_0.15.inst.cfg

Update zav_layer_0.15.inst.cfg

Add files via upload

Add files via upload

Add files via upload

Add files via upload

Update zav_extruder_1.def.json

Update zav_extruder_2.def.json

Update zav_base.def.json

Update zav_extruder_1.def.json

Update zav_extruder_2.def.json

Update zav_maxpro.def.json

Update zav_bigplus.def.json

Update zav_mini.def.json

Update zav_big.def.json

Update zav_bigplus.def.json

Update zav_max.def.json

Update zav_maxpro.def.json

delete materials

Delete bestfilament_abs_skyblue.xml.fdm_material

Delete bestfilament_petg_orange.xml.fdm_material

Delete bestfilament_pla_green.xml.fdm_material
2020-11-06 17:58:47 +01:00
Remco Burema
e05c32f88d
Merge pull request #8693 from Ultimaker/CURA-7115_connected_gradual_infill_overextrusion
Disable infill multiplier if gradual infill and connected lines enabled
2020-11-06 17:31:25 +01:00
Angie
d8cae83623
add Syndaver AXI machine (#8427)
* add Syndaver AXI machine

Added Syndaver AXI Machine and Extruder Profile

* Correct text in json file

removed the spaces in the json file names

* remove unused text

remove the unused name assigning code in the json machine file

* corrected start/end gcode

specified values that could not be replaced

* Update syndaveraxi.def.json

corrected the machine dimesions
2020-11-06 16:42:50 +01:00
Washington C. Corrêa Jr
2f50de2c9d
Adding TwoTrees Bluer printer (#8620)
* Uploading TwoTrees Bluer definition file

* TwoTrees Bluer platform file

* teste

teste

* Delete xtwotrees_bluer.def.json

Teste2

* New definition file for TwoTrees Bluer

Modified for using exclusive extruders files

* Adding TwoTrees Bluer Extruders files
2020-11-06 15:28:38 +01:00
Kostas Karmas
1719394049 Patch the updateNumberExtrudersEnabled temporarily
CURA-7827
2020-11-06 09:38:15 +01:00
Kostas Karmas
bd5ed7a3ac Add tests for _correctPrintSequence
CURA-7827
2020-11-06 09:21:55 +01:00
Kostas Karmas
c1becbe43c Fix failing tests in TestMachineManager
When the machine manager calls the _onGlobalContainerChanged(), it calls updateNumberExtruders
Enabled, which triggers the signal numberExtrudersEnabledChanged. This, in turn, triggers the need
to check the MachineManager's pyqtProperty numberExtrudersEnabled. Now, since this property has no
setter, it cannot be patched. Instead, to work properly, patch the updateNumberExtrudersEnabled.

CURA-7827
2020-11-06 09:19:21 +01:00
Kostas Karmas
a1c7ebe1c3 Fix mypy complaints
CURA-7827
2020-11-05 19:04:29 +01:00
Kostas Karmas
845c994cbc Replace f string since it's not available in Python3.5
That should fix the failing test which produces a SyntaxError.

CURA-7827
2020-11-05 17:38:34 +01:00
Kostas Karmas
1a759f81df Change print sequence when the number of enabled extruders changes
Fixes https://github.com/Ultimaker/Cura/issues/8682 while still maintaining the correct behavior for CURA-6914.

CURA-7827
2020-11-05 16:58:47 +01:00
Ghostkeeper
a4b2dc2cfe
Show Connect Top/Bottom Polygons when top surface pattern is concentric too
If there is a top surface, that is.

Fixes #8683.
2020-11-05 13:25:09 +01:00
jelle Spijker
c76eb64dfe
Disable infill multiplier if gradual infill and connected lines enabled
Contributes to CURA-7115
2020-11-04 18:24:07 +01:00
Jaime van Kessel
bf7914dd5e
Merge branch 'New_raft_settings_Nylon_PLA_ABS' of github.com:Ultimaker/Cura 2020-11-04 16:56:17 +01:00
Ghostkeeper
b740fda491
Catch environment errors when reading 3MF archive metadata
The file could get deleted in the meanwhile.

Fixes Sentry issue CURA-1CK.
2020-11-04 14:25:39 +01:00
Ghostkeeper
9ffc6bc705
Rotate FLSUN-QQ mesh by 135 degrees around negative Z
Also convert it to 3MF, to save some file size.
According to reports in #8663 this is the true orientation of the printer w.r.t. the coordinate system in its firmware.

Fixes #8663.
2020-11-04 12:09:53 +01:00
Jaime van Kessel
080832fcf2
Merge branch '4.8' of github.com:Ultimaker/Cura 2020-11-04 11:07:38 +01:00