Lipu Fei
f7f5123fea
WIP: Fix highlighting of selected network printer
2019-03-13 11:03:23 +01:00
Lipu Fei
60f6d881a3
WIP: Fixes and add cloud logic to cloud welcome page
2019-03-13 10:37:41 +01:00
Lipu Fei
5fa2c72b0d
WIP: Complete add network and local printer flow
2019-03-13 10:31:47 +01:00
Lipu Fei
cc35eb0195
WIP: Add gotoPage
2019-03-11 15:34:53 +01:00
Lipu Fei
53ea944da1
WIP: Add comments
2019-03-11 15:04:09 +01:00
Lipu Fei
0c94ded93d
WIP: Refactor and fix network printer list
2019-03-11 14:57:02 +01:00
Lipu Fei
6f6e54fb06
WIP: Add comments
2019-03-11 09:22:41 +01:00
Lipu Fei
6b2642ee9a
Merge remote-tracking branch 'origin/master' into WIP_onboarding
2019-03-11 09:05:43 +01:00
Lipu Fei
69ca6f02a3
WIP: Add bottom buttons for add network printer dropdown
2019-03-11 09:04:38 +01:00
Lipu Fei
e821179d7f
WIP: Fix binding loops
2019-03-11 08:33:37 +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
Lipu Fei
940a833e73
WIP: Add printers via network
2019-03-08 13:43:58 +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
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
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
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
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
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
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
