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

11963 commits

This branch
This branch
All branches
Author SHA1 Message Date
Diego Prado Gesto
17183316db Gradual infill stepping 1 by 1 and remembering previous value - CURA-4397 2017-10-05 15:22:39 +02:00
Lipu Fei
5e970fa5a5 Use more descriptive function name 
CURA-4411
 2017-10-05 15:08:08 +02:00
Lipu Fei
18e636f928 Cleanup post_reply cleanup code 
CURA-4398

- Create 2 separate try-except blocks for disconnect()s
- Remove duplicated post_reply cleanup code by creating a function to do
  so
 2017-10-05 15:02:30 +02:00
ChrisTerBeke
82805fefe4 Merge branch '3.0' of https://github.com/Ultimaker/Cura into 3.0 2017-10-05 15:01:27 +02:00
ChrisTerBeke
9ef1caff50 Fix view combobox not updating when using view menu item, code cleanup, CURA-4411 2017-10-05 15:01:19 +02:00
Lipu Fei
d89f027458 Fix extruder stacks list handling in profile models 
CURA-4404
 2017-10-05 14:11:16 +02:00
Lipu Fei
0eeded7930 Fix KeyError in WorkspaceDialog 
CURA-4404
 2017-10-05 14:11:16 +02:00
Ghostkeeper
f2ecf41ab1
Fix referencing creality definitions 
The IDs don't matter, but that little 'a' there does.
 2017-10-05 13:44:06 +02:00
Ghostkeeper
aa9ae73e8f
Set minimum layer time to 10 seconds 
Via inheritance this is applied to all Creality printers.
 2017-10-05 13:44:06 +02:00
Ghostkeeper
5cd1825603
Remove 'beta' from names of Creality printers 
They are now considered stable.
 2017-10-05 13:44:06 +02:00
Ghostkeeper
42652cc1c1
Update Japanese translations 
Received these via Ultimaker's resellers in the area.

Contributes to issue CURA-4341.
 2017-10-05 13:44:06 +02:00
Ghostkeeper
203485d436
Update Korean translations 
These were received via Ultimaker's resellers for that area. I fixed up the metadata before uploading it here.

Contributes to issue CURA-4341.
 2017-10-05 13:44:06 +02:00
ChrisTerBeke
cd59048475 Disconnect upload finished signals, move already uploading check down, CURA-4398 2017-10-05 13:11:45 +02:00
Ghostkeeper
d458fcde5c
Revert "Revert "Merge branch 'fix_garbled_fonts_macos' into 3.0"" 
This reverts commit e07e7bc9e7.

Contributes to issue CURA-4414.
 2017-10-05 10:58:49 +02:00
Ghostkeeper
ff41b043b1
Merge branch '3.0' 2017-10-05 10:58:21 +02:00
ChrisTerBeke
a8476c30ca
CURA-4414 replace all Text elements for Label, make sure no half pixel anchors exist 2017-10-05 10:58:07 +02:00
Mark
e9a8ae15f3
Move text back to label and remove unused font 2017-10-05 10:57:43 +02:00
Ghostkeeper
e07e7bc9e7
Revert "Merge branch 'fix_garbled_fonts_macos' into 3.0" 
This reverts commit b62c19206f, reversing
changes made to 104926c6ed.

Contributes to issue CURA-4414.
 2017-10-05 10:28:54 +02:00
Diego Prado Gesto
30be02be14 Keep custom infill density value when disabling gradual infill - CURA-4397 2017-10-05 09:08:52 +02:00
Ghostkeeper
e7153968f0
Merge branch 'feature_raise3d_n2' of https://github.com/fieldOfView/Cura into fieldOfView-feature_raise3d_n2 2017-10-04 17:19:35 +02:00
Jaime van Kessel
e8925443a0 Merge branch '3.0' of github.com:Ultimaker/Cura into 3.0 2017-10-04 16:10:04 +02:00
Jaime van Kessel
512a942f75 Added a tickle to zipping state of messages 2017-10-04 16:09:53 +02:00
Jaime van Kessel
c3afd49847 Added a tickle to zipping state of messages 2017-10-04 15:54:19 +02:00
Ghostkeeper
b142a15266
Remove unused import 
And fixed the header and documentation spelling.
 2017-10-04 14:59:39 +02:00
Ghostkeeper
ea39cd4615
Merge branch 'master' of github.com:Ultimaker/Cura 2017-10-04 14:57:40 +02:00
Ghostkeeper
0fab6fcc21
Merge branch 'thopiekar-RemovableDrivePlugin-cleanup' 2017-10-04 14:55:36 +02:00
ChrisTerBeke
b62c19206f Merge branch 'fix_garbled_fonts_macos' into 3.0 2017-10-04 14:09:59 +02:00
ChrisTerBeke
3f1ec174ba CURA-4414 replace all Text elements for Label, make sure no half pixel anchors exist 2017-10-04 13:34:24 +02:00
Diego Prado Gesto
104926c6ed Updating when new definition changes should be created when loading project - CURA-4413 2017-10-04 13:14:07 +02:00
ChrisTerBeke
ea9d389f99 CURA-4390 make plugin browser a required plugin 2017-10-04 12:05:02 +02:00
ChrisTerBeke
3328184fbc CURA-4398 block print over network when another upload is already in progress 2017-10-04 11:06:20 +02:00
ChrisTerBeke
15d945a207 Merge branch '3.0' of https://github.com/Ultimaker/Cura into 3.0 2017-10-03 17:35:19 +02:00
ChrisTerBeke
b0fa87231c CURA-4390 add new menu item for plugins 2017-10-03 17:33:24 +02:00
Mark
dcb630a24e Move text back to label and remove unused font 2017-10-03 14:02:07 +02:00
Jaime van Kessel
6dcb542e64 Fixed issue where "create new" of quality changes in combination with machine caused issues 
CURA-4409
 2017-10-03 13:46:38 +02:00
Jaime van Kessel
bff3a5bb23 Naming of new machines now uses correct ordering again 
CURA-4408
 2017-10-03 13:16:04 +02:00
Ghostkeeper
179ea654cc
Merge branch '3.0' 2017-10-03 12:29:27 +02:00
Jaime van Kessel
a3eae31982 Merge branch '3.0' of github.com:Ultimaker/Cura into 3.0 2017-10-03 11:22:37 +02:00
ChrisTerBeke
3c747dd69e Merge branch '3.0' of https://github.com/Ultimaker/Cura into 3.0 2017-10-03 11:22:18 +02:00
ChrisTerBeke
edc10e0630 fix topbar colors in monitor mode for UM3 networking 2017-10-03 11:21:47 +02:00
Ghostkeeper
bd78c1ae63
Merge branch '3.0' 2017-10-03 10:59:16 +02:00
Ghostkeeper
9a30941ead
Set support horizontal expansion back to 3 
Also for Extended.
 2017-10-03 10:59:00 +02:00
Jaime van Kessel
8c5b5e32ac Loading multi extruder custom machine over a single extruder doesnt cause issue anymore 
CURA-4404
 2017-10-03 10:26:51 +02:00
Ghostkeeper
dd79b895f5
Set support horizontal expansion back to 3 
They discovered that the 2 was causing a lot of failed prints.
 2017-10-03 10:00:48 +02:00
Ghostkeeper
1d7792861d
Merge branch '3.0' 
Conflict in ClusterControlItem.qml where there was a new element in Master that wasn't present in 3.0. That element wasn't referenced anywhere else so I just removed it.
 2017-10-02 17:40:24 +02:00
Ghostkeeper
6fc62fd2b3
Don't try to disconnect after aborting 
Because if the signal is not connected then we'd get a segfault in this case.

Contributes to issue CURA-4376.
 2017-10-02 17:34:57 +02:00
Ghostkeeper
1aa6d2876c
Revert "Use self._camera_active to detect whether we should show the camera" 
This reverts commit bd0b38f688.
 2017-10-02 17:34:57 +02:00
Simon Edwards
91c5515d4e Merge pull request #2541 from Ultimaker/CL-228-authorization 
CL-228 CL-229 authorization and fixup state display
 2017-10-02 17:33:11 +02:00
Simon Edwards
6dade56758 Unapply the @override decorator as it doesn't actually work 
CL-228
 2017-10-02 17:12:15 +02:00
Simon Edwards
b5b3f47e4d Apply the @override decorator 
CL-228
 2017-10-02 17:05:39 +02:00