18762 Commits

Author SHA1 Message Date
Diego Prado Gesto
412bcc9b90 Add the skeleton of the plugin
Contributes to CURA-5155.
2019-03-08 21:57:07 +01:00
Diego Prado Gesto
8c41bc86d2
Merge pull request #5259 from fieldOfView/fix_travel_speed
Add {travel_speed} as an alias to {speed_travel}
2019-03-08 17:26:18 +01:00
Diego Prado Gesto
f47bc21204 Merge branch 'BluefireXD-4.0' 2019-03-08 17:02:10 +01:00
Diego Prado Gesto
0286c701fd Change setting_version to be the same as in current master
Also change the profiles to act as global profiles and fix indentation.

Contributes to CURA-6080.
2019-03-08 17:00:17 +01:00
Diego Prado Gesto
c62bfc8ece Merge branch '4.0' of https://github.com/BluefireXD/Cura into BluefireXD-4.0 2019-03-08 16:48:56 +01:00
Diego Prado Gesto
757224c187 Merge branch 'wporter82-master' 2019-03-08 15:47:37 +01:00
Diego Prado Gesto
9396628170 Make suggested changes to post processing scripts
Contributes to CURA-5713.
2019-03-08 15:46:21 +01:00
Diego Prado Gesto
b913dd9702 Merge branch 'master' of https://github.com/wporter82/Cura into wporter82-master 2019-03-08 15:37:41 +01:00
Diego Prado Gesto
d53c8b1162 Change text to singular mode
It makes more sense.
2019-03-08 15:27:17 +01:00
Diego Prado Gesto
55e27f6e21
Merge pull request #5402 from lucik/patch-1
monitor does not show "Build Plate"
2019-03-08 11:46:52 +01:00
Andrew
70e640be22
Change regexp for greater compatibility
Change regexp in bed_temperature_matches  and extruder_temperature_matches for greater compatibility with different printers.
2019-03-08 11:25:49 +06:00
kaleidoscopeit
7f3abbd717 Deltacomb 3D - Updated profile 2019-03-07 17:17:02 +01:00
kaleidoscopeit
473e8efac0 Deltacomb 3D - Updated profile 2019-03-07 17:06:49 +01:00
Ghostkeeper
1d25f52df6
Merge branch '4.0' 2019-03-06 15:23:55 +01:00
Ghostkeeper
d72a8581bf
Merge branch 'CURA-6252_Fix_crash_single_extrusion_upgrade_and_project' into 4.0 2019-03-06 15:23:33 +01:00
Ghostkeeper
380d8ce0c2
Merge branch 'afinkle-master' 2019-03-06 14:23:15 +01:00
Andrew
e56a97bfa2
monitor does not show "Build Plate"
bed_temperature_matches : error in temperature search expression
2019-03-06 17:28:22 +06:00
Lipu Fei
4979b401b3 Disable prime blob by default for CFFF
CURA-6282
2019-03-06 11:02:55 +01:00
Ghostkeeper
cf2fcc57ee
Merge branch 'CURA-6237_fix_remove_materials' into 4.0 2019-03-06 09:44:08 +01:00
Ghostkeeper
76d9503777
Replace travel_speed with speed_travel
The setting key was renamed in version 15.6.
2019-03-05 17:43:00 +01:00
Ghostkeeper
0fe9e660b1
Don't show Silicone for UM printers that are incompatible with it anyway
It's still an open bug that we show materials of which all configurations are incompatible with the printer.

Contributes to issue CURA-6262.
2019-03-05 15:36:31 +01:00
Ghostkeeper
943503cac7
Fix iterating over 'hardware compatible' keys
This is both faster and actually functions properly.

Contributes to issue CURA-6272.
2019-03-05 15:25:39 +01:00
Ghostkeeper
c7e5ac31a1
Merge branch 'master' of https://github.com/afinkle/Cura into afinkle-master 2019-03-05 14:41:17 +01:00
Ghostkeeper
df8d060a00
Increment setting_version
This must be up-to-date with the setting version that Cura currently uses, in order to ensure that the settings have the same names and the same functionality.
The settings that are set by these profiles are all nozzle-dimensional settings that haven't changed since 3.5, so we don't need to actually change the settings right now.

Contributes to issue CURA-6262.
2019-03-05 14:37:45 +01:00
Ghostkeeper
a7f9fc5f6b
Add contribution guidelines
Gets us one step closer to maintaining a good community according to the FSF.
2019-03-05 14:24:31 +01:00
Ghostkeeper
c665a481dd
Show settings that influence draft/ooze shields if enabled
The skirt/brim speeds currently affect the draft and ooze shields. So if the draft or ooze shield is enabled, show those settings.

Contributes to #5373.
2019-03-05 10:45:25 +01:00
Simon Edwards
eff6b58e18
Merge pull request #5375 from Ultimaker/CL-1274_dont_use___file__
CL-1274 Don't use __file__ in the monitor tab
2019-03-04 17:26:49 +01:00
Jaime van Kessel
6157cb6f91 Merge branch '4.0' of github.com:Ultimaker/Cura 2019-03-04 16:00:56 +01:00
Ian Paschal
88fc7d0fba Don't try to get the plugin path when there's no plugin registry
i.e. in tests
Contributes to CL-1274
2019-03-04 14:27:35 +01:00
Ian Paschal
a74717ca3c Get plugin path like most other plugins do
Contributes to CL-1274
2019-03-04 12:42:48 +01:00
Ian Paschal
87d4a68c0e Merge remote-tracking branch 'origin/4.0' into CL-1274_dont_use___file__ 2019-03-04 12:11:57 +01:00
Ian Paschal
3889570697 K.I.S.S.
Contributes to CL-1274
2019-03-04 12:04:34 +01:00
Ian Paschal
11ea568d0b
Merge pull request #5370 from Ultimaker/CL-1247_hide_view_prints_button_on_cloud
CL-1247 Hide the "View print history" button when connecting via cloud
2019-03-04 11:40:48 +01:00
Ian Paschal
c8580cf417 Prevent circular dependencies
Contributes to CL-1274
2019-03-04 11:27:52 +01:00
Ian Paschal
a1e0ddd9df Don't hardcode plugin directory
Contributes to CL-1274
2019-03-04 10:19:33 +01:00
Diego Prado Gesto
3fd0561aca Update the ExtruderModel
also when the variant container has changed.

Contributes to CURA-6227.
2019-03-01 14:54:42 +01:00
Diego Prado Gesto
0e7127f80b Merge branch 'master' of github.com:Ultimaker/Cura 2019-03-01 14:54:10 +01:00
Satish
c98a73f8fd Added id's to printer button, installed plugins, material fields and profile tab for integration tests 2019-03-01 12:47:29 +01:00
Ghostkeeper
ad83cff065
Merge branch 'master' of https://github.com/afinkle/Cura into afinkle-master 2019-03-01 11:54:27 +01:00
Ghostkeeper
180156da78
Correct whitespace
Change tabs to spaces according to our style standards. And remove a bunch of unnecessary white lines to make it easier to read.
2019-03-01 11:45:08 +01:00
Diego Prado Gesto
3f8f363836 Fix the installed checkmark in Marketplace
Show a package as completelly installed if the user has more or the same number of packages than in the list. Otherwise if the contributor removes one of the packages from the list, it seems that I don't have all the packages installed when in fact I do.
2019-03-01 10:57:39 +01:00
Jaime van Kessel
2af3ae8efb Ensure that the materials get removed in order
If we remove the materials in order, it doesn't cause any issues. This is probably because
loading the base profile causes the others to be properly instantiated (and subsequently deleted)

CURA-6237
2019-03-01 10:53:55 +01:00
Ian
cac8c85489 Don't use __file__
Contributes to CL-1274
2019-03-01 10:46:41 +01:00
Ian
cf9a1c0248 Sort UM imports alphabetically for easy scanning
Contributes to CL-1274
2019-03-01 10:46:27 +01:00
Simon Edwards
4590fae9b2 Hide the "View print history" button when connecting via cloud
CL-1247
2019-02-28 17:08:28 +01:00
Jaime van Kessel
91cceea6e0 Fix the situation where an upgraded single extrusion machine and loading project caused issues
If the upgraded single extrusion machine was never activated, it would not have it's extruders set.

CURA-6252
2019-02-28 16:17:34 +01:00
Mark
eccfebf39d Update material packages for 4.0 release 2019-02-28 16:11:51 +01:00
Jaime van Kessel
38a9206898 Merge branch '4.0' of github.com:Ultimaker/Cura 2019-02-28 16:01:40 +01:00
Jaime van Kessel
a8128556f3 Don't drop refresh token if request failed 2019-02-28 14:54:59 +01:00
Jaime van Kessel
62f913802f Prevent crash if the connection was lost for auth token 2019-02-28 12:58:41 +01:00