Commit graph

9586 commits

Author SHA1 Message Date
Ghostkeeper
7f969528f3
Merge branch 'master' of ssh://github.com/Ultimaker/Cura 2019-12-10 16:03:02 +01:00
Ghostkeeper
ba2c9cb21e
Fix JSON formatting of start g-code
No newlines allowed.
2019-12-10 16:02:45 +01:00
Ghostkeeper
455721130c
Merge branch 'master' of https://github.com/TheOneOgre/Cura into TheOneOgre-master 2019-12-10 15:57:57 +01:00
Jaime van Kessel
b3430a1fad
Merge pull request #6765 from Ultimaker/CURA-6522_revert_edge_distance_hack
Cura 6522 revert edge distance hack
2019-12-10 13:35:44 +01:00
Remco Burema
5681c631a2
Merge pull request #6781 from Ultimaker/CURA-6941_fix_intent_UI_dark_theme
Cura 6941 fix intent ui dark theme
2019-12-10 13:30:17 +01:00
Kostas Karmas
6ae0e08b7d Change RadioCheckbar active button color
The RadioCheckbar active button is now using the slider_groove_fill
value instead of the small_button_active value to avoid issues in
case the small_button_active and small_button_text are used together.
2019-12-10 13:19:10 +01:00
Jaime van Kessel
f66b1e6fde
Merge branch 'master' of github.com:Ultimaker/Cura into CURA-6522_revert_edge_distance_hack 2019-12-10 13:06:37 +01:00
Jaime van Kessel
7ba1db830a
Re-enable the retraction min travel setting
CURA-6675
2019-12-10 13:00:29 +01:00
Kostas Karmas
c0ac03f2ae Change Custom profiles title similar to Default
CURA-6941
2019-12-09 14:35:19 +01:00
Kostas Karmas
5b9bd46ba3 Change active intent line to white
The activated part of the intent lines will now be white
instead of grey.

CURA-6941
2019-12-09 14:31:43 +01:00
Kostas Karmas
64decc7345 Change unselected intent to outline (dark theme)
The unselected intent radio buttons in the default profiles
are by default white-filled. This is fixed to have a white outline
and be filled with the main background's color.

CURA-6941
2019-12-09 14:24:27 +01:00
Ghostkeeper
4a9f09fa67
Merge branch 'patch-1' of https://github.com/juanluisvaladas/Cura into juanluisvaladas-patch-1 2019-12-05 15:30:42 +01:00
Ghostkeeper
961cd937b4
Correct start and end g-code
According to the thread at #6673 this works.

Fixes #6673.
2019-12-04 09:58:19 +01:00
Jeff Kazules
726561bf30
Increase printer size and add disallowed areas
With the stock firmware of the Ender 3, the size of the original printer was wrong, causing the model to land in a different place on the build plate. This led people to believe that the printer could take bigger prints. However it couldn't; it was just not allowing to print all the way down to the coordinate origin at 0,0.

This makes the printer bigger but also adds disallowed areas so that you can't print anything near 0,0.

Fixes #6267.
2019-12-03 13:39:50 +01:00
Juan-Luis de Sousa-Valadas Castaño
eea4df12a7
Spanish i18n fix fillament weight 2019-12-02 23:30:54 +01:00
Dimitriovski
084f55b611 Removed hard-coded name for Ultimaker Cura to use applicationDisplayName
CURA-6978
2019-11-27 15:35:09 +01:00
Dimitriovski
9522ce2b78 Added the project name in Window Title
CURA-6978
2019-11-27 11:59:19 +01:00
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
Jaime van Kessel
ea02bdf40a
Also bump up the setting version of files changed since this branch was branched
CURA-6522
2019-11-20 16:51:15 +01:00
Jaime van Kessel
50d72692d8
Merge branch 'master' of github.com:Ultimaker/Cura into CURA-6522_one_at_a_time_overlapping_build_area 2019-11-20 16:48:00 +01:00
Jaime van Kessel
266f7d1f74
Also bump up the version nr of FDMExtruder & FDMPrinter
CURA-6522
2019-11-20 16:39:38 +01:00
Remco Burema
9aeb9912c8
Merge branch '4.4' 2019-11-19 15:57:52 +01:00
Dimitriovski
94a5b5ef90 CURA-6522_one_at_a_time_overlapping_build_area
Changed the setting_version to 11
2019-11-19 15:27:17 +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
TheOgre
23d7dca1fc
Added missing bracket, tidied up code
Added a missing { before "default_value".
Moved items around to match the layout of the current file.
2019-11-12 06:22:06 -05:00
Jaime van Kessel
4613b62120
Merge branch '4.4' of github.com:Ultimaker/Cura 2019-11-11 16:01:19 +01:00
Nino van Hooff
254dde5b05 REmove duplicate key machine_head_with_fans_polygon 2019-11-11 15:02:49 +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