Ruben D
910906b785
Merge branch 'feature_material_marketplace'
2018-05-02 12:42:00 +02:00
Ruben D
0d66850bd4
Code style improvements
...
According to our guidelines: Brackets on new line, spaces around binary operators but not within brackets.
Contributes to issue CURA-5035.
2018-05-02 12:40:59 +02:00
Ian Paschal
87e1f98156
Merge pull request #3663 from Ultimaker/feature_material_marketplace
...
Feature material toolbox; all changes made
2018-05-02 12:23:13 +02:00
Ian Paschal
c2ed2a47e7
CURA-5035 Use elide for text clipping
2018-05-02 12:05:34 +02:00
Ian Paschal
62aeb6c954
CURA-5035 Review feedback
2018-05-02 12:01:29 +02:00
Ghostkeeper
3934f6f1b3
Small code style issues
...
Contributes to issue CURA-5035.
2018-05-02 10:27:35 +02:00
Lipu Fei
41092b4d48
Merge pull request #3599 from jwalt/master
...
Fixes for cura on ARM/Mali-based systems
2018-05-02 10:18:24 +02:00
Ghostkeeper
1d11fe0506
Code style: Spaces around binary operators
...
Contributes to issue CURA-5035.
2018-05-02 09:31:46 +02:00
Lipu Fei
9a5fb47a6e
Merge master into material marketplace
2018-05-01 11:56:34 +02:00
Ian Paschal
096f304aef
CURA-5035 Crash because old packages don't have 'author_id'
2018-05-01 10:45:22 +02:00
Ian Paschal
bb7f9feb5e
CURA-5035 Better download resets
2018-05-01 09:02:24 +02:00
Ian Paschal
2d54251be0
CURA-5035 Aproaching the asymptote of done
2018-04-30 17:05:46 +02:00
Ian Paschal
01007946b4
CURA-5035 Separate API calls!
2018-04-30 16:42:11 +02:00
Ian Paschal
679f87ebb3
CURA-5035 Don't show required plugins
...
Also renamed folder of UserAgreementPlugin to UserAgreement
2018-04-26 15:11:32 +02:00
Ghostkeeper
3ae6b8c4c1
Double-escape newlines in script string
...
Because they are stored twice: Once in the CFG of the script, and once in the CFG of the machine instance.
Fixes an issue reported here: https://github.com/Ultimaker/Cura/pull/3229
2018-04-26 13:30:59 +02:00
Ian Paschal
ec8b95591e
CURA-5035 Fixed typo
2018-04-26 13:06:30 +02:00
Ian Paschal
c33710b54b
CURA-5035 Tile improvements
2018-04-25 17:03:27 +02:00
Lipu Fei
d79bbe5725
Remove unnecessary check for plugins_showcase models creation
...
Already created in __init__()
2018-04-25 16:48:01 +02:00
Lipu Fei
3ea80c7c7c
Compare ints instead of floats for progress check
2018-04-25 16:46:20 +02:00
Lipu Fei
48eda4d0dc
Remove unused import
2018-04-25 16:44:32 +02:00
Lipu Fei
cbc45bffd0
Should use .gcode.gz
2018-04-25 16:43:59 +02:00
Jack Ha
efdccb593f
Merge branch '3.3'
2018-04-25 16:35:20 +02:00
Lipu Fei
50e2db47c8
Fix can_upgrade flag for non-working plugins
...
CURA-5287
2018-04-25 14:24:49 +02:00
Ian Paschal
236e2db47e
CURA-5035 Fixed selection header
2018-04-24 16:59:23 +02:00
Ian Paschal
f2301eec31
CURA-5035 Simplify selection
2018-04-24 15:34:05 +02:00
Lipu Fei
585888f84a
Merge remote-tracking branch 'origin/3.3'
2018-04-24 14:28:50 +02:00
Lipu Fei
fca14eeef3
Fix optional arguments in MA _onChanged
2018-04-24 13:56:09 +02:00
Lipu Fei
4d7bf579e6
Do not keep triggering on changed in MA
2018-04-24 13:49:07 +02:00
Diego Prado Gesto
f68ab9ac03
Add the 'auto slice disabled by default' line to the changelog
2018-04-24 12:42:03 +02:00
Ghostkeeper
db0288fec4
Merge branch '3.3'
2018-04-24 10:49:30 +02:00
Ghostkeeper
403051e0b2
Merge branch 'CURA-5143_3.3_send_gz' into 3.3
2018-04-24 10:48:31 +02:00
Ghostkeeper
16de8cac0f
Fix undefined variable
...
Contributes to issue CURA-5143.
2018-04-24 10:38:50 +02:00
Lipu Fei
0852cd2c20
WIP: Fix hanging upon send gz
2018-04-24 10:34:08 +02:00
Diego Prado Gesto
41e3ba528b
Merge branch 'smartavionics-mb-fix-gcode-reader-start-position'
2018-04-23 14:52:29 +02:00
Diego Prado Gesto
f328926be3
CURA-5275 Add the end point of the previous path also when there is a
...
change in the tool.
2018-04-23 14:24:25 +02:00
Ghostkeeper
acd38b365a
Merge branch '3.3'
2018-04-23 14:15:38 +02:00
Ghostkeeper
dd408d559b
Fix translation of Support Blocker plug-in name
...
It was in the wrong catalogue. This means that our template picks it up but our actual code couldn't find the translation in that catalogue.
Contributes to issue CURA-5166.
2018-04-23 14:15:23 +02:00
Diego Prado Gesto
a3dc94aedd
Merge branch 'mb-fix-gcode-reader-start-position' of https://github.com/smartavionics/Cura into smartavionics-mb-fix-gcode-reader-start-position
2018-04-23 14:11:07 +02:00
Ian Paschal
e0d4395950
CURA-5238 Added a bugfix
2018-04-23 13:39:52 +02:00
Ian Paschal
e5a3dffceb
CURA-5238 Updated release notes from Google Docs
2018-04-23 13:31:30 +02:00
Lipu Fei
37bcf1694d
Remove translation wrapper for unnecessary parts
...
CURA-5221
2018-04-23 12:00:05 +02:00
Lipu Fei
f92985b4ac
Add Ultimaker S5 for printer type detection
...
CURA-5221
2018-04-23 11:57:01 +02:00
Diego Prado Gesto
b85b39ff35
CURA-5188 If the auto_slice option was enabled in previous version,
...
keep it like this in the new version.
Since the default value of this preference changed, we don't want to
confuse users that still use the auto_slice option. Those users with
clean install or intalling Cura for the first time will have this
preference disabled.
2018-04-23 11:29:18 +02:00
Ian Paschal
dc0dcac199
CURA-5035 Small style tweaks
2018-04-20 17:06:16 +02:00
Ian Paschal
0944bba86b
CURA-5035 Added typings
2018-04-20 16:21:57 +02:00
Ian Paschal
9b556e9c86
CURA-5035 Removed all base units
2018-04-20 14:08:44 +02:00
Ian Paschal
668a92952c
CURA-5035 Review changes
2018-04-20 13:26:23 +02:00
Ian Paschal
7f622eb300
Cura with a capital "C"
2018-04-20 11:27:53 +02:00
Ian Paschal
fbf73176d3
Use UM.Version instead of VersionTools
2018-04-20 11:25:39 +02:00
Diego Prado Gesto
4e53f219f0
Merge branch 'master' into CURA-5204_send_anonymous_data
2018-04-20 10:35:52 +02:00
