Commit graph

3344 commits

Author SHA1 Message Date
Lipu Fei
367e50669d Refactor code
CURA-3710
2018-02-01 13:56:49 +01:00
Lipu Fei
0e5c67a38f Merge remote-tracking branch 'origin/master' into CURA-3710_setting_visibility_preset 2018-02-01 11:00:13 +01:00
alekseisasin
6c84c713f2
Merge pull request #3211 from Ultimaker/feature-support-blocker
Added Support Eraser Plugin
2018-02-01 09:52:21 +01:00
Aleksei S
37733f51ad Correct name
CURA-4851
2018-02-01 09:44:00 +01:00
Aleksei S
08c64d28cf Typo in XmlValidator
CURA-4851
2018-02-01 09:37:06 +01:00
Diego Prado Gesto
701ac7f91e Merge branch 'master' of https://github.com/Ultimaker/Cura 2018-02-01 09:05:32 +01:00
Ian Paschal
f3372bce7c Added 2018 copyright and license information 2018-01-31 16:03:20 +01:00
alekseisasin
a446ca2759 Material container validation
CURA-4851
2018-01-31 15:00:46 +01:00
alekseisasin
e5c72cfdc5 Validate material profile
CURA-4851
2018-01-31 14:58:44 +01:00
Ian Paschal
e1da097970 Added Support Eraser Plugin
This is the first draft of the Support Eraser tool. The plugin creates a cube mesh which has the `anti_overhang_mesh` decorator causing it to block the creation of support material for overhangs within its volume. This distinction is necessary to avoid confusing this behavior from actually erasing a _portion_ of a support structure.

Some (non-necessary) improvements could be made such as:

- Better graphical style
- Discussion of whether the cube should be able to pass through the build plate or not
- Possible improvements to the tool's icon
- Placing the cube at a cursor click location
2018-01-31 12:55:41 +01:00
Diego Prado Gesto
81488e0bbc Merge branch '3.2' 2018-01-31 09:13:29 +01:00
Lipu Fei
cfd60e5557 Fix Olsson Block binding in UM2 machine settings
CURA-4897
2018-01-30 17:33:34 +01:00
Diego Prado Gesto
41cf708db1 Merge branch '3.2' of https://github.com/Ultimaker/Cura into 3.2 2018-01-30 11:24:39 +01:00
Diego Prado Gesto
bdfb8f1b5b CURA-4885 Remove the part in which the version upgrader creates a
quality changes instance. This instance container is created in the
workspace reader. This avoids the profile to appear twice.
2018-01-30 11:23:00 +01:00
Lipu Fei
a4a1832a58 Fix legacy profile importing for CFP
CURA-4876
2018-01-30 09:49:31 +01:00
Lipu Fei
f1363fab73 Move newline format
CURA-4863
2018-01-29 16:33:52 +01:00
Aleksei S
0954211be8 Fix: Wrong print time
CURA-4874
2018-01-29 16:01:11 +01:00
Lipu Fei
d351eba758 Use \n instead of \r for message formatting
CURA-4863
2018-01-29 14:55:56 +01:00
Lipu Fei
507b967946 Minor fixes
CURA-4868
2018-01-29 14:50:07 +01:00
Jaime van Kessel
0e5395dfd5 Fix crash when removing manually added device.
I forgot to rename a variable :(
CURA-4861
2018-01-29 14:29:13 +01:00
Aleksei S
b5856d6577 Merge branch '3.2' of github.com:Ultimaker/cura into 3.2 2018-01-29 13:48:23 +01:00
Aleksei S
750a86d2fd Added new lines to distinguis error message
CURA-4876
2018-01-29 13:47:24 +01:00
Lipu Fei
b9fc3997e5 Fix jellybox -> imade3d_jellybox renaming
CURA-4863
2018-01-29 13:00:48 +01:00
Lipu Fei
7dfc1a4aa7 Add encoding='utf-8' for text file reading
CURA-4875

When encoding is not provided, the behaviour is system dependent and it
can break on OS X.
2018-01-29 12:29:20 +01:00
Lipu Fei
63ac8412e6 Fix importing legacy INI quality profiles
CURA-4876
2018-01-29 11:18:16 +01:00
Diego Prado Gesto
a0ebb5205b Merge branch 'master' of https://github.com/Ultimaker/Cura 2018-01-26 14:14:59 +01:00
ChrisTerBeke
6cd64e1ce8
Two more fixes for typo in USBPrinterOutputController 2018-01-25 22:47:48 +01:00
ChrisTerBeke
8c7f8fa1fa
Fix typo in USBOutputController 2018-01-25 22:34:28 +01:00
Jaime van Kessel
bcfac3ace6 Added very rough implementation for UCP files 2018-01-25 17:14:32 +01:00
Diego Prado Gesto
38f1ad5db9 Merge branch '3.2' 2018-01-25 17:10:17 +01:00
Ghostkeeper
ae40071ffd
Merge branch '3.2' 2018-01-24 16:17:49 +01:00
Ghostkeeper
1818055966
Merge branch 'master' of github.com:Ultimaker/Cura 2018-01-24 16:17:24 +01:00
Diego Prado Gesto
d72e08a3ba Merge branch '3.2' of https://github.com/Ultimaker/Cura into 3.2 2018-01-24 16:05:28 +01:00
Diego Prado Gesto
e38cf957bb CURA-4839 Avoid creating unique names for the extruder instance
containers if the strategy is upgrade existing
2018-01-24 16:04:11 +01:00
ChrisTerBeke
d1f2d6f45d Fix checking material_used per extruder for analytics - CURA-4858 2018-01-24 14:02:44 +01:00
ChrisTerBeke
c471991044 Update plugin browser version to 4 as network rewrite has another set of breaking changes 2018-01-24 13:30:08 +01:00
ChrisTerBeke
b41d8eb0dd Merge branch '3.2' 2018-01-24 13:29:30 +01:00
ChrisTerBeke
9488c39f68 Update plugin browser version as we have breaking changes in Cura 3.2 2018-01-24 11:07:13 +01:00
Ghostkeeper
f88df7e5cd
Remove overzealous log entry
This was in the happy path and gets executed for every material profile in every material file, which is hundreds of times. Better not.

Found during development of CURA-4797.
2018-01-23 15:45:12 +01:00
Jack Ha
b0d0b75662 Merge branch '3.2' 2018-01-23 14:25:11 +01:00
Diego Prado Gesto
7a84712fc9 CURA-4854 Revert some changes in 619a8cc that make that issue not working 2018-01-23 12:13:26 +01:00
Jack Ha
1efc92ddbe CURA-4853 evaluate layer view compatibility mode in init, therefore not binding some signals and fixing the bug 2018-01-23 11:46:59 +01:00
Aleksei S
54dc63a596 Add missing changes
CURA-3710
2018-01-23 11:24:27 +01:00
Lipu Fei
b14fdb1d0d Merge remote-tracking branch 'origin/3.2' 2018-01-23 11:20:49 +01:00
Lipu Fei
1c605a5108 Fix different strategies for machine and quality in project loading
CURA-4839
2018-01-23 10:58:43 +01:00
Lipu Fei
3fb9877a30 Add call_on_qt_thread to fix project loading crashing on rendering
CURA-4839

See comments...
2018-01-22 17:22:27 +01:00
ChrisTerBeke
2eef282b40 Merge branch '3.2' of https://github.com/Ultimaker/Cura into 3.2 2018-01-22 17:18:19 +01:00
ChrisTerBeke
129f9cc16c Fixes for custom FMD printer material diameter upgrade and storage - CURA-4835 2018-01-22 17:18:09 +01:00
Jaime van Kessel
1f8d7dfacb Merge branch 'master' of github.com:Ultimaker/Cura 2018-01-22 15:48:07 +01:00
Jaime van Kessel
dcfab2f923 Failed state in printjobs is now handled correctly 2018-01-22 15:47:37 +01:00