GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-28 17:18:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
14,330 Commits 293 Branches 266 Tags
Commit Graph

14330 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ian Paschal
0561c66e47 CURA-5096 Remove unused leftovers 2018-05-08 15:38:18 +02:00
Ian Paschal
4b931326fd CURA-5296 Set packages version with super secret method 2018-05-08 15:04:19 +02:00
Ian Paschal
0accdc6320 Cura-5296 Use separate packages.json files in app and user data 2018-05-08 11:54:19 +02:00
Ian Paschal
6dbbfe91db Merge remote-tracking branch 'origin/master' into CURA-5296_bundled_packages 2018-05-07 15:47:28 +02:00
Ian Paschal
4cfd047b11 CURA-5296 Simplifications to CuraPackageManager 2018-05-07 15:47:03 +02:00
Diego Prado Gesto
a6676fb477 Merge branch 'master' of github.com:Ultimaker/Cura 2018-05-07 12:57:33 +02:00
Diego Prado Gesto
b576423747 Adapt ovewritten method signature 2018-05-07 11:49:30 +02:00
Jack Ha
467e814f88 Merge branch 'master' of github.com:Ultimaker/Cura 2018-05-07 10:30:50 +02:00
Jack Ha
00d8427e42 Add sanity check for GlobalStack CURA-5045 2018-05-07 10:30:45 +02:00
Diego Prado Gesto
58289a7b45 Remove useful comment 2018-05-04 17:28:39 +02:00
Ghostkeeper
551cfa9d71
Ignore Mypy cache 
Don't want to commit that accidentally after running tests.

Contributes to issue CURA-5330.
 2018-05-04 15:57:06 +02:00
Ghostkeeper
651f2ffbc9
Return proper exit value if test failed 
Return 1 then.

Contributes to issue CURA-5330.
 2018-05-04 15:57:06 +02:00
Ghostkeeper
ffd1c5cc09
Run Mypy as normal automated test 
This tests all code for good style.

Contributes to issue CURA-5330.
 2018-05-04 15:57:06 +02:00
Diego Prado Gesto
7eda915471 Merge branch 'master' of github.com:Ultimaker/Cura 2018-05-04 15:50:47 +02:00
Diego Prado Gesto
2283bb530d CURA-4644 Fix unselectable item in the Toolbox 2018-05-04 15:49:37 +02:00
Diego Prado Gesto
b8d442a1ac
Merge pull request #3760 from fieldOfView/fix_missing_units 
Add some missing units to machine settings
 2018-05-04 15:07:09 +02:00
Diego Prado Gesto
be81d4c4cc Merge branch 'master' of github.com:Ultimaker/Cura 2018-05-04 15:01:16 +02:00
Ian Paschal
4a2e36978e Merge remote-tracking branch 'origin/master' into CURA-5296_bundled_packages 2018-05-04 15:00:40 +02:00
Diego Prado Gesto
8c4dc1cc2b CURA-5264 Don't need the if statement since the hardware-typeid is the 
right value to look at and it is in the firmware api.
 2018-05-04 14:59:59 +02:00
Ian Paschal
858108920a
Merge pull request #3765 from fieldOfView/fix_toolbox_appearance 
Fix toolbox appearance
 2018-05-04 14:25:01 +02:00
Diego Prado Gesto
a3028e2c7d Merge branch 'master' of github.com:Ultimaker/Cura 2018-05-04 14:04:13 +02:00
Diego Prado Gesto
b00d51a6eb CURA-4644 Set the property in the component where is being used. 2018-05-04 14:03:26 +02:00
Ghostkeeper
736f28bdb9
Move platform model slightly further down 
Otherwise it clips with the build volume. This looks much nicer.
 2018-05-04 13:30:28 +02:00
Diego Prado Gesto
6b214d2443 CURA-4644 Change the return type to QObject 2018-05-04 13:05:29 +02:00
fieldOfView
4e305079ec Simplify 2018-05-04 11:42:45 +02:00
fieldOfView
1f675f505f Tweak margins 2018-05-04 10:42:03 +02:00
fieldOfView
89322b9db6 Move toolbox button style into theme 2018-05-04 10:41:45 +02:00
Aleksei S
4a26cf0cbd Merge branch 'master' of github.com:Ultimaker/cura 2018-05-04 10:30:03 +02:00
Aleksei S
dfd9283ed5 Project name after importing 
CURA-5323
 2018-05-04 10:29:09 +02:00
Diego Prado Gesto
c8f73d303e
Merge pull request #3699 from Ultimaker/M&P-Setting-Optimization 
PP formula based temperatures fix
 2018-05-04 09:43:30 +02:00
Diego Prado Gesto
61a6a176b9 Merge branch 'master' of github.com:Ultimaker/Cura 2018-05-04 09:09:20 +02:00
Jaime van Kessel
7c80bc203c Fixed bunch of wrong / missing typing 2018-05-03 21:14:06 +02:00
Jaime van Kessel
7d2257838b Added missing typing 2018-05-03 20:42:06 +02:00
Jaime van Kessel
34483b4b34 Merge branch 'master' of github.com:Ultimaker/Cura 2018-05-03 20:27:35 +02:00
Jaime van Kessel
21e2fcbcf6 Also added missing context usage of archive 2018-05-03 20:27:02 +02:00
Ruben D
f3be394080
Properly get the application 
Why are we getting this passed via parent???
 2018-05-03 20:26:20 +02:00
Jaime van Kessel
7665f8a7cb Reading packages from archive now uses With context 2018-05-03 20:22:38 +02:00
Aleksei S
defb22dc07 Keep 'dot' in file name for type *.gcode.gz 
CURA-5323
 2018-05-03 18:11:45 +02:00
Diego Prado Gesto
a1e6792664 Set the LocalContainerProvider as a required plugin. 2018-05-03 18:03:30 +02:00
Aleksei S
c5e9acf664 Fix: Manually added printer by ip address shows proper printer type 
CURA-5264
 2018-05-03 17:14:56 +02:00
Diego Prado Gesto
5b8f426ea2 Merge branch 'master' of github.com:Ultimaker/Cura 2018-05-03 16:14:34 +02:00
Diego Prado Gesto
0d56d72760 CURA-5234 Make use of the function to add wrong containers to the set. 2018-05-03 16:14:08 +02:00
Mark
ce7f64d8e3 ignore empty directories in plugin folder 2018-05-03 14:36:08 +02:00
ChrisTerBeke
80d7dc18cb Fix is_dir for Python 3.5 2018-05-03 13:37:33 +02:00
ChrisTerBeke
b62b682570 Make Qt network redirects work in both 5.8 and 5.9+ 2018-05-03 13:33:32 +02:00
ChrisTerBeke
9fe72210be Merge branch 'master' of https://github.com/Ultimaker/Cura 2018-05-03 11:39:11 +02:00
Diego Prado Gesto
7850f5a18e Merge branch 'master' of github.com:Ultimaker/Cura 2018-05-03 09:30:29 +02:00
Diego Prado Gesto
65a6c751cd Change attribute of the download request to follow redirects. That makes the download feature of the Toolbox compatible with Qt 5.8.2. 2018-05-03 09:29:04 +02:00
Ian Paschal
45e32e6c05 CURA-5296 Quick hack to test using a list of IDs 2018-05-03 09:12:35 +02:00
fieldOfView
c2c5228eee Fix plugin details 
Previous fix for QML warnings broke the details display.
 2018-05-02 23:19:13 +02:00