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

783 Commits

Author SHA1 Message Date
Jaime van Kessel
b072b7935f Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-07 13:44:19 +02:00
Jaime van Kessel
3d1bbeca38 Restarting machine check properly re-enables endstop check 
CURA-1385
 2016-07-07 13:43:45 +02:00
fieldOfView
8c22efc4dd Fix UMO Checkup button size 
CURA-1385
 2016-07-07 10:38:08 +02:00
fieldOfView
2ba2599d6b Remove debug statement and commented-out code 
CURA-1385
 2016-07-07 10:23:01 +02:00
Jaime van Kessel
386cd40a03 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-06 16:33:07 +02:00
Jaime van Kessel
57d0ad1bd0 Made exception handling of slice info plugin way more robust 
CURA-1831
 2016-07-06 16:32:24 +02:00
Jack Ha
d3b8c7f8d5 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-06 16:22:28 +02:00
Jack Ha
2be8111f1b Restart timer after slicing is performed when not enabled. 
CURA-1502
 2016-07-06 16:21:03 +02:00
Jaime van Kessel
d42a97f036 Fixed firmware upgrade for um2+ 
CURA-1761
 2016-07-06 13:22:09 +02:00
Jaime van Kessel
6bf10bbbb3 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-06 11:23:16 +02:00
Jaime van Kessel
59020fd98c CHeckup action now correctly resets every time you start it 
CURA-1385
 2016-07-06 11:20:06 +02:00
fieldOfView
c06e5f4d39 Remove unused name/id when importing a profile from a gcode file 
A unique name will be set from the filename by ContainerRegistry
CURA-1615
 2016-07-05 21:58:47 +02:00
Aldo Hoeben
c865bb13ea Merge pull request #821 from thopiekar/master-CURA-1615 
[CURA-1615] GCodeProfileReader/-Export: Rework
 2016-07-05 21:19:37 +02:00
Thomas Karl Pietrowski
25c81ce1f8 Just a little typo 2016-07-05 18:55:13 +02:00
Jaime van Kessel
aba0392728 Saving g-code no longer crashes 2016-07-05 10:46:38 +02:00
Jaime van Kessel
fc99cac05e Removed update firmware from extensions; This is now handled by machine actions 2016-07-05 09:39:18 +02:00
Jaime van Kessel
08502b9240 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-05 09:37:27 +02:00
Jaime van Kessel
44e4fc383e Changing active extruder no longer trigger re-slice 
CURA-1729
 2016-07-05 09:37:01 +02:00
fieldOfView
793f7824c7 Quick fix to restore slicing 
This list of zeros may have to match the number of extruders
CURA-1687
 2016-07-04 19:14:48 +02:00
Jack Ha
012484a4f1 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-04 17:35:32 +02:00
Jaime van Kessel
318182495a We now recieve material estimation per extruder 
CURA-1687
 2016-07-04 17:11:03 +02:00
U-ULTIMAKER\j.ha
84b736df07 first commit in Cura! fix CURA-1085, time estimate is reset before every slice action 2016-07-04 17:08:35 +02:00
fieldOfView
90fa0f0564 Make Select Upgrades page look like the other pages 
CURA-1385
 2016-07-04 13:14:40 +02:00
Jaime van Kessel
1242d6bf52 Added UMO upgrade selection 
CURA-1385
 2016-07-04 11:24:31 +02:00
Jaime van Kessel
53087bd278 Added stubs for UMO upgrade selection 
CURA-1385
 2016-07-04 10:28:37 +02:00
Jaime van Kessel
ea9e7f1755 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-04 10:27:46 +02:00
Jaime van Kessel
41147b5128 Machine action labels are now translatable 
CURA-1385
 2016-07-04 10:26:59 +02:00
Thomas Karl Pietrowski
ec41fce7bd USBPrinting: Let's "Print via USB" 
Already made that correction in the past. When print monitor was merged it appeared again.
 2016-07-03 13:26:51 +02:00
fieldOfView
087ebc0768 Automatically show the Print Monitor when starting a print 
CURA-1036
 2016-07-01 15:06:49 +02:00
fieldOfView
6800991fa1 Fix USBPrinterOutputDevice to work with the Print Monitor 
CURA-1036
 2016-07-01 14:32:40 +02:00
Jaime van Kessel
aaae2aa3d5 Minor check machine action GUI improvements 
CURA-1385
 2016-07-01 09:51:54 +02:00
Simon Edwards
47de254f97 Fixed up the 3MF reader to use the changed MeshBuilder and MeshData. 
CURA-1633 OverflowError: cannot convert float infinity to integer (loading larger models)
 2016-06-28 11:43:02 +02:00
Thomas Karl Pietrowski
d376719500 Better call it "Print via USB" 
I think this sounds better, because I understand "USB" as an technology. So you wouldn't say "Print with USB", but would fit if you say "Print with USB cable". So "Print via USB" should be more correct here.
 2016-06-27 09:48:16 +02:00
Thomas Karl Pietrowski
93cdce7b33 GCodeProfileReader: Fixing read of profiles from GCode 2016-06-24 16:01:47 +02:00
Thomas Karl Pietrowski
d49ba80117 GCodeWriter: Getting always the correct container with the currently used profile. 2016-06-24 16:00:38 +02:00
Thomas Karl Pietrowski
1fdf835c19 GCodeProfileReader: Increasing the setting version 2016-06-23 19:40:52 +02:00
Thomas Karl Pietrowski
6a1942c254 GCodeWriter: Exporting the data as done on regualar exports 2016-06-23 19:40:00 +02:00
fieldOfView
19412c5bda Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-23 14:08:49 +02:00
fieldOfView
3f7f6f8a23 Skip containers that can not be serialized 
CURA-1445
 2016-06-23 14:08:38 +02:00
Arjen Hiemstra
38ce6cd4b8 Make PerObjectSettingVisiblityHandler inherit SettingVisiblityHandler and some other cleanup 2016-06-23 13:33:51 +02:00
Arjen Hiemstra
10d572eae3 Fix expanded settings for Per Object settings tool 2016-06-23 13:32:04 +02:00
Jaime van Kessel
b14ae94190 Starting UMOCheckup before connection was established now works correctly 
CURA-1385
 2016-06-23 13:10:57 +02:00
Aldo Hoeben
488740c60d Merge pull request #819 from Ultimaker/MachineActions 
Machine actions
 2016-06-23 12:59:03 +02:00
Jaime van Kessel
6909cf211a Fixed layout 
CURA-1385
 2016-06-23 11:42:18 +02:00
fieldOfView
51259e2684 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-06-23 10:18:37 +02:00
fieldOfView
7c606b21b5 Remove some trailing spaces 
CURA-1615
 2016-06-23 10:18:27 +02:00
Aldo Hoeben
cf718a3a42 Merge pull request #818 from thopiekar/master-CURA-1445 
[CURA-1445] SliceInfo: Providing data from all containers
 2016-06-23 09:55:53 +02:00
Aldo Hoeben
097bcad427 Merge pull request #810 from thopiekar/master-CURA-1615 
[CURA-1615] Plugins: Updating GCodeProfileReader and SliceInfo
 2016-06-23 09:45:56 +02:00
Thomas Karl Pietrowski
c9ec81cbe2 Merge pull request #3 from thopiekar/master-CURA-1615 
GCodeProfileReader: Removing useless containername
 2016-06-22 23:25:36 +02:00
Thomas Karl Pietrowski
688accfab7 GCodeProfileReader: Removing useless containername 2016-06-22 23:25:04 +02:00