GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-07-13 05:51:46 +08:00
Code Issues Packages Projects Releases Wiki Activity
19,026 Commits 295 Branches 268 Tags
Commit Graph

19026 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jaime van Kessel
7c744044fd Fixed merge issues & updated proto files 2016-02-02 11:25:10 +01:00
Jaime van Kessel
f068f569d3 Merge pull request #612 from thopiekar/2.1-alternative-nvidia-fix 
Alternative fix for NVidia graphic cards
 2016-02-02 10:53:16 +01:00
Ghostkeeper
2bea12624a Merge pull request #625 from thopiekar/2.1-i18n-de-spelling 
i18n: de: Set of (better) translations for german
 2016-02-02 10:24:41 +01:00
Elena Filenko
29562090b6 Removed lines fro 2.1 version 2016-02-01 17:38:21 -08:00
Elena Filenko
000390966e Added CmakeLists.txt file for ability to open and search through files in Qtcreator 2016-02-01 13:07:24 -08: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
Thomas-Karl Pietrowski
9014c0422f i18n: de: Better calling Setup -> "Konfiguration" 
The reason why I would rename it, is that you usually do a "Einrichtung" on the first time you run an application.
"Konfiguration" sounds here better, in my point of view, because you configure your slicing process for your loaded (difficult) object.
 2016-02-01 17:50:12 +01:00
Thomas-Karl Pietrowski
7ed16b55bf i18n🇩🇪 Removing fuzzy tag from some good translations 
Totally agree with these translations. So marked them as "non-fuzzy".
 2016-02-01 17:48:03 +01:00
Thomas-Karl Pietrowski
e7769ae0a5 i18n: de: Generally call "removable drive" "Wechseldatenträger" 
I don't know the name for "Wechsellaufwerk" in english, but these devices are not meant to be USB-sticks.
Some PC cases have the possibility to remove a CD drive and you can e.g. replace it with a HDD.
Such devices are really called "Wechsellaufwerk", but the meaning here is "Wechseldatenträger".
 2016-02-01 17:40:40 +01:00
Thomas-Karl Pietrowski
eb1edd9a28 i18n: de: Revert translation on SI unit 
Don't see a reason, why we should translate "m" > "meter" -> "Meter" here.
Additionally the tranlation for "0.0m" is untranslated while "m" is translated as "Meter".
So I reverted this here.
 2016-02-01 17:33:48 +01:00
Thomas-Karl Pietrowski
81eccdba45 i18n: de: X-Ray -> Röntgen 
Of course most people might now what the meaning of X-Ray is, but I would translate it, because first it sounds more professional than using anglicisms.
 2016-02-01 17:28:33 +01:00
Arjen Hiemstra
ffec2484b7 Fix Layer view 2016-02-01 17:15:45 +01:00
Jaime van Kessel
ebc1df1a4c Hull node is no longer added if linked node is deleted while it was calculating 
CURA-637
 2016-02-01 17:03:53 +01:00
Jaime van Kessel
782c4508c6 Convex hull is also redrawn when machineInstance is changed 
CURA-742
 2016-02-01 16:03:31 +01:00
Tim Kuipers
fd5d029c4b infill overlap % ==> mm (CURA-786) 2016-02-01 11:53:19 +01:00
Jaime van Kessel
d68e17c9f5 Merge pull request #624 from Ultimaker/fast_advanced_switch 
Fast Simple<->Advanced Switch
 2016-02-01 10:48:27 +01:00
Jaime van Kessel
e6d7dd1e4e Merge pull request #611 from Ultimaker/feature_delay_cameranimation 
Feature delay cameraanimation
 2016-02-01 10:30:21 +01:00
Ghostkeeper
d795450c22 Merge pull request #623 from thopiekar/2.1-l10n-critical-fixes 
i18n: Revert translations on keywords
 2016-02-01 09:59:10 +01:00
Ghostkeeper
a45e55ab4c Reactivate _always_restart 
This was deactivated during debugging as a test. Shouldn't have been committed.

Contributes to issue CURA-427.
 2016-01-29 20:57:16 +01:00