GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-23 14:19:37 +08:00
Code Issues Packages Projects Releases Wiki Activity
22,286 Commits 288 Branches 260 Tags
Commit Graph

6871 Commits

Author SHA1 Message Date
Dimitriovski
ada2a776d5
Reworked the Compatibility Dialog and how it shows the subscribed packages 
CURA-7038
 2019-12-30 17:36:46 +01:00
Dimitriovski
4b86400661
Merge branch 'master' of github.com:Ultimaker/Cura into CURA-7038 2019-12-23 17:48:15 +01:00
Dimitriovski
12be21e594
Reworked the flow to show only not installed packages for installing in the Compatibility Dialog 
CURA-7038
 2019-12-23 17:23:26 +01:00
Jaime van Kessel
58a20fc110
Remove themed color from machinesettings action 
Since it's partially in a system themed style, it shouldn't use color.
If it does use color, it gets messed up if the user uses dark theme (white text on
gray background doesn't work)

CURA-7059
 2019-12-23 17:08:48 +01:00
Dimitriovski
4375118a9f
Refactored most of the code into separate functions 
CURA-7038
 2019-12-23 16:58:44 +01:00
Ghostkeeper
8a9b791298
Merge branch '4.4' 
Conflicts:
	cura/Machines/MaterialNode.py -> Due to some automated formatting tool. Please disable those tools, people.
 2019-12-23 16:26:25 +01:00
Ghostkeeper
a3c5435a1d
Remove support_tree_wall_thickness 
This setting will not be automatically translated to support_wall_thickness if it's overwritten, because that would require knowing the line width and we don't know that here. So it's hard to do.

Contributes to issue CURA-7077.
 2019-12-23 16:22:17 +01:00
Ghostkeeper
50f64ca696
Merge support_tree_wall_count into support_wall_count 
So now the two settings are used as one.

Contributes to issue CURA-7077.
 2019-12-23 16:22:17 +01:00
Ghostkeeper
dbda415bba
Make merged settings extensible 
This way it's:
- documented at the top of the file to make it easier to find all the changes, and
- easier to extend the list of merged settings.

Contributes to issue CURA-7077.
 2019-12-23 16:22:16 +01:00
Ghostkeeper
824dd59e76
Code style: Spaces around binary operators 2019-12-23 16:22:16 +01:00
Ghostkeeper
71a10a262a
Move documentation nearer to code it applies to 
Contributes to issue CURA-6522.
 2019-12-23 16:22:16 +01:00
Dimitriovski
bd8c1e4c96
Initial implementation for the Compatibility Dialog window 
CURA-7038
 2019-12-23 15:18:09 +01:00
Ghostkeeper
f02d4f5e43
Fix spelling 
Help, I'm forced to do this by the Apostrophe Protection Society!
 2019-12-23 14:01:06 +01:00
Jaime van Kessel
f983990ac1
Fix some codestyle issues 2019-12-23 11:13:59 +01:00
Jaime van Kessel
5061a36aba
Fix mesh_type being reset when adding a setting 2019-12-23 11:11:09 +01:00
Jaime van Kessel
4ce086d5c3
Cut op beginRendering of solidView 2019-12-20 16:44:12 +01:00
Dimitriovski
9cf5a388f3
Change for CURA-6979. Check for packages installed in Cloud MP but not in Cura MP. 
CURA-7038
 2019-12-20 13:59:45 +01:00
Dimitriovski
dc20db393e
Initial work for Compatiility Dialog done 
CURA-7038
 2019-12-20 13:10:22 +01:00
ninovanhooff
4773c4eaf3
Merge pull request #6803 from Ultimaker/sentry_crash_integration 
Sentry crash integration
 2019-12-19 14:29:07 +01:00
Remco Burema
f05f4ff244
Fix typo. 
part of CURA-7041
 2019-12-19 11:38:53 +01:00
Nino van Hooff
ff01b1dab9 Add 6 Material Station specific material settings. 
These settings are currently unused by cura, but passed into the PPA
output. Some considerations:
- material_ prepended to all. Even though they are not all
  material specific. The consistency is more developer-friendly imho
- defaults taken from generic_pla
- type is float for all, consistent with what I found in this file

CURA-7041
 2019-12-18 11:46:40 +01:00
Dimitriovski
799e7fc48c
changed to use the new function name from UM 
CURA-6979
 2019-12-17 16:26:59 +01:00
Dimitriovski
1595c3aef9
Merge branch 'master' of github.com:Ultimaker/Cura into CURA-6979 2019-12-17 16:17:43 +01:00
Ghostkeeper
9870097ab5
Code style: Spaces around binary operators 
Contributes to issue CURA-6979.
 2019-12-17 16:11:47 +01:00
Ghostkeeper
1155b4bab2
Code style: Double quotes around strings 
Contributes to issue CURA-6979.
 2019-12-17 16:10:09 +01:00
Lipu Fei
f9739e2af8 Fix typing 2019-12-17 11:33:39 +01:00
Lipu Fei
3ddc2466f8 Fix typing 2019-12-17 10:27:05 +01:00
Dimitriovski
d958e74467 Use the new name of the function from Uranium's PackageManager 
CURA-6979
 2019-12-16 15:57:49 +01:00
Dimitriovski
46d3a73e7e Some more refactoring 
CURA-6979
 2019-12-16 15:52:00 +01:00
Dimitriovski
3c2da64c94 Some refactoring done after code review 
CURA-6979
 2019-12-16 15:39:21 +01:00
Tim Kuipers
a7e4d76d05 make lithophane alpha channel control total final width multiplier. 
That way the picture is not always square. We can use the alpha channel to encode the actual shape
 2019-12-16 13:31:11 +01:00
Jaime van Kessel
4de28bed28
Merge branch 'master' of github.com:Ultimaker/Cura into sentry_crash_integration 2019-12-16 11:28:04 +01:00
Jaime van Kessel
ffccca257f
Add some documentation to SentryLogger 2019-12-16 11:15:25 +01:00
Jaime van Kessel
62ea766880
Rename <censored_path> to <user_home> 2019-12-16 11:12:19 +01:00
Jaime van Kessel
7c9d7a3aef
Clean up the _translateLogType 
This makes it a bit easier to read
 2019-12-16 11:11:28 +01:00
Jaime van Kessel
157a25a992
Fix minor codestyle issues 2019-12-16 11:06:48 +01:00
Dimitriovski
ebc0813603 Refactored 'installed_plugins' to 'installed_packages' for brevity 
CURA-6979
 2019-12-16 10:53:56 +01:00
Dimitriovski
1f5df8fe79 Restore wrongly deleted code 
CURA-6979
 2019-12-16 10:43:55 +01:00
Dimitriovski
dae626375d Merge branch 'master' of github.com:Ultimaker/Cura into CURA-6979 2019-12-16 09:54:58 +01:00
Dimitriovski
b048c27238 Added check for discrepancies between Cloud subscribed packages and Cura installed packages 
CURA-69679
 2019-12-16 09:54:49 +01:00
Jaime van Kessel
6a36a71c2c
Prune user paths from the sentry logs 2019-12-13 16:25:58 +01:00
Jaime van Kessel
93ee111566
Add missing typing 2019-12-13 15:20:43 +01:00
Ghostkeeper
5ea60823f5
Don't crash if address is still none after getting info 
This can happen (starting somewhere between zeroconf version 21.0 and 24.0).

Contributes to issue CURA-7032.
 2019-12-13 10:54:27 +01:00
Ghostkeeper
e54ce8643b
Don't wrap str unnecessarily 
Just an inefficiency that I found.
 2019-12-13 10:44:48 +01:00
Remco Burema
8cc054cecc Add missing 'material break preparation temperature'. 
part of CURA-6971

(cherry picked from commit 25f0460231fd970b73744fb3fe1c004dc68a5dc9)
 2019-12-12 14:09:46 +01:00
Lipu Fei
849ac3551d
Merge branch 'master' into master-1 2019-12-11 10:57:50 +01:00
Nino van Hooff
8aae5f7563 Fix: extra ConfigParsaer arg added to wrong call 
CURA-6522
 2019-12-10 16:33:47 +01:00
Jaime van Kessel
f66b1e6fde
Merge branch 'master' of github.com:Ultimaker/Cura into CURA-6522_revert_edge_distance_hack 2019-12-10 13:06:37 +01:00
Jaime van Kessel
4811f15a7b
Merge pull request #6662 from Ultimaker/CURA-6981_add_build_type 
CURA-6981 Add build_type into crash reports and stats
 2019-12-05 15:09:38 +01:00
Ghostkeeper
250774c4cd
Merge branch 'master' of https://github.com/iLyngklip/Cura into iLyngklip-master 2019-12-05 11:19:42 +01:00