GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-21 23:01:38 +08:00
Code Issues Packages Projects Releases Wiki Activity
12,771 Commits 295 Branches 268 Tags
Commit Graph

5681 Commits

Author SHA1 Message Date
Lipu Fei
f024f45cfe WIP: Rework Material management page 2018-02-16 14:23:11 +01:00
Lipu Fei
a0b53dc1c9 WIP: Materials management page, make Activate work 2018-02-16 14:23:11 +01:00
Lipu Fei
4468f4d620 WIP: Fix NozzleMenu warning on non-notifiable bindings 2018-02-16 14:23:11 +01:00
Lipu Fei
1e0a078af8 WIP: Refactor Materials management page to use new Managers 2018-02-16 14:23:11 +01:00
Jack Ha
8275e506ce CURA-4606 fix material names for 1.75mm materials 2018-02-16 14:23:11 +01:00
Lipu Fei
6dc53eb741 WIP: Fix NozzleMenu extruder binding 2018-02-16 14:23:11 +01:00
Lipu Fei
0349c1c5d7 WIP: Fix Cartesio quality_type "Extra coarse" -> "extra coarse" 2018-02-16 14:23:11 +01:00
Lipu Fei
1538486e85 WIP: Change low quality_type to fast 
"low" is "fast", and the majority is using "fast".
 2018-02-16 14:23:11 +01:00
Lipu Fei
73968e5c48 Revert "WIP: Update and fix definition files" 
This reverts commit 27a346a58beaea9de249ebf229f0979d51ad21ff.
 2018-02-16 14:23:11 +01:00
Lipu Fei
5ad4447e37 WIP: Update and fix definition files 2018-02-16 14:23:11 +01:00
Lipu Fei
c469ebbf9f WIP: Fix material lookup problems and update definition files 2018-02-16 14:23:11 +01:00
Lipu Fei
730cbb25bf WIP: Simplify machine creation 2018-02-16 14:23:11 +01:00
Jack Ha
8aab8f4394 CURA-4606 cleanup and optimization for replaceContainer 2018-02-16 14:23:11 +01:00
Lipu Fei
bf2317a74d WIP: use new QualityChangesGroups 2018-02-16 14:23:11 +01:00
Jack Ha
27169e883c CURA-4606 Ensure the correct material is highlighted in the material menu 2018-02-16 14:23:10 +01:00
Lipu Fei
54363bad02 WIP: Refactor NozzleMenu.qml 2018-02-16 14:20:03 +01:00
Lipu Fei
cd53ae0639 WIP: Refactor ProfileMenu.qml 2018-02-16 14:20:03 +01:00
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 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
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
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 0d5bb952efc468522b55cbf903349aaf7f979af9.
 2018-02-13 14:37:05 +01:00