GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-04 11:14:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
18,800 Commits 295 Branches 268 Tags
Commit Graph

18800 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Simon Edwards
eff6b58e18
Merge pull request #5375 from Ultimaker/CL-1274_dont_use___file__ 
CL-1274 Don't use __file__ in the monitor tab
 2019-03-04 17:26:49 +01:00
Jaime van Kessel
6157cb6f91 Merge branch '4.0' of github.com:Ultimaker/Cura 2019-03-04 16:00:56 +01:00
Ian Paschal
88fc7d0fba Don't try to get the plugin path when there's no plugin registry 
i.e. in tests
Contributes to CL-1274
 2019-03-04 14:27:35 +01:00
Ian Paschal
a74717ca3c Get plugin path like most other plugins do 
Contributes to CL-1274
 2019-03-04 12:42:48 +01:00
Ian Paschal
87d4a68c0e Merge remote-tracking branch 'origin/4.0' into CL-1274_dont_use___file__ 2019-03-04 12:11:57 +01:00
Ian Paschal
3889570697 K.I.S.S. 
Contributes to CL-1274
 2019-03-04 12:04:34 +01:00
Ian Paschal
11ea568d0b
Merge pull request #5370 from Ultimaker/CL-1247_hide_view_prints_button_on_cloud 
CL-1247 Hide the "View print history" button when connecting via cloud
 2019-03-04 11:40:48 +01:00
Ian Paschal
c8580cf417 Prevent circular dependencies 
Contributes to CL-1274
 2019-03-04 11:27:52 +01:00
Ian Paschal
a1e0ddd9df Don't hardcode plugin directory 
Contributes to CL-1274
 2019-03-04 10:19:33 +01:00
Diego Prado Gesto
3fd0561aca Update the ExtruderModel 
also when the variant container has changed.

Contributes to CURA-6227.
 2019-03-01 14:54:42 +01:00
Diego Prado Gesto
0e7127f80b Merge branch 'master' of github.com:Ultimaker/Cura 2019-03-01 14:54:10 +01:00
Remco Burema
113c37f555 Start work on 'AddPrinterByIp' for WelcomePages. [CURA-6057] 2019-03-01 13:17:15 +01:00
Satish
c98a73f8fd Added id's to printer button, installed plugins, material fields and profile tab for integration tests 2019-03-01 12:47:29 +01:00
Ghostkeeper
ad83cff065
Merge branch 'master' of https://github.com/afinkle/Cura into afinkle-master 2019-03-01 11:54:27 +01:00
Ghostkeeper
180156da78
Correct whitespace 
Change tabs to spaces according to our style standards. And remove a bunch of unnecessary white lines to make it easier to read.
 2019-03-01 11:45:08 +01:00
Diego Prado Gesto
3f8f363836 Fix the installed checkmark in Marketplace 
Show a package as completelly installed if the user has more or the same number of packages than in the list. Otherwise if the contributor removes one of the packages from the list, it seems that I don't have all the packages installed when in fact I do.
 2019-03-01 10:57:39 +01:00
Jaime van Kessel
2af3ae8efb Ensure that the materials get removed in order 
If we remove the materials in order, it doesn't cause any issues. This is probably because
loading the base profile causes the others to be properly instantiated (and subsequently deleted)

CURA-6237
 2019-03-01 10:53:55 +01:00
Ian
cac8c85489 Don't use __file__ 
Contributes to CL-1274
 2019-03-01 10:46:41 +01:00
Ian
cf9a1c0248 Sort UM imports alphabetically for easy scanning 
Contributes to CL-1274
 2019-03-01 10:46:27 +01:00
Simon Edwards
4590fae9b2 Hide the "View print history" button when connecting via cloud 
CL-1247
 2019-02-28 17:08:28 +01:00
Jaime van Kessel
91cceea6e0 Fix the situation where an upgraded single extrusion machine and loading project caused issues 
If the upgraded single extrusion machine was never activated, it would not have it's extruders set.

CURA-6252
 2019-02-28 16:17:34 +01:00
Mark
eccfebf39d Update material packages for 4.0 release 2019-02-28 16:11:51 +01:00
Jaime van Kessel
38a9206898 Merge branch '4.0' of github.com:Ultimaker/Cura 2019-02-28 16:01:40 +01:00
Jaime van Kessel
a8128556f3 Don't drop refresh token if request failed 2019-02-28 14:54:59 +01:00
Jaime van Kessel
62f913802f Prevent crash if the connection was lost for auth token 2019-02-28 12:58:41 +01:00
Jaime van Kessel
1c7e047a38 Added tests for adding & removing discovered devices 
CURA-6179
 2019-02-28 09:47:25 +01:00
Jaime van Kessel
bbe1b1590a Added test for adding & creating machine with discovered printer 
CURA-6179
 2019-02-28 09:35:16 +01:00
Lipu Fei
6ebfaff61e WIP: Fixes and add cloud page 2019-02-28 08:33:28 +01:00
Lipu Fei
9c66921538 WIP: dos2unix new files 2019-02-28 08:07:44 +01:00
Lipu Fei
51c773fd80 WIP: Make reusable widget CuraProgressBar 2019-02-28 08:06:28 +01:00
Lipu Fei
92730a09a2 WIP: Add data collections page 2019-02-28 07:48:05 +01:00
Andrew Finkle
5581cd5c2c Added definition, extruder, material, and variants for Discov3ry Complete 2019-02-27 11:55:25 -05:00
Andrew Finkle
3f765a9ca2 Revert "Create structur3d_discov3ry1_complete_um2plus.json" 
This reverts commit 05e889621ecaba1eec47216fb5393fd7cfb65ed0.
 2019-02-27 10:29:58 -05:00
Andrew Finkle
05e889621e Create structur3d_discov3ry1_complete_um2plus.json 2019-02-27 10:29:28 -05:00
Lipu Fei
72866683e6 WIP: Add Whats new page 2019-02-27 16:00:45 +01:00
Ghostkeeper
b723beb435
Pre-heat to initial layer temperature instead of normal temperature 
Because that's what it's going to start printing with.
 2019-02-27 15:58:30 +01:00
Ghostkeeper
970fa69166
Merge branch 'patch-2' of https://github.com/h0x91b/Cura into h0x91b-patch-2 2019-02-27 15:55:57 +01:00
Ghostkeeper
470871a0d2
Merge branch 'master' of https://github.com/radfahrer/Cura into radfahrer-master 2019-02-27 15:31:57 +01:00
Lipu Fei
14fdf68871 WIP: Add User Agreement page and fixes 2019-02-27 15:28:39 +01:00
Lipu Fei
ac012e8f09 WIP: Add Welcome Page and use CTRL+Alt+D to trigger 2019-02-27 12:45:28 +01:00
Lipu Fei
3b63f92d55 WIP: Add base QMLs for WelcomeDialog 2019-02-27 12:45:28 +01:00
Jaime van Kessel
17fdc86e50 Fix typing 
CURA-6179
 2019-02-27 11:59:50 +01:00
Ghostkeeper
1c6cce316a
Merge branch '4.0' 2019-02-27 11:47:47 +01:00
Ghostkeeper
9fba8f5381
Update metadata of translation templates 
It's now 2019, and Cura 4.0.

Contributes to issue CURA-6257.
 2019-02-27 11:47:29 +01:00
Jaime van Kessel
21c6bba1ce Add the discovered printer functionality 
This can be used in the add machine wizard to short circuit the creation of a printer.
So instead of first selecting a printer and then connecting it, it will be possible to have
a list that contains all network discovered printers (from all plugins that can do this).

This means we can select one of those printers and directly add it (thus no longer needing that step)

CURA-6179
 2019-02-27 11:05:54 +01:00
Jaime van Kessel
7ed1ee4365
Merge pull request #5365 from Ultimaker/fix-token-expiry 
Fix token expiry
 2019-02-27 10:56:00 +01:00
ChrisTerBeke
9ba342c541 Fix codestyle failure on float conversion 2019-02-27 10:43:15 +01:00
ChrisTerBeke
365f67cbf8 Have some overlap in token expiry to prevent unauthorized issues 2019-02-27 10:32:30 +01:00
Ghostkeeper
c44a207744
Remove duplicate property 
I think this is the result of a merge conflict or something. This entry should not be dependent on the number of bottom layers so I'm keeping the first one.
 2019-02-27 10:23:46 +01:00
Ghostkeeper
e2adc1791f
Merge branch '4.0' 2019-02-26 17:08:30 +01:00