8024 Commits

Author SHA1 Message Date
Ghostkeeper
f1ac1bd876
Add JellyBox to XML material printer name translations
Because the automatic translation removes the underscore, and then the definition can't be found any more.

Contributes to issue CURA-3695.
2017-04-18 15:11:24 +02:00
Mark
2d14052f4e Change Label to Text to fix ugly fonts
CURA-3389
2017-04-18 13:35:39 +02:00
Mark
8c9eccd1f4 Change Label to Text because of ugle font rendering
CURA-3389
2017-04-18 12:11:02 +02:00
Ghostkeeper
7dbb08735a
Merge branch 'master' of github.com:Ultimaker/Cura 2017-04-18 10:30:15 +02:00
Ghostkeeper
e33d4693f0
Merge branch '2.5' 2017-04-18 10:30:01 +02:00
Ghostkeeper
9ad85ce235
Move prime tower 1mm down
The combination PC-0.4 and PVA-0.8 wouldn't print because the raft was getting so big that it intersected with the prime tower. Moving the prime tower 1mm down allows us to print again.

Contributes to issue CURA-3650.
2017-04-18 10:29:41 +02:00
Lipu Fei
865ab7135a Merge pull request #1686 from fieldOfView/fix_material_nan
Fix NaN values on material print settings tab
2017-04-18 09:52:38 +02:00
Mehmet Sutas
9b0dbdf47c Rigid3D Zero2 Platform 2017-04-16 01:01:16 +03:00
Mehmet Sutas
b908e3a201 Rigid3D Zero2 Machine Definition 2017-04-16 01:00:27 +03:00
Ghostkeeper
7151dc0381
Merge branch '2.5' 2017-04-14 17:06:37 +02:00
Ghostkeeper
c3d18bc256
Remove lower warnings for jerk settings
It's not a problem to have lower jerk. It'll just print corners quite slow. But sometimes that's necessary, for example for PVA.

Contributes to issue CURA-3650.
2017-04-14 17:06:18 +02:00
Ghostkeeper
9b06d7dd80
Relax warning constraints for top and bottom thickness
With very thick layers, fewer layers will still provide enough strength to not sag. 2 is quite a hard minimum though because there are 2 different orientations.

Contributes to issue CURA-3650.
2017-04-14 16:26:14 +02:00
Ghostkeeper
39fbe542b9
Fix font rendering issues in job spec details
Labels render with system settings. Text renders with our settings.

Contributes to issue CURA-3389.
2017-04-14 16:08:12 +02:00
Lipu Fei
b3f60c461b Fix type hinting and function name for upgrade profile
CURA-3540
2017-04-14 15:40:18 +02:00
Ghostkeeper
0d793a60fe
Remove duplicate infill overlap setting
infill_overlap and infill_overlap_mm were in conflict with each other. Went to the Materials team to resolve it. They say it should be 0.

Contributes to issue CURA-3650.
2017-04-14 15:14:51 +02:00
Ghostkeeper
d6f49d4c12
Merge branch '2.5' 2017-04-14 15:04:05 +02:00
Ghostkeeper
541e28a387
Allow exactly 2 line widths for prime tower
We give a warning when it's 2 or fewer lines in the prime tower, but 2 should be allowable. It works quite well.

Contributes to issue CURA-3650.
2017-04-14 14:58:30 +02:00
Ghostkeeper
72c0295c81
Set nozzle tip diameter for 0.8mm cores
They have a outer diameter of 2mm.

Contributes to issue CURA-3650.
2017-04-14 14:58:23 +02:00
Jaime van Kessel
c087f4b0dc Merge branch 'master' of git://github.com/maukcc/cura 2017-04-14 14:30:25 +02:00
Jaime van Kessel
5fcb7714af Merge branch 'master' of github.com:Ultimaker/Cura 2017-04-14 14:22:06 +02:00
Jaime van Kessel
53ecaba7f2 Added more typing.
These typing hints should have prevented the previous issue from happening
2017-04-14 14:21:36 +02:00
Jaime van Kessel
09d624dcfe Fixed accidental switch of function properties 2017-04-14 14:15:43 +02:00
Mark
bfda8712e1 Change all Label to Text so fonts are rendered correct
CURA-3389
2017-04-14 13:16:48 +02:00
Mark
9cd7d9a038 Use the correct i18n catalog name for translations in the right-click menu
CURA-3660
2017-04-14 12:38:26 +02:00
Ghostkeeper
ac46c4358b
Merge branch '2.5' 2017-04-14 11:56:57 +02:00
Ghostkeeper
3a30386ec6
Fix brim width of Nylon 0.8mm profiles
The 3mm was computed from wanting 7 lines, but in that calculation I used a line width of 0.4mm. This is obviously wrong, since for 0.8mm profiles the line width is 0.8mm.

Contributes to issue CURA-3650.
2017-04-14 11:56:36 +02:00
Ghostkeeper
e72d5ce93f
Make raft middle thickness warn based on nozzle size
Whether the layer is too thick to extrude properly depends on the nozzle size, not on the line width.

Contributes to issue CURA-3650.
2017-04-14 11:54:20 +02:00
Mark
81ab6dd754 Merge branch 'master' of github.com:Ultimaker/Cura 2017-04-14 11:41:29 +02:00
Mark
8ede111001 Texts in the mainwindow should be Text instead of Label
CURA-3389
2017-04-14 11:41:12 +02:00
Jaime van Kessel
16a3f10e1e Merge branch 'master' of github.com:Ultimaker/Cura 2017-04-14 11:27:00 +02:00
Jaime van Kessel
397b08ce6d Merge branch 'feature_filter_materials_by_diameter' of git://github.com/fieldOfView/Cura 2017-04-14 11:22:35 +02:00
Lipu Fei
4f2c76e462 Update a profile when deserializing it
CURA-3540
2017-04-14 10:50:42 +02:00
Ghostkeeper
2cb45f698f
Merge branch 'master' of github.com:Ultimaker/Cura 2017-04-14 10:30:08 +02:00
Ghostkeeper
a8df94f5b3
Merge branch '2.5' 2017-04-14 10:29:43 +02:00
Jaime van Kessel
d6d6036760 Fixed minor mistake with pull request
CURA-3681
2017-04-14 10:29:24 +02:00
Jaime van Kessel
04d2f8d68c Merge branch 'usbprinting-zparseerror-refactor' of git://github.com/tamarintech/Cura 2017-04-14 10:28:14 +02:00
Ghostkeeper
137b5309fd
Relax warning value for support interface thickness
It was being violated by the superdraft profiles. With very thick layers, 2 layers of interface suffices. But 2 layers is not quite enough for very thin layers. So I'm making it scale a bit more slowly with an offset.

Contributes to issue CURA-3650.
2017-04-14 10:28:13 +02:00
Ghostkeeper
39ceb53980
Set raft margin to 10
This was ambiguous in the original profiles.

Contributes to issue CURA-3650.
2017-04-14 10:22:25 +02:00
Jaime van Kessel
fe36da3438 Added more files to gitignore 2017-04-14 09:52:29 +02:00
Jaime van Kessel
6dfe9f609a Added build info to gitignore 2017-04-14 09:48:17 +02:00
Jaime van Kessel
ad26c169bb Merge branch 'master' of github.com:Ultimaker/Cura 2017-04-14 09:46:23 +02:00
Jaime van Kessel
bb752fa16f Added more logging 2017-04-13 19:05:13 +02:00
Ghostkeeper
cb8796711d
Merge branch '2.5' 2017-04-13 18:21:35 +02:00
Ghostkeeper
e49316d1b9
Set nozzle switch prime speed in AA 0.8mm profiles to 20
Some of them ended up as 15 because that's the default in the Ultimaker 3. This was done correctly by the profile optimiser because this setting was not specified by the original profiles, but it should've been 20 for all AA 0.8mm profiles.

Contributes to issue CURA-3650.
2017-04-13 18:21:17 +02:00
Jaime van Kessel
12ec7a5bc9 Merge branch 'master' of github.com:Ultimaker/Cura 2017-04-13 16:36:17 +02:00
Jaime van Kessel
437c78711d Added typing to all singletons
This greatly helps with pycharms ability to do auto code completion
2017-04-13 16:32:17 +02:00
Ghostkeeper
b0a1e909c9
Merge branch '2.5' 2017-04-13 16:10:10 +02:00
Ghostkeeper
ba64573fa0
Use support interface density instead of line distance
This way the user can still override the line distance if necessary.

Contributes to issue CURA-3650.
2017-04-13 16:09:51 +02:00
Ghostkeeper
ba46a90f92
Merge branch '2.5' 2017-04-13 15:02:29 +02:00
Ghostkeeper
9b2bd36fdf
Update Russian translations again
Previous time I accidentally committed this to master instead of 2.5. This was then cherry-picked to 2.5 by a colleague but that went wrong in all sorts of ways. So I'm doing this again but then properly.

Contributes to issue CURA-3487.
2017-04-13 14:51:42 +02:00