GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-03 10:44:18 +08:00
Code Issues Packages Projects Releases Wiki Activity
14,142 Commits 295 Branches 267 Tags
Commit Graph

3880 Commits

Author SHA1 Message Date
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
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
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
Diego Prado Gesto
4e53f219f0 Merge branch 'master' into CURA-5204_send_anonymous_data 2018-04-20 10:35:52 +02:00
Lipu Fei
53495604f8 Merge remote-tracking branch 'origin/feature_show_config_errors' 2018-04-19 15:38:29 +02:00
Lipu Fei
db5c18295b Merge remote-tracking branch 'origin/3.3' 2018-04-19 09:20:22 +02:00
fieldOfView
57404deba6 Prevent scaling support eraser with scaled parent 2018-04-19 08:32:50 +02:00
fieldOfView
0e85802f9c Only respond to left mouse button 2018-04-19 08:32:50 +02:00
Lipu Fei
2ba7a6e462 Revert "Fix gcode.gz double extension problem on Mac" 
This reverts commit fa90fcf18e26871df030ddb8371cdc05f4d4b6cc.

CURA-5228
 2018-04-18 16:00:08 +02:00
Lipu Fei
9e7c417801 Revert "Fix gcode.gz double extension problem on Mac" 
This reverts commit fa90fcf18e26871df030ddb8371cdc05f4d4b6cc.

CURA-5228
 2018-04-18 15:59:28 +02:00
Lipu Fei
e7ec767cb7
Merge pull request #3545 from fieldOfView/fix_support_eraser_related 
[3.3] Support Eraser related fixes
 2018-04-18 15:14:44 +02:00
Lipu Fei
340916179a Small typo fixes for preheat timeout 
CURA-5227
 2018-04-18 12:00:50 +02:00
Lipu Fei
dc52678c05
Merge pull request #3620 from fieldOfView/fix_preheat_end_during_print 
[3.3] Prevent preheat timeout from occurring during a print
 2018-04-18 11:59:54 +02:00
Lipu Fei
1fefc05698 Fix UM2 custom profile upgrade from 2.7 
CURA-5218
 2018-04-18 10:54:54 +02:00
Ghostkeeper
b8920b290f
Merge branch '3.3' 2018-04-18 09:47:06 +02:00
Lipu Fei
35e7be1d41 Use pyqtSlot to show more info dialog 
CURA-5204
 2018-04-17 16:43:41 +02:00
Lipu Fei
4d3acddfa4 Update text and fix qml code styles 
CURA-5024
 2018-04-17 16:08:43 +02:00
Lipu Fei
50153b43a8 Fix license banner for MoreInfoWindow.qml 
CURA-5204
 2018-04-17 16:08:05 +02:00
Lipu Fei
4aab395b71 Update example_data.json 
CURA-5204
 2018-04-17 16:06:44 +02:00
Lipu Fei
fa90fcf18e Fix gcode.gz double extension problem on Mac 
CURA-5228
 2018-04-17 15:03:17 +02:00
Ghostkeeper
e43e9ad117
Merge branch '3.3' 2018-04-17 13:56:46 +02:00
Diego Prado Gesto
94cad851a4 Use the correct filament diameter to calculate line width in the gcode 
parser.
 2018-04-17 13:39:22 +02:00
Diego Prado Gesto
2ebf6e8d51 CURA-5232 Renaming variable since it was on conflict with a new variable 
introduced in 4cabcb3632fe7a2c987e70197767a6a4bf88349b
 2018-04-17 13:07:15 +02:00
Ghostkeeper
d13fa3a6aa
Merge branch '3.3' 2018-04-17 11:40:29 +02:00
Diego Prado Gesto
819d1ac4e7 CURA-5202 Add modality to PluginBrowser window 2018-04-17 11:24:11 +02:00
Mark
f61efb8e20 resolve merge conflict 2018-04-17 10:39:35 +02:00
Mark
b78b6b2c01 Change default auto_slice setting to False 
CURA-5188
 2018-04-17 10:37:07 +02:00
Lipu Fei
c381f3707b Schedule model check for later if a machine change has not done yet 
CURA-5239
 2018-04-16 17:33:14 +02:00
Lipu Fei
e5d795cc0b Update model checker text 
CURA-5237
 2018-04-16 17:21:12 +02:00
Lipu Fei
4bb6962302 Rename model checker property to hasWarnings 
CURA-5237
 2018-04-16 17:20:40 +02:00
Lipu Fei
62521e93db Make sure that project writer runs on Qt thread 
CURA-5229

 - Move @call_on_qt_thread to a separate module
 - Make sure that project writer runs on Qt thread because itself and the
   calls it makes can create new QObjects such as InstanceContainers, and
   this must happen on the Qt thread.
 2018-04-16 15:32:12 +02:00
fieldOfView
d9034a6c85 Only respond to left mouse button 2018-04-15 12:08:49 +02:00