3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-17 19:57:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6
25644 commits 305 branches 270 tags 779 MiB
Commit graph

7988 commits

Author SHA1 Message Date
ChrisTerBeke
b386bda2c8 more fixes for reverting 11ebdf7303 2017-09-18 15:38:31 +02:00
ChrisTerBeke
3db04c918f fixes for reverting 11ebdf7303 2017-09-18 15:37:17 +02:00
Jaime van Kessel
e5629f26de Merge branch 'master' of github.com:Ultimaker/Cura 2017-09-18 15:31:12 +02:00
Jaime van Kessel
a3b6ced5e5 Changed titles of unable to slice messages 
This makes it a bit clearer what is going on and what the "source" of the message is.

CURA-4332
 2017-09-18 15:30:40 +02:00
Diego Prado Gesto
e8553e8e69 Fixed double messages and rearrange some code - CURA-4224 2017-09-18 11:47:23 +02:00
ChrisTerBeke
4ca5987ca8 CURA-4269 added a flag to determine wether auto drop should be executed or not 2017-09-18 10:50:52 +02:00
Diego Prado Gesto
255eb2f377 Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-09-15 16:05:28 +02:00
Diego Prado Gesto
f139bbe3f1 Fixed some missed references to the previous variables - CURA-4232 2017-09-15 16:05:24 +02:00
Ghostkeeper
e092b908a0
Add message content for WriteRequestFailedErrors 
The content of the exception is directly put inside a message, so we should give the exception a message.
 2017-09-15 11:06:32 +02:00
Ghostkeeper
6083989777
Merge branch 'master' of github.com:Ultimaker/Cura 2017-09-15 09:32:15 +02:00
alekseisasin
aa0ade2e74 Merge branch 'master' of github.com:Ultimaker/cura 2017-09-14 18:05:28 +02:00
alekseisasin
98ab571483 Removed 14bitVoid code accord to a new LGPL license 
CURA-4232
 2017-09-14 18:03:31 +02:00
Ghostkeeper
bf96be3ab2
Improve titles for slice failure messages a bit 
The previous ones were very vague.
 2017-09-14 16:40:20 +02:00
ChrisTerBeke
11ebdf7303 CURA-4269 disable auto-drop for first time loaded models from project files 2017-09-14 16:06:51 +02:00
Lipu Fei
3812a478cf Only use lowercase for string comparison 
CURA-4224
 2017-09-14 12:50:55 +02:00
Lipu Fei
ccebadee10 Merge branch 'master' 2017-09-14 12:48:07 +02:00
ChrisTerBeke
c5c6ed8b2b CURA-4318 fix colors and layouts for dark design 2017-09-14 09:59:13 +02:00
Lipu Fei
a48507546f More defensive machine name and version check 
CURA-4224
 2017-09-14 08:34:01 +02:00
Lipu Fei
9567a6921d Fix code style 
CURA-4224
 2017-09-14 08:29:46 +02:00
Lipu Fei
be57ccb127 Minor fixes 
CURA-4224

 - Fix code style
 - Fix typos
 2017-09-13 17:44:53 +02:00
Lipu Fei
2e1c6abe0e Merge branch 'master' 2017-09-13 17:25:47 +02:00
alekseisasin
d0997f7f7e Merge branch 'master' of github.com:Ultimaker/cura 2017-09-13 13:58:39 +02:00
alekseisasin
204019702d Added Title for messages 
CURA-4203
 2017-09-13 13:58:08 +02:00
Diego Prado Gesto
fd1c76ac80 Merged branch - CURA-4270 2017-09-13 13:25:00 +02:00
Diego Prado Gesto
aa2c7c2ff6 Checking first if the user has enabled the 'check for updates' preference - CURA-4224 2017-09-13 10:22:07 +02:00
Diego Prado Gesto
80992dd44c The checker now runs also when the user adds a new printer - CURA-4224 2017-09-12 17:22:17 +02:00
ChrisTerBeke
92617e2177 remove layerview toolbox arrow 2017-09-12 10:15:08 +02:00
ChrisTerBeke
7d719c4ab5 layer view toolbox height depending on color scheme mode 2017-09-12 09:54:24 +02:00
ChrisTerBeke
7cc8656be3 Merge branch 'master' into CURA-4203-message-redesign 2017-09-12 09:13:37 +02:00
ChrisTerBeke
4143effbe1 only show slider track when layers are available 2017-09-12 09:13:16 +02:00
alekseisasin
637b536536 Merge pull request #2342 from hroncok/localefix 
Relocate locales to proper locations
 2017-09-11 17:23:12 +02:00
ChrisTerBeke
89cbaca257 Hide layer view toolset when in monitoring mode 2017-09-11 15:20:46 +02:00
Mark
af3b799cfa Renamed the views to * view 
CURA-4212
 2017-09-11 14:23:32 +02:00
ChrisTerBeke
7efe3a3b9e Merge branch 'master' into feature_top_right_layer_view 2017-09-11 11:50:18 +02:00
Lipu Fei
08882a3f12 Fix LayerView text colour 
CURA-4212
 2017-09-11 11:26:22 +02:00
Lipu Fei
f4bfa499d4 Remove debugging line 
CURA-4284
 2017-09-11 11:23:33 +02:00
Lipu Fei
94a8d2dfc6 Fix LayerView text colour 
CURA-4212
 2017-09-11 11:15:56 +02:00
ChrisTerBeke
98babfade7 CURA-4284 remove debug logging 2017-09-11 11:11:45 +02:00
Lipu Fei
e26be6b14a Merge remote-tracking branch 'master' 2017-09-11 11:11:24 +02:00
Lipu Fei
96678b11ca Update LayerView slider according to new style 
CURA-4212
 2017-09-11 11:10:56 +02:00
ChrisTerBeke
5c30658012 CURA-4284 fix relationship dependencies in per object settings 2017-09-11 10:56:34 +02:00
Lipu Fei
b2eead7736 Resolve merge conflicts from master 
CURA-4212
 2017-09-11 10:32:34 +02:00
ChrisTerBeke
5bb09d73fc clean 2017-09-11 09:46:37 +02:00
Diego Prado Gesto
b17ff081d6 Added the FirmwareUpdateChecker to Cura - CURA-4224 2017-09-11 09:35:27 +02:00
ChrisTerBeke
2d8fca8ac4 Merge branch 'master' of https://github.com/Ultimaker/Cura 2017-09-11 09:14:56 +02:00
ChrisTerBeke
d802c0bd26 CURA-4284 some code cleanup while debugging 2017-09-11 09:14:50 +02:00
Ruben D
234e724fe9
Merge branch 'fix_abort_sequence' of https://github.com/fieldOfView/Cura into fieldOfView-fix_abort_sequence 2017-09-10 15:10:11 +02:00
Ruben D
291d30f118
Update language preference in preferences when upgrading 
The language codes were all renamed, so they have to change in the .cfg file of the user as well.

Contributes to issue CURA-4263.
 2017-09-10 14:01:26 +02:00
Lipu Fei
c8a92f2c59 Move LayerView slider down 
CURA-4212
 2017-09-07 17:04:14 +02:00
Lipu Fei
750f1ce158 Make extruder icons on LayerView panel round 
CURA-4212
 2017-09-07 16:24:48 +02:00