3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-22 06:03:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 17
21777 commits 305 branches 272 tags 787 MiB
Commit graph

21777 commits

This branch
This branch
All branches
Author SHA1 Message Date
ChrisTerBeke
1d09cb5b9c
Fix typing for optional data argument 
Co-Authored-By: Jaime van Kessel <nallath@gmail.com>
 2019-06-24 13:18:27 +02:00
Jaime van Kessel
9e4f2a441b Revert "Also upgrade profiles if only the setting version is incorrect" 
This reverts commit 77d396b9bd.

The upgrade only needs to be run if it still uses "profile" as type (eg 2.1 profiles). So for a
regular setting version upgrade, this does not need to be run (and breaks importing profiles).

Fixes CURA-6592
 2019-06-24 11:59:13 +02:00
Jaime van Kessel
0a0b4821ef Added logging for cases where the upgrade of the profile failed 
CURA-6592
 2019-06-24 11:32:43 +02:00
nubnubbud
d6339ee541 Revised capitalization to match Ultimaker themes 2019-06-22 04:33:49 -07:00
nubnubbud
33f959259b removed incomplete theme 2019-06-22 03:02:56 -07:00
nubnubbud
ad6f09a744 added light and dark colorblindness accessibility themes 2019-06-22 02:56:02 -07:00
nubnubbud
da56f2787c added colorblind mode 2019-06-21 15:49:56 -07:00
Remco Burema
308fcb6b9f Fix typing for IntentManager 
Part of CURA-6091.
 2019-06-21 15:39:27 +02:00
Remco Burema
02516f0f47 Refactor: Move common fixtures to 'conftest'. 
Part of CURA-6091.
 2019-06-21 14:58:55 +02:00
Remco Burema
96bb1e8915 Merge branch 'master' into feature_intent_per_quality 2019-06-21 14:38:30 +02:00
Remco Burema
0f9de9935e Add unit-test for .intentCategories 
Part of CURA-6091.
 2019-06-21 14:37:10 +02:00
Ghostkeeper
f339686c49
Implement category model 
Not just pseudocode. However this code is not yet tested.

Contributes to issue CURA-6091.
 2019-06-21 12:45:44 +02:00
Ghostkeeper
6273d34eae
Merge branch 'master' of https://github.com/Robokinetics/Cura into Robokinetics-master 2019-06-21 11:33:07 +02:00
KOUBeMT
11270b9142 Top_Bottom_layers_number_fix 2019-06-21 11:19:45 +02:00
Робокинетика
f5d94b9646
Fixed the value of "retraction_amount" 2019-06-21 11:53:06 +03:00
Remco Burema
f03c239041 Update some documentation. [CURA-6091] 2019-06-20 17:57:15 +02:00
Remco Burema
d076bfae77 Merge branch 'feature_intent_per_quality' of https://github.com/Ultimaker/Cura into feature_intent_per_quality 2019-06-20 17:49:41 +02:00
Remco Burema
fd80a6c1b6 Change some leftover pseudo-code to real code. 
Part of CURA-6091.
 2019-06-20 17:48:52 +02:00
KOUBeMT
6d0bb01bd5 Quality_&_Variant_setting_version_update 2019-06-20 16:12:22 +02:00
Ghostkeeper
ede6efb799
Missing documentation 
Contributes to issue CURA-6091.
 2019-06-20 16:09:56 +02:00
Remco Burema
53c387f34d Add TestIntentManager (mostly a dummy file), prevents future conflicts. [CURA-6091] 2019-06-20 16:04:37 +02:00
Ghostkeeper
96c111553a
Implement selectDefaultIntent 
Bit of a weird one.

Contributes to issue CURA-6091.
 2019-06-20 15:30:57 +02:00
Ghostkeeper
aa0bf2f6ba
Implement selectIntent 
Selects a certain intent profile, applying it to the stack.

Contributes to issue CURA-6091.
 2019-06-20 15:27:07 +02:00
Ghostkeeper
744fbec38c
Implement defaultIntent 
We keep this function in as a way of documentation.

Contributes to issue CURA-6091.
 2019-06-20 15:12:53 +02:00
Ghostkeeper
2b775497b5
Implement complete code for currentAvailableIntentCategories 
There is an inconsistency here with the available quality types. It's documented in the function for now.

Contributes to issue CURA-6091.
 2019-06-20 15:06:24 +02:00
Ghostkeeper
28e2569c86
Implement complete code for currentAvailableIntents 
Slightly more complex than the original pseudocode was indicating: It needs to filter on the available quality types first in order to only show the quality types that can be printed with all extruders, but still show the union of all intents for those quality types.

Contributes to issue CURA-6091.
 2019-06-20 14:48:18 +02:00
Diego Prado Gesto
efa42ccbd1 Merge branch 'master' into CURA-6329_add_crystallinity_setting 2019-06-20 14:06:18 +02:00
Ghostkeeper
c83b9d158b
Final implementation of intentMetadatas and intentCategories 
Instead of pseudocode.

Contributes to issue CURA-6091.
 2019-06-20 14:02:34 +02:00
ChrisTerBeke
1ab109ade0 Fix 'resume' action 2019-06-20 13:46:20 +02:00
ChrisTerBeke
baf9dc041c Fix typing of Any 2019-06-20 12:56:45 +02:00
ChrisTerBeke
0513322f86 Fix expected controller options in test 2019-06-20 12:36:56 +02:00
ChrisTerBeke
93351ec9b9 Show context menu on printers with firmware 5.3 or later 2019-06-20 12:36:15 +02:00
Remco Burema
9845178d26 Remove superfluous bracket (causing 'EOF'). [CURA-6460] 2019-06-20 09:44:19 +02:00
Ghostkeeper
15997685df
Merge branch 'master' of https://github.com/maukcc/Cura into maukcc-master 2019-06-20 09:18:16 +02:00
Ghostkeeper
64e3a99ad3
Also select correct quality level on the stack when changing intent 
Contributes to issue CURA-6091.
 2019-06-19 16:52:54 +02:00
Ghostkeeper
fa65875824
Add psuedocode/boilerplate for intent manager 
This won't run. Don't try to import this class yet. It's outlining what we need to implement to get intents per stack.

It does no form of caching at this point. Build first, optimise later, right.

Contributes to issue CURA-6091.
 2019-06-19 14:29:19 +02:00
KOUBeMT
2ecf2d019b Extruders_rename 2019-06-19 14:24:25 +02:00
ChrisTerBeke
6cbe89f832 Remove weird file 2019-06-19 13:58:26 +02:00
ChrisTerBeke
eb8d353e11 Add basic support for print job actions via Cloud output device 2019-06-19 13:58:11 +02:00
Ghostkeeper
aea5e50401
Stacks are upgraded to a higher version number 
So indicate to the plug-in metadata that they are.
 2019-06-19 13:14:02 +02:00
Ghostkeeper
91767cf81f
Fix merge conflict 2019-06-19 13:12:42 +02:00
Ghostkeeper
5ab1881a21
Merge branch 'master' into feature_intent 
Conflicts:
	plugins/VersionUpgrade/VersionUpgrade41to42/VersionUpgrade41to42.py -> There is a new version upgrade in master, so the old one is sort of obsolete. We may have to move this part to a new version upgrade for 4.3.
	plugins/VersionUpgrade/VersionUpgrade41to42/__init__.py
 2019-06-19 13:10:36 +02:00
Ghostkeeper
23abcd6fd6
Merge branch 'master' into CURA-6329_add_crystallinity_setting 2019-06-19 10:49:20 +02:00
Remco Burema
c65fefce67
Merge pull request #5909 from Ultimaker/CURA-6590_fix_value_update_material 
CURA-6590 Fix value update in material profile
 2019-06-18 16:56:45 +02:00
Ghostkeeper
adc6f79c9c
Merge branch 'master' into CURA-6329_add_crystallinity_setting 2019-06-18 15:50:48 +02:00
Ghostkeeper
77d396b9bd
Also upgrade profiles if only the setting version is incorrect 
We need to check both version numbers.
 2019-06-18 12:00:23 +02:00
Ghostkeeper
0498d43834
Run upgrader on imported profiles from >2.1 
Oops... It should upgrade the old profiles so that they have the correct version and setting version.
 2019-06-18 12:00:23 +02:00
Ghostkeeper
7fbdccffdb
Add typing 2019-06-18 12:00:22 +02:00
pkuiper-ultimaker
6a65045587
Merge pull request #5862 from Ultimaker/CURA-6460_remove_square_tower 
Remove square prime tower. [CURA-6460]
 2019-06-18 11:49:43 +02:00
Lipu Fei
51dc7b1b8e Fix value update in material profile 
CURA-6590
 2019-06-18 11:23:28 +02:00