GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-08 17:39:00 +08:00
Code Issues Packages Projects Releases Wiki Activity
12,997 Commits 290 Branches 260 Tags
Commit Graph

12997 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diego Prado Gesto
a4455bbbe5 CURA-4891 Use the printer definition name instead of the ID to generate 
the abbreviated name.
- Also revert some previous changes to keep the same behavior as before.
 2018-02-14 13:47:30 +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
3c32a1b0f3
Merge branch 'master' of github.com:Ultimaker/Cura 2018-02-13 15:51:14 +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
Ian Paschal
c0561bc525 CURA-4935 Can't disable sending anonymous slice data and checking updates 
This is the ~5 minute~ 3 second fix. I know it's not the more proper way to do it, but I've spent several hours on the more proper way to do it and it's causing huge amounts of headache (because, for example, the PluginBrowser installs plugins and the PluginRegistry removes them, and the PluginBrowser can't update the PluginsModel because the PluginsModel is intantiated in QML instead of in `PluginBrowser.py`, etc. etc. etc.

I'm effectively doing a full refactor of this functionality while simultaneously avoiding moving any "install from remote URL" functionality into the PluginRegistry which is dumb.

I'd prefer a simple, stable soution now instead of re-writing this all again.

I'll make a proposal for a proper, organized refactor for Cookies & Cura.
 2018-02-13 15:50:29 +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
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
Ghostkeeper
6eeaab3c12
Add plug-in locations with different lib suffixes 
Or suffices if you want to go the Latin way.

Fixes #3195.
 2018-02-13 11:45:49 +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
488d310643 CURA-4320 Add the new setting to the tower's settings list so the 
buildvolume reacts to its changes.
 2018-02-12 15:03:03 +01:00
Ian Paschal
2964bedc28 CURA-4891 
Scan for 'ultimaker' in the name. If found, add 'UM' to abbreviation, and scan again for a number after 'ultimaker' (e.g. 'ultimaker3'). If found, add the number as well. If 'ultimaker' is not found, take either the first 4 letters of the name or first letter.
 2018-02-12 14:58:55 +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
Ellecross
8feaab85cd New Spanish Translations 2018-02-12 13:34:55 +01:00
Ghostkeeper
b814a13985
Remove fuzzies and correct header 
Contributes to issue CURA-4883.
 2018-02-12 13:28:54 +01:00
Ghostkeeper
fa2edc5fa0
Update German translations 
Checked by a reseller of Ultimaker's in the area.

Contributes to issue CURA-4883.
 2018-02-12 13:27:53 +01:00
Ian Paschal
7273ecfee8 Merge branch 'master' of https://github.com/Ultimaker/Cura 2018-02-12 13:11:50 +01:00
Ian Paschal
f91ed67db0 Added wiki reference 2018-02-12 13:11:45 +01:00
Ghostkeeper
03b4213e92
Merge branch '3.2' 
Conflicts in Cura.qml and SaveButton.qml from people fixing positioning rounding at the same time...
 2018-02-12 13:10:24 +01:00
Ghostkeeper
669e6994d5
Update Polish translations 
We got these from Andrzej. We'll check them now and update the header.

Contributes to issue CURA-4883.
 2018-02-12 13:07:17 +01:00
Ghostkeeper
b9df632d3f
Update Polish translations 
We got these from Andrzej. We'll check them now and update the header.

Contributes to issue CURA-4883.
 2018-02-12 13:06:26 +01:00
Ghostkeeper
fb0eda72b9
Change tabs into spaces 
As per our code style.
 2018-02-12 11:59:46 +01:00
Ghostkeeper
75265911d4
Add option to pause at layer 
Fixes #3172.
 2018-02-12 11:59:22 +01:00
Ian Paschal
9b82d26344
Merge pull request #3279 from Ultimaker/fix_garbled_fonts_4 
Checked all divisions (again..) and multiplications on rounding errors
 2018-02-12 11:49:50 +01:00
Ian Paschal
72788445ab Added one more floor 2018-02-12 11:49:14 +01:00
Ghostkeeper
afeea6e214
Don't interrupt loading scripts when one error occurs 
Instead of breaking the loading of the rest of the scripts, just don't load this particular one.
 2018-02-12 11:23:43 +01:00
Ghostkeeper
b8fce75dac
Track index instead of finding it back later 
It has to iterate over all layers and do string comparison to find the index back. Instead we just keep track of the index so this should improve performance a bit.
 2018-02-12 11:12:55 +01:00
Ghostkeeper
80b99e0323
Use double quotes instead of single quotes 
As per our code style. It doesn't say anything about single-character strings in particular.
 2018-02-12 11:10:57 +01:00
Ghostkeeper
0e23fb15af
Don't skip the first layer 2018-02-12 11:07:15 +01:00
Ghostkeeper
cfdde8dd07
Simplify indentation of pause at height script 
Instead of making lots of nested if statements, use the if statements as an interruption check. This reduces the indentation a lot and makes it easier to read in my opinion. It also makes it easier to add stuff to these checks.
 2018-02-12 11:06:17 +01:00
Ghostkeeper
b44854d19d
Merge branch 'pouncingiguana-master' 2018-02-12 09:44:01 +01:00