Commit graph

19507 commits

Author SHA1 Message Date
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
Ghostkeeper
e53eb70cad
Add tests for validating metadata before loading
Contributes to issue CURA-6270.
2019-03-08 14:07:10 +01:00
Lipu Fei
940a833e73 WIP: Add printers via network 2019-03-08 13:43:58 +01:00
Ghostkeeper
3c779b58de
Specialise _isMetadataValid for Cura to check setting_version
Because we need to reject loading metadata for containers whose setting_version is incorrect.

Contributes to issue CURA-6270.
2019-03-08 13:34:16 +01:00
Ghostkeeper
20fc26b8ba
Correct setting version for definition files
Otherwise the container provider actually rejects loading it completely.

Contributes to issue CURA-6270.
2019-03-08 13:32:36 +01:00
Remco Burema
6d34a2abd0 Start to connect/handle new signals for manual device addition. [CURA-6294] 2019-03-08 13:08:44 +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
Amanda de Castilho
82466785ad
Update and rename UsePrevProbeMeasure.py to UsePreviousProbeMeasurements.py
Applied suggested changes
2019-03-06 12:54:57 -08:00
Diego Prado Gesto
a0888ccc0c
Update plugins/PostProcessingPlugin/scripts/UsePrevProbeMeasure.py
Co-Authored-By: adecastilho <familydecastilho@gmail.com>
2019-03-06 12:33:36 -08:00
Diego Prado Gesto
6e011352af
Update plugins/PostProcessingPlugin/scripts/UsePrevProbeMeasure.py
Co-Authored-By: adecastilho <familydecastilho@gmail.com>
2019-03-06 12:33:25 -08:00
Diego Prado Gesto
8a45a4e06f
Update plugins/PostProcessingPlugin/scripts/UsePrevProbeMeasure.py
Co-Authored-By: adecastilho <familydecastilho@gmail.com>
2019-03-06 12:33:09 -08:00
Diego Prado Gesto
8f2a2f3ae9
Update plugins/PostProcessingPlugin/scripts/UsePrevProbeMeasure.py
Co-Authored-By: adecastilho <familydecastilho@gmail.com>
2019-03-06 12:30:14 -08:00
Remco Burema
7a7e710b2a Support for manual device addition for plugins (WIP). [CURA-6294] 2019-03-06 17:50:40 +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
Lipu Fei
a55808b24a WIP: Rename files 2019-03-06 15:15:21 +01:00
Lipu Fei
c1960109f8 Merge remote-tracking branch 'origin/WIP_onboarding_by_ip' into WIP_onboarding 2019-03-06 15:12:30 +01:00
Lipu Fei
28eaea8426 WIP: Make dropdown exclusive from each other 2019-03-06 15:12:05 +01:00
ValentinPitre
f4a20b35a6
Update tizyx_evy_dual.def.json 2019-03-06 14:43:07 +01:00
Ghostkeeper
380d8ce0c2
Merge branch 'afinkle-master' 2019-03-06 14:23:15 +01:00
Remco Burema
48cc9b3c1d Merge branch 'WIP_onboarding' into WIP_onboarding_by_ip 2019-03-06 14:08:41 +01:00
Remco Burema
5f335b4401 Merge branch 'WIP_onboarding' of https://github.com/Ultimaker/Cura into WIP_onboarding 2019-03-06 14:07:44 +01:00
Remco Burema
3c0583bef0 [AddPrinterByIp] Finish GUI as a facade first for review. [CURA-6057] 2019-03-06 14:05:42 +01:00
Ian Paschal
c9d99e0149 Revert "Adapt tests to manual IP connection"
This reverts commit d758189aaf.
2019-03-06 13:11:43 +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
Ian Paschal
9c3f67a9ed Code style
Contributes to CL-1272
2019-03-06 12:26:38 +01:00
Lipu Fei
ffb8aed4c3 Merge CURA-6179 2019-03-06 11:32:52 +01:00
Lipu Fei
9968a79863 Merge remote-tracking branch 'origin/master' into WIP_onboarding 2019-03-06 11:29:56 +01:00
Lipu Fei
4979b401b3 Disable prime blob by default for CFFF
CURA-6282
2019-03-06 11:02:55 +01:00
Ian Paschal
99fe8ec7aa Improve cloud flow pop up logic
Contributes to CL-CL-1272
2019-03-06 10:56:31 +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
Remco Burema
c1cde2ebc0 Merge branch 'WIP_onboarding' of https://github.com/Ultimaker/Cura into WIP_onboarding 2019-03-05 14:15:17 +01:00
Lipu Fei
56060b1e64 WIP: Add add printer page, network part 2019-03-05 12:06:51 +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
Ian Paschal
f483eb431f Make IP address optional
Contribues to CL-1266
2019-03-05 09:30:51 +01:00
Ian Paschal
d758189aaf Adapt tests to manual IP connection
Contributes to CL-1266
2019-03-05 09:28:18 +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
Ian Paschal
04a2caf781 Add internal IP to CloudClusterResponse
Contributes to CL-1266
2019-03-04 16:29:23 +01:00
Ian Paschal
63bf95cc9e More robust check for network key
Contributes to CL-1266
2019-03-04 16:26:20 +01:00
Jaime van Kessel
6157cb6f91 Merge branch '4.0' of github.com:Ultimaker/Cura 2019-03-04 16:00:56 +01:00