Commit graph

8024 commits

Author SHA1 Message Date
Ghostkeeper
6bf3d084b9
Update translation templates
These are generated from the state of the code at commit b67b41653f.

Contributes to issue CURA-3487.
2017-03-29 09:31:01 +02:00
fieldOfView
ba06f06cd0 Optimize code 2017-03-28 20:17:51 +02:00
Filip Goc
5cf2f9b021 add jellybox variants
there’s a one fan variant and a two fan variant. for now, both are only
0.4mm nozzle.
2017-03-28 12:58:22 -04:00
Filip Goc
a328261456 add jellybox specific profiles
pla and a few petg profiles to get started
2017-03-28 12:57:43 -04:00
Filip Goc
b0627159fa rename jellybox platform mesh
jellybox_platform -> imade3d_jellybox_platform
2017-03-28 12:57:03 -04:00
Filip Goc
0d4a74182b update and rename jellybox definition
- jellybox -> imade3d jellybox
- includes variants
2017-03-28 12:56:19 -04:00
Lipu Fei
208935960f Add comments for putting open file logic in qml
CURA-3495
2017-03-28 15:02:50 +02:00
Lipu Fei
e4af8e36bb Fix dialog text for opening multiple files with project(s)
CURA-3495
2017-03-28 14:38:26 +02:00
Lipu Fei
1fc7120fff Fix dialog text "file(s)" -> "files"
CURA-3495
2017-03-28 14:27:40 +02:00
Lipu Fei
5bec46a29c Drag-and-drop files behave the same as open file menu
CURA-3495
2017-03-28 14:27:40 +02:00
Jack Ha
bf08d30e7d Added first arrange function and smart placement after loading. CURA-3239 2017-03-28 14:27:22 +02:00
Jaime van Kessel
38a07d75c7 Merge branch 'master' of github.com:Ultimaker/Cura 2017-03-28 13:16:00 +02:00
Jaime van Kessel
db1fb8e692 Moved authentication request state change 2017-03-28 13:14:47 +02:00
Tim Kuipers
7a67ab4e66 Merge branch '2.5' 2017-03-28 12:55:18 +02:00
Tim Kuipers
db2766aba1 fix: move prime positions to the sides (CURA-3605) 2017-03-28 12:53:46 +02:00
Jaime van Kessel
910ff7acea No longer check printer state when no material lengths are known
This fixes issues with g-code from g-code reader not having material lengths set.

CURA-3604
2017-03-28 11:59:07 +02:00
Jack Ha
d8c20b9d6c First version of multiply object seems to work quite well. CURA-3239 2017-03-28 11:33:07 +02:00
Jaime van Kessel
6367755875 Disabled center_on_select for windows, as pyqt has a bug with it 2017-03-28 10:21:52 +02:00
Ghostkeeper
2810054f8e
Fix spelling of maximum skin angle expansion description 2017-03-27 16:00:09 +02:00
Lipu Fei
50266f760b
Revert "Prevent MachineSettings dialog go beyond the top of screen"
This reverts commit a0f841e8eb.
2017-03-27 16:00:08 +02:00
Jack Ha
efa1513e4c
Changed all Not Supported Draft quality profiles to Not Supported Superdraft to prevent double Not Supported entries. CURA-3555 2017-03-27 16:00:08 +02:00
Ghostkeeper
b67b41653f
Fix spelling of maximum skin angle expansion description 2017-03-27 15:59:27 +02:00
Jaime van Kessel
88704051d1 Filter bar is now always visible
CURA-3574
2017-03-27 15:47:30 +02:00
Lipu Fei
6644a4d386 Revert "Prevent MachineSettings dialog go beyond the top of screen"
This reverts commit a0f841e8eb.
2017-03-27 11:09:40 +02:00
Jack Ha
088202c366 Changed all Not Supported Draft quality profiles to Not Supported Superdraft to prevent double Not Supported entries. CURA-3555 2017-03-27 10:30:51 +02:00
fieldOfView
67d66905ba Fix crash when editing material diameter
While editing the diameter value in the materials pane, it can happen that the radius evaluates to 0. This led to a division by zero.

Fixes https://github.com/Ultimaker/Cura/issues/1582
2017-03-26 14:08:07 +02:00
fieldOfView
2b761b87ac Fail gracefully when libSavitar is not found
By catching the ImportError, this prevents the logs being clogged with exceptions in start and when the plugins preference page is touched.
2017-03-25 09:56:02 +01:00
Jaime van Kessel
f04d1efb8d Removed file progress from removable output device, as writefile job now handles that itself 2017-03-24 16:32:39 +01:00
Jaime van Kessel
dafeab4e8a Merge branch 'feature_CURA-3495_open_menu' of github.com:Ultimaker/Cura 2017-03-24 11:52:26 +01:00
Jaime van Kessel
298fa52da5 Merge branch '2.5' of github.com:Ultimaker/Cura 2017-03-24 11:51:16 +01:00
fieldOfView
33f20710d9 Ups the limit of the maximum cost of a spool of filament
This is necessary for currencies such as Japanese Yen or South Korean Won, where prices can easily exceed 1000. This PR sets the limit to 100,000,000. If the price of a spool exceeds this amount, perhaps the user should consider moving to a more stable country.

Fixes https://github.com/Ultimaker/Cura/issues/1567
2017-03-24 11:23:40 +01:00
Jaime van Kessel
4b7b8600ec Shortened the logging of the auth key. Turned out it was extremely long 2017-03-24 11:22:57 +01:00
Jaime van Kessel
8d2e824205 Added even more logging 2017-03-24 11:17:59 +01:00
Jaime van Kessel
8572be99b9 Merge branch 'master' of github.com:Ultimaker/Cura 2017-03-24 11:05:21 +01:00
Jaime van Kessel
adab4a1110 Added "blurred" auth key logging.
The getSafeaAuthKey prints a key of the same length, but only the last 5 chars are real. The rest is blurred out with *
THis is a bit like how most payment services hide your credit card number.
2017-03-24 11:04:08 +01:00
Ghostkeeper
7688ce6582
Merge branch 'master' of github.com:Ultimaker/Cura 2017-03-24 10:50:28 +01:00
Ghostkeeper
e76c3f72e7
Lower QtQuick requirement further to 2.2
2.2 is required for the modifications we make to the Button objects.
2017-03-24 10:49:46 +01:00
Ghostkeeper
0f0b8cd5dd
Lower QtQuick requirement further to 2.2
2.2 is required for the modifications we make to the Button objects.
2017-03-24 10:47:47 +01:00
Lipu Fei
578f72c91e Use "False" instead "false" in cfg files
CURA-3555
2017-03-24 10:44:44 +01:00
Jaime van Kessel
ba21a52827 Merge pull request #1570 from fieldOfView/fix_spool_cost_limit
Up the limit of the maximum cost of a spool of filament
2017-03-24 09:53:42 +01:00
Lipu Fei
7ad5a64b91 Add msg dialog for ignoring gcode in multiple file selection
CURA-3495
2017-03-24 09:53:12 +01:00
fieldOfView
6474f3eb25 Ups the limit of the maximum cost of a spool of filament
This is necessary for currencies such as Japanese Yen or South Korean Won, where prices can easily exceed 1000. This PR sets the limit to 100,000,000. If the price of a spool exceeds this amount, perhaps the user should consider moving to a more stable country.

Fixes https://github.com/Ultimaker/Cura/issues/1567
2017-03-24 09:12:48 +01:00
Jaime van Kessel
e30e2a8018 Instead of not sending the line at all, just send a get temp command 2017-03-23 20:13:13 +01:00
Jaime van Kessel
645e3e8dfe Don't try to send empty g-code lines 2017-03-23 19:42:52 +01:00
Jaime van Kessel
6ff130c361 Added logging 2017-03-23 17:57:52 +01:00
Jaime van Kessel
8023341090 Merge branch '2.5' of github.com:Ultimaker/Cura 2017-03-23 15:15:08 +01:00
Jaime van Kessel
ecbf0e1e28 Only add center to list for merge if there is one 2017-03-23 15:14:34 +01:00
Jack Ha
462f3abead Merge branch 'master' into feature_arrange 2017-03-23 15:02:04 +01:00
Lipu Fei
a0f841e8eb Prevent MachineSettings dialog go beyond the top of screen 2017-03-23 13:46:01 +01:00
Lipu Fei
96e9780273 Fix typo in changelog 2.5.0 2017-03-23 08:53:57 +01:00