23100 Commits

Author SHA1 Message Date
Ghostkeeper
fa44da3155
Slightly improve wording
'Layer data' is a bit technical.
2020-02-04 11:46:29 +01:00
Orel
802f92700b Add "machine_extruders_share_heater" parameter in printer profiles 2020-02-04 11:36:42 +01:00
Orel
67146c2b25 Enhance quality profiles for Dagoma printers 2020-02-04 11:13:47 +01:00
konskarm
35903e7dd3
Merge pull request #6988 from Ultimaker/CURA-7071
CURA-7071/Added option to redirect to Web MP from Cura MP
2020-02-04 11:02:30 +01:00
Orel
173a05ddb5 Merge remote-tracking branch 'upstream/master' into dagoma_discoultimate 2020-02-04 10:07:56 +01:00
jeffkyjin
a989838823 Add MBot3D Grid Printers 2020-02-04 14:39:51 +08:00
Matt Jani
35aadad747 Merge branch 'master' of https://github.com/Ultimaker/Cura 2020-02-03 16:55:57 +01:00
Ghostkeeper
66e2ca6aa5
Merge branch 'CURA-7099_sync_sideloaded_plugins' 2020-02-03 16:12:56 +01:00
Matt Jani
81429f8985 Cleaned up timelapse post processing script (issue #6730) 2020-02-03 15:19:11 +01:00
Jaime van Kessel
1fc0705c31
Remove a bit of over verbose logging
It would put the content of the entire licence file into the log,
which seems a bit much to me.
2020-02-03 13:20:08 +01:00
Jaime van Kessel
42f7cead4d
Merge branch 'CURA-7155_confusing_license_dialog_page_count' of github.com:Ultimaker/Cura 2020-02-03 13:16:23 +01:00
Ghostkeeper
3a616c78bc
Merge branch 'rf100_config' of https://github.com/dok-net/Cura into dok-net-rf100_config 2020-02-03 11:47:50 +01:00
Ghostkeeper
2c28f70016
Add warning if you haven't sliced before going to layer view
Done as a 5 minute fix.

Fixes #7044.
2020-02-03 11:22:22 +01:00
Jaime van Kessel
5e70d2c122
Merge branch 'WH_unzip_backups_security' of github.com:Ultimaker/Cura 2020-01-31 16:32:53 +01:00
Remco Burema
a03a2885b6
Check if main config file is in backup zip.
Prevent unpacking of possibly spoofed backups (as a last line of defence if other security has failed).
Zips with partially known content are a lot harder to spoof.
Thanks WhiteHats :-)
2020-01-31 16:26:30 +01:00
Jaime van Kessel
c167481e60
Add missing ignore 2020-01-31 16:24:46 +01:00
Jaime van Kessel
f03b6cc7dc
Add some max values for FDMPrinter temperatures
Marlin breaks on anything above it, so these seem like sensible defaults
A-6.1 (WhiteHats)
2020-01-31 16:21:59 +01:00
Jaime van Kessel
2af749fb3c
Merge branch 'master' of github.com:Ultimaker/Cura 2020-01-31 16:16:28 +01:00
Jaime van Kessel
1269de744f
Use state in AuthorizationService
It's a paranoid safety precaution, but beter safe than sorry.
Reported by WhiteHats; F-1.1.1
2020-01-31 16:11:59 +01:00
Ghostkeeper
20475229ba
Revert "Add test to force submitters to stay below 1MB for platform meshes"
This reverts commit 842bdfbf643220eaf51b10ab651c79cc7b8f975c.
The tests are now failing because I reverted the commit that made them succeed.
2020-01-31 15:57:35 +01:00
Ghostkeeper
c2b76df614
Revert "Reduce file size of platform meshes"
This reverts commit 88be7fe2c1c66e98f23afa93e18e7e6f5017329f.
Some meshes have inadvertedly been rotated. Sorry.
2020-01-31 15:56:39 +01:00
Ghostkeeper
88be7fe2c1
Reduce file size of platform meshes
Now all platform meshes adhere to our policy of 1MB file size limits.
2020-01-31 15:21:25 +01:00
Ghostkeeper
842bdfbf64
Add test to force submitters to stay below 1MB for platform meshes
This is our current policy. So this way we'll let submitters of new definition files know that their platform meshes might be too big. If they are too big they'll get a fat X at their PR.
2020-01-31 15:21:24 +01:00
Jaime van Kessel
ca25ec3dbc
Increase size of the verificationCode
It's mostly a theoretical problem, but 16 could theoretically be brute
forced. Bumping it up to 32 won't break anything, but it does make it
exteremely unlikely that it gets broken
2020-01-31 15:00:03 +01:00
Ghostkeeper
32d94f76f1
Merge branch 'mb-fuzzy-outside-only' of https://github.com/smartavionics/Cura into smartavionics-mb-fuzzy-outside-only 2020-01-31 13:10:45 +01:00
fieldOfView
5f67331bac Fix "typo" caused by cleanup before push 2020-01-30 18:23:25 +01:00
Nino van Hooff
a02b753d53 Count the number of packages which have a license to display
CURA-7155
2020-01-30 16:42:42 +01:00
Ghostkeeper
d437d480dc
Code style: Spaces around binary operators
Contributes to issue CURA-7099.
2020-01-30 16:10:36 +01:00
Ghostkeeper
1d34f1ecb4
Merge branch 'master' of ssh://github.com/Ultimaker/Cura 2020-01-30 15:47:46 +01:00
Ghostkeeper
c00004b1c0
Correct capitalisation of Geeetech printer names
Contributes to issue CURA-7132.
2020-01-30 15:47:18 +01:00
amitlobo
004ddb3e2c
Add Geeetech printer and extruder definitions 2020-01-30 15:46:08 +01:00
Jaime van Kessel
37471b7861
Merge branch 'CURA-7152_unreadable_license_dialog' of github.com:Ultimaker/Cura 2020-01-30 15:32:21 +01:00
Remco Burema
99680db819
Merge branch 'master' of https://github.com/Ultimaker/Cura 2020-01-30 15:07:06 +01:00
Remco Burema
c6b6af14cf
Fix typo. 2020-01-30 15:06:47 +01:00
Nino van Hooff
eec7d2f0cd Use default timeout for sync dialog 2020-01-30 14:56:19 +01:00
Nino van Hooff
8ea3004c73 Fix some dark theme styling (MoreInfoWindow, ToolboxLicenseDialog
CURA-7152
2020-01-30 12:51:13 +01:00
Jaime van Kessel
d15e64cc5b
Remove unused import 2020-01-30 09:44:15 +01:00
Jaime van Kessel
18163af5a3
Ensure that the default default marketplace URL is used when not defined
CURA-7071
2020-01-30 09:42:51 +01:00
Jaime van Kessel
e79b3beed1
Remove unused URL
CURA-7071
2020-01-30 09:42:23 +01:00
Nino van Hooff
8c250cfbbc Process review comments
CURA-7099
2020-01-29 11:28:29 +01:00
fieldOfView
5a4661db98 Add valueFromContainer() and extruderValueFromContainer() functions 2020-01-28 16:36:06 +01:00
Nino van Hooff
4e33f6849c Merge remote-tracking branch 'origin/master' 2020-01-28 15:44:23 +01:00
Nino van Hooff
82e24c1ac3 Register the 44 to 45 version upgrade as a bundled plugin 2020-01-28 15:44:14 +01:00
Matt Jani
155408d77d Merge branch 'master' of https://github.com/Ultimaker/Cura 2020-01-28 15:28:26 +01:00
Matt Jani
f62312449b Fixed wrong extrusion (issue #6730) 2020-01-28 15:26:43 +01:00
Ghostkeeper
242da1b3aa
Give web marketplace button a hover colour
It needs to be the same as the bar beneath the marketplace tab buttons when highlit.

Contributes to issue CURA-7071.
2020-01-28 14:47:00 +01:00
Ghostkeeper
6553443f3b
Make marketplace materials link slightly smaller
Contributes to issue CURA-7071.
2020-01-28 14:41:29 +01:00
Ghostkeeper
38e7a9e4df
Turn Marketplace link into an actual link
With consistent styling. The original design didn't have the link underlined but since the rest of the Cura UI has it underlined I let that happen here too.

Contributes to issue CURA-7071.
2020-01-28 14:37:59 +01:00
Ghostkeeper
e51a1b18be
Add link text to marketplace search page
Contributes to issue CURA-7071.
2020-01-28 14:19:33 +01:00
Ghostkeeper
1c79193f9a
Always go to plug-ins page regardless of active tab
This was a requirement from UX. Apparently we're adding a link to the materials elsewhere.

Contributes to issue CURA-7071.
2020-01-28 13:25:27 +01:00