ChrisTerBeke
c3ddd12e16
Merge pull request #2882 from fieldOfView/fix_sidebar_estimation_tooltips
...
Tweak layout and alignment of print time and cost estimation
2017-12-01 15:08:37 +01:00
Ghostkeeper
ffc439852f
Merge branch '3.1'
2017-12-01 15:00:34 +01:00
Ghostkeeper
378ad076b4
Merge branch 'master' of github.com:Ultimaker/Cura
2017-12-01 15:00:25 +01:00
Ghostkeeper
335f790b4e
Merge branch '3.1' of github.com:Ultimaker/Cura into 3.1
2017-12-01 15:00:01 +01:00
Ghostkeeper
7068f6c28c
Fix whitespace at the end
...
Otherwise gettext will complain that one of them ends with \n but the other doesn't.
Contributes to issue CURA-4601.
2017-12-01 14:59:51 +01:00
Lipu Fei
a425a1c51b
Fix legacy profile loading
...
CURA-4075
2017-12-01 14:57:59 +01:00
ChrisTerBeke
7cc953d8e7
Merge pull request #2880 from fieldOfView/fix_machinesettings_diameter_no_materials
...
Hide material diameter when the machine has no materials
2017-12-01 14:56:36 +01:00
Ghostkeeper
e3b7bbb6bd
Fix whitespace at the end
...
Otherwise gettext will complain that one of them ends with \n but the other doesn't.
Contributes to issue CURA-4601.
2017-12-01 14:43:41 +01:00
Ghostkeeper
2236e0016d
Merge branch '3.1'
2017-12-01 14:41:41 +01:00
Dinow
c5baabd8a3
Update cura.po for 3.1
2017-12-01 14:40:51 +01:00
Dinow
4c1024fcc2
Update fdmprinter for 3.1
2017-12-01 14:40:41 +01:00
Dinow
302543cad2
update from pot files
2017-12-01 14:40:27 +01:00
Dinow
fb9645d185
import from 3.0
2017-12-01 14:40:15 +01:00
Ghostkeeper
270eec791a
Merge branch 'dinowchang-translate-zh_TW'
2017-12-01 14:38:34 +01:00
Ghostkeeper
b429966ab6
Merge branch 'translate-zh_TW' of github.com:dinowchang/Cura into dinowchang-translate-zh_TW
2017-12-01 14:37:57 +01:00
Diego Prado Gesto
21d61ce21e
Fix an error that makes Cura crash when introducing commas in the
...
textfields in the ImageReader panel. Now it's possible to use commas xor
dots for separating decimal values.
2017-12-01 14:26:53 +01:00
ChrisTerBeke
b99ad6c93a
Merge pull request #2864 from Ultimaker/thopiekar-Ultimaker-Cura-desktop
...
desktop.in: Ultimaker Cura everywhere!
2017-12-01 14:04:46 +01:00
Ghostkeeper
c039535ee3
Fix retraction window of PLA and Nylon of 0.25mm profiles
...
This was probably caused by having wrong default profiles.
We're checking the rest of the settings again now just to be sure, because this probably has more implications elsewhere too.
2017-12-01 13:57:10 +01:00
Andreea Scorojitu
0fe51589ac
Merge branch '3.1' of https://github.com/Ultimaker/Cura into 3.1
2017-12-01 13:29:05 +01:00
Andreea Scorojitu
5202c8584c
Update_ChangeLog_3.1_CURA-4656
2017-12-01 13:26:38 +01:00
Diego Prado Gesto
e7ac2e37b4
Fix an error when closing USB connection. This error raised several
...
times in the crash reports in the stats.
2017-12-01 13:17:36 +01:00
Lipu Fei
7b4cb11240
Fix legacy profile upgrade
...
CURA-4075
Only for single-extrusion machines just like before.
2017-12-01 11:20:52 +01:00
Lipu Fei
7de43e71e0
Fix legacy profile upgrade
...
CURA-4075
Only for single-extrusion machines just like before.
2017-12-01 11:06:14 +01:00
Ghostkeeper
c0e7446f2a
Correct label of Save Project menu item
...
Capital P. Ellipses to indicate that a modal window is coming. Ampersand to enable the hotkey.
2017-12-01 10:44:56 +01:00
Ghostkeeper
f045b85db3
Merge branch '3.1'
2017-12-01 10:19:36 +01:00
Ghostkeeper
ea7ff05a3d
Merge branch '3.1' of github.com:Ultimaker/Cura into 3.1
2017-12-01 10:19:23 +01:00
Ghostkeeper
81533c888e
Merge branch 'anraf1001-3.1' into 3.1
2017-12-01 10:19:07 +01:00
Lipu Fei
14c84d835a
Make quality switching clear
...
CURA-4650
2017-12-01 09:55:38 +01:00
Ghostkeeper
0336af3b4a
Merge branch '3.1' of github.com:Anraf1001/Cura into anraf1001-3.1
2017-12-01 09:52:17 +01:00
Diego Prado Gesto
972f4c5b05
Merge branch '3.1' of https://github.com/Ultimaker/Cura into 3.1
2017-11-30 17:38:47 +01:00
Diego Prado Gesto
7e4ed8a257
CURA-4646 Fix save containers also for the extruders
2017-11-30 17:37:16 +01:00
Ghostkeeper
96c38bce2b
Merge branch '3.1'
2017-11-30 16:57:01 +01:00
Ghostkeeper
93159c8986
Corrections to translations
...
Made by Vandrasc.
Contributes to issue CURA-4601.
2017-11-30 16:32:52 +01:00
Ghostkeeper
31104bcdc4
Corrections to Dutch translation
...
Not all too bad this time.
Contributes to issue CURA-4601.
2017-11-30 16:32:52 +01:00
ChrisTerBeke
47c1c1a8bf
Merge pull request #2883 from fieldOfView/fix_machinesettings_gcode_flavor_materials
...
[regression] Fix material container for extruder when changing gcode flavor
2017-11-30 16:30:13 +01:00
ChrisTerBeke
d76081ae1d
Only restore global profile based on extruders that are actually in use when loading legacy project file
2017-11-30 16:24:46 +01:00
fieldOfView
9564bb645f
Remove test code
2017-11-30 15:54:24 +01:00
ChrisTerBeke
f5a35408e8
Merge pull request #2884 from fieldOfView/fix_gcode_snippets_encoding
...
[CRITICAL] Prevent start & end gcode snippets being double encoded
2017-11-30 15:33:22 +01:00
ChrisTerBeke
96d5d376fb
Merge branch '3.1' of https://github.com/Ultimaker/Cura into 3.1
2017-11-30 15:25:03 +01:00
ChrisTerBeke
3abf067d25
Fix loading .curaproject files with stack setups from earlier versions - CURA-4646
2017-11-30 15:24:51 +01:00
fieldOfView
4b0ff6e5f4
Prevent start & end gcode snippets being double encoded
2017-11-30 15:16:09 +01:00
Ghostkeeper
0fdb21fc91
Update translations for 3.1
...
The rest of the ones from Bothof.
Contributes to issue CURA-4601.
2017-11-30 15:12:44 +01:00
Ghostkeeper
3bb45488c3
Update translations for 3.1
...
From Bothof.
Contributes to issue CURA-4601.
2017-11-30 14:54:34 +01:00
fieldOfView
e8a7237391
Fix updating material container for extruder when changing gcode flavor
...
Since single extrusion printers have a single extruder stack now, material container needs to be set on the extruder stack instead of the global stack
2017-11-30 11:46:06 +01:00
fieldOfView
4303278602
Tweak layout and alignment of print time and (material) cost estimation...
...
improving readability
* table takes the full width and values are right-aligned
* time estimates are shortened
* values are right aligned
* feature/time/percentage are on a single line again
* handle long feature & material names gracefully
Fixes #2712
* totals are only shown when there are multiple extruders
2017-11-30 10:35:31 +01:00
Diego Prado Gesto
b425672ad0
CURA-4643 Allow using the ESC/ENTER keys for reject or accept the
...
user agreement
2017-11-30 09:31:07 +01:00
fieldOfView
d5d75aca19
Hide material diameter when the machine has no materials
...
eg Ultimaker 2 when using UltiGcode
2017-11-29 22:46:17 +01:00
Lipu Fei
320330b788
Take DebugMode flag from CuraVersion
...
CURA-4539
2017-11-29 14:36:00 +01:00
Lipu Fei
e1167ee68f
Fix disableKeyButtons in UserAgreement dialog
...
CURA-4643
2017-11-29 14:33:19 +01:00
Lipu Fei
4586e3dd55
Merge pull request #2375 from Ghostkeeper/optimise_sending_slice_job
...
Optimise sending slice job
2017-11-29 14:13:37 +01:00
