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
19,026 Commits 291 Branches 260 Tags
Commit Graph

5951 Commits

Author SHA1 Message Date
Lipu Fei
80dff49b8a Fix merge conflicts 2019-03-22 10:00:57 +01:00
Lipu Fei
f90fd8aee8 Add typing 2019-03-22 09:50:32 +01:00
Lipu Fei
b1620f1912 Fix typing 2019-03-22 09:49:40 +01:00
Lipu Fei
11252ce0f7 Merge remote-tracking branch 'origin/WIP_onboarding' into WIP_onboarding_machine_action 2019-03-21 15:00:15 +01:00
Lipu Fei
4e5d08f320 Fix merge conflicts with master 2019-03-21 14:59:53 +01:00
Jaime van Kessel
620cd9c45d Change the comment of the UFP mimetype to the correct description 2019-03-21 14:32:27 +01:00
Jaime van Kessel
3f02ad7619 Merge branch 'feature_ufp_reader' of github.com:Ultimaker/Cura 2019-03-21 14:27:51 +01:00
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
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
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
Lipu Fei
c3c9c53f13 Merge WIP_onboarding 2019-03-20 11:28:30 +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
e1d26da528 Move ExtrudersModel into cura.UI module 2019-03-20 09:19:30 +01:00
Ghostkeeper
35fcdf3978
Merge branch '4.0' 2019-03-20 09:12:39 +01:00
Lipu Fei
5eb51c6cd4 Move CuraStage into cura.UI module 2019-03-20 09:07:15 +01:00
Lipu Fei
a106a9ddb9 WIP: Cleanup MachineSettingsAction 2019-03-20 08:59:20 +01:00
Lipu Fei
a92971d80e Merge WIP_boarding_by_ip 2019-03-19 15:51:47 +01:00
Lipu Fei
09e317372e WIP: Remove UMOCheckup MachineAction 
Not used any more.
 2019-03-19 15:47:49 +01:00
Lipu Fei
3911c3d73d WIP: Cleanup and unify MachineAction styles 2019-03-19 15:40:44 +01:00
Lipu Fei
8d68db9ff0 WIP: Add first-start machine actions 2019-03-19 14:24:57 +01:00
Remco Burema
740dd095cc (Add-by-IP) Incorporated review comments. [CURA-6294] 2019-03-19 13:45:56 +01:00
Diego Prado Gesto
00e22d6c11 Remove short description of bug fixes in the changelog 
In order to keep consistency with previous entries, the bug fixes only show the full description but not a short description.

Contributes to CURA-6386.
 2019-03-19 10:54:01 +01:00
Diego Prado Gesto
a083590121 Add change log for 4.0 
Contributes to CURA-6386.
 2019-03-19 10:29:13 +01:00
Ghostkeeper
731cbc9e95
Make 'All jobs are printed.' translatable 2019-03-18 15:16:50 +01:00
Jaime van Kessel
c1ed8ba9d0 Merge branch '4.0' of github.com:Ultimaker/Cura 2019-03-18 14:56:49 +01:00
Jaime van Kessel
61e031bf1a Fix format for two of the translated messages. 
The format needs to be done on the result of whatever the translate spits out instead of
the string that is passed to the translate.
 2019-03-18 13:45:31 +01:00
Ghostkeeper
3e9ed0fbfa
Add translation hint for untranslatable Ultimaker Cloud brand 
So that the translators next time hopefully won't translate this.

Contributes to issue CURA-6257.
 2019-03-18 10:36:23 +01:00
Lipu Fei
cf0e3effc7 WIP: Refactor NumericTextFieldWithUnit 2019-03-18 08:48:29 +01:00
Remco Burema
5b31feebba Remove UserAgreement-plugin in favour of Welcome-Pages. [CURA-6057] 2019-03-15 13:58:36 +01:00
Remco Burema
0f116fa3f4 Replace old User-Agreement-page with new Welcome-Pages. [CURA-6057] 2019-03-14 14:59:04 +01:00
Jaime van Kessel
bcf6a21bc8 Merge branch 'patch-3' of https://github.com/adecastilho/Cura 2019-03-14 14:50:34 +01:00
Remco Burema
2693eecd33 (Add-by-IP/onboard) Cleanup and use discovered-printer instead of machine-manager. [CURA-6294] 2019-03-14 13:33:24 +01:00
Remco Burema
61821e6378 Merge remote-tracking branch 'origin/WIP_onboarding' into WIP_onboarding_by_ip 2019-03-14 11:40:44 +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
Remco Burema
b12b6892ca Add-by-IP onboarding: Create (and set active) new device. [CURA-6294] 2019-03-13 17:36:03 +01:00
Jaime van Kessel
31a8421fd4 Remove : from display script as it breaks on some machines 2019-03-13 17:06:47 +01:00
Jaime van Kessel
0c57aa5054 Merge branch 'fix_usb_print_postprocessing' of github.com:Ultimaker/Cura 2019-03-13 16:44:12 +01:00