Cura/plugins/UM3NetworkPrinting
Ghostkeeper d42ba9dda0
Merge branch '4.0'
Conflicts:
	resources/quality/ultimaker2_plus/um2p_pp_0.8_draft.inst.cfg -> Weights being changed while a whole slew of fixes were being done on 4.0
	resources/quality/ultimaker2_plus/um2p_pp_0.8_verydraft.inst.cfg -> Ditto
2019-02-15 13:58:47 +01:00
..
resources Merge pull request #5293 from Ultimaker/CL-1165_missing_cloud_info 2019-02-13 14:23:05 +01:00
src Merge branch '4.0' 2019-02-15 13:58:47 +01:00
tests Revert "Added skip mark to failing cloud tests" 2019-01-17 14:43:43 +01:00
__init__.py Use BaseModel for CloudCluster, some fixes 2018-11-26 14:51:24 +01:00
plugin.json Update plugin versions to match package versions 2018-12-17 13:03:21 +01:00