8143 Commits

Author SHA1 Message Date
Ghostkeeper
cc23c72124
Merge branch 'revise_jellybox_support' of github.com:IMADE3D/Cura into IMADE3D-revise_jellybox_support 2017-04-19 10:36:20 +02:00
jack
74726e305e Merge pull request #1698 from Ultimaker/feature_CURA-3574_toggle_button
CURA-3574: Use a toggle button mode switching
2017-04-19 10:28:54 +02:00
Jack Ha
232f975092 Removed unused code, added ';' to end of lines. CURA-3574 2017-04-19 10:28:16 +02:00
Ghostkeeper
f91037fb7c
Merge branch 'Rigid3D-master' 2017-04-19 09:30:09 +02:00
Ghostkeeper
58bf3e7ab3 Merge branch 'master' of github.com:Rigid3D/Cura into Rigid3D-master 2017-04-19 09:27:54 +02:00
Lipu Fei
61c4631270 Put sizes and numbers for toggle button into theme
CURA-3574
2017-04-19 08:56:11 +02:00
Mehmet Sutas
0637719622 Resized Rigid3D Zero2 Platform STL
Resized Rigid3D Zero2 Platform STL
2017-04-18 22:49:50 +03:00
Filip Goc
3c85159b05 swap M109 for M104 in the start gcode
It’s necessary to preheat the nozzle before the auto bed leveling
procedure to loosen up leftover filament that may had hardened on the
nozzle.
2017-04-18 20:44:55 +02:00
Lipu Fei
6bf0965632 Adjust toggle button size
CURA-3574
2017-04-18 16:52:17 +02:00
Lipu Fei
c75887be80 Use a toggle button for mode switching
CURA-3574
2017-04-18 16:40:59 +02:00
Jaime van Kessel
c20542b7b8 Merge branch 'feature_CURA-3540_upgrade_for_project' of github.com:Ultimaker/Cura 2017-04-18 15:33:53 +02:00
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
Jaime van Kessel
9ce8f6cf66 Added new icons
CURA-3577
2017-04-18 15:10:32 +02:00
fieldOfView
4d96e6931d Store definition changes containers in a folder named definition_changes 2017-04-18 15:08:46 +02:00
Tim Kuipers
fdf20fcb15 fix: forgotten floor in descriptions (CURA-3491) 2017-04-18 13:49:55 +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
fieldOfView
94545ec4ee Restore active extruder after forcing an update of the global extruder stack 2017-04-15 20:09:20 +02:00
fieldOfView
6e0221636d Save definition_changes in their own folder 2017-04-15 20:03:09 +02:00
fieldOfView
813ee65849 Update printer (& disallowed areas) when setting nozzle offsets 2017-04-15 18:58:25 +02:00
fieldOfView
12079fc9da Add documentation 2017-04-15 18:55:59 +02: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