GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-29 22:25:11 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,990 Commits 295 Branches 268 Tags
Commit Graph

1990 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas-Karl Pietrowski
bad862e72f USBPrinting: Adding lost check for "machine_heated_bed" 2016-03-14 15:09:10 +01:00
Thomas-Karl Pietrowski
b0e4f095a6 Merge branch 'master-usb-printing' of https://github.com/thopiekar/Cura into master-usb-printing 2016-03-14 14:49:25 +01:00
Thomas-Karl Pietrowski
e7bd07740e USBPrinting: Reordering and rethinking machine detection 
* Moved all machines again to a basic dictionary
** The idea is to collect all machines at one place, which are unmodified. In case there is a printer, which is modified, it goes to a seperate dictionary.
* The if-clauses now respect this idea (hopefully)
 2016-03-14 14:43:14 +01:00
Thomas Karl Pietrowski
6775d337f5 USBPrinting: Complete the note with a link to the hex files 2016-03-14 14:23:26 +01:00
Thomas-Karl Pietrowski
9f251a43e2 Merge branch 'master-usb-printing' of https://github.com/thopiekar/Cura into master-usb-printing 2016-03-14 14:16:35 +01:00
Thomas-Karl Pietrowski
4d0a2094a1 USBPrinting: Reordering printers in dictionaries 2016-03-14 14:13:26 +01:00
Thomas-Karl Pietrowski
b3f721cfa0 USBPrinting: Using the correct dictionary 
(Dirty coding does not make any sense..)
 2016-03-14 14:02:56 +01:00
Thomas Karl Pietrowski
8422356dc9 USBPrinting: Correcting typo 2016-03-14 13:57:27 +01:00
Thomas Karl Pietrowski
eed5f88b13 USBPrinting: Adding a short instruction 
Just added a short instruction where to find the id of the machine, just to make it easier for the vendor to fill in the correct values.
 2016-03-14 13:56:27 +01:00
Thomas-Karl Pietrowski
a1e673dc64 USBPrinting: Correcting indents 2016-03-14 13:34:49 +01:00
Thomas-Karl Pietrowski
a2915ddc80 USBPrinting: Correcting machine_with_heated_bed dictionary again (oops) 2016-03-14 10:16:53 +01:00
Thomas-Karl Pietrowski
d968d3e2b2 USBPrinting: Correcting machine_with_heated_bed dictionary 2016-03-14 10:14:12 +01:00
Thomas-Karl Pietrowski
29ea25d0b3 USBPrinting: Huge clean up in _getDefaultFirmwareName 
* Moving TODO on top of if clauses
* Moving all machine types and hex-file names into dictionaries
* Adding error messages for unknown printers
 2016-03-14 10:04:30 +01:00
Thomas-Karl Pietrowski
97a7cee3e2 USBPrinting: Using platform.system() for platform check 
As platform is already imported here, usig platform for the check is much easier.
 2016-03-14 09:42:57 +01:00
Thomas-Karl Pietrowski
8bbbb480a4 USBPrinting: Moving baudrate and correcting indent 
Moves the baudrate into the if clause, which looks at least for me better and just found a wrong indent
 2016-03-14 09:38:55 +01:00
Thomas-Karl Pietrowski
7a9e19555a Merge remote-tracking branch 'upstream/master' 2016-03-14 09:33:29 +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 ce562713c3bf5951e43448746819fafc2261e8c6.
 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
fieldOfView
5cb1e9e2a6 Tweak layer slider appearance 2016-03-03 09:00:52 +01:00
fieldOfView
bc24a3c95b Add sensible maximum length to machine name and job name entry 2016-03-02 22:39:15 +01:00
fieldOfView
90fda4cb3d Remove defaults section from current settings before adding it to a gcode file. 
Contributes to CURA-936
 2016-03-02 21:18:16 +01:00