Jelle Spijker e37f08790f Fixed a merge conflict ... And not in a neat way. I'm a shamed to say copy-paste was used extensively. Contributes to: CURA-8587		2021-12-03 13:51:43 +01:00
..
resources	Fixed a merge conflict	2021-12-03 13:51:43 +01:00
__init__.py	Add Marketplace plug-in, starting a rewrite from the Toolbox	2021-10-19 13:06:04 +02:00
LocalPackageList.py	Groundwork for installing/updating packages	2021-12-03 13:27:26 +01:00
Marketplace.py	Check the server if a package can be updated	2021-12-03 13:25:43 +01:00
PackageList.py	Added uninstall functionality	2021-12-03 13:27:30 +01:00
PackageModel.py	Fixed a merge conflict	2021-12-03 13:51:43 +01:00
plugin.json	Add Marketplace plug-in, starting a rewrite from the Toolbox	2021-10-19 13:06:04 +02:00
RemotePackageList.py	Adding functionality to the manageButtons	2021-12-03 13:27:16 +01:00