Mehmet Sutas
d417e436ba
CI Fix
2020-02-17 00:43:45 +03:00
Mehmet Sutas
5931826414
Update rigid3d_zero2.def.json
2020-02-16 19:43:27 +03:00
Mehmet Sutas
a0f02897e4
Update Rigid3D Profiles
2020-02-16 18:02:04 +03:00
Mehmet Sutas
da0e84bdfc
Update Rigid3D Printer Profiles
2020-02-10 01:05:20 +03: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
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
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
Jaime van Kessel
9a9e715e2f
Merge branch 'CURA-6914_Reset_print_sequence_when_reactivating_2nd_extruder' of github.com:Ultimaker/Cura
2020-01-28 09:36:29 +01:00
Ghostkeeper
305bce5a78
Enforce Cura API to be a singleton
...
If it's not used that way we want to know about it and fail.
If plug-ins use it this way, the plug-in won't get initialised so it'll be as if the plug-in is disabled or that function doesn't work.
Contributes to issue CURA-7135.
2020-01-27 16:28:26 +01:00
Jaime van Kessel
a706b42782
Disable create & import on materialpage if machine does not support materials
2020-01-27 16:12:26 +01:00
ninovanhooff
3a0bd48e1b
Merge pull request #7011 from Ultimaker/CURA-7090-addition
...
CURA-7090/Added check to reevaluate dismissed incompatible packages
2020-01-27 14:33:13 +01:00
Kostas Karmas
a720939e64
Fix max layer to correspond to starting layer
...
When the starting layer was set to 0 the max layer was not adjusted
to be max_layer-1.
This commit makes the extra adjustment.
2020-01-27 14:21:51 +01:00
konskarm
e128dadbf5
Merge pull request #6930 from jtychu/master
...
Update DisplayFilenameAndLayerOnLCD.py
2020-01-27 14:08:26 +01:00
Dimitriovski
a08bea1376
String translate improvements
...
CURA-7090
2020-01-27 14:00:47 +01:00
Dimitriovski
2e0fef3bd4
Merge branch 'master' of github.com:Ultimaker/Cura into CURA-7090-addition
2020-01-27 13:25:35 +01:00
Dimitriovski
aa2c612925
PR review changes
2020-01-27 13:25:29 +01:00
Kostas Karmas
bcec433f53
Update description of the Print Sequence setting
...
Update description to clearly state that Print Sequence is not
possible if more than one extruders are enabled.
CURA-6914
2020-01-24 17:30:46 +01:00
Kostas Karmas
9266c753c3
Reset print_sequence when reactivating extruder 2
...
The setting print_sequence was not being resetted to all at once
whenever the 2nd extruder was reactivated.
This commit fixes that by explicitly resetting print_sequence
when reenabling an extruder, if it has been changed by the user.
CURA-6914
2020-01-24 17:12:00 +01:00
Jaime van Kessel
61a3122a78
Merge branch 'CURA-7129_license_window_design' of github.com:Ultimaker/Cura
2020-01-24 16:56:23 +01:00
Ghostkeeper
db41a83aa6
Fix mix of whitespace styles: Use spaces instead of tabs
...
Contributes to issue CURA-7140.
2020-01-24 16:13:15 +01:00
Ghostkeeper
20e410694b
Merge branch 'master' of ssh://github.com/Ultimaker/Cura
2020-01-24 16:11:49 +01:00
Ghostkeeper
61d5ace952
Merge branch 'rf100_config' of https://github.com/dok-net/Cura into dok-net-rf100_config
2020-01-24 16:09:09 +01:00
Dimitriovski
537891d80b
Further improvements and refactors to the CloudPackageChecker
2020-01-24 16:05:35 +01:00
Dimitriovski
526cdac200
fixed silly merge conflict
2020-01-24 15:41:13 +01:00
Dimitriovski
38c7d80f82
Refactored the onConfirmClicked function. Added the ability to auto-dismiss the incompatible packages. Changed the button text depending on the displayed list
2020-01-24 15:39:58 +01:00
Remco Burema
40ec88ab70
Merge pull request #7005 from Ultimaker/CURA-6627_Store_extra_data_project_files
...
CURA-6627_Store_extra_data_project_files
2020-01-24 15:21:04 +01:00
Dimitriovski
d829405347
Update plugins/Toolbox/src/CloudSync/DiscrepanciesPresenter.py
2020-01-24 14:54:12 +01:00
Ghostkeeper
d31240ad70
Merge branch 'CURA-6627_Store_extra_data_project_files'
2020-01-24 14:53:33 +01:00
Jaime van Kessel
c97ce6fafb
Make the sentry_env a bit smarter
2020-01-24 14:12:03 +01:00
