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

12731 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
f6095e9ad0 Merge branch 'master' of github.com:Ultimaker/cura 2018-02-16 11:50:03 +01:00
Aleksei S
f897930950 Fix: Allow connection button for other printers 
CURA-4962
 2018-02-16 11:48:08 +01:00
Jaime van Kessel
16ab593eab Merge branch 'master' of github.com:Ultimaker/Cura 2018-02-16 11:15:48 +01:00
Jaime van Kessel
4a0a9f521c Bumped the required version numbers down again, as they should specifcy a min version number. 
As the summary describes; We should use *min* version numbers. If we have a higher version installed as defined, it will have the bugfixes and not the features. Increasing version nr should therefore only be done if we want new features.
 2018-02-16 11:13:40 +01:00
Diego Prado Gesto
85059882fe CURA-4959 Add buildplate information to the summary when saving a 
project file.
- The activeVariantNames now returns only the names of the variants in
the extruder stacks.
 2018-02-16 11:01:02 +01:00
Diego Prado Gesto
41d297f21a Merge branch 'Setting-Optimization' 2018-02-16 09:42:19 +01:00
Diego Prado Gesto
d2ba63147d Merge branch 'master' into Setting-Optimization 2018-02-16 09:39:30 +01:00
Diego Prado Gesto
125fd1a1e2 Merge branch 'master' of https://github.com/Ultimaker/Cura 2018-02-16 09:15:12 +01:00
Diego Prado Gesto
735dac6a4a Modify debug message to show the correct/useful information 2018-02-16 09:15:06 +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
Mark
17943ceb70 Merge branch 'master' of github.com:Ultimaker/Cura 2018-02-15 15:49:19 +01:00
Mark
c508e77fe2 Improved the text 2018-02-15 15:49:06 +01:00
Jack Ha
530297b40a Merge branch 'master' of github.com:Ultimaker/Cura 2018-02-15 15:23:34 +01:00
Jack Ha
06ec77e012 Better readability in PreviewPass 2018-02-15 15:23:17 +01:00
Diego Prado Gesto
ea5a95edaa Merge branch 'master' of https://github.com/Ultimaker/Cura 2018-02-15 14:59:40 +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
Mark
38e84b962d Make the large text a little bigger 
CURA-4790
 2018-02-15 14:19:45 +01:00
Jack Ha
1551560a6b Merge branch 'master' of github.com:Ultimaker/Cura 2018-02-15 13:53:53 +01:00
Jack Ha
037298cf03 Tweaked the snapshot images to make it look prettier 2018-02-15 13:53:45 +01:00
Diego Prado Gesto
e7df8efe4d CURA-4698 Change value of setting as indicated by materials team 2018-02-15 13:34:37 +01:00
Diego Prado Gesto
f11a1341ee Fix rounded values in qml files 2018-02-15 13:27:13 +01:00
Mark
2f37bd4b73 Add native rendering to Print Setup Label 
CURA-4941
 2018-02-15 12:57:42 +01:00
Mark
1e02463c7e
Merge pull request #3320 from fieldOfView/fix_text_rendertype 
Set renderType to Text.NativeRendering for qtquick controls 2 Labels
 2018-02-15 11:50:06 +01:00
fieldOfView
32d677295f Set rendertype for units in SettingTextField 2018-02-15 11:38:51 +01:00
fieldOfView
593dad7cca Fix categories too 2018-02-15 11:34:46 +01:00
Ian Paschal
bc47c6e623 Fix for CURA-4963 
Exclude buildplate and nozzle meshes from being reloaded on F5 press.
 2018-02-15 11:20:46 +01:00
fieldOfView
ec1cf4065e Set renderType to Text.NativeRendering for qtquick controls 2 Labels 
Apparently, the qtquickcontrols 2 Label no longer defaults to using renderType: Text.NativeRendering
This causes text to render with QtRendering which looks subtly different on Windows and succinctly broken on some OSX installations.
 2018-02-15 11:12:19 +01:00
Lipu Fei
44bf6579fd Fix punchtec extruder IDs 2018-02-14 20:48:21 +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
Mark
2042774179 Merge branch 'master' of github.com:Ultimaker/Cura 2018-02-14 15:14:23 +01:00
Mark
ab19941c53 Update license and url-tags 2018-02-14 15:14:14 +01:00
Diego Prado Gesto
a4df9b6cc6 CURA-4891 Add a '+' that I removed by accident 2018-02-14 15:02:53 +01:00
Diego Prado Gesto
605c63514d CURA-4891 Remove print out for debugging 2018-02-14 14:51:32 +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
Diego Prado Gesto
a4455bbbe5 CURA-4891 Use the printer definition name instead of the ID to generate 
the abbreviated name.
- Also revert some previous changes to keep the same behavior as before.
 2018-02-14 13:47:30 +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
Ghostkeeper
582f6ff2d2
Disable Traditional Chinese 
We didn't get a new translation for 3.2. Sorry. People that had their preferences set to Traditional Chinese will stay on that language until they choose another, but the translation will be incomplete. If someone wants to pick up the translation for a next release, we'll keep the files in our source code.

Contributes to issue CURA-4883.
 2018-02-14 09:39:23 +01:00
Ghostkeeper
9483d4678b
Corrections to French translations 
Some are really bad.

Contributes to issue CURA-4883.
 2018-02-14 09:39:23 +01:00
Ghostkeeper
31330d07f3
Update French translations 
Our French reseller took a look at our translations and made some improvements. Some are for the worse, so I'm making corrections.

Contributes to issue CURA-4883.
 2018-02-14 09:39:23 +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
Ian Paschal
4d3f7d098f
Merge pull request #3299 from Ultimaker/feature_circular_prime_tower 
Circular prime tower functionality

Looks good Diego!
 2018-02-13 16:01:02 +01:00
Ghostkeeper
c167325b3d
Simplify translation of printer and variant 
The key-replacements are always in the same place regardless of translation. A translator can't put them before their translation any more now. But it greatly reduces the confusion among translators and produces fewer strings to translate.

Contributes to issue CURA-4883.
 2018-02-13 15:57:32 +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