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

14396 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lipu Fei
7b20ce856e Fix merge conflicts 2018-04-17 11:30:23 +02:00
Diego Prado Gesto
96dcff8ba5 Merge branch '3.3' of github.com:Ultimaker/Cura into 3.3 2018-04-17 11:25:01 +02:00
Diego Prado Gesto
819d1ac4e7 CURA-5202 Add modality to PluginBrowser window 2018-04-17 11:24:11 +02:00
Lipu Fei
c0db82e7a3 Merge remote-tracking branch 'origin/3.3' 2018-04-17 11:18:27 +02:00
Lipu Fei
a111dda82e Revert "Custom qualities are always checkable" 
CURA-5218

This reverts commit fdd78077697f9e3ff9f0fe654eff8af36a1623d9.
 2018-04-17 11:14:14 +02:00
Lipu Fei
0f5f059a7c Add missing __init__.py 
CURA-5242
 2018-04-17 11:06:30 +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
DavidGergely
61eba07c50 PC profile adjustment 
PC top bottom speed for the 0.4 printcore adjusted to have formula
 2018-04-16 16:45:42 +02:00
DavidGergely
dd2d365884 Revert "PC top-bottom speed changed to function based" 
This reverts commit cec7b8691d27e47e322bc430de62854651db7afa.
 2018-04-16 16:40:35 +02:00
DavidGergely
cec7b8691d PC top-bottom speed changed to function based 
PC top-bottom speed in all layer heights for the 0.4 mm printcore
changed to function based.
 2018-04-16 16:39:34 +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
Lipu Fei
58e18ded18 Remove unneeded code 
CURA-5202
 2018-04-16 15:24:18 +02:00
Ghostkeeper
455abb15bf
Consistently use capital letters for CLI settings too 
They're not actually visible, but in case they are made visible by modifying the preferences file...
 2018-04-16 12:36:17 +02:00
Jinbuhm Kim
23fdd5f1e6 Fix and update Korean Translation 2018-04-16 17:27:33 +09: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
Unknown
42d3235e91 refine translation for 'overhang' 2018-04-13 22:27:21 +08:00
Unknown
172a197cbf update fdmprinter.def.json.po for cura 3.3 (2) 2018-04-13 22:27:12 +08:00
Unknown
6a233ccd41 refine translation of 'visibility' 2018-04-13 22:27:07 +08:00
Unknown
e944d5f78e update cura.po for cura 3.3 (2) 2018-04-13 22:27:03 +08:00
Unknown
003c4831ea update cura.po for cura 3.3 (1) 2018-04-13 22:26:51 +08:00
Unknown
929de409ce update fdmprinter.def.json.po for cura 3.3 (1) 2018-04-13 22:26:46 +08:00
Unknown
b4802fa3a1 update fdmextruder.def.json.po for cura 3.3 2018-04-13 22:26:41 +08:00
Unknown
c5c4ae093a refine old translation 2018-04-13 22:26:23 +08:00
Ian Paschal
523518020c CURA-5035 Better linking between Toolbox and CuraPluginManager 2018-04-13 16:25:01 +02:00
Ghostkeeper
133f6f43fe
Merge branch '3.3' 2018-04-13 16:14:23 +02:00
Ghostkeeper
db09272b1e
Corrections for Bothof translations 
These are corrections for the mistakes that we found in Bothof's translations.

Thanks to Vandrasc and Ellecross.

Contributes to issue CURA-5166.
 2018-04-13 16:13:17 +02:00
Ghostkeeper
479e260833
Correct formatting of string starting with \n 
Gettext doesn't accept this, even though it's correct.

Contributes to issue CURA-5166.
 2018-04-13 15:28:53 +02:00
Ghostkeeper
1488f965b7
Scale height of slider hover area with screenScaleFactor 
This way it scales along with the high-resolution screen scaling for high-DPI screens.
 2018-04-13 11:43:43 +02:00
Ghostkeeper
776234aaa2
Remove check for preset settings directory 
This directory is not used any more.

See Uranium's pull request #333.
 2018-04-13 11:16:05 +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
Jaime van Kessel
5d1d426037 Merge branch 'master' of github.com:Ultimaker/Cura 2018-04-12 21:56:13 +02:00
Jaime van Kessel
dc935e2698 Added unit to adaptive layer height settings 2018-04-12 21:55:51 +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
Diego Prado Gesto
f23491377f CURA-5197 Add Cura booting time to the logs. 2018-04-12 16:52:09 +02:00
Ghostkeeper
942afe2c3f
Merge branch '3.3' into feature_show_config_errors 2018-04-12 16:20:42 +02:00
Lipu Fei
7eba73adc5 Handle excluded_materials in getAvailableMaterials() 
CURA-5223

Move the handling of excluded_materials into MaterialManager
getAvailableMaterials().
 2018-04-12 16:12:07 +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
Diego Prado Gesto
e2d6e18ac9 Merge branch '3.3' of github.com:Ultimaker/Cura into 3.3 2018-04-12 14:59:38 +02:00
Diego Prado Gesto
df521dcc93 Change description of a setting. 
Contributes to CURA-5222.
 2018-04-12 14:56:42 +02:00
Ghostkeeper
13f63a7051
Rename 'No Skin' to 'Not in Skin' 
It's a bit more clear, as discussed in #3115. To actually change the functionality requires a bit more effort for which I'll need to make a ticket.
 2018-04-12 14:39:46 +02:00
Lipu Fei
6d2e49c228 Merge remote-tracking branch 'origin/3.3' 2018-04-12 14:04:29 +02:00