GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-21 12:09:13 +08:00
Code Issues Packages Projects Releases Wiki Activity
23,664 Commits 290 Branches 260 Tags
Commit Graph

23664 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaime van Kessel
b58730a70c
Fix decoding in recently opened menu 
Fixes #7820
 2020-05-27 15:30:22 +02:00
Konstantinos Karmas
e0734ff130
Merge pull request #7681 from sm3dp/add-lotmaxx-sc60-printers 
Added Lotmaxx sc60 profile
 2020-05-26 16:42:30 +02:00
Jaime van Kessel
5749e8b20a
Fix name for the I3 Metal Motion 
CURA-7466
 2020-05-26 14:00:12 +02:00
Jaime van Kessel
280d3f07a6
Merge branch 'CURA-7290_manual_account_sync' of github.com:Ultimaker/Cura 2020-05-26 11:52:14 +02:00
Jaime van Kessel
85d5eab27d
Merge branch '4.6' of github.com:Ultimaker/Cura 2020-05-26 11:20:59 +02:00
Jaime van Kessel
ed74198e20
Revert "Revised text from Enterprise marketplace pop-up screen" 
This reverts commit 6a334dd907eeeaf657db006a07d71618d800987f.

The commit broke the string freeze. It also hardcodes the enterprise text
for all versions of Cura (which should not be the case!)
 2020-05-26 11:19:54 +02:00
Ghostkeeper
6edaedfe22
Use Czech name for the Czech language option 
This is in line with the other languages in that drop-down.
 2020-05-26 09:52:30 +02:00
Kostas Karmas
fad02193ab Fix sync button not appearing when opening popup after clicking away 
This was achieved by adding an IDLE state, which is the default state
when opening the account management popup. The state is now reseted
when the popup opens instead of when it closes. In addition, now either
the "You are in sync with your account" label or the "Check account for
updates" button will appear in the popup based on the state, not both.

Finally, with theses changes, if the popup is open and an autosync
occurs, the user will be informed that the account is synced and he/she
will have to close and reopen the popup in order to trigger a manual
update.

CURA-7290
 2020-05-26 09:49:58 +02:00
Ghostkeeper
edf7fdad75
Check first if we have valid vertex data 
The convex hull calculation may fail. If it does, we want to just tomit the convex hull shadow, rather than crash.

Fixes Sentry issue CURA-ST.
 2020-05-25 17:20:39 +02:00
Ghostkeeper
715e5a890e
Don't crash when the file is deleted while in pre-read phase 
The pre-read takes a while since it shows a dialogue. The user has all the time to delete the file or rename it in the meanwhile.

Fixes Sentry issue CURA-SG.
 2020-05-25 17:20:39 +02:00
Jelle Spijker
6a334dd907 Revised text from Enterprise marketplace pop-up screen 
Updated the qml WelcomPage with the revised text:
"Please sign in to get verified plugins and materials for Ultimaker Cura Enterprise"
 2020-05-25 14:48:18 +02:00
Jelle Spijker
fed5598eb7 Removed logobot image from Enterprise marketplace pop-up screen 
Updated the qml WelcomPage to no longer show the logobot and removed the logobot.svg
from the resources since it is no longer used.
 2020-05-25 14:39:04 +02:00
Jaime van Kessel
7adcce08eb
Merge branch 'eMotionTech_I3MetalMotion' of https://github.com/pfelecan/Cura 2020-05-25 14:08:55 +02:00
Ghostkeeper
2c3fc59a9e
Merge branch 'master' of github.com:Ultimaker/Cura 2020-05-25 11:48:16 +02:00
Ghostkeeper
be9029b33e
Merge branch 'CURA-7318_Ironing_offsets_with_half_a_skin_line_width' 2020-05-25 11:48:05 +02:00
Jaime van Kessel
dff4771fae
Merge branch 'master' of https://github.com/loociano/Cura 2020-05-25 11:29:37 +02:00
Remco Burema
52050d858f
Merge pull request #7640 from smartavionics/mb-rotate-cubsubdiv-infill 
Make Infill Line Directions visible for cubicsubdiv infill pattern.
 2020-05-22 13:40:05 +02:00
Konstantinos Karmas
e22b672f12
Merge pull request #7785 from Ultimaker/CURA-7436_cloud_printer_remove_warning 
CURA-7436_cloud_printer_remove_warning
 2020-05-20 15:48:27 +02:00
Kostas Karmas
b5e971f9ec Update remove cloud printer pop-up message 
CURA-7436
 2020-05-20 15:21:57 +02:00
Kostas Karmas
f677be14c2 Fix spacing 
CURA-7436
 2020-05-20 15:10:04 +02:00
Kostas Karmas
4e930b4d52 Remove unused "has_cloud_connection" variable 
CURA-7436
 2020-05-20 15:08:05 +02:00
Konstantinos Karmas
1ec3c562ff
Merge pull request #7769 from paalex/master 
add 2nd extruder to Tevo Tarantula and Tevo Tarantula Pro printers
 2020-05-20 15:06:04 +02:00
Kostas Karmas
503d5d2a35 Correctly upgrade the ironing_inset based on the ironing_pattern used 
Previously, the ironing_inset was changed in the profiles to reflect
the changes made in the CuraEngine. This inset though was not taking
into account the ironing_pattern (in the CuraEngine, the inset is
compensated differently depending on the pattern).

This commit fixes that in the version upgrader and the printer
definitions in order to maintain the same behavior for the old
profiles.

CURA-7318
 2020-05-20 13:56:24 +02:00
Nino van Hooff
81ec7d6582
Merge pull request #7201 from fieldOfView/feature_unify_pause_at_height 
Unify pause at height scripts
 2020-05-19 15:51:21 +02:00
Nino van Hooff
7388829fc1 Change account sync date format back to dd/mm/YYYY 
For consistency with the rest of the application
 2020-05-19 14:32:02 +02:00
Nino van Hooff
e7af27ff80
Add type hint to plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py 
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
 2020-05-19 14:14:59 +02:00
Jaime van Kessel
fa34c625ae
Prevent crash when sentry could not be initialized 2020-05-19 14:14:44 +02:00
Nino van Hooff
23c039a873
Add type hint in cura/API/Account.py 
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
 2020-05-19 14:14:39 +02:00
Nino van Hooff
050878bbfe
Update cura/API/Account.py 
Co-authored-by: Jaime van Kessel <nallath@gmail.com>
 2020-05-19 14:14:10 +02:00
Nino van Hooff
9e30efb615 Merge branch 'CURA-7290_manual_account_sync' of https://github.com/Ultimaker/Cura into CURA-7290_manual_account_sync 2020-05-19 13:10:56 +02:00
Nino van Hooff
4f074d0609 Add 4.6.2 changelog stub 2020-05-19 11:53:11 +02:00
Ghostkeeper
98fed95725
Adjust the default values for ironing_inset so that the slice result remains the same 
The slicer has been adjusted to give this setting a more logical function: It should be an inset of the outer edge of ironing as it appears in layer view where the lines are made thinner according to their flow.
As a result all of the slices with ironing have changed. This adjusts the setting value so that the actual slice output will not change, just the appearance of the setting.

Contributes to issue CURA-7318.
 2020-05-18 18:19:57 +02:00
Ghostkeeper
95bb3f603d
Merge branch 'master' of github.com:Ultimaker/Cura 2020-05-18 17:50:09 +02:00
Nino van Hooff
252b993169 Refactor removal warning message to CloudOutputDeviceManager 
CURA-7436
 2020-05-18 16:22:55 +02:00
Nino van Hooff
c61f5a162e Update remote and local printer labels in Machines page 
CURA-7436
 2020-05-18 14:49:05 +02:00
Nino van Hooff
3d19e75c82 Notify user of proper way to remove cloud printer 
CURA-7436
 2020-05-18 14:48:19 +02:00
Jaime van Kessel
8f22e62675
Fix typing issues 
CURA-7290
 2020-05-18 13:47:03 +02:00
Ghostkeeper
7b87538890
Merge branch 'master' of https://github.com/maukcc/Cura into maukcc-master 2020-05-18 13:42:57 +02:00
Nino van Hooff
9344bb8494 Merge remote-tracking branch 'origin/master' 2020-05-18 11:59:53 +02:00
Jaime van Kessel
252be6352b
Prevent crash when sentry could not be initialized 2020-05-18 11:42:39 +02:00
Luc Rubio
6fe66bf525 Add support for more than one network plugin when adding a network printer by IP address. 2020-05-18 00:16:09 +01:00
paalex
1fb67f903c add 2nd extruder to Tevo Tarantula printers 2020-05-15 20:25:27 -04:00
Ghostkeeper
d499c6fdfe
Keep this position a string 
We've set up enough defensive coding that this kept working, but the typing checker fails on it.
 2020-05-15 18:50:20 +02:00
Ghostkeeper
2125b7130f
Use extruderList rather than extruders 
Extruders has been deprecated.
This also allows us to use integers for a while longer (until it needs to be serialised to a message with the .join() function).

Done during Turbo Testing and Tooling to reduce the number of warnings in our log.
 2020-05-15 16:18:05 +02:00
Ghostkeeper
696d2ffa1d
Use extruderList rather than deprecated extruders 
I looked into changing that position into an integer and perhaps the dictionary into a list, but this dictionary is passed around throughout all of the functions so that would be quite a refactor.

Done during Turbo Testing and Tooling to reduce the number of warnings in our log.
 2020-05-15 16:11:27 +02:00
Ghostkeeper
acc8e24cb4
Use extruderList rather than extruders dictionary 
The extruders dictionary has been deprecated.

Done during Turbo Testing and Tooling to reduce the amount of warnings in our log.
 2020-05-15 16:07:19 +02:00
Ghostkeeper
17762cb431
Use extruderList rather than extruders to switch userChanges over 
It's a bit weird that it switches the user changes over though. Won't it be a different printer type then?
 2020-05-15 16:04:42 +02:00
Ghostkeeper
33c1901070
Replace another extruders() call with extruderList 
The extruders function is deprecated.

Done during Turbo Testing and Tooling to reduce the number of warnings in our log.
 2020-05-15 15:51:49 +02:00
Ghostkeeper
174a8e5411
Use extruderList rather than deprecated extruders 
Done during Turbo Testing and Tooling to reduce the number of warnings in our log.
 2020-05-15 15:50:03 +02:00
Ghostkeeper
a6d7b97abc
Use extruderList rather than deprecated extruders 
Done during Turbo Testing and Tooling to reduce the number of warnings in our log.
 2020-05-15 15:39:28 +02:00