Jaime van Kessel
06fff748e3
Decreased the size of the batches to send, as it froze the interface too much.
2017-03-30 16:59:35 +02:00
Jaime van Kessel
7ae8d96775
Simply reset the authentication when requesting a new one.
...
Only changing the state caused a whole lot of issues.
2017-03-30 16:47:08 +02:00
Jack Ha
76c1c31cf4
Merge branch '2.5' of github.com:Ultimaker/Cura into 2.5
2017-03-30 16:27:19 +02:00
Jack Ha
1164805a68
WIP Solved stash apply. CURA-3610
2017-03-30 16:26:39 +02:00
Jaime van Kessel
e2faaf56fd
Merge branch 'bugfix_CURA-3604_print_adter_loading_gcode' of github.com:Ultimaker/Cura into 2.5
2017-03-30 16:26:16 +02:00
Jack Ha
3135dc7d77
Solved MC
2017-03-30 16:20:08 +02:00
Lipu Fei
bfd77f915d
Compress gcode lines in batch
...
CURA-3604
2017-03-30 16:09:17 +02:00
Lipu Fei
c785e84b86
Check len(materialLengths) before using
...
CURA-3604
2017-03-30 16:09:16 +02:00
Lipu Fei
ef666aac88
Set gcode_list for Scene after loading gcode
...
CURA-3604
2017-03-30 16:09:16 +02:00
Lipu Fei
2158826e06
Change backend state to disabled after reading a gcode
...
CURA-3604
2017-03-30 16:09:16 +02:00
Jaime van Kessel
6314d872e1
If we find multiple materials for a new extruder, prefer a read only material
...
CURA-3147
2017-03-30 16:07:26 +02:00
Jack Ha
fa7a026efe
Merge branch '2.5' of github.com:Ultimaker/Cura into 2.5
2017-03-30 16:05:07 +02:00
Jack Ha
da5288ea78
Fix updating allowed areas. CURA-3610
2017-03-30 16:04:57 +02:00
Ghostkeeper
1bc383b615
Update Russian translations for Cura 2.5.
...
These are provided to us by RaD: github.com/RaD
Contributes to issue CURA-3487.
2017-03-30 14:51:08 +02:00
fieldOfView
adf2ac10b0
Fix check for succesfully imported 3MFReader & 3MFWriter modules
2017-03-30 13:56:19 +02:00
Jaime van Kessel
cd5e883010
Build volume now uses IsSlicable decorator to check for scene changes
...
CURA-3608 Fixes #1598
2017-03-30 11:24:01 +02:00
Tim Kuipers
e4a1d4dce2
JSON fix: default mold width: 5mm (CURA-3512)
2017-03-30 11:17:52 +02:00
Tim Kuipers
a4272bf7be
Merge branch 'master' into feature_mold
2017-03-30 11:16:27 +02:00
Jaime van Kessel
f7bbb243b8
Moved authentication request state change
2017-03-30 11:02:56 +02:00
Jaime van Kessel
13561bdb46
material_amounts is now defined in init
...
Somehow this was forgotten, which could cause issues in certain cases.
CURA-3617
2017-03-30 10:47:11 +02:00
Ghostkeeper
6eeb61c6ff
Merge branch 'maukcc-master'
2017-03-29 13:26:14 +02:00
Ghostkeeper
23a09f7f3c
Merge branch 'master' of https://github.com/maukcc/Cura into maukcc-master
2017-03-29 13:25:34 +02:00
jack
a8be748df7
Merge pull request #1599 from Ultimaker/feature_CURA-3495_open_menu
...
CURA-3495 Open project/files menu
2017-03-29 12:58:24 +02:00
Lipu Fei
e92c21af28
Remove FIXME
...
CURA-3495
2017-03-29 12:53:19 +02:00
Lipu Fei
42b8f06e99
Ignore gcode when selected multiple files
...
CURA-3495
2017-03-29 12:52:56 +02:00
Jack Ha
0655771cb8
Removed comment. CURA-3390
2017-03-29 11:00:59 +02:00
Jack Ha
d5d265a996
Resolve mc cherry-picking CURA-3390
2017-03-29 11:00:54 +02:00
Jack Ha
02bb575ced
Fixed extruder per gcode layer. Created show_caution preference for gcode reader. CURA-3390
2017-03-29 10:56:36 +02:00
Jack Ha
1e75c84662
Less yields for G-code reader and faster. CURA-3390
2017-03-29 10:56:28 +02:00
Jack Ha
ea0c55fff1
Solved merge conflict in cherry-pick CURA-3390
2017-03-29 10:56:26 +02:00
Jack Ha
fb2c318a0a
Added caution message for g-code reader. CURA-3390
2017-03-29 10:53:25 +02:00
Jaime van Kessel
fbc372812c
Minor refactor to improve readability
...
CURA-3390
2017-03-29 10:51:56 +02:00
jack
3a255b341f
Merge pull request #1586 from fieldOfView/fix_radius0
...
Fix crash when editing material diameter
2017-03-29 10:43:41 +02:00
jack
f50c3f430a
Merge pull request #1586 from fieldOfView/fix_radius0
...
Fix crash when editing material diameter
2017-03-29 10:37:13 +02:00
Ghostkeeper
f62488fd11
Catch JSONDecodeErrors on decoding messages from the network
...
The network can corrupt packages or the printer can only send partial messages. Cura shouldn't break on that. It's just a warning. This warning says more than the original stack trace does, because the stack trace only said like 'unexpected comma there and there' while this message actually says what message contained the error.
2017-03-29 10:34:27 +02:00
Jack Ha
099752125b
Arrange all now places biggest objects first. CURA-3239
2017-03-29 10:00:21 +02:00
Jack Ha
f357dea086
Tuned arranger a bit, good enough for proof of concept. CURA-3239
2017-03-29 09:32:29 +02:00
Ghostkeeper
6bf3d084b9
Update translation templates
...
These are generated from the state of the code at commit b67b41653fc7c24061103993016fb29b86a51488.
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
