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

8170 commits

Author SHA1 Message Date
Tim Kuipers
14b6ae2a4c JSON: made support_minimal_diameter child of support_tower_diameter (CURA-870) 2016-02-12 13:52:41 +01:00
Tim Kuipers
42e6d88e7f JSON: default cone angle inversed to get less support by default (CURA-869) 2016-02-12 13:39:19 +01:00
Jaime van Kessel
d0880445ad Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-02-12 09:46:48 +01:00
Jaime van Kessel
b2f37390fd Merge branch '2.1' of https://github.com/Ultimaker/Cura 2016-02-12 09:46:23 +01:00
fieldOfView
f8aa4cdade Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-02-11 09:26:48 +01:00
fieldOfView
cd768902e9 Fix tooltips in simple mode 
Simple mode no longer showed tooltips since Simple Mode and Advanced Mode were put in a StackView.
 2016-02-11 09:25:37 +01:00
Tim Kuipers
5ae140f84c JSON: changed description and name of cooling settings (CURA-863) 2016-02-10 17:22:57 +01:00
Ghostkeeper
edb7803760 Make the machine file types filter optional for OutputDevice 
The call to OutputDevice from the save button filters by the file types available to the machine. The call to OutputDevice from the application menu doesn't.

Contributes to issue CURA-611.
 2016-02-10 13:39:49 +01:00
Jaime van Kessel
8402189b42 Removed unused code 2016-02-10 10:28:03 +01:00
Jaime van Kessel
bf3ce61b7f SidbarSimple now uses container proxy correctly 
Fixes CURA-823
 2016-02-10 10:26:59 +01:00
Ghostkeeper
9151740be7 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-02-09 18:01:55 +01:00
Ghostkeeper
29e01a698b Match MIME types in printers with writer plugins 
The MIME types as specified in the printer definitions need to match the MIME types specified in the mesh writer plugins.

Contributes to issue CURA-611.
 2016-02-09 17:16:38 +01:00
fieldOfView
3369750b97 Make sure Machine names are always unique and non-zerolength 
Applies the same rename behavior introduced in the profiles rework to machine names. Machine names are always accepted, but if they are non-unique a number is added (recursively).

If no name is specified, a logical default is chosen. Robust against leading/trailing spaces, and case insensitive.

Contributes to CURA-425
 2016-02-09 15:33:27 +01:00
Ghostkeeper
0fc17ffda0 Move file types to machine metadata 
Much better place than machine settings...

Contributes to issue CURA-611.
 2016-02-09 15:25:49 +01:00
Ghostkeeper
80698c47de Add machine_file_format setting 
This will determine which file formats a machine is able to save to. The setting is currently not yet used. It will be used to filter the output formats under the Save to File dialogue.

Contributes to issue CURA-611.
 2016-02-09 13:50:02 +01:00
Ghostkeeper
5693d639f1 Merge pull request #618 from Ultimaker/feature_profiles 
Profiles rework
 2016-02-09 09:49:28 +01:00
Jaime van Kessel
4194a9772f Updates description of support_z_height 
CURA-788
 2016-02-08 16:34:56 +01:00
Ghostkeeper
f05da7212a Define which settings are global-only 
And when, in case it depends on something like the print sequence.

Contributes to issue CURA-458.
 2016-02-08 15:59:58 +01:00
Tim Kuipers
847ab01272 Revert "JSON: feat: modifier mesh setting (83" 
This reverts commit 682ef482af.
 2016-02-08 10:21:53 +01:00
fieldOfView
ccf53147b3 Add margins around infillmodel options, so an infill option is always selected 2016-02-08 09:20:47 +01:00
fieldOfView
2f022244c1 Edit UM2Extender+ profiles to use UM2+ profiles 2016-02-08 09:20:47 +01:00
fieldOfView
828752af30 Remove dialogs that were moved to Uranium 2016-02-08 09:18:35 +01:00
fieldOfView
d30f8322ba Make material profiles have values for the same settings 2016-02-08 09:18:34 +01:00
fieldOfView
57046a43e8 Rename material profiles for consistency 2016-02-08 09:18:34 +01:00
fieldOfView
a53b898670 Rename [profile] to [settings] in material profiles 2016-02-08 09:18:34 +01:00
fieldOfView
277dd71759 Align variant naming in profiles and machine definitions 2016-02-08 09:18:33 +01:00
fieldOfView
f97e2fa6aa Prepare "Add profile" dialog 2016-02-08 09:18:33 +01:00
fieldOfView
bfa45245cc machine_type is a reference to the id, not the name 2016-02-08 09:18:33 +01:00
fieldOfView
9bd13cf9a7 Add JARJAR machine definitions from cura-private-data 2016-02-08 09:18:32 +01:00
fieldOfView
747f5fbd55 Add converted UM2+ profiles (variant/material specific) 2016-02-08 09:18:32 +01:00
fieldOfView
cbbc6d1a18 Add converted material profiles 2016-02-08 09:18:31 +01:00
fieldOfView
ce562713c3 Reimport default profiles from 15.04.04 2016-02-08 09:18:31 +01:00
fieldOfView
3d85646d07 Move general profiles into profiles/general 2016-02-08 09:18:31 +01:00
fieldOfView
faefbb6b8e Rename materials model to MachineMaterialsModel 2016-02-08 09:18:30 +01:00
fieldOfView
47d299b8c3 Add material profile selection to sidebar 2016-02-08 09:18:30 +01:00
Thomas-Karl Pietrowski
dd95ea71cf i18n: de: Moving the name of the removable drive to the right position 
In my point of view this is the most locial order of it.
For the future we should think about putting the name of the removable drive into quotation marks,
so it will output: "Auf Wechseldatenträger 'Your SD card' gespeichert als 'Your Code.gcode'".
 2016-02-07 16:02:03 +01:00
Thomas-Karl Pietrowski
e3163155bd Merge remote-tracking branch 'upstream/2.1' into 2.1-i18n-de-spelling 2016-02-07 11:20:16 +01:00
Ghostkeeper
bdfdc1191c Move Uranium's translation to Uranium repository 
Sorry, that was wrong. Also, why am I not doing this in a feature branch? Sorry.

Contributes to issue CURA-526.
 2016-02-05 10:51:27 +01:00
Thomas-Karl Pietrowski
6d475ce08c i18n: de: Better translation for "Print Job" 
The old translation is actually "Printer Job". Correcting this to "Druckauftrag".
 2016-02-04 22:09:48 +01:00
Thomas-Karl Pietrowski
14f0998904 i18n: de: Improve translation of spitted string 
I don't know where "Ready to " also appears, but after loading an object I just found this mixed translation.
"Bereit Auf Wechseldatenträger speichern" -> "Bereit zum Speichern auf Wechseldatenträger"
 2016-02-04 22:04:08 +01:00
Tim Kuipers
682ef482af JSON: feat: modifier mesh setting (83 
CURA-833)
 2016-02-04 20:20:45 +01:00
Jaime van Kessel
5cb27c5589 Updates list of languages in interface 
CURA-526
 2016-02-04 12:00:20 +01:00
Ghostkeeper
a539d50830 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-02-03 17:39:17 +01:00
Ghostkeeper
234b5ce545 Add Castilian, Italian and Dutch translations 
These have been checked and corrected by me. In the case of Dutch, extensively!

Contributes to issue CURA-526.
 2016-02-03 17:27:56 +01:00
Jaime van Kessel
2867f03840 Fixes rotation hint 
CURA-816
 2016-02-03 14:30:00 +01:00
Thomas-Karl Pietrowski
f9f4c50703 i18n: de: Comma will be overwritten, when value gets overwritten by the UI 
As far as I understand the code Cura will replace "%1 Meter" with a string converted from a float.
In german it is correct so say "x,y Meter" where in english regions it would be called "x.y meter".
So what it needs in Cura is something like "[before_comma],[after_comma] Meter" to the character "." can be translated to ",".
As Cura isn't able (correct me if it can) to do this on it's own, so changing it back to "x.y Meter".
 2016-02-01 18:48:53 +01:00
Thomas-Karl Pietrowski
d0247f350c i18n: de: Undoing my changes on "%1 Meter" 2016-02-01 18:47:57 +01:00
Thomas-Karl Pietrowski
1ae783897b i18n: de: Calling "Update" -> "Aktualisierung" 
In my point of view this sounds better than using "Update" (anglicism)
 2016-02-01 18:16:06 +01:00
Thomas-Karl Pietrowski
1e0eddbd32 i18n: de: another set of good translations 2016-02-01 18:14:40 +01:00
Thomas-Karl Pietrowski
5c9b2d81b9 i18n: de: Marking another good set of translations 
No more left so say...
 2016-02-01 17:58:02 +01:00