GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-29 09:38:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
14,396 Commits 294 Branches 267 Tags
Commit Graph

14396 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lipu Fei
d32ddea678
Merge pull request #3601 from fieldOfView/fix_usb_rapid_commands 
Fix sending commands in rapid succession over USB
 2018-04-09 15:33:44 +02:00
Lipu Fei
95c6258d0f Handle plugin not found due to mixed plugin metadata 
CURA-5202

Plugin metadata that comes from the plugin server is also saved into
PluginRegistry's metadata collection, so it's all mixed. Plugins that
are just installed cannot be loaded immediately, and this causes an
error in checkCanUpgrade().
 2018-04-09 15:10:25 +02:00
Lipu Fei
4615c756a7 More clear error handling for container deserialization 
CURA-5045

 - If a container cannot be deserialized in project loading, it should fail
   right on the spot because even if it continues, it still won't work.
 - In other places, at least log deserialization errors if any of them show
   up.
 2018-04-09 14:51:05 +02:00
fieldOfView
2def68edab Merge branch 'master' into fix_usb_rapid_commands 
# Conflicts:
#	cura/PrinterOutput/GenericOutputController.py
 2018-04-09 14:49:12 +02:00
Gabriele Rossetti
9607fd261a
Upate deltacomb.def.json 
bad indenting fixes
 2018-04-09 14:21:39 +02:00
alekseisasin
7b9bf23786
Merge pull request #3411 from BagelOrb/support_retraction_setting 
setting to disable omitting retractions in support
 2018-04-09 13:57:49 +02:00
Aleksei S
10ebabb7f6 Home head only by X- and Y axis, do extra bedHome (G28 Z) 
CURA-4844
 2018-04-09 13:13:52 +02:00
Aleksei S
c7b6bb8188 Merge branch '3.3' 2018-04-09 12:53:53 +02:00
fieldOfView
fcb45b3b82 Fix a crash when a variant has no hardware_type 2018-04-09 12:08:32 +02:00
fieldOfView
523e6a59e3 Exclude non-printing-meshes from bounding box of parents 
Non-printing-meshes inside a group should not affect push apart or drop to build plate
 2018-04-09 11:29:49 +02:00
Ian Paschal
91001455ad Improved structure and enabled display by author 2018-04-06 17:26:25 +02:00
Ghostkeeper
572721e20d
Catch ContainerFormatError when deserialising containers 
Only the deserialize() functions themselves may pass the ContainerFormatError on, because their callers will have to handle those errors anyway.

Contributes to issue CURA-5045.
 2018-04-06 13:26:16 +02:00
Lipu Fei
cadb2c62b7 Fix open file with Cura 
CURA-5203

When open a file that's associated with Cura, dialogs that need to
pop up may not work because QML is still in the middle of initialization,
so we need to wait for QML to finish before doing anything else such
as opening files.
 2018-04-06 11:55:07 +02:00
Lipu Fei
872a029f99 Merge remote-tracking branch 'origin/feature_benchmarking' 2018-04-06 10:47:00 +02:00
Lipu Fei
c47fe52ca5 Merge 3.3 into master 2018-04-06 10:39:38 +02:00
Lipu Fei
19937d1be0 Fix version comparison in plugin browser 
CURA-5202

It was comparing with itself so there's never a version upgrade.
 2018-04-06 10:34:55 +02:00
Gabriele Rossetti
f4399834b4
Update deltacomb.def.json 
Some quality improvements
 2018-04-05 17:11:32 +02:00
Ian Paschal
dc00156410 CURA-5035 Added thumbnails and detail view 2018-04-05 15:33:07 +02:00
Diego Prado Gesto
8c0d58c227 CURA-5197 Add Cura booting time to the logs. 2018-04-05 15:28:44 +02:00
Diego Prado Gesto
877d700180 CURA-5197 Add log output with number of models in the buildplate after 
slice.
 2018-04-05 15:27:05 +02:00
Lipu Fei
e36ef583b7 Minor changes and cleanup 2018-04-05 15:14:15 +02:00
Lipu Fei
1737267dfd Accept drag-and-drop for curapackage files 2018-04-05 15:14:15 +02:00
Lipu Fei
6ae9694998 Add CuraPackageManager 2018-04-05 15:14:15 +02:00
Lipu Fei
ed390738f4 Update all qualities and variants to version 4 2018-04-05 15:14:15 +02:00
Lipu Fei
19bc2b78f4 Add Version upgrade 3.3 to 3.4 
Need to distinguish between quality and quality_changes in the cura directory,
so we need to move all custom quality profiles into the quality_changes directory.
 2018-04-05 15:14:15 +02:00
Lipu Fei
c3fe53123b Create module cura.ReaderWriters 
CURA-4644

Move all reader writer classes into cura.ReaderWriters.
 2018-04-05 15:14:15 +02:00
Lipu Fei
8c4c52f915 Remove unused functions in PluginBrowser 2018-04-05 15:13:22 +02:00
Ian Paschal
15b8d18da8 CURA-5035 Small changes 2018-04-05 09:47:43 +02:00
Diego Prado Gesto
53c7e2a01e Merge branch 'master' of github.com:Ultimaker/Cura 2018-04-05 08:55:45 +02:00
Diego Prado Gesto
deaff17a32 Merge branch '3.3' 2018-04-05 08:54:50 +02:00
Diego Prado Gesto
f0c36f8471 CURA-5137 Add the mock-up component for the loading. I forget it. 2018-04-04 18:23:32 +02:00
Diego Prado Gesto
2fe2c71754 CURA-5137 Adding a loading page while the data is not yet ready. 2018-04-04 18:20:49 +02:00
Jaime van Kessel
18551a4a72 Ensure that the "Slice info message disable button" actually disables the sending of info. 2018-04-04 17:39:22 +02:00
Diego Prado Gesto
79a66b43ab CURA-5175 Add the get_version function to the version upgrade. 2018-04-04 14:43:20 +02:00
Ian Paschal
20feabbb06 CURA-5035 Renaming 2018-04-04 13:53:09 +02:00
fieldOfView
bc84c1f6e6 Prevent preheat timeout from occurring during a print 2018-04-04 13:47:40 +02:00
Aleksei S
c6c35a98b4 Merge branch 'master' of github.com:Ultimaker/cura 2018-04-04 11:10:50 +02:00
Aleksei S
43e535ea54 Rename expandAll to expandRecursive 
CURA-5190
 2018-04-04 11:04:54 +02:00
Ian Paschal
0cfcc8cd5f
Merge pull request #3618 from Ultimaker/feature_cura_package_api 
Backend of the Toolbox
 2018-04-04 11:01:05 +02:00
Lipu Fei
836cba9c03
Merge pull request #3617 from Ultimaker/feature_try_line_widths 
Add setting to try multiple line thicknesses
 2018-04-04 11:00:30 +02:00
Diego Prado Gesto
2bf6615b53 CURA-5137 Make some adjustments in the UI. 2018-04-04 10:51:19 +02:00
Lipu Fei
04571dcb9b Merge branch 'feature_try_line_widths' 2018-04-04 10:49:49 +02:00
Diego Prado Gesto
0e01e9a6a9 CURA-5137 Reset to the global view when switching tabs 2018-04-03 17:24:05 +02:00
Diego Prado Gesto
007529c9ec Merge branch 'feature_material_marketplace' into feature_cura_package_api 
Contributes to CURA-5137
 2018-04-03 17:13:36 +02:00
Diego Prado Gesto
b621b5ef6b CURA-5137 Add filtering for materials and plugins and change the 
behavior of switching tabs.
 2018-04-03 17:07:33 +02:00
Ian Paschal
8a7f9027c5 CURA-5035 Finished layout 2018-04-03 16:57:31 +02:00
Ghostkeeper
4ad9867591
Add setting to try multiple line thicknesses 
Engine implementation pending. This setting is intended for debugging problems with interrupted walls. It should probably not be published in a final release.

Contributes to issue CURA-5189.
 2018-04-03 16:38:19 +02:00
Diego Prado Gesto
1ad34495b4 Merge branch 'feature_material_marketplace' into feature_cura_package_api 2018-04-03 11:42:56 +02:00
Ian Paschal
32eab05397 CURA-5035 Rename ToolboxDetailTile 2018-04-03 11:36:21 +02:00
Ian Paschal
229512e730 CURA-5035 More progress 2018-04-03 11:33:58 +02:00