Thomas-Karl Pietrowski
3b8000035d
Remove unneeded imports
2016-03-14 17:06:44 +01:00
Thomas-Karl Pietrowski
19ccfdfbd7
RemovableDriveOutputDevice: Same for OSX
...
See 0b0bc80805
2016-03-14 17:04:51 +01:00
Thomas-Karl Pietrowski
0b0bc80805
RemovableDriveOutputDevice: Making output of uname command useful
2016-03-14 17:03:08 +01:00
Thomas-Karl Pietrowski
9ccd903fc9
Fixing typo
2016-03-14 16:57:58 +01:00
Thomas-Karl Pietrowski
60d1f34b17
Removing unused import
2016-03-14 16:57:21 +01:00
Thomas-Karl Pietrowski
48d06fea50
Fixing typo
2016-03-14 16:50:28 +01:00
Thomas-Karl Pietrowski
2e8d653fa5
webbrowser is not used here anymore
2016-03-14 16:38:21 +01:00
Thomas-Karl Pietrowski
ca65547f05
Remove unused imports
2016-03-14 16:06:10 +01:00
Thomas-Karl Pietrowski
f2da1db984
We only use os.path here
2016-03-14 15:50:59 +01:00
Thomas-Karl Pietrowski
3893cd06bd
platform gets imported twice
2016-03-14 15:49:47 +01:00
Thomas-Karl Pietrowski
2a104bc6da
Remove unused imports and replace object with entry
...
"object" is also a built-in function of python
2016-03-14 15:47:17 +01:00
Thomas-Karl Pietrowski
cbc7f0c1de
Remove unneeded line
...
This variable gets redefined later...
2016-03-14 15:45:02 +01:00
Thomas-Karl Pietrowski
27da5c56c0
Marking unused variable
2016-03-14 15:43:57 +01:00
Thomas-Karl Pietrowski
af280b782e
Rename name to printer_name
...
"name" is a built-in function
2016-03-14 15:39:01 +01:00
Thomas-Karl Pietrowski
3b58d1e2a5
Removing unused import of "os"
2016-03-14 15:38:05 +01:00
Thomas-Karl Pietrowski
a00f0ece18
Adding #@UnusedImport to ignore this import
2016-03-14 15:34:42 +01:00
Thomas-Karl Pietrowski
27423205b0
Rename type into hook_type
...
"type" itself if a built-in function. Using this name could be unsave.
2016-03-14 15:32:51 +01:00
Thomas-Karl Pietrowski
6adfbf4b90
Removing import of "os"
...
"os" is only needed for Windows as far as I can see it. However, it gets reimported for Windows, as you can see in line 22.
2016-03-14 15:30:15 +01:00
Tim Kuipers
d668438d1f
JSON: merge fix: support_minimal-diameter was double..
2016-03-14 13:57:13 +01:00
fieldOfView
83e4385e7e
Revert "Reimport default profiles from 15.04.04" because I did not oversee
...
the implications at the time
This reverts commit ce562713c3
2016-03-10 13:45:00 +01:00
fieldOfView
d8b082071d
Merge branch 'feature_profilesorting'
2016-03-10 13:44:38 +01:00
fieldOfView
cdc9ece474
Show separator between readonly profiles and custom profiles in profiles menu and sidebar profiles dropdown
...
Contributes to CURA-855
2016-03-10 11:57:47 +01:00
Ghostkeeper
ca1e9f6e52
Merge branch 'master' of https://github.com/Ultimaker/Cura
2016-03-09 09:38:18 +01:00
Ghostkeeper
ae0cb70d25
Tweak infill wipe distance
...
This wasn't taken over correctly from Paul's spreadsheet.
Contributes to issue CURA-892.
2016-03-09 09:38:02 +01:00
fieldOfView
48a181d0b5
Add weights to standard profiles for sorting
...
Contributes to CURA-1059
2016-03-08 17:45:00 +01:00
fieldOfView
81a015015d
Add "star" icon to profile dropdown when there are customised settings
...
Contributes to CURA-909
2016-03-08 12:06:21 +01:00
fieldOfView
00afebbc0d
Add translate icon
...
Contributes to CURA-838
2016-03-08 12:04:39 +01:00
fieldOfView
06445ef3bb
Add link to troubleshooting guide to simple mode
...
Fixes CURA-536
2016-03-07 15:19:27 +01:00
Jaime van Kessel
2ab999851c
Toolbar correctly shows location of toolpanel when not triggered through QML
...
Contributes to CURA-838
2016-03-07 14:12:44 +01:00
Ghostkeeper
a785c9a205
Fix merge conflict resolution
...
A comma was missing. Also fixed the whitespace in this file, since there were a few tabs mixed in there.
2016-03-04 11:23:35 +01:00
Jaime van Kessel
a9bd73f32a
Merge branch '2.1' of https://github.com/Ultimaker/Cura
2016-03-04 10:59:40 +01:00
Tim Kuipers
24f1726585
JSOn/profiles: changed infill overlap to mm (CURA-786)
2016-03-03 17:28:45 +01:00
fieldOfView
317706bbeb
Rename inventor_platform.stl to match the rest
2016-03-03 17:21:00 +01:00
fieldOfView
2c2640f38b
Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1
2016-03-03 17:18:02 +01:00
fieldOfView
2f9d505fdc
Fix and move Innovo INVENTOR machine definition to machines folder
2016-03-03 17:17:36 +01:00
Tim Kuipers
b0befb6309
Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1
2016-03-03 17:11:12 +01:00
Tim Kuipers
ff1cf02470
JSON: fix: magic surface mode had wrong default
2016-03-03 17:10:59 +01:00
fieldOfView
6d1a848e40
Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1
2016-03-03 16:44:49 +01:00
fieldOfView
22fadf396a
Fix 2 pixel space between save button and device selection menu button
2016-03-03 16:43:39 +01:00
fieldOfView
dfef811821
Update UM2+, UM2Ex and UM2Ex+ backplates
2016-03-03 16:19:24 +01:00
Ghostkeeper
a3115bc548
Also take points on Z=0 with convex hull
...
Contributes to issue CURA-1009.
2016-03-03 16:14:59 +01:00
Tim Kuipers
884de2a8ce
JSON: fix: min_value should be a string also for third party printers :P
2016-03-03 13:09:28 +01:00
Tim Kuipers
b4b2267890
JSON: fix: rigidbot printers had duplicate id
2016-03-03 12:29:39 +01:00
Tim Kuipers
ff3cd59ed0
added prusai3_xl_platform.stl
2016-03-03 12:27:06 +01:00
Tim Kuipers
7c8e08401b
Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1
2016-03-03 11:58:47 +01:00
Tim Kuipers
fc15b9e0b0
profiles: removed superfluous top_thickness and bottom_thickness from ABS and CPE profiles (CURA-1004)
2016-03-03 11:58:37 +01:00
Arjen Hiemstra
66a9c63048
Add not using numpy.insert explanation to ProcessSlicedObjectJob
...
Contributes to CURA-708
2016-03-03 11:52:56 +01:00
Jaime van Kessel
ef206f5ab7
Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1
2016-03-03 11:36:54 +01:00
Jaime van Kessel
c4c5ba6c22
Top layers are now correctly updated when object is selected
...
CURA-992
2016-03-03 11:36:28 +01:00
Ghostkeeper
f6fc5fea06
Fix slicing not interrupting first layer processing job
...
The layer processing job that was triggered by switching to layer view was not stored in the field. The field is where the start of slicing looks for jobs to abort.
Contributes to issue CURA-864.
2016-03-03 11:31:59 +01:00
