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
22,028 Commits 295 Branches 268 Tags
Commit Graph

102 Commits

Author SHA1 Message Date
Jaime van Kessel
366dd4bd00
Swap the splashscreen image 
RIP Ultibot :(

CURA-6656
 2019-11-05 09:33:50 +01:00
Lipu Fei
94e89ad4ac Fix merge conflicts with master 2019-09-24 14:26:43 +02:00
Ghostkeeper
cc9115b3d3
Don't use material manager to reset material 
Use the container tree.

Contributes to issue CURA-6776.
 2019-09-20 09:57:35 +02:00
Jaime van Kessel
0ff9d72c4c
Remove use of deprecated extruders property 2019-09-13 17:27:16 +02:00
Jaime van Kessel
c3166703b4 Also connect the objectsModel to the selectionChanged signal 2019-07-22 10:27:19 +02:00
Jaime van Kessel
66d8e41064 Also add tests for the update of the objects mode 
CURA-6283
 2019-05-24 15:27:08 +02:00
Jaime van Kessel
834e6344df Cut up large update function to make testing easier 
CURA-6283
 2019-05-24 13:26:11 +02:00
Jaime van Kessel
bd39a9c591 Simplify & cleanup objects mode 
CURA-6283
 2019-05-24 09:30:50 +02:00
Jaime van Kessel
502eea4d26 Simplify the objects model further 
CUA-6283
 2019-05-23 16:09:22 +02:00
Jaime van Kessel
71d156b175 Remove unneeded check 
CURA-6283
 2019-05-23 16:04:39 +02:00
Jaime van Kessel
4a6495a0e6 Remove unneeded itemsChanged emit 
CURA-6283
 2019-05-23 16:01:53 +02:00
Jaime van Kessel
48dd9d247c Renamed some local variables so they describe better what they do 
CURA-6283
 2019-05-23 16:01:19 +02:00
Jaime van Kessel
c784a39ec6 Fixed typing 
CURA-6283
 2019-05-23 15:59:14 +02:00
Lipu Fei
5d58d60a16 Fix typing 
CURA-6283
 2019-05-21 13:39:14 +00:00
Lipu Fei
83b9e5e53b Change import 
CURA-6182
 2019-05-21 15:17:04 +02:00
Lipu Fei
c9642273eb Fix typing 
CURA-6283
 2019-05-21 15:15:18 +02:00
Lipu Fei
c282897c1e Fix numbering in object renaming 
CURA-6283

For both individual nodes and grouped nodes.
 2019-05-21 14:49:45 +02:00
Lipu Fei
80827bdf70 Fix adhesion checkbox in recommended mode 
CURA-6182

Move complex logic to Python.
 2019-05-21 08:10:49 +02:00
Diego Prado Gesto
9e5e57e6c5 Merge branch 'master' into feature_model_list 2019-05-07 11:57:31 +02:00
Diego Prado Gesto
11e86512cb Include the prime tower to the time calculations 
Contributes to CURA-6509.
 2019-05-06 14:33:24 +02:00
Lipu Fei
defcba6927 Fix that you can only cancel in WizardDialog 
CURA-6483
 2019-04-29 15:53:08 +02:00
Jaime van Kessel
ef92aad6bb Merge branch 'master' of github.com:Ultimaker/Cura into CURA-6435_new_style_add_machine 2019-04-17 11:06:30 +02:00
Ghostkeeper
325e60d821
Correct renamed welcome check function 
Contributes to issue CURA-6435.
 2019-04-16 15:28:32 +02:00
Lipu Fei
9494173f43 Remove hack in WelcomePagesModel and add WhatsNewPagesModel 
CURA-6447
 2019-04-12 12:11:09 +02:00
Lipu Fei
e0e3c9609f Fix update should show logic 
CURA-6447
 2019-04-12 09:56:45 +02:00
Lipu Fei
01c0fe1ffb Fix update should show logic 
CURA-6447
 2019-04-10 10:52:11 +02:00
Lipu Fei
b692787def Fix how onboarding flow is shown 
CURA-6447
 2019-04-10 07:16:09 +02:00
Lipu Fei
dfa35bd589 Fix goToPage() when page_id is not found 
CURA-6435
 2019-04-08 09:20:24 +02:00
Lipu Fei
a18bb9d953 Add AddPrinterPagesModel 
CURA-6435
 2019-04-05 09:09:00 +02:00
Lipu Fei
0f62f0c60a Add next_page_button_text field to WelcomePagesModel 
CURA-6435
 2019-04-05 09:09:00 +02:00
Ghostkeeper
467a9f179d
Code style: Spaces around binary operators 
Contributes to issue CURA-6057.
 2019-04-01 17:30:43 +02:00
Lipu Fei
69293a0545 Fix typing 2019-04-01 13:52:07 +02:00
Remco Burema
dc8524b90d Fix 'DiscoverUM3Action' required attention from user in flow. [CURA-6057] 2019-03-29 16:23:16 +01:00
Remco Burema
3ca8ba421a Move CuraStage back to where plugins expect it. 2019-03-29 13:11:03 +01:00
Remco Burema
7ceaade26d Sort changelog correctly (newest on top). [CURA-6057] 2019-03-29 11:27:37 +01:00
Remco Burema
1cebf145f5 Make User-Agreement work with new 'WizadPanel'. [CURA-6057] 2019-03-29 09:23:10 +01:00
Lipu Fei
109631d023 Update doc for updateHasMaterialsMetadata() 2019-03-28 15:13:41 +01:00
Lipu Fei
f4d0e39788 Pass application 2019-03-28 14:43:37 +01:00
Lipu Fei
3ad79a5888 Fix divided by 0 problem 2019-03-28 14:34:18 +01:00
Lipu Fei
82471a0e39 Add doc for MachineSettingsManager 2019-03-28 14:31:33 +01:00
Lipu Fei
8780fce7a7 Move MaterialOutputModel back 2019-03-28 14:26:54 +01:00
Jaime van Kessel
84aa7fd007 Fix mypy type errors 
CURA-6057
 2019-03-27 17:40:33 +01:00
Lipu Fei
6dbae6f088 Show machine actions page optionally 2019-03-27 09:34:48 +01:00
Lipu Fei
1c39d0c015 Fix merge conflicts 2019-03-26 15:55:58 +01:00
Lipu Fei
6843fb1ffb Load change log from file for on-boarding page 2019-03-26 15:49:40 +01:00
Lipu Fei
a6d05aa3bb Fix misc issues 2019-03-26 11:47:09 +01:00
Lipu Fei
af9f9fc857 Fix merge conflicts 2019-03-26 11:46:35 +01:00
Lipu Fei
418ad73a63 Move page index logic into WelcomePagesModel 2019-03-26 11:34:44 +01:00
Lipu Fei
92d95a1c00 Move page index logic into WelcomePagesModel 2019-03-26 10:34:38 +01:00
Lipu Fei
a85f2ce156 Fix merge conflicts 2019-03-26 09:01:01 +01:00