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

14139 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kristel88
cf84adfb73 S5 dimensions were incorrect 
See Jira: CURA-5331
 2018-05-14 11:25:55 +02:00
Kristel88
3671296860 Updates PLA 0.8 S5 
2 mistakes in previous pull request
 2018-05-03 14:39:06 +02:00
Kristel88
352cb9184c S5 profile updates 
More formulas en more in line with UM3
 2018-05-02 10:52:20 +02:00
Kristel88
c1b5d940ba 0.25 PP temperature formula S5 
In line with UM3
 2018-05-01 13:41:52 +02:00
Kristel88
b9872cc269 PP formula based temperature fixes S5 2018-04-30 16:28:25 +02:00
Diego Prado Gesto
d91dabb087 Merge branch 'master' of github.com:Ultimaker/Cura 2018-04-30 15:16:23 +02:00
Diego Prado Gesto
b582ac7526 CURA-5253 Initialize UI elements right after the qml files were loaded. 2018-04-30 15:09:52 +02:00
Lipu Fei
00dbf2c694 Change a logging line to an error 
CURA-5301
 2018-04-30 10:23:43 +02:00
Lipu Fei
3e37487632
Merge pull request #3626 from kaleidoscopeit/patch-1 
Update deltacomb.def.json
 2018-04-30 10:19:37 +02:00
Diego Prado Gesto
90eb4eb651 Merge branch 'master' of github.com:Ultimaker/Cura 2018-04-26 15:49:25 +02:00
Diego Prado Gesto
27b1e2cdd6 Fix format and add error message to log. Contributes to CURA-5301 2018-04-26 15:49:18 +02:00
Ghostkeeper
4f777457ee
Simplify issue template 
We don't usually need to know what specific Qt version or graphics driver the user has, and it's a great hassle for the user to figure this out, especially when they aren't technical and just installed an official release.
I hope that this leads more bug reporters to actually fill in the template.
 2018-04-26 15:00:46 +02:00
Gabriele Rossetti
b16cee5892
Fixed values with double-quotes 2018-04-26 14:36:08 +02:00
Ghostkeeper
3ae6b8c4c1
Double-escape newlines in script string 
Because they are stored twice: Once in the CFG of the script, and once in the CFG of the machine instance.

Fixes an issue reported here: https://github.com/Ultimaker/Cura/pull/3229
 2018-04-26 13:30:59 +02:00
Lipu Fei
d393316a27
Merge pull request #3638 from fieldOfView/fix_variant_hardware_type_crash 
Fix a crash when a variant has no hardware_type
 2018-04-26 09:35:33 +02:00
Lipu Fei
93b2a4f774
Merge pull request #3688 from kerog777/Felix_Profile 
Felix profile
 2018-04-26 08:55:36 +02:00
kerog777
88dc33a288 Corrected preferred variant name 
Made it match the name field in the variant file
 2018-04-25 20:29:09 -07:00
Lipu Fei
76fe273eb6 Merge remote-tracking branch 'origin/3.3' 2018-04-25 17:57:07 +02:00
Lipu Fei
dc52e939e9 Fix unit tests for adding CuraContainerStacks 
CURA-5281

Because of the definition_changes fix, CuraContainerStack.deserialize()
may create and add extra containers, so the unit tests need to be adjusted.
 2018-04-25 17:55:20 +02:00
Jack Ha
efdccb593f Merge branch '3.3' 2018-04-25 16:35:20 +02:00
Lipu Fei
df1e15b1e5 Move the definition_changes fix to CuraContainerStack 
CURA-5281
3.3.1 		2018-04-25 16:12:47 +02:00
Lipu Fei
50e2db47c8 Fix can_upgrade flag for non-working plugins 
CURA-5287
 2018-04-25 14:24:49 +02:00
Ghostkeeper
4aec316b48
Prevent homing twice on printers that don't support X/Y specialisation 
If the X Y is ignored and it just executes G28, it still executes it only once now.
 2018-04-25 13:29:07 +02:00
Lipu Fei
ec9be7a103 Merge remote-tracking branch 'origin/3.3' 2018-04-25 12:55:21 +02:00
Lipu Fei
1d8c2bea98 Do not reset quality if the current custom quality is based on not supported 
CURA-5285
 2018-04-25 12:40:10 +02:00
Lipu Fei
491e0c83ba Allow to select custom profiles based-on not supported 
CURA-5285
 2018-04-25 12:38:57 +02:00
Lipu Fei
a6b62656c7 Fix quality profiles for Vertex Delta K8800 
CURA-5284

quality_type "extreme" is used but not defined.
 2018-04-25 12:01:41 +02:00
Lipu Fei
c4994918c8 Make sure all stacks in a loaded machine have non-empty definition_changes container 
CURA-5281
 2018-04-25 11:16:02 +02:00
Diego Prado Gesto
3b499edac5 Add back the setAcceptsCommands function with a deprecated decorator. 2018-04-25 10:20:48 +02:00
Ghostkeeper
4fc29554ef
Don't process inheritance before there is an active global container 
This could be called after an extruder was disabled by a broken configuration.

Fixes #3570.
 2018-04-25 09:59:25 +02:00
Ghostkeeper
1af56871e2
Don't crash if the number of extruders in setting doesn't match 
...with the actual number of extruders. These could misalign with Custom FDM Printer or when any of the extruders was deleted because of a configuration format error.

Contributes to issue #3570.
 2018-04-25 09:58:10 +02:00
kerog777
9d9a238b2c Update start gcode 
bed_temperature should have been print_bed_temperature.  Refined
heating steps and added a purge line.
 2018-04-24 21:30:54 -07:00
kerog777
616d3f9ea8 Fixed version numbers and moved hardware_type = nozzle to metadata 
section.
 2018-04-24 17:11:17 -07:00
Lipu Fei
585888f84a Merge remote-tracking branch 'origin/3.3' 2018-04-24 14:28:50 +02:00
Lipu Fei
fca14eeef3 Fix optional arguments in MA _onChanged 3.3.0 2018-04-24 13:56:09 +02:00
Lipu Fei
4d7bf579e6 Do not keep triggering on changed in MA 2018-04-24 13:49:07 +02:00
Diego Prado Gesto
06b9e5240e Merge branch '3.3' of github.com:Ultimaker/Cura into 3.3 2018-04-24 12:43:49 +02:00
Diego Prado Gesto
0fa4df4193 Adjust Spanish and French translations to correctly fit in the space for 
the compatibility message.

Contributes to CURA-5166.
 2018-04-24 12:42:12 +02:00
Diego Prado Gesto
f68ab9ac03 Add the 'auto slice disabled by default' line to the changelog 2018-04-24 12:42:03 +02:00
Lipu Fei
9b77484e96 Translate adhesion sheet warning text 
CURA-5166
 2018-04-24 11:59:43 +02:00
LukeChen-Ultimaker
10616bd4a0
Chinese translation for one string 2018-04-24 11:58:48 +02:00
Diego Prado Gesto
d6dcb995bf Add Spanish and Italian translations to a string added after the string 
freeze.

Contributes to issue CURA-5166.
 2018-04-24 11:35:21 +02:00
Ghostkeeper
fad7885ba7
Add Dutch, German and French translations of string that broke freeze 
These are the languages other than English that I trust myself to translate properly...

Contributes to issue CURA-5166.
 2018-04-24 11:01:38 +02:00
Ghostkeeper
db0288fec4
Merge branch '3.3' 2018-04-24 10:49:30 +02:00
Ghostkeeper
403051e0b2
Merge branch 'CURA-5143_3.3_send_gz' into 3.3 2018-04-24 10:48:31 +02:00
Ghostkeeper
16de8cac0f
Fix undefined variable 
Contributes to issue CURA-5143.
 2018-04-24 10:38:50 +02:00
Lipu Fei
0852cd2c20 WIP: Fix hanging upon send gz 2018-04-24 10:34:08 +02:00
Ghostkeeper
55e3c5c6d2
Update template with string break 
This new string broke the string freeze. We'll translate it for our most commonly used languages.
 2018-04-24 10:22:53 +02:00
kerog777
930b716cc2 Fix brackets in start_gcode 
Had square brackets instead of curly brackets in M109 commands.  Still
worked OK from SD, but not from Octoprint.
 2018-04-23 21:06:52 -07:00
kerog777
e8b37ea39c Merge remote-tracking branch 'Ultimaker/master' into Felix_Profile 2018-04-23 21:05:34 -07:00