3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-12 17:27:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
18800 commits 302 branches 270 tags 770 MiB
Commit graph

5880 commits

Author SHA1 Message Date
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
Aldo Hoeben
5796848bfd
Merge branch 'master' into feature_separate_stage_qml 2018-04-23 10:42:57 +02:00
Fredrik Öhrn
33e35e114e Only open USB ports if the printer understands gcode. 2018-04-21 08:09:05 +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
Ian Paschal
921e8f7602 CURA-5035 Clean-up 2018-04-19 16:07:31 +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
Ian Paschal
8f8d709b64 CURA-5035 Removed debug statements 2018-04-18 17:05:01 +02:00
Ian Paschal
d3ba684b15 CURA-5035 Installed plugins instantly move to the installed tab 2018-04-18 17:03:27 +02:00
Ian Paschal
a5a35ef98b CURA-5035 Added dummy author text 2018-04-18 16:47:28 +02:00
Ian Paschal
f8672ecbc6 CURA-5035 Improved details pages 2018-04-18 16:35:55 +02:00
Lipu Fei
2ba7a6e462 Revert "Fix gcode.gz double extension problem on Mac" 
This reverts commit fa90fcf18e.

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 fa90fcf18e.

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
Ian Paschal
7a0fe74989 CURA-5035 Added material authors + icons 2018-04-17 17:07: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
Lipu Fei
b763b2a5a0 Fix gcode.gz double extension problem on Mac 
CURA-5228
 2018-04-17 15:02:29 +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
Lipu Fei
7b20ce856e Fix merge conflicts 2018-04-17 11:30:23 +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