GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-05 06:44:20 +08:00
Code Issues Packages Projects Releases Wiki Activity
10,749 Commits 289 Branches 260 Tags
Commit Graph

10749 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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 b62c19206f5e494fa27eb0b877197556c559e449, reversing
changes made to 104926c6ed1648ec20b4308fdacad4e99c14c8b3.

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
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
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 bd0b38f6885d0dabb24aa078ade2eed6425ff5ce.
 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
Ghostkeeper
d9906caf05
Merge branch 'fix_layerview_box_width' of https://github.com/fieldOfView/Cura into fieldOfView-fix_layerview_box_width 2017-10-02 17:02:46 +02:00
Ghostkeeper
bd0b38f688
Use self._camera_active to detect whether we should show the camera 
Because the camera timer is whether we should request the camera.

Contributes to issue CURA-4376.
 2017-10-02 16:55:19 +02:00
jack
dfe4a76e85 Merge pull request #2543 from Ultimaker/CL-511_abort_crash 
CL-511 fix abort crash
 2017-10-02 16:51:46 +02:00
Ghostkeeper
894c3fc0da
Emit authenticationStateChanged when setting auth to NotAuthenticated 
So that the interface may display this as well.

Contributes to issue CURA-4376.
 2017-10-02 16:43:09 +02:00
Ghostkeeper
b7090feadb
Don't stop camera if it wasn't running 
Otherwise you get a segfault in the .abort() function down below.

Contributes to issue CURA-4376.
 2017-10-02 16:43:09 +02:00
Robin den Hertog
a9c732e624 Made sure printers are present before printjobs to avoid referring to unknown printers 
CL-523

Signed-off-by: Robin den Hertog <r.denhertog@ultimaker.com>
 2017-10-02 16:39:28 +02:00
jack
4fc279fa39 Merge pull request #2544 from Ultimaker/revert-2542-CL-523 
Revert "CL-523: Made sure printers are present before printjobs to avoid referring to…"
 2017-10-02 16:37:45 +02:00
Jaime van Kessel
189fc3fe94 Added missing activeStack changed signal 
This fixes some issues with the recommended view when the first machine is added.

CURA-4403
 2017-10-02 16:37:00 +02:00