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

2105 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
fieldOfView
1583018e75 Clean up theme: tweak colors, remove unused styles 
Contributes to CURA-1143
 2016-03-17 21:09:18 +01:00
fieldOfView
a78e1a62d4 Fix ctypes imports in WindowsRemovableDrivePlugin 
See 9684ca80d7912daed1db2cf0bdebf75fe204562f
 2016-03-17 20:34:18 +01:00
fieldOfView
6017d9176d Remove exception logging in USBPrinterManager because it caused an error every 5 seconds. 
CURA-1198
 2016-03-17 16:59:41 +01:00
Ghostkeeper
de9a66e1f4 Merge branch '2.1' 
Conflicts:
	plugins/RemovableDriveOutputDevice/OSXRemovableDrivePlugin.py
	plugins/RemovableDriveOutputDevice/WindowsRemovableDrivePlugin.py
	plugins/USBPrinting/PrinterConnection.py
	resources/machines/fdmprinter.json
	resources/profiles/ultimaker2+/abs_0.4_high.curaprofile
 2016-03-17 15:24:00 +01:00
Jaime van Kessel
479c6c3319 Added extra relative move to prevent nozzle scraping 
CURA-1102
 2016-03-17 14:57:44 +01:00
Jaime van Kessel
2df91d8e0b Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-17 14:44:37 +01:00
Jaime van Kessel
89256b5423 Added explicit home bed before rest of bed leveling 
CURA-1102
 2016-03-17 14:44:09 +01:00
Ghostkeeper
4507560e30
Codestyle: Whitespace around operators 
A space on both sides around binary operators. A space after the comma.

Contributes to issue CURA-1102.
 2016-03-17 11:53:11 +01:00
Ghostkeeper
14f5d236b2 Merge pull request #666 from thopiekar/master-code-fixes 
Fixing small issues in the code (#2)
 2016-03-17 11:30:22 +01:00
Jaime van Kessel
aafb981245 Setting empty jobname is now possible again 
I hope this fixes CURA-707, but it can only be tested through means of a build.
 2016-03-17 10:18:46 +01:00
Jaime van Kessel
90293a4a5c Removed stray broken code 
CURA-1102
 2016-03-16 16:33:36 +01:00
Jaime van Kessel
9a6615213c Bed should no longer be damaged when leveling 
CURA-1102
 2016-03-16 15:18:11 +01:00
Thomas Karl Pietrowski
f93f0330ea Removing wrong marking about @UnusedVariable 2016-03-16 14:51:31 +01:00
Tim Kuipers
762f964221 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-16 09:55:28 +01:00
Tim Kuipers
b7065628a3 JSON: temporarily made temp graph and cooldown speed modifier disabled (CURA-1157) 2016-03-16 09:55:19 +01:00
fieldOfView
f904d3aa74 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-15 18:05:57 +01:00
fieldOfView
ff25e382ee Add a notice icon 
This icon is used in lieu of the warning icon for CURA-1122
 2016-03-15 17:56:30 +01:00
Tim Kuipers
802623443a JSON: fix for inherit function of fan speed (CURA-1171) 2016-03-15 17:51:52 +01:00
Tim Kuipers
65499bd06c JSON: made parent-child relations logical (CURA-1171) 
the child should depend foremost on the parent
no parent may be used in the engine
 2016-03-15 17:48:58 +01:00
Jaime van Kessel
0bf41cf528 Changed dimensions of UM2 
CURA-1166
 2016-03-15 16:48:35 +01:00
Jaime van Kessel
7c22fe1eb5 Removable drive plugin is now forced to use machine preference for output type 
Fixes CURA-1165
 2016-03-15 16:43:14 +01:00
Jaime van Kessel
bcb2857f6e Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-15 16:15:40 +01:00
Jaime van Kessel
4fb9a6a699 Per object settings now also uses visible depth 
CURA-1160
 2016-03-15 16:15:13 +01:00
Tim Kuipers
75b43de546 JSON: wall thickness warning values based on line_width instead of harccoded (CURA-1167) 2016-03-15 15:27:19 +01:00
Tim Kuipers
a20e98d980 JSON: minimal support width only holds for conical supprot (CURA-1164) 2016-03-15 15:16:45 +01:00
Tim Kuipers
90b0692f78 JSON: updated conical support minimal width to 5mm: more chance it will stay up straight 2016-03-15 13:01:38 +01:00
Tim Kuipers
939b65a6b5 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-03-15 13:00:18 +01:00
Tim Kuipers
5998371644 JSON: made support_bottom_distance disabled and default to zero when Placement=Buildplate Only (CURA-1161) 2016-03-15 12:59:03 +01:00
Thomas-Karl Pietrowski
6a4e2019dc Removing unused imports 2016-03-15 12:57:03 +01:00
Thomas-Karl Pietrowski
148c13ac31 Removing unused imports, fixing a indent and adding more logging 
* Added the logging here, because it was called "except Exception as e:", so "e" seems to be something relevant.
 2016-03-15 12:55:08 +01:00
Thomas-Karl Pietrowski
8197e84927 Using PyDev compatible tag 2016-03-15 12:54:41 +01:00
Jaime van Kessel
cff34fa441 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-15 12:53:53 +01:00
Thomas-Karl Pietrowski
9684ca80d7 Removing unused imports, reorder them and replace windll with ctypes.windll (the same) 2016-03-15 12:53:29 +01:00
Jaime van Kessel
b863d239b0 Added more logging to engine connection 
Should make it easier to debug future issues. CURA-1133
 2016-03-15 12:53:22 +01:00
Thomas-Karl Pietrowski
6cd1171051 Removing unused imports 2016-03-15 12:53:07 +01:00
Thomas-Karl Pietrowski
0b93328aeb Using PyDev compatible tags 2016-03-15 12:52:29 +01:00
Thomas-Karl Pietrowski
e99099fd89 Cleanup in plugins/ImageReader/ImageReader.py 
* Removing unused import
* Marking two variables as @UnusedVariable
* Replacing i with _ in for-loop
 2016-03-15 12:50:46 +01:00
Thomas-Karl Pietrowski
c986fa0268 Removing unused imports 2016-03-15 12:50:29 +01:00
Thomas-Karl Pietrowski
5d00c3120d Use save variable names here 2016-03-15 12:35:33 +01:00
Thomas-Karl Pietrowski
8b95865843 Import of Logger missing here 2016-03-15 12:34:43 +01:00
Thomas-Karl Pietrowski
74627345a2 Corrections in plugins/CuraEngineBackend/ProcessSlicedObjectListJob.py 
* Remove unused import
* Replace dict with dictionary in comment
* Use object_position instead of i
* Use current_object instead of object which is a built-in class
 2016-03-15 12:32:40 +01:00
Thomas-Karl Pietrowski
d1f5985fee Removing unused imports 2016-03-15 12:25:51 +01:00
Thomas-Karl Pietrowski
0081c44ba7 Marking unused variable 
Maybe work in progress here...
 2016-03-15 12:25:10 +01:00
Thomas-Karl Pietrowski
9fc573a7f9 Merge remote-tracking branch 'upstream/master' into master-code-fixes 2016-03-15 12:20:15 +01:00
Thomas-Karl Pietrowski
eee1be94ab Removing unused imports and rename built-in varibales/functions into save one 
* The new names for the variables might be misleading...
 2016-03-15 12:18:44 +01:00
Thomas-Karl Pietrowski
5ae63f2de1 Removing unused imports 2016-03-15 12:17:59 +01:00
Thomas-Karl Pietrowski
95d9700c0e Removing unused import and marking other as (probably) used imports 2016-03-15 12:16:14 +01:00
Thomas-Karl Pietrowski
7be6340dd5 Cleanups in cura/CuraApplication.py 
* Removed unused imports
* Replaced i with _ in for-loop (removes message about unused variable)
* As we have "Exception as e" use e in debug message
 2016-03-15 12:14:18 +01:00
Thomas-Karl Pietrowski
bbf931450a Marking another unused variable 2016-03-15 12:09:49 +01:00
Tim Kuipers
34814cd657 JSON: updated conical support minimal width to 5mm: more chance it will stay up straight 2016-03-15 11:10:20 +01:00