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

3441 Commits

Author SHA1 Message Date
Lipu Fei
a5afaab467 WIP: Fix material duplication and metadata update 2018-02-16 14:23:11 +01:00
Lipu Fei
f024f45cfe WIP: Rework Material management page 2018-02-16 14:23:11 +01:00
Lipu Fei
20e0f8a82a WIP: Fix material serialization 2018-02-16 14:23:11 +01:00
Lipu Fei
4af176dbf3 WIP: Rename function to getVariantNode() 2018-02-16 14:23:11 +01:00
Lipu Fei
bf2317a74d WIP: use new QualityChangesGroups 2018-02-16 14:23:11 +01:00
Lipu Fei
d84ea07e9e WIP: add getQaulityChangesGroup() 2018-02-16 14:23:10 +01:00
Lipu Fei
0f045ce121 WIP: TO BE REMOVED: TestTools plugin 2018-02-16 14:20:03 +01:00
Lipu Fei
55bdc0c853 WIP: Create VariantManager 2018-02-16 14:20:02 +01:00
Lipu Fei
86eb9b925f WIP: Use variant_name in metadata for XMLMaterialProfile 2018-02-16 14:20:02 +01:00
Diego Prado Gesto
cc2cc2a751 Merge branch 'master' of https://github.com/Ultimaker/Cura 2018-02-16 14:02:20 +01:00
Diego Prado Gesto
744313af27 CURA-4946 Add the quality_definition metadata entry to the gcode so when 
parsing, the quality definition is taken into account instead of the
definition.
The message when importing a profile to a different machine,
now shows the expected machine and the current machine definition id.!!
 2018-02-16 14:01:46 +01:00
Aleksei S
f897930950 Fix: Allow connection button for other printers 
CURA-4962
 2018-02-16 11:48:08 +01:00
Aleksei S
86b31c3a6c Fix: in 3.0 version we did not save quality type under extruder.cfg in project 
for custom fdm pritners. For this case during deserializing share quality stack
between global and extruder's stacks
CURA-4966
 2018-02-16 09:12:42 +01:00
Diego Prado Gesto
a2fde9f5f2 Revert "Fix rounded values in qml files" 
This reverts commit f11a1341ee52069f47d9fbca5d2e043b7ff3b17d.
 2018-02-15 14:58:58 +01:00
Diego Prado Gesto
f11a1341ee Fix rounded values in qml files 2018-02-15 13:27:13 +01:00
Diego Prado Gesto
e7b1bb6c7a Merge branch 'master' of https://github.com/Ultimaker/Cura 2018-02-14 17:24:07 +01:00
Diego Prado Gesto
68acb13853 CURA-4615 Rename to ChangeAtZ also the file, the class name and 
variables.
 2018-02-14 17:23:02 +01:00
Ian Paschal
0b62a312c3 CURA-4869 Infill meshes influence layer count in layer view 
If a layer is empty, don't add it to the total layer count!
 2018-02-14 16:56:07 +01:00
Mark
64ea2399a1 Add tags to urls 2018-02-14 15:15:02 +01:00
Aleksei S
11377d1034 Revert "Added plugin for reading cad files with .step file extension" 
This reverts commit 0cebc2e9f39921daa9c11d4808f4aa4a505ac5fb.
 2018-02-14 14:05:49 +01:00
Aleksei S
0cebc2e9f3 Added plugin for reading cad files with .step file extension 
CURA-4891
 2018-02-14 14:03:57 +01:00
Ghostkeeper
ee9de1f11b
Merge branch '3.2' 
Lots of conflicts due to rounding vs. flooring of text element positions for weirdness with the font aliasing.
 2018-02-14 10:53:51 +01:00
Mark
b531c0550d Change Math.floor to Math.round as a last try to fix garbled fonts 
CURA-4941
 2018-02-14 09:28:47 +01:00
Ghostkeeper
3c32a1b0f3
Merge branch 'master' of github.com:Ultimaker/Cura 2018-02-13 15:51:14 +01:00
Ghostkeeper
f91c990fed
Streamline usage of g-code (vs. GCode, Gcode, G-code, gcode, etc.) 
This makes it all the same. It is something that came up in our translation pass this time.

Contributes to issue CURA-4883.
 2018-02-13 15:50:59 +01:00
Ian Paschal
c0561bc525 CURA-4935 Can't disable sending anonymous slice data and checking updates 
This is the ~5 minute~ 3 second fix. I know it's not the more proper way to do it, but I've spent several hours on the more proper way to do it and it's causing huge amounts of headache (because, for example, the PluginBrowser installs plugins and the PluginRegistry removes them, and the PluginBrowser can't update the PluginsModel because the PluginsModel is intantiated in QML instead of in `PluginBrowser.py`, etc. etc. etc.

I'm effectively doing a full refactor of this functionality while simultaneously avoiding moving any "install from remote URL" functionality into the PluginRegistry which is dumb.

I'd prefer a simple, stable soution now instead of re-writing this all again.

I'll make a proposal for a proper, organized refactor for Cookies & Cura.
 2018-02-13 15:50:29 +01:00
Ghostkeeper
03b4213e92
Merge branch '3.2' 
Conflicts in Cura.qml and SaveButton.qml from people fixing positioning rounding at the same time...
 2018-02-12 13:10:24 +01:00
Ghostkeeper
fb0eda72b9
Change tabs into spaces 
As per our code style.
 2018-02-12 11:59:46 +01:00
Ghostkeeper
75265911d4
Add option to pause at layer 
Fixes #3172.
 2018-02-12 11:59:22 +01:00
Ghostkeeper
afeea6e214
Don't interrupt loading scripts when one error occurs 
Instead of breaking the loading of the rest of the scripts, just don't load this particular one.
 2018-02-12 11:23:43 +01:00
Ghostkeeper
b8fce75dac
Track index instead of finding it back later 
It has to iterate over all layers and do string comparison to find the index back. Instead we just keep track of the index so this should improve performance a bit.
 2018-02-12 11:12:55 +01:00
Ghostkeeper
80b99e0323
Use double quotes instead of single quotes 
As per our code style. It doesn't say anything about single-character strings in particular.
 2018-02-12 11:10:57 +01:00
Ghostkeeper
0e23fb15af
Don't skip the first layer 2018-02-12 11:07:15 +01:00
Ghostkeeper
cfdde8dd07
Simplify indentation of pause at height script 
Instead of making lots of nested if statements, use the if statements as an interruption check. This reduces the indentation a lot and makes it easier to read in my opinion. It also makes it easier to add stuff to these checks.
 2018-02-12 11:06:17 +01:00
Mark
461da709ff Checked all divisions (again..) and multiplications on rounding errors 
CURA-4941
 2018-02-10 12:45:36 +01:00
Mark
b52bf6decf resolve conflict 2018-02-09 13:01:56 +01:00
Mark
8fca183a5e Fix rounding errors for garbled text 
CURA-4941
 2018-02-09 11:30:56 +01:00
Ghostkeeper
183792ae09
Change 'Tweak' into 'Change' and 'tw@' into 'ch@' 
Also in the resulting g-code.

Contributes to issue CURA-4615.
 2018-02-09 10:55:50 +01:00
Lipu Fei
ffa4df6a06 Merge 3.2 into master 2018-02-07 13:20:24 +01:00
Jack Ha
a460804bbe CURA-4924 always use interpolation = None for configparser, preventive 2018-02-07 10:21:40 +01:00
Jaime van Kessel
b4a1b97eda Removed warning that caused massive spam 2018-02-06 14:37:39 +01:00
Jaime van Kessel
08394c99d3 PossibleDefinitionIds from name only returns distinct names 
It would sometimes return 3x the same id.
 2018-02-06 14:27:54 +01:00
Aleksei S
fdfeeb5496 Renamed: In Postprocessing plugin the "Tweak" script is renamed to "Change" 
CURA-4615
 2018-02-06 13:38:14 +01:00
Lipu Fei
99fe120bc2
Merge pull request #3227 from fieldOfView/fix_material_temp_prepend 
Fix the detection of multiextruder replacement patterns
 2018-02-06 12:24:16 +01:00
fieldOfView
ab9c415e26 Gracefully handle missing libCharon 2018-02-05 18:30:25 +01:00
Aleksei S
1701cbd011 Merge branch 'master' of github.com:Ultimaker/cura 2018-02-05 17:06:11 +01:00
Aleksei S
7b9bec2891 Fix: Wrong print jobs queued number 
CURA-4888
 2018-02-05 17:05:27 +01:00
Ian Paschal
e02cb78d57 CURA-4578 Manually installed plugins handled correctly 
3rd-party plugins which were manually installed were listed as uninstall-able instead of disable-able. The distinction between plugins which could be installed or disabled was previously made by whether or not it was 3rd party, but is now made by determining the install location.
 2018-02-05 16:39:45 +01:00
Jack Ha
bc2dafe863 Merge branch 'master' of github.com:Ultimaker/Cura 2018-02-05 15:29:01 +01:00
Jack Ha
0e7edc3eaf CURA-4425 the thumbnail now crops correctly 2018-02-05 14:36:42 +01:00