37 Commits

Author SHA1 Message Date
Jaime van Kessel
9cdf18525c Merge branch 'master' of github.com:Ultimaker/Cura into add_42_43_version_upgrader 2019-07-23 11:33:52 +02:00
Jaime van Kessel
2877685bce Fix typo 2019-07-23 11:32:02 +02:00
Jaime van Kessel
14a1882e14 Add missing 4.1-4.2 upgrade to bundled package list 2019-07-23 11:30:40 +02:00
Jaime van Kessel
585e8c3c97 Add the versionupgrade to bundled packages list 2019-07-23 11:29:13 +02:00
Aldo Hoeben
8276cf2352
Fix merge issue
Merge accidentally reverted a cosmetic change.
2019-04-26 11:53:50 +02:00
Aldo Hoeben
066b90bdea
Merge branch 'master' into feature_amf_reader 2019-04-26 11:51:55 +02:00
Lipu Fei
3794c8f75e Remove ChangeLog plugin
CURA-6436
CURA-6447
2019-04-12 12:13:41 +02:00
Lipu Fei
4e5d08f320 Fix merge conflicts with master 2019-03-21 14:59:53 +01:00
Remco Burema
5b31feebba Remove UserAgreement-plugin in favour of Welcome-Pages. [CURA-6057] 2019-03-15 13:58:36 +01:00
fieldOfView
331c8c52fd Add AMDReader to bundled packages 2019-03-14 16:53:36 +01:00
Diego Prado Gesto
53b59220f8 Change the sdk_version to use SemVer 2019-03-11 17:12:44 +01:00
Diego Prado Gesto
412bcc9b90 Add the skeleton of the plugin
Contributes to CURA-5155.
2019-03-08 21:57:07 +01:00
Jaime van Kessel
6157cb6f91 Merge branch '4.0' of github.com:Ultimaker/Cura 2019-03-04 16:00:56 +01:00
Mark
eccfebf39d Update material packages for 4.0 release 2019-02-28 16:11:51 +01:00
Diego Prado Gesto
f16735a5be Add VersionUpgrade40to41 as a bundled package
Otherwise it will show up as an old plugin and the uninstall button will appear in the Markeplace.
2019-01-14 17:10:52 +01:00
Diego Prado Gesto
bf20e04b0d Merge branch '4.0' 2019-01-14 17:03:12 +01:00
Diego Prado Gesto
fa7b38243c Add VersionUpgrade35to40 as a bundled package
Otherwise it will show up as an old plugin and the uninstall button will appear in the Markeplace.
2019-01-14 17:02:02 +01:00
Diego Prado Gesto
c6da824203 Merge branch '4.0' 2019-01-14 08:56:33 +01:00
Remco Burema
980953b00c
Merge pull request #4960 from Ultimaker/CURA-6005_cura_drive_plugin
[4.0] CURA-6005 Added CuraDrive plugin to Cura build
2019-01-10 14:58:00 +01:00
Ghostkeeper
efac7c39c0
Fix indentation 2019-01-03 17:22:22 +01:00
Lipu Fei
56c9de44f7 Update Cura Backups sdk_version to 6 in bundled json
CURA-6005
2019-01-03 11:26:14 +01:00
Ghostkeeper
02f7a14765
Fix ordering of a bunch of profiles 2018-12-27 11:29:45 +01:00
Diego Prado Gesto
3c99b69724 Merge branch '4.0' into CURA-6005_cura_drive_plugin
Remove unused file.

Contributes to CURA-6005.
2018-12-18 07:17:37 +01:00
Ghostkeeper
8d6a281070
Increment SDK version in bundled packages file
And increment the version number of every package.

Contributes to issue CURA-6019.
2018-12-17 09:58:38 +01:00
Lipu Fei
b6ea61612e Fix merge conflicts 2018-12-12 13:26:01 +01:00
Lipu Fei
9618e8d4e0 Add CuraDrive 1.2.0 to bundled_packages
CURA-6005
2018-12-11 10:39:41 +01:00
Lipu Fei
5255bca9dd Merge remote-tracking branch 'origin/master' into ui_rework_4_0 2018-12-04 15:08:50 +01:00
Lipu Fei
43096c1baf Update USBPrinting version to 1.0.1
CURA-5943
2018-12-04 15:03:45 +01:00
Jaime van Kessel
8683a1e07e Add previewStage to bundled cura package list
CURA-5785
2018-11-19 16:16:41 +01:00
Diego Prado Gesto
a9523fd894 Change the Ultimaker author_id to UltimakerPackages. Apparently this is
the new author_id.

Contributes to CURA-5926.
2018-11-09 17:18:01 +01:00
Diego Prado Gesto
15a30a7a98 Increase the version of the bundled TPLA to match with the version that
is currently in the server.
2018-11-09 17:06:45 +01:00
Lipu Fei
982123a04e Update bundled package versions for materials using CC 0.6 2018-11-07 10:32:30 +01:00
Diego Prado Gesto
3548f9f23c Fix typo in the bundled packages. 2018-10-31 11:31:05 +01:00
Lipu Fei
0068dc81b1 Update bundled material packages due to CC 0.6
CURA-5839

 - Update bundled material package versions which has material profiles
   updated due to CC 0.6
 - Fix sdk_versions by changing them to 5
 - Add bundled material packages for new materials for CC 0.6
2018-10-30 15:15:07 +01:00
Diego Prado Gesto
87086907da Add some Ultimaker materials to the list of bundled materials, so they
will show as installed in the Toolbox.
2018-10-26 12:14:27 +02:00
fieldOfView
b7542a8ef8 Move Firmware Updater into a plugin of its own 2018-10-03 20:55:51 +02:00
Lipu Fei
a33ce8178a Support mulitple bundled_packages JSON files
CURA-5718
2018-09-18 15:53:56 +02:00