GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 14:35:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.11' into CURA-8496_Fix_long_material_names_overlappint_with_icon

Browse Source
This commit is contained in:
Konstantinos Karmas 2021-08-24 09:38:25 +02:00
commit a754b49299
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/GCodeReader/FlavorParser.py
View File

@ -1,4 +1,4 @@
# Copyright (c) 2020 Ultimaker B.V. # Copyright (c) 2021 Ultimaker B.V.
# Cura is released under the terms of the LGPLv3 or higher. # Cura is released under the terms of the LGPLv3 or higher.
import math import math
@ -153,7 +153,7 @@ class FlavorParser:
Af = (self._filament_diameter / 2) ** 2 * numpy.pi Af = (self._filament_diameter / 2) ** 2 * numpy.pi
# Length of the extruded filament # Length of the extruded filament
de = current_extrusion - previous_extrusion de = current_extrusion - previous_extrusion
# Volumne of the extruded filament # Volume of the extruded filament
dVe = de * Af dVe = de * Af
# Length of the printed line # Length of the printed line
dX = numpy.sqrt((current_point[0] - previous_point[0])**2 + (current_point[2] - previous_point[2])**2) dX = numpy.sqrt((current_point[0] - previous_point[0])**2 + (current_point[2] - previous_point[2])**2)

4
resources/definitions/anycubic_i3_mega_s.def.json
View File

@ -1,6 +1,6 @@
{ {
"version": 2, "version": 2,
"name": "Anycubic i3 Mega (S, Pro)", "name": "Anycubic i3 Mega S/Pro",
"inherits": "fdmprinter", "inherits": "fdmprinter",
"metadata": "metadata":
{ {
@ -21,7 +21,7 @@
"overrides": "overrides":
{ {
"machine_name": { "default_value": "Anycubic i3 Mega (S, Pro)" }, "machine_name": { "default_value": "Anycubic i3 Mega S/Pro" },
"machine_heated_bed": { "default_value": true }, "machine_heated_bed": { "default_value": true },
"machine_width": { "default_value": 210 }, "machine_width": { "default_value": 210 },
"machine_height": { "default_value": 205 }, "machine_height": { "default_value": 205 },

6
resources/texts/change_log.txt
View File

@ -9,13 +9,13 @@ Look around and you will notice that we have refreshed over 100 icons throughout
Collaborative workflows using the Digital Library are now simpler. Every user with a cloud-connected Ultimaker 3D printer can access stored projects. And we have added a “Search” function to make finding files easier. Collaborative workflows using the Digital Library are now simpler. Every user with a cloud-connected Ultimaker 3D printer can access stored projects. And we have added a “Search” function to make finding files easier.
* Save materials profiles to USB * Save materials profiles to USB
Users can now save all third-party material profiles to USB. <i>This feature is for Ultimaker S-line printers only and is espacially useful for cloud-connected (or offline) printers.</i> Users can now save all third-party material profiles to USB. <i>This feature is for Ultimaker S-line printers only and is especially useful for cloud-connected (or offline) printers.</i>
* Notifications for beta and plugin releases * Notifications for beta and plugin releases
Users can now set notification preferences to alert them to new Ulitmaker Cura beta and plugin releases. Users can now set notification preferences to alert them to new Ultimaker Cura beta and plug-in releases.
* Improve logging of errors in OAuth flow * Improve logging of errors in OAuth flow
When helping a user with log-in problems it is easiers to see where the OAuth flow goes wrong. When helping a user with log-in problems it is easier to see where the OAuth flow goes wrong.
* Search in the description in the settings visibility menu * Search in the description in the settings visibility menu
When searching in the settings visibility menu you will also search in the description of the settings. When searching in the settings visibility menu you will also search in the description of the settings.