GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-17 15:45:54 +08:00
Code Issues Packages Projects Releases Wiki Activity
10,852 Commits 295 Branches 268 Tags
Commit Graph

10852 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lipu Fei
f4718162d3 Merge remote-tracking branch 'upstream/3.0' 2017-10-16 15:01:15 +02:00
Lipu Fei
8ef918829f Fix quality profile upgrade for UM2 family 2017-10-16 15:00:29 +02:00
Lipu Fei
38b9df80f3 Merge remote-tracking branch 'upstream/3.0' 2017-10-16 14:54:40 +02:00
Lipu Fei
aa7b456594 Fix custom quality profile upgrade for UM2 family 
The custom quality profiles for the UM2 family used to be saved as
profiles for "fdmprinter". They now should be updated to set for
"ultimaker2".
 2017-10-16 13:59:22 +02:00
A.Sasin
65eac37f30 Merge branch 'send_crashes' 
CURA-4195
 2017-10-16 13:48:26 +02:00
alekseisasin
eebe4028ff Merge pull request #2610 from fieldOfView/fix_machinesettings_backend_crash 
Fix crash when exiting Machine Settings
 2017-10-16 13:46:03 +02:00
A.Sasin
b32f3f9f77 Adjusted Crash report message title 
CURA-4195
 2017-10-16 13:42:29 +02:00
Ghostkeeper
58562d59a0
Remove unused import 2017-10-16 11:17:50 +02:00
Ghostkeeper
997be09493
Ignore Siemens NX plug-in 2017-10-16 11:16:53 +02:00
Ghostkeeper
dea230ed6a
Make generated extruder options translateable 
These do appear in the actual interface.
 2017-10-16 11:13:55 +02:00
Ghostkeeper
a10390dbf1
Fix ANOTHER broken string freeze with plugin browser menu item 
This is annoying.

Contributes to issue CURA-4341.
 2017-10-16 11:01:01 +02:00
Ghostkeeper
fb5aa97641
Forgot ellipses 
Contributes to issue CURA-4341.
 2017-10-16 11:01:01 +02:00
Ghostkeeper
5a221a31d9
Fix another broken string freeze with plugin browser menu item 
This is getting annoying.

Contributes to issue CURA-4341.
 2017-10-16 11:01:00 +02:00
Ghostkeeper
639f22a986
Fix broken string freeze with plugin browser menu item 
This is getting annoying.

Contributes to issue CURA-4341.
 2017-10-16 11:01:00 +02:00
fieldOfView
d4e83ceba8 Fix one more fractional pixel offset affecting text placement 2017-10-16 10:39:02 +02:00
fieldOfView
464cf139a8 Change renderType for TextInput elements 
Unlike Label elements, which are defined to use Text.NativeRendering, TextInput uses Qt text rendering by default. This can lead to differences in font rendering between input fields and other texts.
 2017-10-16 10:38:51 +02:00
ChrisTerBeke
5c0488c182 Merge pull request #2603 from fieldOfView/fix_textinput_rendertype 
Change renderType for TextInput elements
 2017-10-16 10:33:05 +02:00
Lipu Fei
7e0014eadd Create machine name-to-id map at runtime instead of using a hard-coded map 
CURA-4223
 2017-10-16 10:28:06 +02:00
Jaime van Kessel
c9ba269084 Merge branch 'master' of github.com:Ultimaker/Cura 2017-10-16 09:42:43 +02:00
fieldOfView
ad1c0046d9 Fix crash when exiting Machine Settings 
fixes #2609
 2017-10-15 11:54:49 +02:00
fieldOfView
f9ca353f6a Fix one more fractional pixel offset affecting text placement 2017-10-14 11:49:27 +02:00
fieldOfView
29729d2a23 Change renderType for TextInput elements 
Unlike Label elements, which are defined to use Text.NativeRendering, TextInput uses Qt text rendering by default. This can lead to differences in font rendering between input fields and other texts.
 2017-10-14 11:43:18 +02:00
Diego Prado Gesto
74c37dfc65 CURA-4195 Add strings for I18N 2017-10-13 16:32:01 +02:00
Mark
c2515ca7a9 Merge branch '3.0' 2017-10-13 16:21:54 +02:00
Mark
73f6427a88 Change mainwindow name to Ultimaker Cura 2017-10-13 16:21:23 +02:00
Diego Prado Gesto
3ea9c3856c CURA-4450 Updating UI after removing printer 
When removing a printer, the new one was activated but not signals were
emitted so the UI didn't update correctly. Now the printer is added and
signals are emitted.
 2017-10-13 13:06:48 +02:00
Diego Prado Gesto
4c4de2cf1a Merge branch 'CURA-4358_buildplate' into 3.0 2017-10-13 10:51:05 +02:00
Diego Prado Gesto
de260683cf CURA-4195 - Add module name to the crash report 2017-10-13 10:43:58 +02:00
Jaime van Kessel
a7e1017aa2 Added some missing widths en heights 
GammaRay complained about some objects not having a size
 2017-10-12 19:14:22 +02:00
Ghostkeeper
4627c728b2
Merge branch '3.0' 2017-10-12 17:10:22 +02:00
Ghostkeeper
cfcb47234c
Add cross infill to the change log 
Contributes to issue CURA-4391 and CURA-4095.
 2017-10-12 17:10:04 +02:00
Ghostkeeper
08d475b7ac
Merge branch 'master' of github.com:Ultimaker/Cura 2017-10-12 14:59:13 +02:00
Ghostkeeper
e4a53da763
Merge branch '3.0' 
Contributes to issue CL-508.
 2017-10-12 14:56:30 +02:00
Lipu Fei
920c90010f Fix base.selectedPrinter is undefined problem 2017-10-12 14:54:01 +02:00
Ghostkeeper
eda61f1ff9
Merge branch 'update_printer_blocked_icon' into 3.0 2017-10-12 14:49:07 +02:00
Ghostkeeper
e6f613248c
Merge branch 'CL-508_correct_status_msg_when_disconnected' into 3.0 2017-10-12 14:48:36 +02:00
Ghostkeeper
56ccc2e8b8
Merge branch 'CL-555_fix_incorrect_msg_in_discovery' into 3.0 2017-10-12 14:45:11 +02:00
Simon Edwards
8ed7918b60 Update the icon used to show that a printer is blocked. 
This applies to the printer status icons shown in the monitor tab when connected via Cura Connect.
 2017-10-12 14:02:19 +02:00
Simon Edwards
eef4d61402 Correct the status message when a printer needs a config change but is unreachable 
CL-508
 2017-10-12 13:44:03 +02:00
A.Sasin
624aca324e Updated changelog, except Cross infill 
CURA-4391
 2017-10-12 13:42:21 +02:00
Simon Edwards
427afdbe23 Correctly set up the cluster output device instances with the cluster size 
This fixes the Cura Connect messages shown in the network printer selection dialog.

CL-555
 2017-10-12 12:41:21 +02:00
A.Sasin
8d20f62dc9 Changed back to previous commit 2017-10-12 11:57:02 +02:00
A.Sasin
a3b8642a4e Added text.elideRight on SidebarSimple 2017-10-12 11:45:25 +02:00
A.Sasin
372e86e39b Merge branch '3.0' of github.com:Ultimaker/cura into 3.0 2017-10-12 11:42:24 +02:00
Ghostkeeper
bb1dd0e3d4
Merge branch 'CL-584_no_selecting_disabled_printers' into 3.0 2017-10-12 11:01:58 +02:00
Simon Edwards
af3c34b6fd Don't let the user select unreachable printers in the Cura Connect monitor tab 
CL-584
 2017-10-12 10:46:25 +02:00
A.Sasin
a7e0d5147e Merge branch 'master' of github.com:Ultimaker/cura 2017-10-12 10:40:50 +02:00
Ghostkeeper
ca28748bc3
Add missing translations from broken string freeze 
These texts were added later after the strings were frozen. Bad! But this is the German translation for it, retrieved from a secondary speaker here at the office.

Contributes to issue CURA-4341.
 2017-10-12 10:26:38 +02:00
Ghostkeeper
497327ba73
Merge branch '3.0' 2017-10-12 09:29:09 +02:00
Ghostkeeper
f94954e9ca
Improved end g-code 
This one removes the hair at the end of this print a bit better.

Contributes to issue EM-1859.
 2017-10-12 09:28:50 +02:00