GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-29 07:14:24 +08:00
Code Issues Packages Projects Releases Wiki Activity
20,614 Commits 288 Branches 260 Tags
Commit Graph

1105 Commits

Author SHA1 Message Date
Lipu Fei
79f11286a6 Fix typing 
CURA-6643
 2019-08-27 14:42:31 +02:00
Lipu Fei
946b2b943e F5 reloads gcode file 
CURA-6643
 2019-08-27 14:42:31 +02:00
Lipu Fei
9f18ceda51 Merge remote-tracking branch 'origin/master' into add_42_43_version_upgrader 2019-07-25 14:56:27 +02:00
Jaime van Kessel
d8ddcba091 Fix typing ignore for breath frist iterator 2019-07-23 13:40:40 +02:00
Jaime van Kessel
827ccd5a13 Fix mypy issues caused by scenenode iterator being correctly typed 2019-07-23 13:19:42 +02:00
Jaime van Kessel
9ceb9ce18b Fix typing issues 
They were caused by upgrading to a higher mypy version, which found more mistakes
 2019-07-23 12:58:46 +02:00
Jaime van Kessel
e56e355e79 Added upgrader for 4.3 2019-07-23 11:15:13 +02:00
pkuiper-ultimaker
9236f21d67
Merge pull request #5888 from Ultimaker/rename_minimum_diameter 
Rename Minimum Diameter to Maximum Tower-Supported Diameter
 2019-06-17 15:39:44 +02:00
Ghostkeeper
a38984dcec
Increment setting_version to 8 
This is required for the version upgrade.

Contributes to issue CURA-6311.
 2019-06-12 09:09:41 +02:00
Jaime van Kessel
ca8fa9cfac Merge branch 'master' of github.com:Ultimaker/Cura into CURA-5395-orthographic-view 2019-05-21 14:23:24 +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
Jaime van Kessel
2f5dfb8e65 Remove hardcoded set perspective function 
CURA-5395
 2019-05-20 16:34:24 +02:00
Lipu Fei
be4e05c13f
Merge pull request #5393 from Ultimaker/feature_model_list 
Add an object list/selector
 2019-05-17 07:48:22 +02:00
Lipu Fei
961f6403ad Change preference key to cura/show_list_of_objects 2019-05-16 15:49:08 +02:00
Jaime van Kessel
186eef0b68 Fix backup causing a crash in specific situations 2019-05-16 15:38:44 +02:00
Diego Prado Gesto
9e5e57e6c5 Merge branch 'master' into feature_model_list 2019-05-07 11:57:31 +02:00
Lipu Fei
40d26bbb6e NetworkingUtil is included in Cura 1.5 QML 
CURA-6483
 2019-04-30 12:49:26 +02:00
Lipu Fei
ed8127777c Make a single NetworkingUtil 
CURA-6483
 2019-04-30 09:43:50 +02:00
Lipu Fei
c8872cb4a1 Use a separate function to validate IP address 
CURA-6483
 2019-04-29 15:53:08 +02:00
Ghostkeeper
1fb336ed3d
Merge branch 'CURA-6483_fix_manual_printer_discovery' into 4.1 2019-04-26 14:15:07 +02:00
Remco Burema
ad9fc62ff5 Fix typing. [CURA-6478] 2019-04-25 23:05:52 +02:00
Remco Burema
194f01f840 Add preferences for draggable/expandable-component. [CURA-6478] 2019-04-25 14:50:29 +02:00
Lipu Fei
372e9026e4 Move add by ip device discovery into DiscoveredPrintersModel 
CURA-6483
 2019-04-25 08:44:55 +02:00
Remco Burema
37fddaee5c Limit draggable component to the main window. 2019-04-25 08:43:36 +02:00
Lipu Fei
4876d5af00 Fix data saving before making a backup 
CURA-6471
 2019-04-24 08:21:11 +02:00
Lipu Fei
f5668df127 Add parent to models so QML dont take ownership 2019-04-18 15:54:23 +02:00
Lipu Fei
46fa45768a Simplify shouldShowWelcomeDialog() 
CURA-6447
 2019-04-17 09:35:01 +02:00
Lipu Fei
0fe6555881 Remove debug code 
CURA-6447
 2019-04-15 13:09:44 +02:00
Lipu Fei
9494173f43 Remove hack in WelcomePagesModel and add WhatsNewPagesModel 
CURA-6447
 2019-04-12 12:11:09 +02:00
Lipu Fei
61ee2ec85c Simplify code 
CURA-6447
 2019-04-09 11:45:30 +02:00
Lipu Fei
a18bb9d953 Add AddPrinterPagesModel 
CURA-6435
 2019-04-05 09:09:00 +02:00
Lipu Fei
56a3b2dfa7 Fix merge conflicts 2019-03-26 16:33:13 +01:00
Lipu Fei
1dd48c5728 Show welcome page if no printer 2019-03-26 16:21:07 +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
a85f2ce156 Fix merge conflicts 2019-03-26 09:01:01 +01:00
Lipu Fei
4a171eebf6 Move models around again 
- Move machine related models to cura.Machines.Models
 - Move printer device related models to cura.PrinterOutput.Models
 - Other UI/GUI related modules in cura.UI
 2019-03-26 08:29:22 +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
Remco Burema
1f2fea14ce Little refactors (apply review comments). [CURA-6294] 2019-03-20 16:08:50 +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
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
2b39d6422c Move PrinterOutputDevice into cura.PrinterOutput module 2019-03-20 09:43:09 +01:00
Lipu Fei
1f5cf62a7c Move UserChangesModel into cura.UI module 2019-03-20 09:22: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
Lipu Fei
228270d9d5 Move ObjectModel into cura.UI module 2019-03-20 09:12:21 +01:00
Lipu Fei
dfc53d3604 Move MachineActionManager into cura.UI module 2019-03-20 09:10:48 +01:00
Lipu Fei
8c0cb2b7b8 Move GlobalStackModel into cura.UI module 2019-03-20 09:09:48 +01:00