3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-11 16:57:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
3049 commits 302 branches 270 tags 770 MiB
Commit graph

3049 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tim Kuipers
7ab215f4d6 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-02-08 10:22:20 +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
6e11c2409b Use working profile instead of "active" profile 2016-02-08 09:20:46 +01:00
fieldOfView
828752af30 Remove dialogs that were moved to Uranium 2016-02-08 09:18:35 +01:00
fieldOfView
5542073e44 Fix error on profile rename 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
Bob Burrough
dd0b04ead4 Merge pull request #631 from Ultimaker/revert-626-cmake_files_qtcreator 
Revert "Cmake files qtcreator"
 2016-02-06 11:59:37 -08:00
Bob Burrough
53c1eaeba1 Revert "Cmake files qtcreator" 2016-02-06 11:59:26 -08:00
Arjen Hiemstra
8d2fc1f7e1 Do not close the engine from our side when finished with slicing 
The engine will close itself when done. Closing it from our side
actually introduces errors as things can still be busy processing
 2016-02-06 18:08:47 +01:00
filushka
51adfd9067 Merge pull request #626 from Ultimaker/cmake_files_qtcreator 
Cmake files qtcreator
 2016-02-05 10:50:49 -08: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
ede0cbcfe6 Removed old code in per object settings that caused crash. 2016-02-04 16:04:52 +01:00
Ghostkeeper
a334e8876d Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-02-04 12:59:29 +01:00
Ghostkeeper
736d04ba8d Fix getting container properties 
Due to an optimisation earlier, the model and selected index in the per-object settings panel couldn't be found. This was giving errors and making the per-object settings unusable.

Contributes to issue CURA-458.
 2016-02-04 12:33:39 +01:00
Jaime van Kessel
01ecd9357c Max size & value are now set in correct order for layerview 
CURA-763
 2016-02-04 12:14:59 +01:00
Ghostkeeper
a658140997 Remove more remnants of print sequence message 
I found this other place that was helping to display the message that warns that print sequcence is set per-object. Since the latter is no longer possible, this message shouldn't be displayed any more.

Contributes to issue CURA-458.
 2016-02-04 12:14:59 +01:00
Ghostkeeper
44872ade43 Remove superfluous warning for printsequence 
Print sequence can no longer be chosen per-object, so the warning that displays when you choose print sequence per-object is no longer necessary.

Contributes to issue CURA-458.
 2016-02-04 12:08:57 +01:00
Jaime van Kessel
c5c90ba66e Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-02-04 12:01:54 +01:00
Jaime van Kessel
5cb27c5589 Updates list of languages in interface 
CURA-526
 2016-02-04 12:00:20 +01:00
Ghostkeeper
b5ccc1ec6d Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-02-04 11:46:32 +01:00
Jaime van Kessel
2300410c2e Fuzzy translations are now used by default 2016-02-04 11:45:58 +01:00
Ghostkeeper
bf03d71427 Hide setting if global-only 
In the per-object-setting panel, a setting is no longer displayed as settable per-object if it is global-only.

Contributes to issue CURA-458.
 2016-02-04 11:43:43 +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
Jaime van Kessel
eab378252a Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-02-03 10:27:27 +01:00
Jaime van Kessel
e7ab686318 Increases size of imageload dialog 
CURA-266
 2016-02-03 10:26:52 +01:00
Jaime van Kessel
538ef391c7 Removes undefined modal type 
CURA-266
 2016-02-03 10:25:25 +01:00
Jaime van Kessel
0038408933 Fixes binding errors 
CURA-266
 2016-02-03 10:24:52 +01:00
Jaime van Kessel
88f9cbc213 Fixes several code style violations 2016-02-03 09:14:34 +01:00
Arjen Hiemstra
1e4631ecdd Remove Cura_pb2.py file since it is no longer needed 
The new Arcus API uses the Cura.proto file instead.
 2016-02-02 18:22:09 +01:00