3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-06 21:44:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10
14139 commits 313 branches 275 tags 718 MiB
Commit graph

6232 commits

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
3e37487632
Merge pull request #3626 from kaleidoscopeit/patch-1 
Update deltacomb.def.json
 2018-04-30 10:19:37 +02:00
Gabriele Rossetti
b16cee5892
Fixed values with double-quotes 2018-04-26 14:36:08 +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
ec9be7a103 Merge remote-tracking branch 'origin/3.3' 2018-04-25 12:55:21 +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
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
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
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
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
Diego Prado Gesto
609d51e52e CURA-5250 Remove buildplate menu entry temporary. Add back when the 
whole feature is back again.
 2018-04-23 14:41:43 +02:00
Ghostkeeper
acd38b365a
Merge branch '3.3' 2018-04-23 14:15:38 +02:00
Ghostkeeper
47101cc1ca
Merge branch 'master' of github.com:Ultimaker/Cura 2018-04-23 14:14:12 +02:00
Ghostkeeper
5648bc82e7
Merge branch '3.3' 2018-04-23 14:07:46 +02:00
Lipu Fei
0a1fd51b2f Prefer gcode for UM3 
CURA-5143
 2018-04-23 13:40:19 +02:00
Diego Prado Gesto
5333ca5aa8
Merge pull request #3666 from Ultimaker/CURA-5204_send_anonymous_data 
Show information dialogue on what usage data is sent
 2018-04-23 13:32:22 +02:00
Lipu Fei
4c61e190ae Add exclude materials for UMO, UM2, and UM2+ 
CURA-5271
 2018-04-23 12:51:06 +02:00
Ghostkeeper
7c3fe6ac93
Publish Tough PLA profiles 
The Tough PLA material is now published, so we can publish these files too.

Contributes to issue CURA-5272.
 2018-04-23 11:28:33 +02:00
Ghostkeeper
aec2b9dafe
Add Ultimaker S5 resources 
The Ultimaker S5 has now been published, so these files may be published as well.

Contributes to issue CURA-5272.
 2018-04-23 11:27:13 +02:00
Ghostkeeper
d857541677
Update PO headers 
We're releasing 3.3 now.
 2018-04-23 10:29:59 +02:00
Cláudio Sampaio (Patola)
b4ddeab47e updated pt-br translations 2018-04-21 21:16:03 -03:00
kerog777
85fb9441ea Made requested changes to version numbers, etc. per comments fro 
previous pull request.
 2018-04-21 09:34:41 -07:00
Diego Prado Gesto
dbd30abd86 Merge branch '3.3' of github.com:Ultimaker/Cura into 3.3 2018-04-20 17:06:09 +02:00
Diego Prado Gesto
b8a26f3187 CURA-5218 Disable the Activate and Duplicate button in the management 
page if the selected profile is not supported
 2018-04-20 17:04:51 +02:00
Ghostkeeper
ac2301a8fd
Fix code style: Brackets on new line 
And one comma without a space after it.

Contributes to issue CURA-5204.
 2018-04-20 15:36:32 +02:00
Ghostkeeper
e13c3b1f13
Merge branch '3.3' 2018-04-20 15:34:06 +02:00
Ghostkeeper
f675b0b858
Fix 'Setting up scene...' translation 
This was replaced with its English term, even though it's not really an industry term or anything.

Contributes to issue CURA-5166.
 2018-04-20 15:33:48 +02:00
Lipu Fei
d0c6d87417 Fix Rigid3D Mucit definition 
CURA-5257

 - Remove extra trailing spaces
 - Replace TABs with SPACEs
 - "value"s should use quotes ""
 2018-04-20 14:52:52 +02:00
Lipu Fei
addcf5236a
Merge pull request #3642 from Rigid3D/master 
Printer Definitions for Rigid3D Mucit
 2018-04-20 14:43:58 +02:00
Ghostkeeper
70aed244ca
Merge branch '3.3' 2018-04-20 14:36:51 +02:00
Ghostkeeper
74016f0fb3
Merge branch 'jbkim-3.3' into 3.3 2018-04-20 14:19:03 +02:00