Commit graph

2904 commits

Author SHA1 Message Date
Ghostkeeper
c7a91f07d2
Add label for printer connection text to header
Also fixed the indenting of the previous two labels to use spaces instead of tabs. I knew I was going to forget putting it back to spaces after working on a different project that uses tabs.

The information is duplicated now. I'll remove the old one promptly.

Contributes to issue CURA-3161.
2017-02-02 14:45:44 +01:00
Ghostkeeper
1f0bcc1abd
Add header bar for print monitor
It lists the name of the printer it is connected to, and the address on the right side. This won't work for USB printing (it'll give errors there). I'll solve that later.

Contributes to issue CURA-3161.
2017-02-02 14:34:40 +01:00
Ghostkeeper
5c2f1a935a
Move monitorLabel into PrintMonitor.qml
It's a label that belongs to the print monitor after all. Let the print monitor file decide how it's going to look.

Contributes to issue CURA-3161.
2017-02-01 17:31:36 +01:00
Ghostkeeper
9cf0fdc4a3
Add quality profiles for ABAX printers
These are delivered to me by Pedro J. of ABAX 3D Tech. I modified the file names to be in line with our code standards, and I modified the link to the machine definition to coincide with the file names that were changed there to be in line with our code standards.
2017-02-01 13:17:02 +01:00
Ghostkeeper
f2695a40e0
Remove Prusa platforms from ABAX printers
The Prusa platform meshes say 'PRUSA' in huge letters. They are not the ABAX printers, though the structure is mostly the same. To prevent confusion I'm removing the platform mesh.
2017-02-01 13:17:02 +01:00
Ghostkeeper
2c893e2ea1
Conform ABAX printers to our code style
Fixed indenting, that's mostly all.
2017-02-01 13:17:02 +01:00
Ghostkeeper
d45f292324
Add ABAX printer definitions
These are exactly how they were delivered to me by Pedro J. from ABAX 3D Tech.
2017-02-01 13:17:02 +01:00
Tim Kuipers
6e84805c93 fix: angle limitations for machine_nozzle_expansion_angle (CURA-2572) 2017-02-01 13:10:39 +01:00
Tim Kuipers
6b7876d60e fix: fill line distance of 0 is possible, but generates no fill (CURA-2572) 2017-02-01 13:06:02 +01:00
Tim Kuipers
2db15602a4 fix: minmum line width is 1 micron (CURA-2572) 2017-02-01 13:05:17 +01:00
Jack Ha
e31a695061 WIP OpenGL 4.1 core profile. CURA-3273 2017-01-31 17:05:00 +01:00
Ghostkeeper
a9b8fbe72b
Don't start menu entry with 'Configur'
Because OSX triggers on that and moves the entry in its own main menu.

Contributes to issue CURA-3029.
2017-01-31 14:19:21 +01:00
Ghostkeeper
7115db6f2e Merge branch 'master' of https://github.com/maukcc/Cura into maukcc-master 2017-01-31 10:46:36 +01:00
MaukCC
e2b208eebd Update cartesio_0.4.inst.cfg 2017-01-31 09:02:31 +01:00
MaukCC
26854eedcf Update cartesio_extruder_0.def.json 2017-01-31 09:01:46 +01:00
MaukCC
f65ea57e80 Update cartesio.def.json 2017-01-31 09:01:14 +01:00
Ghostkeeper
876de2bd03 Merge branch 'patch-1' of https://github.com/probonopd/Cura into probonopd-patch-1 2017-01-30 17:39:31 +01:00
Jack Ha
2f9618f2ad Merge branch 'master' into layer_view3_cleanup 2017-01-30 11:25:55 +01:00
Ghostkeeper
ee2076b407
Merge branch '2.4' 2017-01-28 02:35:28 +01:00
Ghostkeeper
d24f42444e
Fix formatting so translation files actually compile
My guess is that the translation bureau didn't properly check its file format correctness.

Contributes to issue CURA-3028.
2017-01-28 02:30:33 +01:00
Ghostkeeper
24cb768339
Remove all fuzzy markers from professional translations
They don't want them there. They apparently don't think they have to check for fuzziness either.

Contributes to issue CURA-3028.
2017-01-28 01:44:17 +01:00
Ghostkeeper
3d0c57262c
Fix fuzzy translations
They are still marked as fuzzy. Going to resolve that next.

Contributes to issue CURA-3028.
2017-01-28 01:29:40 +01:00
Ghostkeeper
efb866c64f
Update translations for 2.4
This initial round, the translators didn't check the fuzzy string matches. These are therefore incorrect. We have new translations for the fuzzies. I'm going to add them now.

Contributes to issue CURA-3028.
2017-01-28 01:05:43 +01:00
Cláudio (Patola) Sampaio
f83a2c1066
Fixed two typos, removed quotes from jerk, changed 'anti-suporte' to 'anti-pendências' so that it does not conflict with future changes. 2017-01-27 09:51:38 +01:00
Ghostkeeper
4f2ec59298 Merge branch 'misc' of https://github.com/ubitux/Cura into ubitux-misc 2017-01-26 17:24:24 +01:00
Ghostkeeper
73516fce89
Merge branch 'fieldOfView-fix_unthemed_rects' 2017-01-26 17:21:21 +01:00
Ghostkeeper
0a2520599d Merge branch 'fix_unthemed_rects' of https://github.com/fieldOfView/Cura into fieldOfView-fix_unthemed_rects 2017-01-26 17:19:05 +01:00
Ghostkeeper
d3029c6c4f
Add Brazillian Portuguese language
The translation is almost complete at the moment. In the beta of the next release we'll decide if we want to keep this language.
2017-01-26 17:06:06 +01:00
Ghostkeeper
635535e33a
Fix plural forms of Brazillian Portuguese files 2017-01-26 17:06:06 +01:00
Jack Ha
6defbc8649 Merge branch '2.4' 2017-01-26 15:30:50 +01:00
Ghostkeeper
ed64154600
Merge branch 'master' of https://github.com/Patola/Cura into Patola-master 2017-01-26 15:14:29 +01:00
Jack Ha
b8967edd82 Merge branch '2.4' of github.com:Ultimaker/Cura into 2.4 2017-01-26 14:57:40 +01:00
Jack Ha
64d5d094b3 initial bed temperature: resolveOrValue to the rescue. CURA-3307 2017-01-26 14:57:26 +01:00
fieldOfView
e2a9fc0d79 Rename header tab status overlays to make them reusable
The "settings" tab could use a status overlay to show setting errors and slicing paused states.
2017-01-26 14:32:47 +01:00
fieldOfView
5939ff9b81 Make header tab button color stylable
The monitor tab icon is split up in a base monitor tab icon and a status overlay, each with their own color.
2017-01-26 14:17:07 +01:00
MaukCC
70a4d0bd52 Update cartesio_0.4.inst.cfg 2017-01-26 13:51:57 +01:00
MaukCC
e3aff8e2ac Update cartesio_0.25.inst.cfg 2017-01-26 13:51:45 +01:00
MaukCC
c70229ff88 Update cartesio_0.8.inst.cfg 2017-01-26 13:51:34 +01:00
MaukCC
06830fe16a Update cartesio_0.8.inst.cfg 2017-01-26 13:47:03 +01:00
MaukCC
50b65da860 Update cartesio_0.4.inst.cfg 2017-01-26 13:46:50 +01:00
MaukCC
5ba4e3549d Update cartesio_0.25.inst.cfg 2017-01-26 13:46:37 +01:00
Clément Bœsch
bf73a76b96 definitions: fix deprecated usage of travel_speed in rigidbot 2017-01-26 13:32:47 +01:00
MaukCC
d625115815 Update cartesio_extruder_3.def.json 2017-01-26 12:46:33 +01:00
MaukCC
7398cdba18 Update cartesio_extruder_2.def.json 2017-01-26 12:46:03 +01:00
MaukCC
7d98b98a99 Update cartesio_extruder_2.def.json 2017-01-26 12:45:47 +01:00
MaukCC
7586054cdf Update cartesio.def.json 2017-01-26 12:41:39 +01:00
MaukCC
059c70968e Update cartesio_0.8.inst.cfg 2017-01-26 12:39:21 +01:00
MaukCC
f68e09ce9a Update cartesio_0.4.inst.cfg 2017-01-26 12:38:57 +01:00
MaukCC
873340376e Update cartesio_0.25.inst.cfg 2017-01-26 12:38:26 +01:00
Ghostkeeper
b377fdd2a6 Merge branch 'fix_unthemed_rects' of https://github.com/fieldOfView/Cura into fieldOfView-fix_unthemed_rects 2017-01-26 10:56:10 +01:00