3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-18 04:07:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7
23379 commits 305 branches 270 tags 779 MiB
Commit graph

23379 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Ghostkeeper
487673e780
Always uncheck zoom to mouse if preference is disabled 2019-06-18 11:19:41 +02:00
Ghostkeeper
7f559987a0
Disable move to mouse position preference in orthogonal view 2019-06-18 11:16:21 +02:00
maukcc
c2ad542e21 HMS434 update 
start gcode
exruder gcode
 2019-06-18 10:56:04 +02:00
Lipu Fei
d1e7648f0e Fix merge conflicts 2019-06-18 09:45:06 +02:00
pkuiper-ultimaker
9236f21d67
Merge pull request #5888 from Ultimaker/rename_minimum_diameter 
Rename Minimum Diameter to Maximum Tower-Supported Diameter
 2019-06-17 15:39:44 +02:00
Lipu Fei
927135e0da Fix typing 
CURA-6460
 2019-06-17 13:44:08 +02:00
Lipu Fei
1d85e60a6b Merge remote-tracking branch 'origin/master' into CURA-6460_remove_square_tower 2019-06-17 13:11:07 +02:00
Ghostkeeper
669b1021c0
Add reproduction steps to the bug report template 
It's like the most important part of a bug report, in my opinion.
 2019-06-17 11:54:58 +02:00
Ghostkeeper
edcf905870
Merge branch 'master' of https://github.com/Robokinetics/Cura into Robokinetics-master 2019-06-17 09:38:12 +02:00
Lipu Fei
42b1e4f8f6 Fix typing 
CURA-6311
 2019-06-17 08:48:15 +02:00
Робокинетика
c96777cb9e
Indentation fixes 
All tabs are replaced by 4 spaces
 2019-06-16 19:38:20 +03:00
Робокинетика
f95bac436e
Update erzay3d.def.json 2019-06-16 19:33:30 +03:00
Filip Goc
f7da0fd301 Update JellyBOX start gcodes 2019-06-15 21:17:57 +02:00
Filip Goc
ffaa09e906 Update the JellyBOX variants 2019-06-15 21:11:36 +02:00
Filip Goc
7256b69aaa Update the JellyBOX quality profiles 2019-06-15 21:11:20 +02:00
Filip Goc
73177f7497 Add JellyBOX 2 platform 2019-06-15 21:11:05 +02:00
Filip Goc
920b7662cc Add JellyBOX 2 Extruder 2019-06-15 21:10:56 +02:00
Filip Goc
9ad6c16c58 Update the JellyBOX definitions 2019-06-15 21:10:48 +02:00
Ghostkeeper
0190247c5a
Don't show tooltip if it shows the same text as the button 
It's only useful if the text on the button gets elided.
 2019-06-14 14:17:10 +02:00
Ghostkeeper
a39ac2ca22
Reduce travel jerk/acceleration and reduce print jerk slightly 
These settings are preventing layer shifts on the Tevo Tornado according to our users at #5694.
 2019-06-14 11:50:58 +02:00
Remco Burema
fd8dfb4185 Fix resolve/value/warning definition for enable prime blob. [CURA-6414] 2019-06-14 11:39:48 +02:00
Ghostkeeper
a89465afa1
Build volume temperature should not be settable per extruder 
Just like build plate temperature, the per-extruder profiles can still override it but it will be resolved to a single global value.
 2019-06-14 11:38:18 +02:00
Ghostkeeper
02b0242807
Fix translatability of caution message 
Never put the formatting within the i18nc call. Always put the formatted string inside, but the formatting call outside of the function, like this:

    catalog.i18nc('@info', 'I am {age} years old.').format(age = my_age)

Otherwise, when looking up the translation for the string, it's going to try to look up the translation for the formatted string (with the age already filled in). It won't be able to find that because this sentence was not translated for all possible ages of a human.
In this case I can make it even easier on the translator because the list must always follow after the text.
 2019-06-14 11:00:52 +02:00
Ghostkeeper
52ed79805e
Enable numerous settings that just work fine with tree support 
Found via a report in #5453.
 2019-06-14 09:51:27 +02:00
Remco Burema
1ae8011cf7 Clarify crystalline description (crystal clear?). [CURA-6329] 2019-06-12 14:02:37 +02:00
Ghostkeeper
a55cc6fade
Also remove removed keys from visible settings 
It's listed among the setting keys that you explicitly made visible.

Contributes to issue CURA-6460.
 2019-06-12 13:36:40 +02:00
Ghostkeeper
056afdde5f
Merge branch 'rename_minimum_diameter' into CURA-6460_remove_square_tower 
Conflicts:
	plugins/VersionUpgrade/VersionUpgrade41to42/VersionUpgrade41to42.py -> Change there that needed to be merged here, but we had changed lines around it.
 2019-06-12 13:34:59 +02:00
Ghostkeeper
2fb722b287
Apply changed visible settings to preferences file 
Otherwise the change will not be made to the actual file, just in memory.

Contributes to issue CURA-6311.
 2019-06-12 13:32:43 +02:00