GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-01 00:04:27 +08:00
Code Issues Packages Projects Releases Wiki Activity
18,808 Commits 291 Branches 260 Tags
Commit Graph

8178 Commits

Author SHA1 Message Date
Lipu Fei
cf0e3effc7 WIP: Refactor NumericTextFieldWithUnit 2019-03-18 08:48:29 +01:00
Lipu Fei
752a48cacd WIP: Refactor and create reusable CuraComboBox 2019-03-14 13:44:15 +01:00
Lipu Fei
3e4624774a WIP: Create new machine settings page 2019-03-14 13:44:15 +01:00
Lipu Fei
6c2e80d2a1 WIP: Create new Machine Settings dialog widgets 2019-03-14 13:44:15 +01:00
Lipu Fei
49233216ec Fix machine management page section 2019-03-14 13:43:24 +01:00
Lipu Fei
4f05a2ab5f WIP: Use GlobalStackModel for Machine management page 2019-03-14 11:21:09 +01:00
Lipu Fei
b3621bae84 WIP: Disable unknown printer type buttons 2019-03-14 11:18:39 +01:00
Lipu Fei
2b0e9ea439 WIP: Fix refresh and naming 2019-03-14 08:56:31 +01:00
Lipu Fei
e5b51c8edf WIP: Implement refreshConnections() 2019-03-13 15:34:18 +01:00
Lipu Fei
20933e8bef WIP: Add label for no discovered network printer 2019-03-13 14:12:05 +01:00
Lipu Fei
764f7281c2 WIP: Show full name of network printer types 2019-03-13 13:03:41 +01:00
Lipu Fei
de9f6f47bd WIP: Implement add machine from network device 2019-03-13 12:04:52 +01:00
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
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
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
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
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
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
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
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
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
Jaime van Kessel
6157cb6f91 Merge branch '4.0' of github.com:Ultimaker/Cura 2019-03-04 16:00:56 +01:00
Remco Burema
113c37f555 Start work on 'AddPrinterByIp' for WelcomePages. [CURA-6057] 2019-03-01 13:17:15 +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
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
Mark
eccfebf39d Update material packages for 4.0 release 2019-02-28 16:11:51 +01:00