GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-28 17:18:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
14,246 Commits 293 Branches 266 Tags
Commit Graph

14246 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lipu Fei
49649e3d4a Add final so the management JSON is always saved 
CURA-5035
 2018-05-02 12:57:26 +02:00
Lipu Fei
09af97634d Simplify code 
CURA-5035
 2018-05-02 12:53:33 +02:00
Lipu Fei
5cc5f32a73 Remove unnecessary is_bundled modifications 
CURA-5035
 2018-05-02 12:52:29 +02:00
Lipu Fei
d4cf944e11 Simplify code 
CURA-5035
 2018-05-02 12:51:13 +02:00
Lipu Fei
8250ea8366 Add version for cura package management JSON 
CIRA-5035
 2018-05-02 12:50:50 +02:00
Ruben D
910906b785
Merge branch 'feature_material_marketplace' 2018-05-02 12:42:00 +02:00
Ruben D
0d66850bd4
Code style improvements 
According to our guidelines: Brackets on new line, spaces around binary operators but not within brackets.

Contributes to issue CURA-5035.
 2018-05-02 12:40:59 +02:00
Ian Paschal
87e1f98156
Merge pull request #3663 from Ultimaker/feature_material_marketplace 
Feature material toolbox; all changes made
 2018-05-02 12:23:13 +02:00
Ian Paschal
c2ed2a47e7 CURA-5035 Use elide for text clipping 2018-05-02 12:05:34 +02:00
Ian Paschal
62aeb6c954 CURA-5035 Review feedback 2018-05-02 12:01:29 +02:00
Ghostkeeper
3934f6f1b3
Small code style issues 
Contributes to issue CURA-5035.
 2018-05-02 10:27:35 +02:00
Lipu Fei
f836cdf3f4 Fix indent 
CURA-5289
 2018-05-02 10:18:52 +02:00
Lipu Fei
41092b4d48
Merge pull request #3599 from jwalt/master 
Fixes for cura on ARM/Mali-based systems
 2018-05-02 10:18:24 +02:00
Ghostkeeper
1d11fe0506
Code style: Spaces around binary operators 
Contributes to issue CURA-5035.
 2018-05-02 09:31:46 +02:00
Ruben D
91faf884fe
Enable backface culling for origin mesh 
It won't matter a whole lot for those 36 triangles in the origin mesh. It reduces the number of triangles to render by 18. But you know, the little bits help.
 2018-05-02 09:21:51 +02:00
Diego Prado Gesto
c8286de3f9 Merge branch 'master' of github.com:Ultimaker/Cura 2018-05-01 15:53:53 +02:00
Diego Prado Gesto
e79324c448 Remove duplicate line 2018-05-01 15:53:16 +02:00
jack
10e83e8653
Merge pull request #3477 from smartavionics/mb-retract-on-long-combs 
Added retraction_combing_max_distance setting
 2018-05-01 15:34:54 +02:00
Lipu Fei
9a5fb47a6e Merge master into material marketplace 2018-05-01 11:56:34 +02:00
Lipu Fei
cc207a3f92 Clean up unused variables 2018-05-01 11:53:52 +02:00
jack
0d8674eceb
Merge pull request #3758 from Ultimaker/feature_travel_resolution 
Add setting for maximum travel resolution
 2018-05-01 11:48:33 +02:00
Lipu Fei
863d67ae64 Use Resources.Plugins for finding plugin storage path 2018-05-01 11:16:21 +02:00
Ghostkeeper
21bbfe1313
Set maximum travel resolution depending on travel speed 
To ratio of travel speed vs. print speed.

Contributes to issue CURA-5171.
 2018-05-01 11:01:14 +02:00
Lipu Fei
7ee085fe50 Check all subdirs in data storage dir for package removal 2018-05-01 10:48:03 +02:00
Ian Paschal
096f304aef CURA-5035 Crash because old packages don't have 'author_id' 2018-05-01 10:45:22 +02:00
Lipu Fei
51abd32328 Use dict get fallback to prevent errors 2018-05-01 10:33:48 +02:00
Lipu Fei
1fb2edace5 Use ContainerRegistry.lockFile in Cura package management 
Prevent concurrent I/O issues.
 2018-05-01 10:31:56 +02:00
Lipu Fei
cff4dc8a0c Use json.load() directly 2018-05-01 10:28:42 +02:00
Ghostkeeper
ebca457f39
Add setting for maximum travel resolution 
I'm making this settable per extruder since a travel move is made with a certain active nozzle but can be between meshes so it can't be a per-mesh setting. I wouldn't know why you would want to set it differently per extruder though, but you can...

Contributes to issue CURA-5171.
 2018-05-01 09:21:36 +02:00
Ian Paschal
bb7f9feb5e CURA-5035 Better download resets 2018-05-01 09:02:24 +02:00
Ian Paschal
2d54251be0 CURA-5035 Aproaching the asymptote of done 2018-04-30 17:05:46 +02:00
Ian Paschal
01007946b4 CURA-5035 Separate API calls! 2018-04-30 16:42:11 +02:00
Diego Prado Gesto
d91dabb087 Merge branch 'master' of github.com:Ultimaker/Cura 2018-04-30 15:16:23 +02:00
Diego Prado Gesto
b582ac7526 CURA-5253 Initialize UI elements right after the qml files were loaded. 2018-04-30 15:09:52 +02:00
Lipu Fei
00dbf2c694 Change a logging line to an error 
CURA-5301
 2018-04-30 10:23:43 +02:00
Lipu Fei
3e37487632
Merge pull request #3626 from kaleidoscopeit/patch-1 
Update deltacomb.def.json
 2018-04-30 10:19:37 +02:00
Diego Prado Gesto
90eb4eb651 Merge branch 'master' of github.com:Ultimaker/Cura 2018-04-26 15:49:25 +02:00
Diego Prado Gesto
27b1e2cdd6 Fix format and add error message to log. Contributes to CURA-5301 2018-04-26 15:49:18 +02:00
Ian Paschal
679f87ebb3 CURA-5035 Don't show required plugins 
Also renamed folder of UserAgreementPlugin to UserAgreement
 2018-04-26 15:11:32 +02:00
Ghostkeeper
4f777457ee
Simplify issue template 
We don't usually need to know what specific Qt version or graphics driver the user has, and it's a great hassle for the user to figure this out, especially when they aren't technical and just installed an official release.
I hope that this leads more bug reporters to actually fill in the template.
 2018-04-26 15:00:46 +02:00
Gabriele Rossetti
b16cee5892
Fixed values with double-quotes 2018-04-26 14:36:08 +02:00
Ghostkeeper
3ae6b8c4c1
Double-escape newlines in script string 
Because they are stored twice: Once in the CFG of the script, and once in the CFG of the machine instance.

Fixes an issue reported here: https://github.com/Ultimaker/Cura/pull/3229
 2018-04-26 13:30:59 +02:00
Ian Paschal
2751299fd3 CURA-5035 Remove un-used base_unit in theme 2018-04-26 13:24:15 +02:00
Ian Paschal
332b7fb497 CURA-5035 Remove uncessary VersionTools 2018-04-26 13:17:00 +02:00
Ian Paschal
ec8b95591e CURA-5035 Fixed typo 2018-04-26 13:06:30 +02:00
Lipu Fei
d393316a27
Merge pull request #3638 from fieldOfView/fix_variant_hardware_type_crash 
Fix a crash when a variant has no hardware_type
 2018-04-26 09:35:33 +02:00
Lipu Fei
93b2a4f774
Merge pull request #3688 from kerog777/Felix_Profile 
Felix profile
 2018-04-26 08:55:36 +02:00
kerog777
88dc33a288 Corrected preferred variant name 
Made it match the name field in the variant file
 2018-04-25 20:29:09 -07:00
Lipu Fei
76fe273eb6 Merge remote-tracking branch 'origin/3.3' 2018-04-25 17:57:07 +02:00
Lipu Fei
dc52e939e9 Fix unit tests for adding CuraContainerStacks 
CURA-5281

Because of the definition_changes fix, CuraContainerStack.deserialize()
may create and add extra containers, so the unit tests need to be adjusted.
 2018-04-25 17:55:20 +02:00