7424 Commits

Author SHA1 Message Date
Ghostkeeper
511d0be9c3
Complete the renaming of a parameter
This caused layer view to break down.

Probably contributes to issue CURA-1208.
2016-03-21 15:33:04 +01:00
Tim Kuipers
ec06226907 quickfix for fan full at height 2016-03-21 14:16:37 +01:00
fieldOfView
2e5868cb82 Removed separators from profilesmodel
Profile menu now inserts separators in QML
CURA-855
2016-03-21 13:47:14 +01:00
Jaime van Kessel
235f324d56 Added missing enabled parameters 2016-03-21 11:12:00 +01:00
Ghostkeeper
e5a5cffe7d
Remove unnecessary parameter to JS toString
This parameter has no effect.

Contributes to issue CURA-1110.
2016-03-18 15:59:05 +01:00
Jaime van Kessel
bb220ed952 Removing min warning from support_tower_diameter
The min warning caused an infinite recursion when support was
enabled / disabled

CURA-1156
2016-03-18 15:52:56 +01:00
Jaime van Kessel
43d13096a1 Added decodeURIComponent to mesh names
Fixes CURA-1110
2016-03-18 14:56:35 +01:00
Jaime van Kessel
834e2148d2 Major cleanup for profiles
This removes a bunch of settings that override default values from machine defaults (or inheritance)
2016-03-18 14:18:19 +01:00
Jaime van Kessel
46bf7e440e Added more logging & removed duplicate slicing canceled signals
CURA-1133
2016-03-18 12:00:10 +01:00
Ghostkeeper
0c92329e54 Merge pull request #669 from thopiekar/patch-1
Adding link for PySerial
2016-03-18 11:09:19 +01:00
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
Thomas Karl Pietrowski
1403458d79 Adding link for PySerial 2016-03-17 18:32:43 +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
fieldOfView
476ab9226d Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-03-17 16:29:37 +01:00
fieldOfView
745bc8051a Fix generic material profiles
Makes sure that the generic PLA material profile has all the same settings as the ABS and CPE settings, so a printer that uses the non-printer-specific material profiles can switch back to the proper settings for PLA when they are merged into the current settings.

CURA-1188
2016-03-17 16:29:19 +01:00
Jaime van Kessel
eeb2c0454a Build volume now uses linecount for disallowed areas
CURA-1152
2016-03-17 15:51:36 +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