GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-07-20 18:54:28 +08:00
Code Issues Packages Projects Releases Wiki Activity
26,804 Commits 295 Branches 268 Tags
Commit Graph

26804 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaime van Kessel
481da09975
Merge branch 'master' of github.com:Ultimaker/Cura 2020-04-29 13:51:35 +02:00
Jaime van Kessel
084e80bcda
Only connect a cloud printer if it's the active one 
By splitting up the correctly setting of metadata and actually
connecting, the distinction can be made.

CURA-7055
 2020-04-29 13:48:06 +02:00
Kostas Karmas
58b61f2331 Remove unnecessary newCloudPrintersDetected variable 
Variable newCloudPrintersDetected is no longer needed, as it is communicated through the
signal itself.

CURA-7022
 2020-04-29 13:47:11 +02:00
maukcc
cf953bd66b HMS434 update 
delete PLA quality files(again)
 2020-04-29 13:37:20 +02:00
maukcc
4f0165e0bd HMS434 update 2020-04-29 13:35:24 +02:00
Kostas Karmas
eda868f938 Make the discovered cloud printers model generic 
Removed the dependency of the DiscoveredCloudPrintersModel on CloudOutputDevice,
which is Ultimaker specific. This can allow even external plugins to add to this
model in the future.

CURA-7022
 2020-04-29 13:31:45 +02:00
Remco Burema
476262acc7
Merge branch 'master' of https://github.com/Ultimaker/Cura 2020-04-29 13:03:25 +02:00
Remco Burema
3604e75cce
CURA-7409 Update keep/discard dialog. 2020-04-29 13:02:48 +02:00
Kostas Karmas
fb328bd307 Display a summary of the Cloud printers added after login in WelcomeWizard 
If the user has cloud printers linked to his/her account, then the welcome
wizard will display a summary of the cloud printers that were found in the account
and added in Cura.

CURA-7022
 2020-04-29 12:11:05 +02:00
Remco Burema
4c4e611629
Fix x-ray error color. 
X-ray errors showed as green and translucent instead of read and solid. Now fixed.
CURA-7407
 2020-04-29 12:06:20 +02:00
Kostas Karmas
c7cf0fab2f Merge branch 'master' into CURA-7022_Add_cloud_printer_within_add_a_connected_printer 2020-04-29 12:04:04 +02:00
Kostas Karmas
64cfe423fe Fix moving to next page when no printers in account 
Fixed a bug where the welcome wizard was not moving to the next page
if the account had no printers connected to it.

CURA-7019
 2020-04-29 11:49:45 +02:00
Kostas Karmas
411a02a827 Simplify the DiscoveredUltimakerCloudPrintersModel reference calls 
CURA-7022
 2020-04-29 11:40:47 +02:00
Kostas Karmas
d6f150a523 Rearrange the AddPrinterPagesModel and mark "Add Cloud Printer" page as final 
In order to avoid cases where the "Machine actions" page would lead to the "add cloud printer"
page when pressing next, the AddPrinterPagesModel was rearranged and the "add cloud printer"
page was marked as final.

CURA-7022
 2020-04-29 11:38:36 +02:00
Kostas Karmas
b2382593ed Add is_final_page attribute and mark the "Add Cloud Printers" page as final 
CURA-7022
 2020-04-29 11:37:42 +02:00
maht
c29ebc8a77
Updated change log for 4.6.1 4.6.1 2020-04-29 10:58:11 +02:00
maukcc
617fb12ac0 HMS434 update 
Deleted pla quality profiles
 2020-04-29 09:03:56 +02:00
64bittuning
fe90632a38 Update tronxy_d01.def.json 2020-04-28 23:37:25 -04:00
64bittuning
66b05f5f50 Update tronxy_d01.def.json 
repaired old inherit
 2020-04-28 23:35:52 -04:00
64bittuning
5123623b50 Create tronxy_base_extruder_0.def.json 2020-04-28 23:21:44 -04:00
64bittuning
98f3dbb028 Tronxy Variants 
Needs to be updated with relevant settings
 2020-04-28 23:10:21 -04:00
64bittuning
19b374884c Tronxy Logo Mesh 2020-04-28 23:08:18 -04:00
64bittuning
b592c1b0aa Tronxy Quality pack 
These need to be renamed and tweaked before attempting a PR
 2020-04-28 23:07:31 -04:00
64bittuning
1eaa384676 Tronxy Definition files 
Reposting the original set of def files from #7553. More to follow.
 2020-04-28 23:06:26 -04:00
Ghostkeeper
8386d094d3
Improve translation of 'tree support' in German 
As discussed in #7590.
 2020-04-29 02:08:09 +02:00
Kostas Karmas
e4a6fe954d Merge branch 'master' into CURA-7022_Add_cloud_printer_within_add_a_connected_printer 2020-04-28 17:45:55 +02:00
Kostas Karmas
05e92b953a Size the Welcome Wizard using the theme 
CURA-7022
 2020-04-28 17:44:35 +02:00
Kostas Karmas
1981325b05 Make "Add printers manually" button invisible when cloud printers found 
CURA-7022
 2020-04-28 16:31:01 +02:00
Jaime van Kessel
9e68bcb7a0
Merge branch 'feature_objectlist_improvements' of https://github.com/fieldOfView/Cura 2020-04-28 15:40:08 +02:00
Evg33
bee9947d84 UNI3D CR at end of files 2020-04-28 16:29:07 +03:00
Evg33
b87444f571 UNI3D setting_version 13 2020-04-28 16:26:25 +03:00
Evg33
6b51f62411 UNI3D platforms 2020-04-28 16:09:10 +03:00
Evg33
80e0078979 UNI3D settings version 13 2020-04-28 15:56:34 +03:00
Kostas Karmas
d6ddfb3990 Add typing 
CURA-7022
 2020-04-28 14:50:47 +02:00
Evg33
61cfcf6b08 UNI3D extruders 2020-04-28 15:43:54 +03:00
Kostas Karmas
ea404af973 Transfer cloudPrintersDetectedChanged in DiscoveredUltimakerCloudPrintersModel 
CURA-7022
 2020-04-28 14:19:28 +02:00
Evg33
c866d91e56 UNI3D meshes 2020-04-28 15:18:04 +03:00
Remco Burema
aaee651369
Fix comment. 
a smaller part of CURA-7404
 2020-04-28 13:28:02 +02:00
Kostas Karmas
0ad9464131 Remove IP Address from DiscoveredCloudPrintersModel 
CURA-7022
 2020-04-28 13:19:19 +02:00
Remco Burema
242e0d403e
Clean pycache for scripts as well. 2020-04-28 12:11:55 +02:00
Kostas Karmas
6583f5f5ac Reset the model when pressing the Add cloud printer button 
CURA-7022
 2020-04-28 12:08:48 +02:00
Ghostkeeper
68e8261c21
Squashed commit of the following: 
commit 96187e21580e10ba3006895c0a0613cb1fa66c4d
Author: Ghostkeeper <rubend@tutanota.com>
Date:   Tue Apr 28 11:52:29 2020 +0200

    Update setting_version of recently merged profiles

    None of these had any settings that needed to be deleted or updated. I'm updating them so that they load properly in Cura 4.7.

    Contributes to issue CURA-7403.

commit 80bea3caa14139c189fc10c6874867d104df2fd7
Merge: 174b58374 037eb9a89
Author: Ghostkeeper <rubend@tutanota.com>
Date:   Tue Apr 28 11:41:31 2020 +0200

    Merge branch 'master' of https://github.com/curso007/Cura into curso007-master

commit 037eb9a898e8625497a0f44e31746155c8523662
Merge: 109b5cf8e 772fd650a
Author: Cataldo URSO <curso007@users.noreply.github.com>
Date:   Fri Apr 24 19:36:01 2020 +0200

    Merge pull request #2 from Ultimaker/master

    Resync with Ultimaker

commit 109b5cf8e3311283f60ffb73dc165974cf619faa
Author: Cataldo URSO <cataldo.urso@gmail.com>
Date:   Fri Apr 24 15:34:31 2020 +0200

    Spacing much consistent after editor reconfiguration.

commit cdea1a7d598e39c3beebd4386b6326503051a160
Author: Cataldo URSO <cataldo.urso@gmail.com>
Date:   Fri Apr 24 15:28:18 2020 +0200

    Spacing much consistent after editor reconfiguration.

commit bc8422d4ee95a5d20b5f8364711965b036b28eed
Author: Cataldo URSO <cataldo.urso@gmail.com>
Date:   Fri Apr 24 00:14:38 2020 +0200

    plateform image renamed.

commit e0d95c12558f7da8dcbc1aab966e92a1d67bdebb
Merge: a069ed5f9 b1e95d7a8
Author: Cataldo URSO <curso007@users.noreply.github.com>
Date:   Fri Apr 24 00:03:57 2020 +0200

    Merge pull request #1 from Ultimaker/master

    Resync with ultimaker

commit a069ed5f946b0a9d9830d8ba39c89e7cbe1ffdb2
Author: Cataldo URSO <cataldo.urso@gmail.com>
Date:   Thu Apr 23 23:15:36 2020 +0200

    Reducing size of meshes and image(s)

commit 256d4a5576802ea9c116b4901a79ae17b96ade99
Author: Cataldo URSO <cataldo.urso@gmail.com>
Date:   Wed Apr 22 21:03:02 2020 +0200

    Try to fix errors comming from the CI

commit ec4cbe6809ba80f84a065a2d875f591110c751ff
Author: Cataldo URSO <cataldo.urso@gmail.com>
Date:   Wed Apr 22 20:44:30 2020 +0200

    STL size reduced as much I could.

commit 8a6468943a79a6f72078ded187722706c85871a5
Author: Cataldo URSO <cataldo.urso@gmail.com>
Date:   Wed Apr 22 18:17:13 2020 +0200

    Adding Anycubic Predator printer

commit e4491b30bdc9e9642737d6851c8f7571be368798
Author: Cataldo URSO <cataldo.urso@gmail.com>
Date:   Tue Apr 21 18:51:29 2020 +0200

    Adding the mesh for the FLSUN QQ-S thanks to Eddy Emck
 2020-04-28 11:55:15 +02:00
Jaime van Kessel
174b58374a
Remove unneeded unit tests 
The code was moved to uranium, so no need to test them in a plugin.

In some cases they were also testing a specific implementation artifact and not
actual expected behavior.

CURA-7388
 2020-04-28 10:23:36 +02:00
Ghostkeeper
f4f990708f
Remove old 'category' metadata 
Most of it was incorrect and very inconsistent too. These are not used by our code any more.
 2020-04-28 09:27:31 +02:00
Jelle Spijker
679739d09d
Applied requested changes proposed by @ninovanhooff 
Fixed a couple of missed double quotes, trailing and leading spaces, to long comment lines
 2020-04-27 20:09:00 +02:00
Ghostkeeper
33d78fd692
Add chapter on how value formulas are evaluated 2020-04-27 01:19:19 +02:00
Ghostkeeper
27bfe68659
Add header on how settings are used in CuraEngine 
This should hopefully fix a couple of the links to this header in the rest of the article. Hopefully I guessed it right as to how Github shows these chapter headers (because Github is the targeted renderer for this documentation).
 2020-04-27 00:56:58 +02:00
Ghostkeeper
8146030bc8
Add documentation on evaluating a setting from a definition 2020-04-27 00:42:31 +02:00
Ghostkeeper
302e7ddc00
Add documentation on how a setting is evaluated from a stack 
And also how it continues evaluating on the global stack.
 2020-04-27 00:32:02 +02:00
Ghostkeeper
98f37e3fa3
Add documentation on the resolve functions 2020-04-27 00:25:29 +02:00