Commit graph

8217 commits

Author SHA1 Message Date
Ghostkeeper
377c7f1438
Merge branch 'patch-4' of https://github.com/thopiekar/Cura into thopiekar-patch-4 2019-03-26 15:00:31 +01:00
Satish
85a7d814d8 Added id to machine selector for integration tests 2019-03-25 14:34:00 +01:00
Diego Prado Gesto
7958f99152 Update the list of check urls for UM3 Extended 2019-03-25 11:59:28 +01:00
Thomas Karl Pietrowski
8b0e1e9f5d
PrintSetupSelector: "G code" -> "G-code"
Noticed that "g-code" is written at some places with and without a hyphen.
Since it think it should be written with, I'm correcting it at this point.
2019-03-22 19:42:01 +01:00
Jaime van Kessel
9a5b7e7925 Set min value for adaptive_layer_height_variation_step
This is to prevent using 0, since that crashes the engine
2019-03-22 10:44:47 +01:00
Ghostkeeper
294b61937a
Re-enable Polish 2019-03-21 21:14:11 +01:00
Diego Prado Gesto
6611ab7d17 Merge branch 'master' of github.com:Ultimaker/Cura 2019-03-21 16:10:09 +01:00
Diego Prado Gesto
6ad6115327 Modify the firmware checker url to use the new file location 2019-03-21 16:07:26 +01:00
Ghostkeeper
20a4d89847
Merge branch 'drzejkopf-patch-5' 2019-03-21 14:43:37 +01:00
Ghostkeeper
07010c7cec
Merge branch 'patch-5' of https://github.com/drzejkopf/Cura into drzejkopf-patch-5 2019-03-21 14:42:09 +01:00
Jaime van Kessel
a5ce34f548 Merge branch 'master' of github.com:Ultimaker/Cura 2019-03-21 14:32:59 +01:00
Diego Prado Gesto
0eb295be16 Add the new TPU 1.75mm filament to the list of excluded materials for some printers
Contributes to CURA-6121.
2019-03-21 14:29:23 +01:00
Jaime van Kessel
3f02ad7619 Merge branch 'feature_ufp_reader' of github.com:Ultimaker/Cura 2019-03-21 14:27:51 +01:00
Diego Prado Gesto
fceffce56e Show the slider in the middle when there is only one quality profile available.
Contributes to CURA-6121.
2019-03-21 14:18:07 +01:00
Diego Prado Gesto
a58c3997d4 Merge branch '4.0' 2019-03-21 09:36:52 +01:00
Diego Prado Gesto
59b3046c0f Remove duplicate shortcut in Polish
Contributes to CURA-6257.
2019-03-21 09:35:51 +01:00
drzejkopf
f03e5c28d7
Update creality_ender3.def.json 2019-03-20 16:00:40 +01:00
Ghostkeeper
74bfd52c36
Fix default layer height
The 0.1mm profile doesn't overwrite it. Maybe it should to prevent this mistake in the future?

Contributes to issue CURA-6391.
2019-03-20 09:21:42 +01:00
drzejkopf
36a395ee91
Update creality_ender3.def.json
Changed override of "default_value" to "value" of acceleration_travel and jerk_travel to make slicer keep those values, as they were overrided by conditional in fdmprinter.def.json, and also removed layer height as it does nothing because it's overriden by preffered quality (draft) settings
2019-03-19 22:51:50 +01:00
pinchies
6ebc08420a Add profile for JGAurora JGMaker Magic (#5430)
Add a basic profile for JGAurora JGMaker Magic
2019-03-18 16:42:43 +01:00
Jaime van Kessel
02f4cf8c46
Merge pull request #5179 from nbennett1978/master
integration of printer profiles for ALYA 3DP and ALYA NX 3DP
2019-03-18 16:39:39 +01:00
Jaime van Kessel
72a0d8b739
Merge pull request #5436 from NicolasNSSM/patch-1
Fix Alfawise U30 to get more realistic print times
2019-03-18 16:37:07 +01:00
Ghostkeeper
cb44223eca
Consistent capitalisation 2019-03-18 15:16:49 +01:00
Jaime van Kessel
c1ed8ba9d0 Merge branch '4.0' of github.com:Ultimaker/Cura 2019-03-18 14:56:49 +01:00
Ghostkeeper
9176240798
Fix replacement keys
Translators translated '%1' to '1%' apparently.

Contributes to issue CURA-6257.
2019-03-18 13:45:05 +01:00
Ghostkeeper
f09f267962
Merge branch '4.0' 2019-03-18 11:52:57 +01:00
Ghostkeeper
8336a3977e
Merge branch 'update_translations_4.0' into 4.0 2019-03-18 11:52:38 +01:00
Ghostkeeper
53f826c5a5
Merge branch '4.0' 2019-03-18 11:28:29 +01:00
Ghostkeeper
87c3fec9ec
Correct interpunction for consistency with English version
Contributes to issue CURA-6257.
2019-03-18 11:28:18 +01:00
Ghostkeeper
c79ffab9fb
Merge branch '4.0' 2019-03-18 11:24:23 +01:00
Ghostkeeper
12b58feb51
Minor corrections to Brazilian translations
Contributes to issue CURA-6257.
2019-03-18 11:24:08 +01:00
Cláudio 'Patola' Sampaio
a286863e27
Update translation strings for Cura 4.0 2019-03-18 11:20:20 +01:00
Nicolas NSSM
df19715e89
Fix Alfawise U30 to get more realistic print times 2019-03-16 14:30:04 +01:00
THeijmans
fdf65b43bc Update the speed values for the um2+
Some more wrong values were found, these should be fixed with this pull request
2019-03-14 15:59:12 +01:00
Jaime van Kessel
f73dabdc3f Merge branch 'UM2plus-profile-speed-issues' of github.com:Ultimaker/Cura 2019-03-14 15:58:36 +01:00
THeijmans
83352e14e9 Update the speed values for the um2+
Some more wrong values were found, these should be fixed with this pull request
2019-03-14 15:38:42 +01:00
Ghostkeeper
9e6b745ec8
Apply changes suggested by PoEdit
Some changes to interpunction, mostly.

Contributes to issue CURA-6257.
2019-03-14 14:51:44 +01:00
Ghostkeeper
0f8a30d37b
Add period to tooltip sentence
A lot of translators got this wrong.

Contributes to issue CURA-6257.
2019-03-14 14:30:57 +01:00
Ghostkeeper
caeb34d567
Don't translate brand names
Contributes to issue CURA-6257.
2019-03-14 14:22:05 +01:00
Ghostkeeper
9c306d5f67
Update Portuguese translation headers
Contributes to issue CURA-6257.
2019-03-14 14:16:18 +01:00
Ghostkeeper
8d98f97032
Update European Portuguese translations from Bothof
These are the translation files that I got from Bothof. No edits have been made yet: No checks, no header updates, etc.

Contributes to issue CURA-6257.
2019-03-14 14:09:44 +01:00
Jaime van Kessel
8b3290fb1e Prevent the deletion of materials that are still active 2019-03-14 10:50:53 +01:00
Ghostkeeper
d0f32adf66
Translate 'on' and 'off' in stage menu
It needs to be short. I used Google Translate for this. I translated the words 'active' and 'inactive' since this is about support being enabled or disabled. However with the translation of the word 'disabled' I'm getting results that seem to go more towards 'handicapped' rather than 'deactivated' so I think this is better.

Contributes to issue CURA-6257.
2019-03-13 17:21:34 +01:00
Ghostkeeper
47d4ae2789
Don't translate brand names
Contributes to issue CURA-6257.
2019-03-13 17:14:39 +01:00
Ellecross
727070fd42
Fix HTML link
Contributes to issue CURA-6257.

Co-Authored-By: Ghostkeeper <Ghostkeeper@users.noreply.github.com>
2019-03-13 16:55:21 +01:00
Ghostkeeper
1270cb6636
Fix replacement key
Contributes to issue CURA-6257.
2019-03-13 16:53:54 +01:00
Ghostkeeper
2974b43840
Fix replacement key
Contributes to issue CURA-6257.
2019-03-13 16:53:39 +01:00
Ghostkeeper
ca401cfb4f
Fix replacement key
Contributes to issue CURA-6257.
2019-03-13 16:53:21 +01:00
Ghostkeeper
e8c5f3502d
Fix replacement key
Contributes to issue CURA-6257.
2019-03-13 16:53:04 +01:00
Ghostkeeper
18938bcf59
Fix quotes in hyperlink
Contributes to issue CURA-6257.
2019-03-13 16:52:40 +01:00