24795 Commits

Author SHA1 Message Date
Konstantinos Karmas
2d56cd4e13
Merge pull request #8152 from thushan/cocoon-printer-profiles
Adds Cocoon Create Printer profiles
2020-08-14 11:48:09 +02:00
Jaime van Kessel
7f47f12bf0
Merge branch '4.7' of github.com:Ultimaker/Cura into 4.7 2020-08-14 10:01:26 +02:00
Jaime van Kessel
ec48496790
Remove unneeded binding
This binding wasn't needed to prevent a binding loop, but it did cause
the length to not be updated correctly sometimes

CURA-7589
2020-08-14 10:00:33 +02:00
Jaime van Kessel
1374c2faa9
Properly fix the translation crash 2020-08-13 15:13:11 +02:00
Jaime van Kessel
aba76d8bca
Merge branch 'CURA-7586_striped_in_layerview' of github.com:Ultimaker/Cura 2020-08-13 14:54:55 +02:00
Jaime van Kessel
5c8132a944
Fix translation crash 2020-08-13 14:54:34 +02:00
Remco Burema
6ad696e69a
Fix non-printing objects in preview. 2020-08-12 17:45:31 +02:00
Remco Burema
99cd8ab1b0
Show models outside of BP clearly in layerview.
CURA-7586
2020-08-12 17:42:10 +02:00
Ghostkeeper
8b59fe83d8
Clarify description of infill mesh rank
Translators found it confusing, and I think users would find so too. Hopefully this is a bit better.
2020-08-12 14:15:38 +02:00
Jaime van Kessel
dd42c87da7
Merge branch 'CURA-7646_Settings_not_applied_when_creating_new_CFFF_from_project_file' of github.com:Ultimaker/Cura into 4.7 2020-08-12 13:42:14 +02:00
Ghostkeeper
ff42b44d41
Merge branch 'patch-1' of https://github.com/n7484443/Cura into n7484443-patch-1
Conflicts:
	resources/i18n/ko_KR/fdmprinter.def.json.po -> I had applied a change from the reseller before seeing that the change actually originated from this pull request. The reseller made some further improvements, so those are held rather than the original suggestion from the PR.
2020-08-12 12:05:18 +02:00
Ghostkeeper
3bba47cd27
Merge branch '4.7' 2020-08-12 11:43:57 +02:00
Ghostkeeper
67ef640524
Improve ironing flow setting name
Another suggestion for an improvement, this time by William Lee from Ultimaker.
2020-08-12 11:43:46 +02:00
Ghostkeeper
975588065b
Merge branch '4.7' 2020-08-12 11:41:26 +02:00
Ghostkeeper
33ea62bb3d
Update translation of ironing flow description
This is an improvement suggested by Kwang jun Ko from Brulé via e-mail.
2020-08-12 11:40:40 +02:00
Ghostkeeper
615c124960
Remove MouseArea if tooltip is not visible
It should unnecessarily catch any mouse events then. And neither should the ScrollView inside.
2020-08-12 11:07:09 +02:00
Ghostkeeper
3de3d438a5
Prevent MouseArea from stealing mouse clicks
Possibly this is a problem if the tooltip is invisible. We're not sure yet how to reproduce that bug though. In any case, it's neater to not catch mouse events you don't need.
2020-08-12 11:02:04 +02:00
Ghostkeeper
4ecab892e5
Further improve translated strings
Remove this formatting from the translated part.
2020-08-12 10:53:37 +02:00
Ghostkeeper
5ec57d42d0
Improve translatability of cloud printer syncing texts
Here are a number of improvements to the translated texts that make it easier for the translators to translate them:
* Never include layout elements such as <ul> or <li> in the translated text. The translators don't know what to do with them. Instead, leave the tags out of the translated parts and then wrap them around it in Python.
* If there are replacement keys in the source text, explain all of them in the context.
* Use a name within the brackets, to make it clear from context what the brackets mean and to disambiguate multiple keys if there are multiple.
* No invisible whitespace (such as space at the end of a line).
* Use plural forms with i18ncp if applicable (or i18np if no context is necessary).

I also changed the catalogue variable to lowercase with underscores, as per our code style.
2020-08-12 09:45:51 +02:00
Jaime van Kessel
5840205442
Merge branch 'setting_tooltip_interaction' of github.com:Ultimaker/Cura 2020-08-11 14:26:03 +02:00
Ghostkeeper
c49056f319
Merge branch '4.7' 2020-08-11 13:30:09 +02:00
Ghostkeeper
55dbb1ea0c
Temporarily remove warning message for cloud cameras
It's incorrect; the camera is possible with development firmware, but not implemented yet in Cura.

Removed this in lieu of the actual fix in CURA-7637, which takes too much time to fix for the 4.7 release.
2020-08-11 13:29:53 +02:00
Kostas Karmas
01d5e846aa Document possible theoretical issue when loading a project file
The issue will happen only if the machine_extruder_count is a formula.
In this case, the project loading will not work properly if "Create new" printer is selected,
as the settings of all extruders but the first one will not be applied.
Workaround in this case will be to load the project again and select to update the existing
printer, in which case all settings will load properly.

CURA-7646
2020-08-11 12:37:34 +02:00
Jaime van Kessel
e42369179f
Merge branch '4.7' of github.com:Ultimaker/Cura into 4.7 2020-08-11 11:38:31 +02:00
Kostas Karmas
84bc7f5094 Merge branch '4.7' 2020-08-11 11:34:30 +02:00
Kostas Karmas
ccd4add3ef Apply different filtering per category when pressing Back
Back now applies the same filters that are applied when pressing the tab buttons.

CURA-7649
2020-08-11 11:32:53 +02:00
Ghostkeeper
23ba40e54f
Clarify replacement key in translated text
This is done as a reaction to translators asking what the brackets mean.
2020-08-11 11:28:25 +02:00
Kostas Karmas
7690dc7bac Merge branch '4.7' 2020-08-11 11:23:25 +02:00
Kostas Karmas
c7525719d5 Fix wrong filtering in Marketplace when pressing Back
It was trying to apply a wrong filter, which was causing a slowdown.
It is now applying the correct filter.

Fixes https://github.com/Ultimaker/Cura/issues/8161

CURA-7649
2020-08-11 11:18:37 +02:00
n7484443
45461e702d
Retranslate ko_kr "ironing_flow"
en:i changed ironing_flow translation to "다림질 압출량". "과정" means process. so i changed it "압출량"-every flow word has been translated to this. 
kr:기존의 다림질 과정에서 flow를 "과정"이 아닌 "압출량"으로 바꾸었습니다.
2020-08-11 08:53:21 +09:00
Kostas Karmas
0feeccff85 Appease mypy complaints for AttributeErrors
CURA-7646
2020-08-10 15:30:55 +02:00
Kostas Karmas
f8a15ea29e Display only the relevant materials when opening a project
Ignore the materials of the extruders that are not visible when opening a project file with a CFFF.

CURA-7646
2020-08-10 15:00:08 +02:00
Kostas Karmas
61cc8c9a95 Remove reference to JIRA ticket in comments
CURA-7646
2020-08-10 14:58:59 +02:00
Kostas Karmas
b9d5f0dc15 Take the machine_extruder_count into consideration when opening project
CURA-7646
2020-08-10 14:56:37 +02:00
Kostas Karmas
2828f45e89 Add optional machine_extruder_count when creating a machine
If the machine_extruder_count is not taken into consideration on machine creation, calling the
extruderList of that machine will return an incomplete list of extruders (since it considers the
default machine_extruder_count). This causes problems in machines with settable number of extruders
where the default machine_extruder_count is 1 while the machine may have more than 1 extruders.

The problem becomes especially visible when opening a project file with e.g. a CFFF with multiple
extruders, because when the machine is created we do not know yet how many extruders the printer
actually has.

CURA-7646
2020-08-10 14:49:41 +02:00
Ghostkeeper
1f09ea58cc
Merge branch '4.7' 2020-08-10 11:26:25 +02:00
Ghostkeeper
e7d95f6d90
Give an error message when stack fails to build
This way we may venture at a reason why it failed to build.
2020-08-10 11:26:09 +02:00
Ghostkeeper
fc6ea28352
Don't crash if CuraStackBuilder failed to create a stack
If it failed to create a global stack, the extruder_stack_dict variable would not be defined, and Cura crashes. It may fail to create a stack because of an indexerror in a malformed project file.

Fixes Sentry issue CURA-137.
2020-08-10 11:25:55 +02:00
Ghostkeeper
cc99c481af
Don't apply printspeed to travel moves
As the documentation says, only apply it to extrusion moves.

Done as a 5 minute fix.
2020-08-07 16:07:42 +02:00
Ghostkeeper
8b522a8a58
Fix crash when processLinearMove gets called on something else than G0 or G1
Return the original line then.
2020-08-07 15:29:55 +02:00
Remco Burema
ba0efb82bc
Merge pull request #8159 from Ultimaker/CURA-7641_Update_SDK_to_7.3.0
CURA-7641: Update SDK version to 7.3.0
4.7-beta
2020-08-07 11:46:19 +02:00
Kostas Karmas
bd54ef8d5a Update the SDK version to 7.3.0 for 4.7
CURA-7641
2020-08-07 11:12:27 +02:00
Jaime van Kessel
724498cba7
Reset quality if none was found
CURA-7589
2020-08-06 17:12:14 +02:00
Jaime van Kessel
eb17e146bc
Fix some quality_changes being incorrectly shown for some configurations
CURA-7589
2020-08-06 16:59:30 +02:00
Jaime van Kessel
c9239ed32e
Hide unavailable quality groups in profile preferences
CURA-7589
2020-08-06 16:01:11 +02:00
Jaime van Kessel
3cdf5a82a4
Use correct property to search container stack
CURA-7609
2020-08-06 15:26:32 +02:00
Jaime van Kessel
ebdab94b98
Merge branch 'CURA-7609_Pick_any_printer_when_opening_a_project_file_single_dropdown' of github.com:Ultimaker/Cura 2020-08-06 15:26:16 +02:00
KOUBeMT
03eacd5093 Adding Aceteta for 04 nozzle 2020-08-06 15:24:40 +02:00
KOUBeMT
72e1a887f7 Delete s3d_std1.2_PLA_H.inst.cfg 2020-08-06 15:19:06 +02:00
Thushan Fernando
3c70d55ae7
Initial Cocoon Create attempt. 2020-08-06 16:11:13 +10:00