9560 Commits

Author SHA1 Message Date
Jaime van Kessel
b5bf3e8e85
Merge branch 'mb-bridge-skin-over-sparse-infill' of https://github.com/smartavionics/Cura 2019-11-26 15:41:04 +01:00
Jaime van Kessel
b1072029ba
Merge branch 'CURA-6971_add_break_prep_temp' of github.com:Ultimaker/Cura 2019-11-25 13:48:27 +01:00
Jaime van Kessel
80719d4724
Mark disabled extruders when saving project 2019-11-25 11:13:07 +01:00
Remco Burema
25f0460231
Add missing 'material break preparation temperature'.
part of CURA-6971
2019-11-22 12:01:46 +01:00
Jaime van Kessel
997f19ba26
Prevent flicking behavior for machine selection
Contributes to #6684
2019-11-22 11:02:19 +01:00
Remco Burema
9aeb9912c8
Merge branch '4.4' 2019-11-19 15:57:52 +01:00
Remco Burema
df1e0abd93
Merge branch '4.4' of https://github.com/Ultimaker/Cura into 4.4 2019-11-19 14:23:10 +01:00
Remco Burema
f1f0290458
Re-enable the Polish language.
part of CURA-6957
2019-11-19 14:22:53 +01:00
Ellecross
2d35343538 Merge branch '4.4' of https://github.com/Ultimaker/Cura into 4.4 2019-11-19 13:17:37 +01:00
Ellecross
d425764da8 Added contributors to PRs 2019-11-19 13:17:33 +01:00
Jaime van Kessel
c6f42766c7
Remove hardcoded sizes from dialogs & popups
Contributes to #6670
2019-11-19 13:00:39 +01:00
Remco Burema
9e32f715bb
Merge branch 'translations_4.4' into 4.4 2019-11-19 12:08:38 +01:00
Remco Burema
dfe468ef68
Added translations from out Brazilian volunteer.
part of CURA-6957
2019-11-19 11:58:39 +01:00
Remco Burema
5cae2fd098
Merge branch '4.4' into translations_4.4 2019-11-19 11:54:08 +01:00
Ellecross
b74ee97048 Update change_log.txt to have 4.4 changes 2019-11-19 11:49:30 +01:00
Remco Burema
4ebec11fc7
Added 16 missing strings from lionbridge.
part of CURA-6957
2019-11-19 11:40:11 +01:00
Jaime van Kessel
650377c819
Merge branch '4.4' of github.com:Ultimaker/Cura 2019-11-18 11:38:11 +01:00
Jaime van Kessel
377a21071b
Remove color from discard dialog text, since it uses system style
Originally a lot of text would not be readable when in dark theme
because the text would be light, but the background would always be
white.
2019-11-18 11:33:36 +01:00
Remco Burema
3f90566edc
Added Polish translation by one of our volunteer translators.
part of CURA-6957
2019-11-15 17:04:53 +01:00
Jaime van Kessel
08ca213127
Add extra update for Combobox 2019-11-15 11:35:06 +01:00
Remco Burema
ed63a9037d
Add raw Lionbridge translations.
part of CURA-6957
2019-11-14 16:47:08 +01:00
Remco Burema
300990ad89
Add Traditional Chinese from one of our volunteer translators.
part of CURA-6957
2019-11-14 16:44:08 +01:00
Jaime van Kessel
c65ccf29b0
Merge branch 'mb-shared-heater' of https://github.com/smartavionics/Cura 2019-11-14 11:06:12 +01:00
Jaime van Kessel
4613b62120
Merge branch '4.4' of github.com:Ultimaker/Cura 2019-11-11 16:01:19 +01:00
Jaime van Kessel
3e50cf5253
Fix issues with makeblock definition 2019-11-11 13:43:04 +01:00
Lipu Fei
2fb8375714
Merge pull request #6591 from pkz0313/master
Hopefully Adding the Makeblock 3d Printer files to the latest version
2019-11-11 10:55:46 +01:00
Jaime van Kessel
d93f6f25d2
Prevent "sticky" tooltips
When quickly moving the mouse in and out, the timer would
still be running, so the tooltip would become active once the mouse
moved out of the area.
2019-11-11 10:47:53 +01:00
Lipu Fei
d13683f4db Merge remote-tracking branch 'origin/4.4' 2019-11-11 08:13:53 +01:00
Kaz
a5aa4c75ba
update gantry_height 2019-11-08 14:11:34 +08:00
Remco Burema
00f505374b
Merge pull request #6637 from Ultimaker/CURA-6917_unlink_duplicated_material_44
Cura 6917 unlink duplicated material
2019-11-07 17:23:28 +01:00
Remco Burema
3636eed964
Instead of selecting first, return only uniques.
part of CURA-6917
2019-11-07 17:19:18 +01:00
Nino van Hooff
6e79f489e2 When multiple linked materials are found, only display the first
CURA-6917
2019-11-07 15:51:22 +01:00
Lipu Fei
3f93dde6b0 Merge remote-tracking branch 'origin/4.4' 2019-11-07 09:50:02 +01:00
Remco Burema
da92c36afb
Don't show tooltip immediately. 2019-11-06 17:22:58 +01:00
Lipu Fei
33f876d749 Fix leapfrog bolt pro definition files 2019-11-06 15:43:22 +01:00
Remco Burema
0d72563dd3
Update i18n headers.
part of CURA-6957
2019-11-05 13:34:44 +01:00
Ghostkeeper
3ed53a99f6
Update missing translations from new translation template
Contributes to issue CURA-6957.
2019-11-05 13:32:11 +01:00
Remco Burema
b4974dc794
Update translation files with the template.
part of CURA-6957
2019-11-05 13:22:58 +01:00
Ghostkeeper
d87d38ceed
Update translation template files for 4.4
Contributes to issue CURA-6957.
2019-11-05 13:18:34 +01:00
Lipu Fei
0ad5ce19da Fix leapfrog profiles
CURA-6951
2019-11-05 12:49:27 +01:00
Lipu Fei
2e4e19594f
Merge pull request #6608 from Leapfrog3DPrinters/master
Leapfrog Bolt Pro machine profile
2019-11-05 12:48:39 +01:00
Lipu Fei
af909b25a2
Merge pull request #6624 from Ultimaker/CURA-6569_mandatory_marketplace_login
WIP: CURA-6569_mandatory_marketplace_login
2019-11-05 11:04:14 +01:00
Lipu Fei
eeed98746d Merge remote-tracking branch 'origin/4.4' 2019-11-05 09:49:14 +01:00
Jaime van Kessel
366dd4bd00
Swap the splashscreen image
RIP Ultibot :(

CURA-6656
2019-11-05 09:33:50 +01:00
Ghostkeeper
f48a5ec028
Fix zigzag initial layer pattern for Skriware 2 2019-11-04 16:43:54 +01:00
Vincent Riemens
c30ec406cf
Add files via upload 2019-11-04 16:28:55 +01:00
Vincent Riemens
0b76f221b4
Delete leapfrog_bolt_pro.def.json 2019-11-04 16:28:35 +01:00
Ghostkeeper
74d52bbd1c
Fix complaints from CI system about settings that don't work
There's one that needed to be a 'value' to properly overwrite it. The rest are all about settings that were equal to the defaults anyway so I've removed those.

Contributes to issue CURA-6949.
2019-11-04 16:18:46 +01:00
Jaime van Kessel
f1b9ac1c21
Fix aspect ratio of logo in about window
CURA-6934
2019-11-04 16:15:40 +01:00
Ghostkeeper
726cf3b7a4
Fix typo in the R
Contributes to issue CURA-6934.
2019-11-04 16:10:52 +01:00