3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-16 19:28:07 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7
3478 commits 305 branches 270 tags 779 MiB
Commit graph

3478 commits

This branch
This branch
All branches
Author SHA1 Message Date
fieldOfView
8bc2c6e042 Tweak styling 
CURA-1036
 2016-06-24 14:41:52 +02:00
fieldOfView
f6e31cd97a Fix updating monitored values 
Though the PrintMonitorModel was a nicer solution, it broke the binding of values coming from the PrinterOutputDevices

CURA-1036
 2016-06-24 14:35:31 +02:00
fieldOfView
00ad7b23ff Prevent QML warnings when there is no connected printer 
CURA-1036
 2016-06-24 13:39:24 +02:00
Tim Kuipers
3e67291e41 Merge branch 'master' into feature_zhop_over_other_material 2016-06-24 13:30:59 +02:00
Tim Kuipers
ccd97f1994 JSON feat: (bool) retraction_hop_after_extruder_switch (CURA-1506 CURA-1061) 2016-06-24 13:29:40 +02:00
fieldOfView
beff54e5b1 Refactor print monitor as styleable listview 
Listview updates when print monitor values becomes available.

CURA-1036
 2016-06-24 12:50:39 +02:00
fieldOfView
2143fc14ab Add print job name 
CURA-1036
 2016-06-23 21:58:45 +02:00
fieldOfView
d613863d83 Tweak colors and icons for print monitor 
CURA-1036
 2016-06-23 21:50:51 +02:00
fieldOfView
e8743abe68 Set a sensible minimum width for the window 2016-06-23 18:44:06 +02:00
fieldOfView
fe05aa18cb Resize camera-image with viewport 
CURA-338
 2016-06-23 17:27:12 +02:00
Jaime van Kessel
d0aa33f57f Added jobName property 
CURA-1036
 2016-06-23 17:05:45 +02:00
Jaime van Kessel
85942583b1 Merge branch 'master' of github.com:Ultimaker/Cura 2016-06-23 16:39:09 +02:00
Jaime van Kessel
0b02a5f12b Machine actions are now when selected (instead of active) machine change 
CURA-1385
 2016-06-23 16:38:04 +02:00
fieldOfView
6d9eb4028e Merge branch 'master' into feature_print_monitoring 
# Conflicts:
#	cura/CuraApplication.py
 2016-06-23 15:53:53 +02:00
fieldOfView
0faecf9b34 Rearrange MachineActions on Machines page 
CURA-1385
 2016-06-23 14:15:39 +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
8c8caa2cac Use the right property for the property provider 
Otherwise we get a bunch of errors from the per object settings tool
 2016-06-23 13:33:07 +02:00
Arjen Hiemstra
9f9de493f7 Clean up indentation 2016-06-23 13:32:31 +02:00
Arjen Hiemstra
cc027ddf41 Remove unused code 2016-06-23 13:32:20 +02:00
Arjen Hiemstra
10d572eae3 Fix expanded settings for Per Object settings tool 2016-06-23 13:32:04 +02:00
Arjen Hiemstra
de36122531 Use the expanded categories from Cura to expand the proper categories on startup 2016-06-23 13:31:01 +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
Jaime van Kessel
35a8e7ca94 Added missing decorator 
CURA-1385
 2016-06-23 11:41:13 +02:00
Jaime van Kessel
d499d59d97 Restored accidental delete 2016-06-23 11:19:54 +02:00
Jaime van Kessel
cd6092581b Removed extraneous space 
CURA-1385
 2016-06-23 11:17:28 +02:00
Jaime van Kessel
3f3a93ae8a Refactoring; Renaming firstRunWizard to machineActionsWizard 
CURA-1385
 2016-06-23 11:12:58 +02:00
Jaime van Kessel
a7deb53acf Added BedLevel as supported action to UMO 2016-06-23 11:12:06 +02:00
Jaime van Kessel
45dca3f878 Refactoring (Renaming variables so they are more clear & update documentation) 2016-06-23 11:09:55 +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
fieldOfView
08411e943c Reenable Per Object Settings tool in simple mode if the current printer has multiextrusion 
and tweak Per Object Settings panel size

CURA-333
 2016-06-22 18:46:24 +02:00
fieldOfView
a6bb0c804a Fix minor codereview issues 
CURA-333
 2016-06-22 17:19:14 +02:00
Jaime van Kessel
1e40d98fd7 Merge pull request #817 from Ultimaker/feature_multi_materialsnozzles 
Multiextrusion support for materials and nozzles
 2016-06-22 17:05:17 +02:00
Jaime van Kessel
a35873a31b Removed test files 
CURA-333
 2016-06-22 17:04:31 +02:00
Simon Edwards
65a8cf1c45 'One at a time' printing was broken due to a regression in the convex hull decorator. 
Contributes to CURA-1504
 2016-06-22 16:51:56 +02:00
Jaime van Kessel
cbbb204718 Merge branch 'master' of github.com:Ultimaker/Cura into feature_multi_materialsnozzles 2016-06-22 16:32:37 +02:00
fieldOfView
cdd38763f6 Tweak sidebar tab bar appearance 
CURA-1036
 2016-06-22 16:06:11 +02:00
Jaime van Kessel
23ca2a3f54 Fixed layout issues 
CURA-1385
 2016-06-22 15:37:22 +02:00
Jaime van Kessel
458749ca4e Removed old wizard pages 
CURA-1385
 2016-06-22 15:35:44 +02:00
Jaime van Kessel
1912722d31 Fixed requesting size of machine for bedLeveling 
CURA-1385
 2016-06-22 15:35:23 +02:00
Jaime van Kessel
b62118dc1c Added supported actions to all UM machines 
CURA-1385
 2016-06-22 15:29:54 +02:00
Jaime van Kessel
4e854700f1 Machine_action plugin objects are now added as list 
CURA-1385
 2016-06-22 15:24:37 +02:00