GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-05 04:54:01 +08:00
Code Issues Packages Projects Releases Wiki Activity
23,916 Commits 289 Branches 260 Tags
Commit Graph

23916 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghostkeeper
e098f98a7d
Remove unused mock of extruders property 
The extruders property is no longer being used by the code under test, so this mock is unnecessary. It's also a deprecated property.

Done during Turbo Testing and Tooling.
 2020-05-29 17:35:42 +02:00
Ghostkeeper
9c78178561
Fix running automated tests from source with different SIP version 
This prevents the PyCapsule_GetPointer error when running the tests for this plug-in.

Done during Turbo Testing and Tooling.
 2020-05-29 17:31:58 +02:00
Ghostkeeper
962e375dad
Remove mocking of deprecated field 
This field is no longer used by the code under test.
 2020-05-29 17:26:33 +02:00
Ghostkeeper
90de482313
Don't mock deprecated property 
This property is deprecated. It's no longer used by the Build Volume code. Apparently it was unnecessary, too.

Done during Turbo Testing and Tooling.
 2020-05-29 17:24:56 +02:00
fieldOfView
cb73cfb0f3 Make add printer dialog resize-aware 2020-05-29 17:22:46 +02:00
Ghostkeeper
e7371bd741
Use extruderList rather than deprecated extruders property 
Done during Turbo Testing and Tooling.
 2020-05-29 17:02:22 +02:00
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
fieldOfView
7c8c1838e0 Make printer name field look less like a search field 2020-05-29 16:21:18 +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
Kostas Karmas
5aff6218d5 Add the offline cloud printers in Cura when they are discovered 
CURA-7458
 2020-05-29 14:02:36 +02:00
fieldOfView
8ce5593eec Add visible scrollbar to list of printer profiles 2020-05-29 13:49:03 +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
Orel
38fce5aa0e Remove useless newlines 2020-05-27 19:13:05 +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
orel
49e3696e61 Fix typo in generic profile names... 2020-05-26 12:35:00 +02:00
orel
dff6ff1c7e Integrate Gcode modifications from @Sophist-UK and use the inherits feature to gather common parameters between profiles 2020-05-26 12:28:20 +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
orel
fc7f1bb0ee Merge remote-tracking branch 'upstream/master' into dagoma_bicolor 2020-05-26 10:47:01 +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