3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-19 20:57:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
18800 commits 306 branches 270 tags 779 MiB
Commit graph

8170 commits

Author SHA1 Message Date
Lipu Fei
8ac9811b41 WIP: Create QualityManager 2018-02-16 14:20:02 +01:00
Lipu Fei
0505b16ffb WIP: Update quality profiles 
- Add a new field "variant" in "metadata" section for quality profiles.
  "material" will only contain values such as "generic_abs", and
  "variant" will contain values such as "0.25 mm", "AA 0.4", etc.

- Reformat "metadata" section to have the following order:
   - setting_version
   - type
   - quality_type
   - weight
   - global_quality
   - material
   - variant
 2018-02-16 14:20:02 +01:00
Lipu Fei
f0d9fba2f5 WIP: Create MaterialManager 2018-02-16 14:20:02 +01:00
Lipu Fei
55bdc0c853 WIP: Create VariantManager 2018-02-16 14:20:02 +01:00
Lipu Fei
b3d0438daa WIP: Update variant files 
- Remove "author" from "metadata" section

- Add "hardware_type" for variants that don't have it

- Reformat "metadata" section to have the following order:
   - setting_version
   - type
   - hardware_type
 2018-02-16 14:20:02 +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
d2ba63147d Merge branch 'master' into Setting-Optimization 2018-02-16 09:39:30 +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 f11a1341ee.
 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
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
fieldOfView
85aed830a6 Merge branch 'master' into feature_setting_visibility_profiles 2018-02-15 11:56:36 +01:00
fieldOfView
a17160f52d Merge branch 'master' into feature_setting_visibility_profiles 
# Conflicts:
#	resources/qml/Settings/SettingView.qml
 2018-02-15 11:54:45 +01:00
Mark Burton
ca115d2f48 Added bridge_wall_coast setting. 2018-02-15 10:45:40 +00:00
Mark Burton
2f8f42aa64 Reduce default bridge flows to 50%. 2018-02-15 10:45:24 +00: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
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
Mark
64ea2399a1 Add tags to urls 2018-02-14 15:15:02 +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
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
Ghostkeeper
a792fc59eb
Fix headers 
Some of these had already been bad for a while.

Contributes to issue CURA-4883.
 2018-02-13 15:25:46 +01:00
Ghostkeeper
0a52818bd2
Update Japanese translations 
Our Japanese reseller did a pass on our translations and came up with a few improvements.

Contributes to issue CURA-4883.
 2018-02-13 15:25:46 +01:00
Ghostkeeper
03b79268ff
Corrections to Italian translations 
Some mistakes that I found.

Contributes to issue CURA-4883.
 2018-02-13 15:25:46 +01:00
Ghostkeeper
31db802c35
Update Italian translations 
This is an improvement suggested by our Italian distributor.

Contributes to issue CURA-4883.
 2018-02-13 15:25:46 +01:00
Mark
12b2348309 Revert "Use QTQuick 2.2 to fix garbled fonts" 
This reverts commit 0d5bb952ef.
 2018-02-13 14:37:05 +01:00
Diego Prado Gesto
18ef3cfc69 CURA-4320 Adjust prime tower settings' formulas for calculating values 
and maximum warning.
 2018-02-13 13:16:32 +01:00
Ghostkeeper
b9205ac19e
Update headers for Brazillian and German translations 
So they say that they are for 3.2.

Contributes to issue CURA-4883.
 2018-02-13 13:03:17 +01:00
Ghostkeeper
312bcb45fa
Merge branch '3.2' of https://github.com/Patola/Cura into Patola-3.2 2018-02-13 13:00:08 +01:00
Mark
0d5bb952ef Use QTQuick 2.2 to fix garbled fonts 
CURA-4941
 2018-02-13 12:42:31 +01:00
Cláudio Sampaio (Patola)
3195055282 Updated pt_BR translation strings for 3.2 2018-02-13 08:35:13 -02:00
Diego Prado Gesto
9053282e8a CURA-4947 The value of the diameter and density were not correctly 
stored in the properties dict.
 2018-02-13 11:29:32 +01:00
Mark
466926fecd Increased the version of QtQuick 2018-02-13 11:07:14 +01:00
Mark
7493fae667 Fix to make sure margins cant have partial values 
CURA-4941
 2018-02-13 07:32:10 +01:00
Mark
7ea654df3d Fix to make sure margins cant have partial values 
CURA-4941
 2018-02-13 07:31:02 +01:00
Diego Prado Gesto
c6328968db CURA-4320 Add circular prime tower setting and draw shadow according to 
it.
 2018-02-12 14:56:26 +01:00
Ghostkeeper
714c0d09b7
Merge branch '3.2' 2018-02-12 13:43:09 +01:00
Ghostkeeper
d0fdf85eb1
Revert header and copyright information 
This was changed back by the translator. I think they just had an older template where the header wasn't yet updated.

Contributes to issue CURA-4883.
 2018-02-12 13:42:38 +01:00
Ghostkeeper
d72b115be4
Merge branch '3.2' of github.com:Ultimaker/Cura into 3.2 2018-02-12 13:35:46 +01:00