GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-15 01:08:07 +08:00
Code Issues Packages Projects Releases Wiki Activity
14,737 Commits 290 Branches 260 Tags
Commit Graph

4159 Commits

Author SHA1 Message Date
fieldOfView
0e85802f9c Only respond to left mouse button 2018-04-19 08:32:50 +02:00
Ian Paschal
8f8d709b64 CURA-5035 Removed debug statements 2018-04-18 17:05:01 +02:00
Ian Paschal
d3ba684b15 CURA-5035 Installed plugins instantly move to the installed tab 2018-04-18 17:03:27 +02:00
Ian Paschal
a5a35ef98b CURA-5035 Added dummy author text 2018-04-18 16:47:28 +02:00
Ian Paschal
f8672ecbc6 CURA-5035 Improved details pages 2018-04-18 16:35:55 +02:00
Lipu Fei
2ba7a6e462 Revert "Fix gcode.gz double extension problem on Mac" 
This reverts commit fa90fcf18e26871df030ddb8371cdc05f4d4b6cc.

CURA-5228
 2018-04-18 16:00:08 +02:00
Lipu Fei
9e7c417801 Revert "Fix gcode.gz double extension problem on Mac" 
This reverts commit fa90fcf18e26871df030ddb8371cdc05f4d4b6cc.

CURA-5228
 2018-04-18 15:59:28 +02:00
Lipu Fei
e7ec767cb7
Merge pull request #3545 from fieldOfView/fix_support_eraser_related 
[3.3] Support Eraser related fixes
 2018-04-18 15:14:44 +02:00
Lipu Fei
340916179a Small typo fixes for preheat timeout 
CURA-5227
 2018-04-18 12:00:50 +02:00
Lipu Fei
dc52678c05
Merge pull request #3620 from fieldOfView/fix_preheat_end_during_print 
[3.3] Prevent preheat timeout from occurring during a print
 2018-04-18 11:59:54 +02:00
Lipu Fei
1fefc05698 Fix UM2 custom profile upgrade from 2.7 
CURA-5218
 2018-04-18 10:54:54 +02:00
Ghostkeeper
b8920b290f
Merge branch '3.3' 2018-04-18 09:47:06 +02:00
Ian Paschal
7a0fe74989 CURA-5035 Added material authors + icons 2018-04-17 17:07:06 +02:00
Lipu Fei
35e7be1d41 Use pyqtSlot to show more info dialog 
CURA-5204
 2018-04-17 16:43:41 +02:00
Lipu Fei
4d3acddfa4 Update text and fix qml code styles 
CURA-5024
 2018-04-17 16:08:43 +02:00
Lipu Fei
50153b43a8 Fix license banner for MoreInfoWindow.qml 
CURA-5204
 2018-04-17 16:08:05 +02:00
Lipu Fei
4aab395b71 Update example_data.json 
CURA-5204
 2018-04-17 16:06:44 +02:00
Lipu Fei
fa90fcf18e Fix gcode.gz double extension problem on Mac 
CURA-5228
 2018-04-17 15:03:17 +02:00
Lipu Fei
b763b2a5a0 Fix gcode.gz double extension problem on Mac 
CURA-5228
 2018-04-17 15:02:29 +02:00
Ghostkeeper
e43e9ad117
Merge branch '3.3' 2018-04-17 13:56:46 +02:00
Diego Prado Gesto
94cad851a4 Use the correct filament diameter to calculate line width in the gcode 
parser.
 2018-04-17 13:39:22 +02:00
Diego Prado Gesto
2ebf6e8d51 CURA-5232 Renaming variable since it was on conflict with a new variable 
introduced in 4cabcb3632fe7a2c987e70197767a6a4bf88349b
 2018-04-17 13:07:15 +02:00
Ghostkeeper
d13fa3a6aa
Merge branch '3.3' 2018-04-17 11:40:29 +02:00
Lipu Fei
7b20ce856e Fix merge conflicts 2018-04-17 11:30:23 +02:00
Diego Prado Gesto
819d1ac4e7 CURA-5202 Add modality to PluginBrowser window 2018-04-17 11:24:11 +02:00
Mark
f61efb8e20 resolve merge conflict 2018-04-17 10:39:35 +02:00
Mark
b78b6b2c01 Change default auto_slice setting to False 
CURA-5188
 2018-04-17 10:37:07 +02:00
Lipu Fei
c381f3707b Schedule model check for later if a machine change has not done yet 
CURA-5239
 2018-04-16 17:33:14 +02:00
Lipu Fei
e5d795cc0b Update model checker text 
CURA-5237
 2018-04-16 17:21:12 +02:00
Lipu Fei
4bb6962302 Rename model checker property to hasWarnings 
CURA-5237
 2018-04-16 17:20:40 +02:00
Lipu Fei
62521e93db Make sure that project writer runs on Qt thread 
CURA-5229

 - Move @call_on_qt_thread to a separate module
 - Make sure that project writer runs on Qt thread because itself and the
   calls it makes can create new QObjects such as InstanceContainers, and
   this must happen on the Qt thread.
 2018-04-16 15:32:12 +02:00
fieldOfView
d9034a6c85 Only respond to left mouse button 2018-04-15 12:08:49 +02:00
Ian Paschal
85ebe741a8 CURA-5035 Don't show authors with 0 packages 2018-04-13 17:27:57 +02:00
Ian Paschal
523518020c CURA-5035 Better linking between Toolbox and CuraPluginManager 2018-04-13 16:25:01 +02:00
Lipu Fei
4b27d036bc
Merge pull request #3659 from Ultimaker/fix_gcode_line_width 
Adjust filament diameter to calculate line width in the gcode parser
 2018-04-13 10:38:47 +02:00
Ian Paschal
5d395f549a CURA-5035 Added already installed plugins 2018-04-12 17:22:50 +02:00
Ghostkeeper
1769a69792
Don't crash Cura when material file is wrongly formatted 
That was the whole point of this change. Instead degrade gracefully. It won't load the material file but give an error message saying that the material is corrupt. Then it won't be able to load the stack as well because the material doesn't exist, and give an error about the stack as well.

Contributes to issue CURA-5045.
 2018-04-12 16:56:05 +02:00
Ghostkeeper
e96c50a582
Fall back to FDMPrinter if definition can't be loaded 
Some of the settings will be different. But at least it won't crash.

Contributes to issue CURA-5045.
 2018-04-12 16:54:21 +02:00
Diego Prado Gesto
1a6a39da93 CURA-5197 Add log output with number of models in the buildplate after 
slice.
 2018-04-12 16:53:00 +02:00
Ghostkeeper
942afe2c3f
Merge branch '3.3' into feature_show_config_errors 2018-04-12 16:20:42 +02:00
Lipu Fei
0f966115e6 WIP: Make CuraPackageManager aggregate PluginRegistry data 
CURA-4644
 2018-04-12 15:46:53 +02:00
Ian Paschal
f510603cb5 CURA-5035 Enjoy Lipu 2018-04-12 15:43:25 +02:00
Lipu Fei
6d2e49c228 Merge remote-tracking branch 'origin/3.3' 2018-04-12 14:04:29 +02:00
Ian Paschal
e13c45daee CURA-5035: Clean-up 2018-04-12 14:03:53 +02:00
Mark Burton
e50be5cbe7 No! G90 does not command absolute extrusion, M82 does that. 2018-04-12 13:44:27 +02:00
Diego Prado Gesto
01c846dbd8
Merge pull request #3651 from smartavionics/mb-fix-gcode-reader-g90 
No! G90 does not command absolute extrusion, M82 does that.
 2018-04-12 13:40:32 +02:00
Ian Paschal
6e9f7174b6 Merge branch 'feature_material_marketplace' of https://github.com/Ultimaker/Cura into feature_material_marketplace 2018-04-12 13:34:09 +02:00
Lipu Fei
74a9ac6ba7 Fix installPlugin in toolbox 
CURA-4644
 2018-04-12 13:30:24 +02:00
Ian Paschal
0abc925f3d CURA-5035 Removing logic 2018-04-12 13:07:24 +02:00
Lipu Fei
596e0be7b6 CuraPackageManager handles packages and plugins 
CURA-4644
 2018-04-12 12:57:58 +02:00