GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-04 11:14:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
19,507 Commits 295 Branches 268 Tags
Commit Graph

19507 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Remco Burema
139edbb0b7
Merge pull request #5460 from Ultimaker/WIP_onboarding_by_ip 
'WIP-onboarding-by-ip' into 'parent' branch
 2019-03-21 09:52:39 +01:00
Diego Prado Gesto
a58c3997d4 Merge branch '4.0' 2019-03-21 09:36:52 +01:00
Diego Prado Gesto
59b3046c0f Remove duplicate shortcut in Polish 
Contributes to CURA-6257.
 2019-03-21 09:35:51 +01:00
Lipu Fei
aa1ad9a93d Fix merge conflicts 2019-03-21 09:31:24 +01:00
Lipu Fei
85a3b54111 Merge WIP_onboarding 2019-03-21 09:21:56 +01:00
Lipu Fei
cf5fd1c355 Fix typing 2019-03-21 09:13:00 +01:00
Lipu Fei
9e92a186ec Fix code styles 2019-03-21 09:06:41 +01:00
Lipu Fei
f2d7f93101 Merge remote-tracking branch 'origin/WIP_onboarding_by_ip' into WIP_onboarding_machine_action 2019-03-21 08:35:06 +01:00
Lipu Fei
7e176e0f2c Fix merge conflicts 2019-03-21 08:34:07 +01:00
Remco Burema
8f9bd0ad06 Adapted to more review comments. [CURA-6294] 2019-03-20 17:20:06 +01:00
Remco Burema
9a2b800fe8 Future proof: also accept IPv6 address. [CURA-6294] 2019-03-20 17:01:37 +01:00
Remco Burema
1f2fea14ce Little refactors (apply review comments). [CURA-6294] 2019-03-20 16:08:50 +01:00
drzejkopf
f03e5c28d7
Update creality_ender3.def.json 2019-03-20 16:00:40 +01:00
Lipu Fei
5d45dba8f3 Fix DiscoveredMachineModel test 2019-03-20 16:00:39 +01:00
Lipu Fei
c6bd31e5f6 Simplify code 2019-03-20 14:07:13 +01:00
Lipu Fei
8cc05a2a62 Bind no printer label visible to item count 2019-03-20 14:05:52 +01:00
Lipu Fei
91acbca141 Bind no printer label visible to item count 2019-03-20 14:05:02 +01:00
Lipu Fei
428fb5a3a1 Use Item instead of transparent Rectangle 2019-03-20 13:49:14 +01:00
Lipu Fei
95a0a5fb24 Theme window_disabled_background 2019-03-20 13:46:54 +01:00
Lipu Fei
a17642a5a1 Merge WIP_onboarding_by_ip 2019-03-20 13:42:15 +01:00
Lipu Fei
615241a416 Fix module renaming 2019-03-20 13:39:08 +01:00
Remco Burema
ad6603bab8 Merge branch 'WIP_onboarding' into WIP_onboarding_by_ip 2019-03-20 13:33:19 +01:00
Remco Burema
61d2aa5c5f No more hardcoded margins (and other QML fixes) in 'add-by-ip'. [CURA-6294] 2019-03-20 13:16:10 +01:00
Lipu Fei
79ab09ca01 Fix troubleshooting typos 2019-03-20 11:33:43 +01:00
Lipu Fei
c3c9c53f13 Merge WIP_onboarding 2019-03-20 11:28:30 +01:00
Lipu Fei
d46d0f2999 Change Scroll policy to AsNeeded 2019-03-20 11:17:58 +01:00
Lipu Fei
3114072038 Fix code style 2019-03-20 11:16:45 +01:00
Lipu Fei
f0104f6245 Remove unused code 2019-03-20 11:15:33 +01:00
Lipu Fei
838944dc2b Change scroll policy to AsNeeded 2019-03-20 11:14:34 +01:00
Lipu Fei
3a3e65224b Remove debugging shortcut 2019-03-20 11:11:30 +01:00
Lipu Fei
ccc4ba0bde Simplify code in WelcomePagesModel 2019-03-20 11:09:09 +01:00
Lipu Fei
da351da611 Update comments for associateActiveMachineWithPrinterDevice() 2019-03-20 10:48:04 +01:00
Lipu Fei
105a07fc16 Rename vars and add typing in DiscoveredPrintersModel 2019-03-20 10:42:43 +01:00
Lipu Fei
e623c807ce Rename SectionName to DiscoverySource in GlobalStacksModel 2019-03-20 10:39:23 +01:00
Lipu Fei
a97410656f Fix WelcomePagesModel qml type registering typo 2019-03-20 10:00:14 +01:00
Lipu Fei
4078719c58 Move cura.Machine.Models to cura.UI.MachineModels 2019-03-20 09:56:11 +01:00
Lipu Fei
81fbc525e4 Rename ConfigurationModel to PrinterConfigurationModel 2019-03-20 09:52:35 +01:00
Lipu Fei
e555f7da68 Move ConfigurationModel into cura.UI module 2019-03-20 09:51:06 +01:00
Lipu Fei
69eb381f10 Move MaterialOutputModel into cura.UI module 2019-03-20 09:47:44 +01:00
Lipu Fei
2d78c2d7fc Move ExtruderOutputModel into cura.UI module 2019-03-20 09:45:26 +01:00
Lipu Fei
49c87a1e1d Move ExtruderConfigurationModel into cura.UI module 2019-03-20 09:44:15 +01:00
Lipu Fei
6a8db55112 Move PrinterOutputModel into cura.UI module 2019-03-20 09:43:10 +01:00
Lipu Fei
2b39d6422c Move PrinterOutputDevice into cura.PrinterOutput module 2019-03-20 09:43:09 +01:00
Lipu Fei
e30104ff7f Move PrintJobOutputModel into cura.UI module 2019-03-20 09:27:23 +01:00
Lipu Fei
1f5cf62a7c Move UserChangesModel into cura.UI module 2019-03-20 09:22:42 +01:00
Ghostkeeper
74bfd52c36
Fix default layer height 
The 0.1mm profile doesn't overwrite it. Maybe it should to prevent this mistake in the future?

Contributes to issue CURA-6391.
 2019-03-20 09:21:42 +01:00
Lipu Fei
e1d26da528 Move ExtrudersModel into cura.UI module 2019-03-20 09:19:30 +01:00
Lipu Fei
5848174ad4 Move PrintInformation into cura.UI module 2019-03-20 09:13:38 +01:00
Ghostkeeper
35fcdf3978
Merge branch '4.0' 2019-03-20 09:12:39 +01:00
Lipu Fei
228270d9d5 Move ObjectModel into cura.UI module 2019-03-20 09:12:21 +01:00