Commit graph

8977 commits

Author SHA1 Message Date
Jaime van Kessel
0c6d0a0abb Moved recent files into Uranium
USL-41
2017-03-30 18:35:41 +02:00
Jack Ha
9db816b0fc Funed arranger for better performance. CURA-3239 2017-03-30 17:26:56 +02:00
Jaime van Kessel
dbfa5873ce Merge branch '2.5' of github.com:Ultimaker/Cura 2017-03-30 17:03:01 +02:00
Jaime van Kessel
5bbdd9fe4b Merge branch '2.5' of github.com:Ultimaker/Cura into 2.5 2017-03-30 17:00:04 +02:00
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
Tim Kuipers
0c6a2f0f6d Merge branch 'master' into feature_support_stair_width 2017-03-30 12:02:37 +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
MaukCC
4fb3513a7e Update cartesio_0.25.inst.cfg 2017-03-30 10:29:08 +02:00
MaukCC
c09c044210 Update cartesio_0.4.inst.cfg 2017-03-30 10:27:46 +02:00
MaukCC
05cbd4ad7b Update cartesio_0.4.inst.cfg 2017-03-30 10:26:13 +02:00
MaukCC
13d11b6cbc Update cartesio_0.4.inst.cfg 2017-03-30 10:25:34 +02:00
MaukCC
a3be68eb3c Update cartesio_0.8.inst.cfg 2017-03-30 10:24:33 +02:00
MaukCC
9abb721981 Update cartesio_0.8.inst.cfg 2017-03-30 10:23:51 +02:00
MaukCC
b154a40e54 Update cartesio_0.4.inst.cfg 2017-03-30 10:23:24 +02:00
MaukCC
2c58fd9ac6 Update cartesio_0.25.inst.cfg 2017-03-30 10:22:54 +02:00
MaukCC
ad00e01855 Update XmlMaterialProfile.py 2017-03-30 10:19:26 +02:00
Arjen Hiemstra
e6adca7dd3 Fix type metadata of some of the test container stacks 2017-03-30 08:58:46 +02:00
Arjen Hiemstra
1f0f8cd6ea Make GlobalStack a subclass of CuraContainerStack 2017-03-30 08:58:21 +02:00
Arjen Hiemstra
202f19a081 Make ExtruderStack a subclass of CuraContainerStack 2017-03-30 08:58:05 +02:00
Arjen Hiemstra
d4400b8674 Introduce a CuraContainerStack that has all the code shared between global and extruder
Since there is actually quite a lot of it
2017-03-30 08:57:37 +02:00
MaukCC
4f1641f7b7 Update cartesio_0.8.inst.cfg 2017-03-29 16:36:24 +02:00
MaukCC
731da24788 Update cartesio_0.4.inst.cfg 2017-03-29 16:35:47 +02:00
MaukCC
7bc83a55cd Update cartesio_0.8.inst.cfg 2017-03-29 16:23:03 +02:00
MaukCC
d8ba5d71ee Update cartesio_0.4.inst.cfg 2017-03-29 16:22:25 +02:00
MaukCC
21c607c88b Update cartesio_0.25.inst.cfg 2017-03-29 16:22:07 +02:00
MaukCC
242fa53668 Update cartesio_0.8.inst.cfg 2017-03-29 16:21:14 +02:00
MaukCC
454ce53957 Update cartesio_0.4.inst.cfg 2017-03-29 16:19:54 +02:00
MaukCC
92af9caadd Update XmlMaterialProfile.py
added retraction_prime_speed  as a material specific value.
This way, if a material needs a specific setting, the value set in the material xml file will be used. 
Probably a good idea to have this value added in the front end as well, but for now this will do.
2017-03-29 15:24:40 +02:00
MaukCC
1055259b52 Merge pull request #1 from Ultimaker/master
update
2017-03-29 14:06:36 +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