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

29960 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
joeydelarago
0993dc99f9 Remove unused import 
CURA-9221
 2022-08-26 09:00:17 +02:00
joeydelarago
a6f459b0f6 Update links 
CURA-9221
 2022-08-26 08:55:12 +02:00
joeydelarago
a58690c774 change _parseModels -> _parseResponse since it now parses responses with no models included. 
Move status check into _parseResponse

Don't give PrintJobUploadSuccessMessage() if printis awaiting approval. The print has successfully uploaded but it is pending approval instead so it does not make sense to display both messages.

CURA-9221
 2022-08-25 14:49:40 +02:00
joeydelarago
30692bb4b8 Add link out to learn more 
CURA-9221
 2022-08-25 14:13:25 +02:00
joeydelarago
1a023f7285 Swap text and title for message. 
Move link opening code into the PrintJobAwaitingApprovalMessage.py

CURA-9221
 2022-08-24 17:02:17 +02:00
joeydelarago
9b20a1b37f Merge branch 'main' into CURA-9221_show_message_cloud_approval 2022-08-24 16:15:24 +02:00
Joey de l'Arago
2ffd5b47bb
Update README.md 2022-08-24 15:06:38 +02:00
joeydelarago
d6effa9716 Update README.md, use dark mode or light mode image depending on github theme. 2022-08-24 14:59:18 +02:00
joeydelarago
abb6d20beb Remove enum, python has no build in support for getting enum from string value. This will be in Python 3.11 though. 
CURA-9221
 2022-08-24 14:06:30 +02:00
Joey de l'Arago
545291511c
Merge pull request #13011 from digitalfrost/patch-9 
setting_properties.md: Reformat text and corrections
 2022-08-24 09:05:50 +02:00
Joey de l'Arago
17ba4375e7
Merge pull request #13006 from ElectronicsArchiver/main 
Formatted README
 2022-08-23 16:47:31 +02:00
digitalfrost
77cc7787e3
setting_properties.md: Use bold 
Use bold for the first part of the description of the property
 2022-08-23 15:42:19 +02:00
digitalfrost
09a8a70739
setting_properties.md: use indented bullet points 
Use indented bullet points for the text about the properties.
 2022-08-23 15:32:10 +02:00
Jelle Spijker
63dc79dca1
Merge pull request #13082 from digitalfrost/200822 
OnExitCallbackManager.py: improve documentation
 2022-08-23 10:27:21 +02:00
Jelle Spijker
cc9a413a49
Merge pull request #12909 from digitalfrost/310722 
Use dataclasses for Peripheral
 2022-08-23 10:23:47 +02:00
Jelle Spijker
67c8585c68
Merge pull request #12929 from digitalfrost/020822 
MachineErrorChecker.py: Move _error_check_timer initialization to a separate function
 2022-08-23 10:19:24 +02:00
Jelle Spijker
896cfb2a7e
Merge pull request #12989 from digitalfrost/090822b 
CuraContainerStack.py: improve TypeIndexMap
 2022-08-23 09:57:05 +02:00
トトも
651646cac8
Merge branch 'Ultimaker:main' into main 2022-08-23 03:55:16 -04:00
joeydelarago
8d709e6fbe Merge remote-tracking branch 'origin/main' 2022-08-22 17:09:08 +02:00
joeydelarago
21878058eb Fix prerelease string assignment 2022-08-22 17:08:55 +02:00
Jelle Spijker
d262d71b5d
Merge pull request #13089 from Ultimaker/CURA-9277_cloud_printer_types 
Cura 9277 cloud printer types
 2022-08-22 17:03:58 +02:00
joeydelarago
e073adfa9e Fix conditional in recipe versioning to use proper syntax 2022-08-22 17:02:53 +02:00
Casper Lamboo
2dbb9ac32f
Merge pull request #13040 from Ultimaker/CURA-9272_semver_postfix 
[CURA-9272] Semver postfix
 2022-08-22 16:43:36 +02:00
joeydelarago
c80dd62169 Fix circular import. 
CURA-9277
 2022-08-22 16:34:18 +02:00
joeydelarago
3413caab62 Set latest.json location back to ultimaker website. 
CURA-9272
 2022-08-22 16:29:08 +02:00
c.lamboo
5884aa3311 Add comment about circular import 
Cura-9277

Co-authored-by: joeydelarago <joeydelarago@gmail.com>
 2022-08-22 15:03:48 +02:00
c.lamboo
f6bf7050fb Revert "Move cura-import to top of the file" 
This reverts commit 5082e64f0c1d60e4820a3ba35fd3ca82c8be3051.
 2022-08-22 15:01:51 +02:00
c.lamboo
5082e64f0c Move cura-import to top of the file 
Cura-9277

Co-authored-by: joeydelarago <joeydelarago@gmail.com>
 2022-08-22 14:58:32 +02:00
jspijker
54e9dbf827 Show device name of failed machine creation in log 
CURA-9277 Detect and Load Specific printers and Cloud Printer Types
 2022-08-22 14:57:37 +02:00
Casper Lamboo
35502e45fa
Apply suggestions from code review 
CURA-9277

Co-authored-by: Jelle Spijker <j.spijker@ultimaker.com>
 2022-08-22 14:48:04 +02:00
Casper Lamboo
12f3581337
Assign result of createAbstractMachine to a variable 
With prepended underscore to highlight the result of the function is not being used.

CURA-9277
 2022-08-22 14:44:45 +02:00
Casper Lamboo
5761b3f27b
Typing 
CUR-9277

Co-authored-by: Jelle Spijker <j.spijker@ultimaker.com>
 2022-08-22 14:35:07 +02:00
Casper Lamboo
77a179be76
Code style 
CURA-9277

Co-authored-by: Jelle Spijker <j.spijker@ultimaker.com>
 2022-08-22 14:32:59 +02:00
joeydelarago
d83673a972 Use ConnectionType enum 
Move import statement

CURA-9277
 2022-08-22 14:25:17 +02:00
j.spijker@ultimaker.com
32c30faf6a Use the latest SIP 
Contributes to CURA-8788
 2022-08-22 11:58:37 +02:00
c.lamboo
61ce8dff7d Add the abstract stack to the Resources 
Cura-9277

Co-authored-by: joeydelarago <joeydelarago@gmail.com>
 2022-08-22 11:58:05 +02:00
c.lamboo
c4be0e298c Add mime type to AbstractMachine 
Cura-9277

Co-authored-by: joeydelarago <joeydelarago@gmail.com>
 2022-08-22 11:57:18 +02:00
Casper Lamboo
3ef77df3fd
Merge pull request #12651 from Ultimaker/CURA-9357_hide_middle_line_threshold_settings 
[CURA-9357] Remove some very difficult to explain (even to experts) settings.
 2022-08-22 11:54:20 +02:00
joeydelarago
544ac33537 Add resource type for abstract machine so they can be saved. 
CURA-9277
 2022-08-22 10:33:47 +02:00
joeydelarago
1f701c267a Merge branch 'main' into CURA-9272_semver_postfix 2022-08-22 09:04:03 +02:00
digitalfrost
50d81225da Improve documentation string 
onCurrentCallbackFinished documentation string:
- Improve clarity
- Fix grammar
- Improve layout and shorten line length
 2022-08-20 19:40:58 +02:00
digitalfrost
d9fb352ee2 Fix typo 2022-08-20 19:27:32 +02:00
digitalfrost
fe2b8ebaf7 Improve triggerNextCallback documentation 
triggerNextCallback documentation:
- Correct grammar
- Shorten lines and improve layout
 2022-08-20 19:22:28 +02:00
digitalfrost
62d05f2350 OnExitCallbackManager.py: Improve docstring layout 
- Reduce line length.
- More logical line breaks.
 2022-08-20 19:12:44 +02:00
digitalfrost
6298bb50ce OnExitCallbackManager.py: Fix grammar 
Grammatical correction of docstring
 2022-08-20 18:58:03 +02:00
digitalfrost
6df4d7677a Fix typo 2022-08-20 18:51:59 +02:00
c.lamboo
963110a9c6 Remove Fix me 
Cura-9277

Co-authored-by: joeydelarago <joeydelarago@gmail.com>
 2022-08-19 16:41:02 +02:00
c.lamboo
f22d446fa4 Implement getMachines function 
Cura-9277

Co-authored-by: joeydelarago <joeydelarago@gmail.com>
 2022-08-19 16:35:13 +02:00
c.lamboo
d7f119415f Use pretty-printed string for the AbstractMachine name 
Cura-9277

Co-authored-by: joeydelarago <joeydelarago@gmail.com>
 2022-08-19 16:35:00 +02:00
Joey de l'Arago
6f6c2df28a
Update requirements-conan-package.txt 2022-08-19 14:45:42 +02:00