3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-23 06:33:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
12129 commits 305 branches 272 tags 787 MiB
Commit graph

12129 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
petterreinholdtsen
379430d072 List model/x3d+xml in the desktop file 
Add model/x3d+xml as a supported MIME type in the desktop file.

Fixes issue #2571.
 2017-10-12 13:40:46 +02:00
Lipu Fei
39891551e3 Fix custom profile handling for quality slider 
CURA-4333
 2017-10-12 12:42:18 +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
Lipu Fei
0383cea816 Fix code style 
CURA-4333
 2017-10-12 10:31:13 +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
Lipu Fei
b59b245bff Merge branch 'master' into CURA-4333_Notification_icon_for_recommended_mode 2017-10-12 10:20:35 +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
Tim Kuipers
2c73b017a4 trihex infill 2017-10-12 09:26:45 +02:00
A.Sasin
a6a58c8c84 Merge branch '3.0' of github.com:Ultimaker/cura into 3.0 2017-10-12 09:22:52 +02:00
A.Sasin
b318dc7087 Added notification icon in recomended mode. The notification icon is only 
active if one of custom settings is changed
CURA-4333
 2017-10-12 08:57:26 +02:00
Lipu Fei
052ea7d90a Force use and update the job name with the loaded project file 
CURA-4348

- If no project is loaded beforehand and then a model file is loaded,
  the job name should be determined with the current machine name and
  the first loaded model name.
- If a project is loaded, the job name should be the same as the project
  name, and it should not change until another project is loaded.
 2017-10-12 07:59:43 +02:00
Jaime van Kessel
799d1a5b0c Updated setting items & sidebar to qtQuick controls 2.0 2017-10-11 21:02:27 +02:00
Mark
3a7fbdb173 Changed parseInt to Math.floor 2017-10-11 17:06:13 +02:00
Mark
eaa7b75f0e Changed parseInt to Math.floor 2017-10-11 16:47:40 +02:00
Diego Prado Gesto
d9c7a211c1 Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-10-11 15:55:54 +02:00
Diego Prado Gesto
2915199367 Avoid printer connection when the status is 'error' - CURA-3868 2017-10-11 15:55:30 +02:00
Ghostkeeper
17a1d4c840
Merge branch 'master' of github.com:Ultimaker/Cura 2017-10-11 15:04:10 +02:00
Ghostkeeper
9f8f8e7c8c
Merge branch '3.0' 2017-10-11 15:03:54 +02:00
Lipu Fei
a835ffa54a Merge pull request #2561 from Ultimaker/FixGridShaderForOlderOpenGLVersions 
Fix the OpenGL shader for older (legacy?) OpenGL.
 2017-10-11 15:03:12 +02:00
ChrisTerBeke
551adc058f Merge branch '3.0' 2017-10-11 14:54:30 +02:00
ChrisTerBeke
331574eec0 Merge branch '3.0' of https://github.com/Ultimaker/Cura into 3.0 2017-10-11 14:53:59 +02:00
Mark
00205996da Change Text to Label and cast all sizes to int 
CURA-4437
 2017-10-11 14:53:46 +02:00
Ghostkeeper
be268a88dc
Fix order of commented-out translations 
Apparently it's not allowed to put a comment halfway through a translation item.

Contributes to issue CURA-4341.
 2017-10-11 14:53:18 +02:00
ChrisTerBeke
3db5787d5d Code cleanup for infill slider value binding - CURA-4438 2017-10-11 14:41:13 +02:00
Ghostkeeper
e4580b6cd2
Delete unused cura.po file 
To crevent ponfusion.

Contributes to issue CURA-4341.
 2017-10-11 14:39:50 +02:00
Ghostkeeper
92e931e02e
Add translations out-of-band for string freeze violations 
These texts were added after the string freeze. Bad! We've now translated half of these with a native speaker in the office, and the other half via Google and some clever copying from existing translations.

Contributes to issue CURA-4341.
 2017-10-11 14:35:05 +02:00
ChrisTerBeke
e97bdc526b Merge branch '3.0' 2017-10-11 14:13:57 +02:00
Lipu Fei
bb476752a4 Fix infill density binding in Recommended mode 
CURA-4438

Infill density in Recommended mode should be bound to the correct stack
when the infill extruder is/is not set to a specific extruder.
 2017-10-11 14:05:56 +02:00
Ghostkeeper
c4339955b3
Merge branch '3.0' into CL-508_show_lost_connection_status 2017-10-11 14:05:10 +02:00
Ghostkeeper
bf1baa2791 Merge branch '3.0' of github.com:Ultimaker/Cura into 3.0 2017-10-11 14:04:17 +02:00
Simon Edwards
b68707d29c Show the printer unreachable status in the Cura Connect tab when needed. 
CL-508
 2017-10-11 13:52:45 +02:00
ChrisTerBeke
23d0201f6b Merge branch 'fix_garbled_fonts_part_2' 2017-10-11 13:41:33 +02:00
Lipu Fei
4927a639cd Always update the job name with the loaded project 
CURA-4348
 2017-10-11 12:49:22 +02:00
Mark
d4a8dbdee7 Change Text to Label and cast all sizes to int 
CURA-4437
 2017-10-11 12:48:42 +02:00
ChrisTerBeke
a5aa13f853 Merge pull request #2585 from Ultimaker/CL-555_manual_ip_connect_bug 
CL-555 Don't blow up at plugin start up due to the plugin path not being ready yet
 2017-10-11 12:40:50 +02:00
ChrisTerBeke
496791db7f simplify updating max layers changed - CURA-4432 2017-10-11 11:55:54 +02:00