GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-04 11:14:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
23,719 Commits 295 Branches 268 Tags
Commit Graph

23719 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nino van Hooff
98587a9008
Merge pull request #7551 from Ultimaker/doxygen_to_restructuredtext_comments 
Converted doxygen style comments to reStructuredText style
 2020-05-29 16:46:25 +02:00
Nino van Hooff
89f0970a88 Remove trailing whitespace from Python files 2020-05-29 14:30:33 +02:00
Nino van Hooff
1e33360c35 Fix merge mistake in ToolPathUploader 2020-05-29 14:12:47 +02:00
Remco Burema
8bbb69300c
Fix anonymizing home directory if path contains double-backslash. 2020-05-29 12:38:42 +02:00
Ghostkeeper
5e73412a67
Merge branch 'master' of https://github.com/5axes/Cura into 5axes-master 2020-05-29 11:29:53 +02:00
Ghostkeeper
52a6618630
Write a new starter text and add a screenshot 
This is my best attempt at marketing fluff. I guess people expect something like that here.
 2020-05-29 09:34:00 +02:00
Nino van Hooff
ff3f4c99a8 Remove incorrect comment 2020-05-28 17:34:04 +02:00
Nino van Hooff
58ffc9dcae Merge remote-tracking branch 'origin/master' into doxygen_to_restructuredtext_comments 
# Conflicts:
#	cura/API/__init__.py
#	cura/Settings/CuraContainerRegistry.py
#	cura/Settings/ExtruderManager.py
#	plugins/PostProcessingPlugin/scripts/PauseAtHeight.py
#	plugins/UM3NetworkPrinting/src/Cloud/CloudApiClient.py
#	plugins/UM3NetworkPrinting/src/Cloud/ToolPathUploader.py
#	plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDeviceManager.py
 2020-05-28 17:31:24 +02:00
Jaime van Kessel
f7921394bf
Merge branch '4.6' of github.com:Ultimaker/Cura 2020-05-28 17:21:42 +02:00
Nino van Hooff
c2c96faf5f Convert remaining doxygen to rst 2020-05-28 17:13:44 +02:00
Jaime van Kessel
7e53bc179f
Add beta upgrader 
CURA-7413
 2020-05-28 17:13:26 +02:00
Nino van Hooff
fe779d9501 Convert doxygen to rst for Cura scripts 2020-05-28 16:25:26 +02:00
Nino van Hooff
bb2a176e36 Convert doxygen to rst for VersionUpgrades 40+ 2020-05-28 16:21:49 +02:00
Nino van Hooff
5af9faf5e5 Convert doxygen to rst for X3DReader, XmlMaterialProfile, XRayView 2020-05-28 16:08:51 +02:00
Ghostkeeper
2a70813d03
Correct orientation of printer volume 
This seems to have been a mix-up of 'depth' and 'height'. The specs online say that these are the correct dimensions.

Fixes #7827.
 2020-05-28 12:59:40 +02:00
Konstantinos Karmas
56e8827d00
Merge pull request #7831 from Ultimaker/CURA-7437_no_internet_cloud_status 
CURA-7437_no_internet_cloud_status
 2020-05-28 10:02:15 +02:00
Nino van Hooff
fbddf88462 Change connection status checking interval to 10s 
CURA-7437
 2020-05-28 09:56:41 +02:00
5axes
44ebb0360e
changement primaire _> d'amorçage 
terme primaire pour prime pas équivalent en français   -> d'amorçage
 2020-05-27 23:11:44 +02:00
Nino van Hooff
e24797b94e Fix tooltip with alpha 0 stealing clicks 
CURA-7437
 2020-05-27 17:21:50 +02:00
Nino van Hooff
8a12f539b5 Fix connection status z-order 
CURA-7437
 2020-05-27 16:37:48 +02:00
Jaime van Kessel
b58730a70c
Fix decoding in recently opened menu 
Fixes #7820
 2020-05-27 15:30:22 +02:00
Nino van Hooff
6035adb963 Fix return type in GCodeProfileReader 2020-05-27 14:24:28 +02:00
Nino van Hooff
ca333b4e8a Revert commented lines 
CURA-7437
 2020-05-26 16:45:17 +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
Nino van Hooff
e39a192b43
Merge pull request #7824 from Ultimaker/CURA-7459_persistent_marketplace_notification_on_updated_bundled_packages 
Cherry-pick changes from CURA-7245_fix_bundled_package_sync
 2020-05-26 16:31:18 +02:00
Nino van Hooff
5f574d4b64 Fix the connection status tooltip 
CURA-7437
 2020-05-26 16:21:51 +02:00
Jaime van Kessel
5749e8b20a
Fix name for the I3 Metal Motion 
CURA-7466
 2020-05-26 14:00:12 +02:00
Nino van Hooff
8c28dd8d84 Check for internet when determining connection status 
CURA-7437
 2020-05-26 13:58:21 +02:00
Nino van Hooff
4d5ef91c43 Add connection status message 
CURA-7437
 2020-05-26 13:50:15 +02:00
Nino van Hooff
de5c6f9318 Set connection status icon + color based on new states 
CURA-7437
 2020-05-26 13:37:47 +02:00
Nino van Hooff
2eaa366424 WIP: add tooltip to connection status icon 
wip: content and position

CURA-7437
 2020-05-26 11:55:54 +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
Nino van Hooff
75f5e6a8ce Consider all packages when calculating account discrepancies 
Not just the user-subscribed ones

CURA-7245
 2020-05-25 15:40:40 +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
Nino van Hooff
eef347ed6c Add an cloud unavailable icon to the active printer icon 
CURA-7437
 2020-05-20 17:20:40 +02:00
Nino van Hooff
b135da866a Add Cura.API.connectionStatus 
CURA-7437
 2020-05-20 16:06:10 +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