ChrisTerBeke
|
4e150fb4bf
|
Merge branch 'master' into cloud-output-device
|
2018-11-27 16:59:28 +01:00 |
|
Marijn Deé
|
172e003e1b
|
Removed the inital call to clusters
|
2018-11-27 14:53:23 +01:00 |
|
Marijn Deé
|
fb019ba987
|
In CloudOutputDeviceManager start a thread to periodically check for changes in the connected clusters
|
2018-11-27 14:48:47 +01:00 |
|
Jaime van Kessel
|
854755277c
|
Fix styling of comments
Because sentences should start with capitals
|
2018-11-27 14:37:01 +01:00 |
|
Jaime van Kessel
|
3ad1802ab6
|
Prevent a KeyError from messing
CURA-5978
|
2018-11-27 14:34:29 +01:00 |
|
Diego Prado Gesto
|
a6a364c337
|
Move material diameter and machine nozzle size to the extruder
definition.
Contributes to CURA-5902.
|
2018-11-27 13:12:47 +01:00 |
|
Diego Prado Gesto
|
0794a2c8c9
|
Remove not needed printer and extruder definitions.
Contributes to CURA-5902.
|
2018-11-27 13:03:36 +01:00 |
|
Diego Prado Gesto
|
c56098d82c
|
Merge pull request #4816 from Ultimaker/tests-for-um3networkplugin
Tests for um3networkplugin
|
2018-11-27 12:59:44 +01:00 |
|
Diego Prado Gesto
|
f91dbd356d
|
Merge branch 'master' of github.com:Ultimaker/Cura
|
2018-11-27 09:51:00 +01:00 |
|
Diego Prado Gesto
|
48853d0d06
|
Merge branch 'pinchies-add-a-u20'
|
2018-11-27 09:50:43 +01:00 |
|
Diego Prado Gesto
|
39e1cfd6bc
|
Fix indentation.
Contributes to CURA-5902.
|
2018-11-27 09:50:01 +01:00 |
|
Lipu Fei
|
bd42136712
|
Fix GcodeStartEndFormatter to use fallback values
CURA-5901
Use values from the global stack (if exist) as fallback values.
|
2018-11-27 09:49:38 +01:00 |
|
Diego Prado Gesto
|
493b37b0fe
|
Merge branch 'add-a-u20' of git://github.com/pinchies/Cura into pinchies-add-a-u20
|
2018-11-27 09:44:11 +01:00 |
|
Lipu Fei
|
2e81b97623
|
Use global_stack.extruders to find extruders
CURA-5978
|
2018-11-27 08:45:45 +01:00 |
|
pinchies
|
47ed9e3f5d
|
deleting the old wrong file....
|
2018-11-27 15:09:36 +11:00 |
|
pinchies
|
519e2a3399
|
uploaded wrong file... oops
|
2018-11-27 15:06:54 +11:00 |
|
Diego Prado Gesto
|
fcc6af68af
|
Don't show the current checked version of the firmware if the version number we gather is ZERO. That means that there was a problem getting the right value.
Contributes to CURA-5980.
|
2018-11-26 17:55:25 +01:00 |
|
ChrisTerBeke
|
efd5f3799b
|
Also catch TypeError now that we have explicit arguments
|
2018-11-26 16:31:32 +01:00 |
|
ChrisTerBeke
|
6506596ece
|
Fix typing syntax
|
2018-11-26 16:19:01 +01:00 |
|
Mark
|
7019afe21f
|
Merge pull request #4717 from forkineye/fix-wanhao_profiles
Fix Wanhao profiles to use speed_travel macro
|
2018-11-26 16:03:25 +01:00 |
|
ChrisTerBeke
|
2d7588903c
|
Merge branch 'tests-for-um3networkplugin' into cloud-output-device
|
2018-11-26 15:55:34 +01:00 |
|
ChrisTerBeke
|
e4d8fb36ab
|
Add more typing as per request from @sedwards2009
|
2018-11-26 15:53:04 +01:00 |
|
Mark
|
39f123f8e0
|
Merge pull request #4670 from pinchies/add-cc-mm-2
Add Cocoon Create ModelMaker
|
2018-11-26 15:49:21 +01:00 |
|
Mark
|
88cedd25cf
|
Merge pull request #4664 from pinchies/master
Add JGAurora Z-603S
|
2018-11-26 15:47:28 +01:00 |
|
Mark
|
037bf8863e
|
Merge pull request #4666 from pinchies/add-jg-a5
Add JGAurora A5
|
2018-11-26 15:43:41 +01:00 |
|
Mark
|
734a8882b1
|
Merge pull request #4667 from pinchies/add-jg-a1
Add JGAurora A1
|
2018-11-26 15:41:30 +01:00 |
|
Mark
|
30c585f298
|
Merge pull request #4834 from mcmidget/master
Add BIBO2 printer (dual and single extruder settings)
|
2018-11-26 15:39:39 +01:00 |
|
ChrisTerBeke
|
da5683c876
|
add typing to models
|
2018-11-26 15:30:30 +01:00 |
|
ChrisTerBeke
|
aaf0f69820
|
Fix some more relative imports
|
2018-11-26 15:10:36 +01:00 |
|
ChrisTerBeke
|
42ccabc7b6
|
Fix relative imports for plugin
|
2018-11-26 15:09:56 +01:00 |
|
ChrisTerBeke
|
a9fedb4f66
|
Restore NetworkedPrinterOutputDevice for now
|
2018-11-26 15:05:53 +01:00 |
|
ChrisTerBeke
|
39f92ced90
|
Comment out test
|
2018-11-26 15:02:52 +01:00 |
|
ChrisTerBeke
|
269d596f5d
|
Fix typing for cluster list
|
2018-11-26 14:54:24 +01:00 |
|
ChrisTerBeke
|
856276d8b7
|
Cleanup plugin imports
|
2018-11-26 14:53:08 +01:00 |
|
ChrisTerBeke
|
6a43d10982
|
Use BaseModel for CloudCluster, some fixes
|
2018-11-26 14:51:24 +01:00 |
|
Marijn Deé
|
579522857a
|
Fix the code-style test
|
2018-11-26 14:42:50 +01:00 |
|
ChrisTerBeke
|
7654f1c71c
|
Merge branch 'tests-for-um3networkplugin' into cloud-output-device
|
2018-11-26 14:30:50 +01:00 |
|
Marijn Deé
|
a382b77eaa
|
Added validation to the models
|
2018-11-26 14:30:17 +01:00 |
|
ChrisTerBeke
|
89e88a73bb
|
Temporary patch for when printer has one or more materials not installed
|
2018-11-26 14:11:20 +01:00 |
|
ChrisTerBeke
|
45159f7a80
|
Merge branch 'tests-for-um3networkplugin' into cloud-output-device
|
2018-11-26 14:09:13 +01:00 |
|
ChrisTerBeke
|
68a90ec510
|
Use simple models instead of namedtuples
Named tuples would throw a TypeError if an unknown attribute was set, but we just want to ignore those
|
2018-11-26 14:08:21 +01:00 |
|
ChrisTerBeke
|
014b1d6e4e
|
test
|
2018-11-26 13:45:37 +01:00 |
|
ChrisTerBeke
|
21c81603b4
|
Use application singleton instead of locally cached application
|
2018-11-26 13:33:14 +01:00 |
|
ChrisTerBeke
|
620ba8f21d
|
Merge branch 'master' into cloud-output-device
|
2018-11-26 11:17:39 +01:00 |
|
Marijn Deé
|
908628e2aa
|
Added a model to represent a cluster
|
2018-11-26 10:47:53 +01:00 |
|
Marijn Deé
|
d8232caec0
|
Merge branch 'tests-for-um3networkplugin' into cloud-output-device
|
2018-11-26 10:14:34 +01:00 |
|
Marijn Deé
|
59510487fa
|
Merge branch 'tests-for-um3networkplugin' of github.com:Ultimaker/Cura into tests-for-um3networkplugin
|
2018-11-26 09:50:40 +01:00 |
|
Ghostkeeper
|
5469613c17
|
Don't fail the samefile check if second file didn't exist
If the backup file didn't exist but the original did, then apparently they are not the same file so the copy should be allowed.
|
2018-11-26 09:40:14 +01:00 |
|
Ghostkeeper
|
c9eb57cead
|
Don't copy preference file to the same location
This crashes Cura on start-up for some people.
|
2018-11-26 09:32:59 +01:00 |
|
Ghostkeeper
|
8f9d6bee62
|
Document dependency on fdm_materials
Without it, Cura simply won't start if you had a printer loaded with material profiles.
Fixes #4460.
|
2018-11-26 08:30:24 +01:00 |
|