GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-01 13:58:59 +08:00
Code Issues Packages Projects Releases Wiki Activity
13,033 Commits 295 Branches 267 Tags
Commit Graph

3488 Commits

Author SHA1 Message Date
Lipu Fei
4586e3dd55
Merge pull request #2375 from Ghostkeeper/optimise_sending_slice_job 
Optimise sending slice job
 2017-11-29 14:13:37 +01:00
Aleksei Sasin
0b9f7c85c8 Skip keyboard clicks for authentication dialog 
CURA-4643
Please enter the commit message for your changes. Lines starting
 2017-11-29 14:07:23 +01:00
Ghostkeeper
99cd139ba4
Remove setting definition double 
Contributes to issue CURA-4243.
 2017-11-29 13:39:24 +01:00
ChrisTerBeke
0668f80792
Merge pull request #2758 from fieldOfView/feature_mesh_types 
Improved mesh type UX (Per Model Settings)
 2017-11-29 13:24:38 +01:00
Ghostkeeper
dad99f5292
Merge branch 'master' into feature_local_container_server 
Contributes to issue CURA-4243.
 2017-11-29 13:06:08 +01:00
Ghostkeeper
8707396ad7
Remove isReadOnly functionality 
Everyone should now ask it from the container registry.

Contributes to issue CURA-4243.
 2017-11-28 17:30:00 +01:00
Ghostkeeper
c63ef6fed6
Remove unused variables 
The machine_name variable is later redefined.

Contributes to issue CURA-4243.
 2017-11-28 16:58:04 +01:00
ChrisTerBeke
263230f9d2 Merge branch '3.1' 2017-11-28 15:45:57 +01:00
ChrisTerBeke
f41759e1dc Fix binding extruder manager in machine actions view - CURA-4568 2017-11-28 15:20:05 +01:00
ChrisTerBeke
eeeefcc47a Update UM3 discovery dialog creation to new method - CURA-4568 2017-11-28 15:06:53 +01:00
ChrisTerBeke
9a7fa67da7 Cleanup plugin browser dialog creation - CURA-4568 2017-11-28 15:02:17 +01:00
ChrisTerBeke
bd5e4f9a51 Cleanup cluster output device component creation - CURA-4568 2017-11-28 14:59:55 +01:00
ChrisTerBeke
b40ba0cfc7 Update network cluster output device print view component creation - CURA-4568 2017-11-28 14:58:53 +01:00
ChrisTerBeke
11f50f1cd3 Update machine action and image reader dialogs with new component creation method - CURA-4568 2017-11-28 14:55:35 +01:00
ChrisTerBeke
1d68bcc218 Cleanup usb printer output device manager qml component creation - CURA-4568 2017-11-28 14:31:21 +01:00
ChrisTerBeke
055e4792b0 Cleanup for change log dialog - CURA-4568 2017-11-28 14:27:51 +01:00
ChrisTerBeke
dd43bcee77 Small cleanups for new component creation method - CURA-4568 2017-11-28 14:27:05 +01:00
ChrisTerBeke
e3f1144d97 Update creating QML component in plugin browser - CURA-4568 2017-11-28 14:25:09 +01:00
ChrisTerBeke
74eb4958af Fixes for printer output device views - CURA-4568 2017-11-28 14:21:47 +01:00
ChrisTerBeke
0f944c094d
Merge pull request #2869 from Ultimaker/gcode_flavors 
Gcode flavors
 2017-11-28 13:30:23 +01:00
Aleksei S
6e171be0b9 After changing the settings refresh simulation max path number 
CURA-4632
 2017-11-28 13:08:25 +01:00
Jaime van Kessel
e841896090 PrintJobs are now assigned if they are not queued 
It used to just do it if it was printing, but jobs can also be in other states such as
paused, pre_print, etc

CL-541
 2017-11-28 13:04:58 +01:00
Jaime van Kessel
9084dfd6bd It's now possible to send print jobs to cluster again 
CL-541
 2017-11-28 12:59:54 +01:00
ChrisTerBeke
f5332ac9ba
Merge pull request #2753 from nickthetait/master 
Cleanup/merge old changelog file
 2017-11-28 12:51:19 +01:00
Jaime van Kessel
cfc6a3ad48 Added some convenience functions to NetworkedPrinterOutputdevice 
This also moves the getUser from legacy to networked printer

CL-541
 2017-11-28 12:43:49 +01:00
Diego Prado Gesto
8054bc3d7d CURA-4552 Change names as indicated in the review and making Marlin the 
default flavor. Also fix the case in which the read flavor was not in
the dict.
 2017-11-28 11:47:34 +01:00
Lipu Fei
7d01e3388f Merge remote-tracking branch 'upstream/3.1' 2017-11-28 11:36:03 +01:00
Lipu Fei
6db06ea713 Fix project loading for single-extrusion machines 
CURA-4617
 2017-11-28 11:17:17 +01:00
ChrisTerBeke
68cd9df65f Merge branch '3.1' 2017-11-28 10:36:11 +01:00
ChrisTerBeke
7b30e9a6fc
Merge pull request #2856 from Ultimaker/simulation_view_gradient_changes 
Adapt gradient in Simulation view for better visualization of feedrates
 2017-11-28 10:34:10 +01:00
Diego Prado Gesto
49537b64f7 CURA-4482 Fix error in SolidView when the support angle stack doesn't 
exist. This error was sent twice through the CrashHandler and it is in Metabase.
 2017-11-28 09:39:57 +01:00
Ruben D
0c4db90b7b
Add button to disable sending info directly 
Convenient and easy.
 2017-11-28 00:20:43 +01:00
ChrisTerBeke
67d6b6ab6f Merge branch '3.1' 2017-11-27 17:36:41 +01:00
ChrisTerBeke
0e2f60f18b Fix toggling UM2 upgrades on extruder 0 - CURA-4626 2017-11-27 17:35:57 +01:00
ChrisTerBeke
a072af5585 Merge branch '3.1' 2017-11-27 17:17:02 +01:00
Jaime van Kessel
83b13546fb Moved compressing of GCode to one class higher 
CL-541
 2017-11-27 17:12:36 +01:00
Diego Prado Gesto
cab2e14728 CURA-4552 Add flavors to GCodeReader. The preRead looks for the flavor 
in the GCode and then the right flavor handler is responsible for
reading the code. At this moment just the Griffin and RepRap flavors are
taken into account.
 2017-11-27 16:56:26 +01:00
Jaime van Kessel
c6f2e167e2 Renamed some missed properties 
CL-541
 2017-11-27 16:02:55 +01:00
Jaime van Kessel
6f495f2d8b Cluster monitor now uses material name 
This matches better with what Cura does.

CL-541
 2017-11-27 16:00:57 +01:00
Jaime van Kessel
5d3779da26 Update cluster view components 
CL-541
 2017-11-27 15:54:44 +01:00
Jaime van Kessel
52a137a68c Ensured that sidebar has the right properties to show again 
CL-541
 2017-11-27 14:42:45 +01:00
Lipu Fei
33a06e13a9 Remove legacy if check in project loading 
CURA-4617
 2017-11-27 14:27:11 +01:00
Ghostkeeper
54a12d14c4
Add string representation for debugging 
My IDE shows the str(inst) representation of an object when indicating what value is in there. This makes it easier to find stuff. It'll also make debug prints more clear than the default <XmlMaterialProfile.XmlMaterialProfile.XmlMaterialProfile object at 0x12345678> stuff of Python.

Contributes to issue CURA-4243.
 2017-11-27 14:19:30 +01:00
Lipu Fei
49cac860a8 Fix project loading 
CURA-4617
 2017-11-27 14:17:13 +01:00
Jaime van Kessel
7d9af8e345 Added Opencontrol panel functions 
CL-541
 2017-11-27 14:13:30 +01:00
Jaime van Kessel
cdfdaec492 ClusterUM3 now uses local material data as first source 
CL-541
 2017-11-27 14:03:53 +01:00
Ghostkeeper
17a25f98a4
Merge branch '3.1' 2017-11-27 13:58:52 +01:00
Jaime van Kessel
f791b53ad8 Enabled monitor items for ClusterOutputDevice again 
CL-541
 2017-11-27 13:54:34 +01:00
Jaime van Kessel
083eee2e9d Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite 2017-11-27 13:43:39 +01:00
Jaime van Kessel
0613b1e4b7 Creating components is now done with the prefab function 
CURA-4568
 2017-11-27 13:00:49 +01:00