Lipu Fei
4777c3f41d
Merge remote-tracking branch 'origin/CURA-5718_fix_upgrade_for_bundled_plugins'
2018-09-17 17:27:32 +02:00
Lipu Fei
da047ea674
isInstalled() should check old plugins as a fallback
2018-09-17 17:26:38 +02:00
Lipu Fei
15657f4cfc
Remove unneeded code
2018-09-17 17:26:19 +02:00
Lipu Fei
4db213c55a
Fix missing import
2018-09-17 16:24:10 +02:00
Lipu Fei
a4b20e046d
Merge remote-tracking branch 'origin/3.5' into CURA-5718_fix_upgrade_for_bundled_plugins
2018-09-17 16:22:22 +02:00
Lipu Fei
6929d96119
Merge remote-tracking branch 'origin/3.5'
2018-09-17 16:14:49 +02:00
Lipu Fei
6d1db55072
Fix SDK version comparison
2018-09-17 16:14:28 +02:00
Ghostkeeper
c6fa9474d6
Merge branch '3.5'
2018-09-17 14:41:45 +02:00
Diego Prado Gesto
dfae4a9a86
Add a property that indicates when the layer slider or the path slider
...
has changed manually.
With this we can differentiate when the layer changed automatically
(during simulation) or manually (by user interaction). In case it was
changed manually, the simulation will stop.
Contributes to CURA-5725.
2018-09-17 14:02:04 +02:00
Lipu Fei
3ac5a316d3
Check package upgradable using PM first, old plugins later
...
CURA-5718
For package upgradable, we need to check if a package is installed
local. For that, we first check in the package manager, if nothing, then
we fall back to check the old plugins.
2018-09-17 12:05:10 +02:00
Lipu Fei
1064d837ed
Exclude bundled plugins in the old plugins list
2018-09-17 12:05:10 +02:00
Ghostkeeper
9e21af65b4
Merge branch '3.5'
2018-09-17 10:54:44 +02:00
Ghostkeeper
ade2b565bc
Add 3.5 change log
...
Contributes to issue CURA-5710.
2018-09-17 10:30:08 +02:00
Jaime van Kessel
4c460b6fa5
Prevent crash if sdk_version is "dev"
2018-09-14 16:15:56 +02:00
Ghostkeeper
177f5dc7db
Merge branch '3.5'
2018-09-14 15:34:02 +02:00
Remco Burema
5c73921943
[CURA-5725] Revert "Set simulation path to 0 after updating layer"
...
This reverts commit 3da6e3c453
2018-09-14 14:35:10 +02:00
Ghostkeeper
3b36223681
Merge branch '3.5'
2018-09-14 12:40:29 +02:00
Ghostkeeper
2e6401b7dc
Don't depend on the name of resource folders not changing
...
If we choose to rename the resource folders, then this plug-in should still look in the old resource folders. So hard-code these resource folders in the state that they were in at version 2.5 so that we can freely change them in a modern version.
2018-09-14 11:36:31 +02:00
Ghostkeeper
572afb052e
Remove unused import
...
This import was actually causing the test to fail on my computer due to a dependency on the order of importing libArcus vs. PyQt.
2018-09-14 11:30:25 +02:00
Ghostkeeper
5a374f31ef
Merge branch '3.5'
2018-09-13 16:27:49 +02:00
Jaime van Kessel
757c8754b1
Merge branch '3.5' of github.com:Ultimaker/Cura
2018-09-13 16:23:55 +02:00
Lipu Fei
ccef0843c2
Merge pull request #4273 from Kriechi/pause-at-height-rrf
...
add PauseAtHeight post-processing script for RRF
2018-09-13 15:11:30 +02:00
Lipu Fei
b39d6c7d87
Package upgrade should also check SDK version
2018-09-13 13:42:53 +02:00
Lipu Fei
efdec50614
Fix typo
2018-09-12 17:08:58 +02:00
Lipu Fei
d1301d16a9
Skip the do-not-handle URLs instead of returning
...
CURA-5718
The request-url dict is not ordered so you cannot garuantee the ordering
when you use .items(). This can cause a problem that if a do-not-handle
item occurs first then nothing will be handled at all.
2018-09-12 16:58:22 +02:00
Aleksei S
3da6e3c453
Set simulation path to 0 after updating layer
...
CURA-5677
2018-09-12 16:56:54 +02:00
Jaime van Kessel
c59ff82c64
Revert "[CURA-5708] Hide the Materials-tab in ToolBox (v3.5 only)"
...
This reverts commit f9585b5fae
2018-09-12 13:39:10 +02:00
Jaime van Kessel
00494d8301
Merge branch '3.5' of github.com:Ultimaker/Cura
2018-09-12 13:38:56 +02:00
Remco Burema
f9585b5fae
[CURA-5708] Hide the Materials-tab in ToolBox (v3.5 only)
2018-09-12 13:38:15 +02:00
Jaime van Kessel
a809575bc8
Add bunch of ID's to qml components so it's easier to test them.
...
CURA-5618
2018-09-11 16:05:53 +02:00
Jaime van Kessel
f628b63c29
Merge branch '3.5' of github.com:Ultimaker/Cura
2018-09-11 15:50:26 +02:00
Diego Prado Gesto
e3681ddd9f
Also hack the way to get the generic materials, since the tag-filtered
...
calls to the api don't work yet.
Contributes to CURA-5670.
2018-09-11 13:39:53 +02:00
Jaime van Kessel
301605c30c
Added missing typing to toolbox
2018-09-11 13:20:42 +02:00
Jaime van Kessel
4f30dffaf9
Ensure that when a corrupt 3mf file is loaded, the "failed to load" message will pop up
2018-09-11 12:58:00 +02:00
Lipu Fei
1fb6441327
Fix default hardware type NOZZLE in XML material
...
CURA-5716
2018-09-11 11:20:00 +02:00
Jaime van Kessel
c84a2213a7
Merge branch '3.5' of github.com:Ultimaker/Cura
2018-09-11 11:01:55 +02:00
Jaime van Kessel
d9e23bf02b
Fix issue caused by making metadata of containerNode private
2018-09-11 10:42:42 +02:00
Jaime van Kessel
8a6c4a9fb6
Merge branch 'CURA-5677_auto_stop_sim_on_layer_change' of github.com:Ultimaker/Cura into 3.5
2018-09-11 10:40:01 +02:00
Jaime van Kessel
e717fa2251
Fix issue caused by making metadata of containerNode private
2018-09-11 10:36:53 +02:00
Remco Burema
109b3fc1d2
[CURA-5677] Removed some superfluous and/or dead lines.
2018-09-11 09:08:50 +02:00
Jaime van Kessel
e7d9f0ce45
Added typing for various setting classes
2018-09-10 15:24:11 +02:00
Thomas Karl Pietrowski
5139e61475
Found the dead line while reading some code
2018-09-10 09:42:47 +02:00
Ian Paschal
2bc1e4b397
Fix bug where disovery window does not appear
2018-09-10 09:27:59 +02:00
Jaime van Kessel
5c6c299b27
Cleanup extruder manager
...
Few more unused functions removed & simplified.
It also fixes a few more typing issues that I encountered.
2018-09-07 17:06:18 +02:00
Jaime van Kessel
a8fc6aabcc
Switch incorrect usage of getMachineExtruders to getActiveExtruderStacks
2018-09-07 16:27:56 +02:00
Remco Burema
c8eeb737bb
Automatically stop simulation when the user manually changes the layer (as opposed to the sim. itself). [CURA-5677]
2018-09-07 15:45:31 +02:00
Jaime van Kessel
c7350ff579
Merge branch 'master' of github.com:Ultimaker/Cura
2018-09-07 15:24:09 +02:00
Jaime van Kessel
4cde6c05ae
Switch most usages of containerStackId to containerStack for settingPropertyProvider
...
This mostly makes the code a bit more logic and also decreases the number of searches in the registry
2018-09-07 15:23:09 +02:00
Diego Prado Gesto
a9f151670e
Remove unused components. They are no longer used.
2018-09-07 14:31:53 +02:00
Ian Paschal
18e0dacda4
Organize files better
...
First things first... organize!
2018-09-07 14:11:37 +02:00
