GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-19 04:07:30 +08:00
Code Issues Packages Projects Releases Wiki Activity
14,010 Commits 290 Branches 260 Tags
Commit Graph

14010 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lipu Fei
8d3c3c0e80 Fix the case that a quality_type is not available 
CURA-5218
 2018-04-12 13:58:20 +02:00
Mark Burton
e50be5cbe7 No! G90 does not command absolute extrusion, M82 does that. 2018-04-12 13:44:27 +02:00
Diego Prado Gesto
01c846dbd8
Merge pull request #3651 from smartavionics/mb-fix-gcode-reader-g90 
No! G90 does not command absolute extrusion, M82 does that.
 2018-04-12 13:40:32 +02:00
Ian Paschal
6e9f7174b6 Merge branch 'feature_material_marketplace' of https://github.com/Ultimaker/Cura into feature_material_marketplace 2018-04-12 13:34:09 +02:00
Lipu Fei
74a9ac6ba7 Fix installPlugin in toolbox 
CURA-4644
 2018-04-12 13:30:24 +02:00
Lipu Fei
8a181ea395 Save curapackage into cache for delayed installation 
CURA-4644

Do not rely on the originally provided curapackage file because they can be
gone after Cura restarts. Copy the curapackages into cache for delayed
installation.
 2018-04-12 13:25:24 +02:00
Lipu Fei
406b64b331 Remove unneeded code 
CURA-4644
 2018-04-12 13:14:58 +02:00
Ian Paschal
0abc925f3d CURA-5035 Removing logic 2018-04-12 13:07:24 +02:00
Lipu Fei
596e0be7b6 CuraPackageManager handles packages and plugins 
CURA-4644
 2018-04-12 12:57:58 +02:00
Ian Paschal
87c194178d CURA-5035 Added fake material showcase model 2018-04-12 12:49:31 +02:00
Diego Prado Gesto
2d30315ecf CURA-5220 Skip storing the settings in the GCode if they already are. 2018-04-12 11:49:38 +02:00
Mark Burton
b7b48927c2 Append a \n to each saved line of gcode otherwise the whole file ends up as one line! 2018-04-12 11:49:19 +02:00
Diego Prado Gesto
2df95b6e35
Merge pull request #3655 from smartavionics/mb-fix-gcode-reader-missing-newlines 
Append a \n to each saved line of gcode otherwise the whole file ends up as one line!
 2018-04-12 11:30:16 +02:00
Diego Prado Gesto
03ec123c3c Use the correct filament diameter to calculate line width in the gcode 
parser.
 2018-04-12 11:00:43 +02:00
Mark Burton
da1790fd37 Append a \n to each saved line of gcode otherwise the whole file ends up as one line! 2018-04-11 17:08:55 +01:00
Ian Paschal
594e9aa414 Cura-5035 Further style improvements 2018-04-11 17:05:16 +02:00
Ghostkeeper
1be6e29494
Merge branch '3.3' 2018-04-11 16:57:49 +02:00
Ian Paschal
a947b768d3 CURA-5035 Re-implemented "installed" view 2018-04-11 14:59:59 +02:00
Ghostkeeper
b101ddcf8d
Re-do shortening of Wechseldatentrager to Datentrager 
The translation update undid my changes there. That was basically a manual merge. We need to change this again now.

Contributes to issue CURA-5166.
 2018-04-11 14:57:45 +02:00
Ghostkeeper
36eef6603f
Update and fix .po file headers 
Lots of things out of sync again.

Contributes to issue CURA-5166.
 2018-04-11 14:54:31 +02:00
Ghostkeeper
884227336f
Update translations from Bothof 
These are the new translation files that the translation bureau sent to us. I've renamed them to fit in our architecture but for the rest they are unaltered.

Contributes to issue CURA-5166.
 2018-04-11 14:53:05 +02:00
Ghostkeeper
0f148dd2e2
Merge branch '3.3' 2018-04-11 13:31:59 +02:00
Ghostkeeper
7d806e7ae9
Fix rendering before the extruder number decoration is set 
If a render is triggered before this decorator is set it would crash. The rest of the code is robust against this being None, but here it would give a TypeError.
 2018-04-11 11:59:54 +02:00
Ian Paschal
80c21acf79 Merge branch 'CURA-4644-package-reader' into feature_material_marketplace 2018-04-11 11:08:50 +02:00
Ian Paschal
94b15b0498 Merge branch 'CURA-4644-package-reader' into feature_material_marketplace 2018-04-11 11:08:18 +02:00
Ian Paschal
bd6acc7502 CURA-5035 More style improvements 2018-04-11 11:02:33 +02:00
Mark Burton
c4a9c38c33 No! G90 does not command absolute extrusion, M82 does that. 2018-04-11 09:12:22 +01:00
Ian Paschal
1ddde146dd CURA-5137 Download URL works now 2018-04-10 17:14:44 +02:00
Ian Paschal
3c7760b514 CURA-5035 Code organization 2018-04-10 16:54:32 +02:00
Ian Paschal
d4cc4659d8 CURA-5035 More styling & layout 2018-04-10 16:07:39 +02:00
Lipu Fei
56e80bb518 Merge branch '3.3' 2018-04-10 13:25:45 +02:00
Lipu Fei
4e625da168 Increase delay time for open file with double-clicking 
CURA-5203
 2018-04-10 13:23:23 +02:00
Lipu Fei
b55570f3fb Merge branch '3.3' 2018-04-10 13:13:38 +02:00
Lipu Fei
b314d2bbe2 Fix extruder nr handling for -1 Not Overriden 
CURA-5213
 2018-04-10 12:56:20 +02:00
Lipu Fei
107c10b860 Merge branch '3.3' 2018-04-10 11:41:13 +02:00
Lipu Fei
95f4515e93 Make it possible to skip project file check in readLocalFile() 
CURA-5203
 2018-04-10 11:40:47 +02:00
Ian Paschal
7359554641 Implimented showcase 2018-04-10 11:05:34 +02:00
Ian Paschal
817b724994 Added author and material views 2018-04-09 15:55:56 +02:00
Lipu Fei
d32ddea678
Merge pull request #3601 from fieldOfView/fix_usb_rapid_commands 
Fix sending commands in rapid succession over USB
 2018-04-09 15:33:44 +02:00
Lipu Fei
95c6258d0f Handle plugin not found due to mixed plugin metadata 
CURA-5202

Plugin metadata that comes from the plugin server is also saved into
PluginRegistry's metadata collection, so it's all mixed. Plugins that
are just installed cannot be loaded immediately, and this causes an
error in checkCanUpgrade().
 2018-04-09 15:10:25 +02:00
fieldOfView
2def68edab Merge branch 'master' into fix_usb_rapid_commands 
# Conflicts:
#	cura/PrinterOutput/GenericOutputController.py
 2018-04-09 14:49:12 +02:00
alekseisasin
7b9bf23786
Merge pull request #3411 from BagelOrb/support_retraction_setting 
setting to disable omitting retractions in support
 2018-04-09 13:57:49 +02:00
Aleksei S
10ebabb7f6 Home head only by X- and Y axis, do extra bedHome (G28 Z) 
CURA-4844
 2018-04-09 13:13:52 +02:00
Aleksei S
c7b6bb8188 Merge branch '3.3' 2018-04-09 12:53:53 +02:00
Ian Paschal
91001455ad Improved structure and enabled display by author 2018-04-06 17:26:25 +02:00
Lipu Fei
cadb2c62b7 Fix open file with Cura 
CURA-5203

When open a file that's associated with Cura, dialogs that need to
pop up may not work because QML is still in the middle of initialization,
so we need to wait for QML to finish before doing anything else such
as opening files.
 2018-04-06 11:55:07 +02:00
Lipu Fei
872a029f99 Merge remote-tracking branch 'origin/feature_benchmarking' 2018-04-06 10:47:00 +02:00
Lipu Fei
c47fe52ca5 Merge 3.3 into master 2018-04-06 10:39:38 +02:00
Lipu Fei
19937d1be0 Fix version comparison in plugin browser 
CURA-5202

It was comparing with itself so there's never a version upgrade.
 2018-04-06 10:34:55 +02:00
Ian Paschal
dc00156410 CURA-5035 Added thumbnails and detail view 2018-04-05 15:33:07 +02:00