GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-05 14:54:33 +08:00
Code Issues Packages Projects Releases Wiki Activity
14,737 Commits 289 Branches 260 Tags
Commit Graph

4159 Commits

Author SHA1 Message Date
Mark
850f6f9b15 Change name to Community materials 2018-05-17 16:46:32 +02:00
ChrisTerBeke
ddc9da63b8
Still raise exception when loading incorrect material file 2018-05-16 19:22:02 +02:00
ChrisTerBeke
c13b77d8a1
Do not load material when no GUID is present instead of crashing Cura 2018-05-16 19:18:09 +02:00
Diego Prado Gesto
e38b31c0eb Merge branch 'master' into WIP_improve_initialization 2018-05-16 16:57:51 +02:00
ChrisTerBeke
419d521e09 Merge branch 'master' into feature-backup-manager 2018-05-16 13:41:57 +02:00
Ghostkeeper
310aee07ac
Code style: Brackets on new line 
As per our code style regulation.

Contributes to issue CURA-5296.
 2018-05-16 13:39:43 +02:00
ChrisTerBeke
d27ac3cf31 Merge branch 'master' into feature-backup-manager 2018-05-15 16:50:25 +02:00
Jack Ha
9281c23555 Fix uninstallable user package which was also bundled; make update package somewhat better by not trying to uninstall builtin package 2018-05-15 16:23:54 +02:00
Jack Ha
fd73751b91 Make the ToolboxProgressButton labels actually overrideable 2018-05-15 16:10:01 +02:00
ChrisTerBeke
4e90e6c2e3 Merge branch 'master' into feature-backup-manager 2018-05-15 14:05:58 +02:00
ChrisTerBeke
bb94ad904a fix 2018-05-15 14:05:40 +02:00
ChrisTerBeke
b7f26ddcc7 Small code improvements 2018-05-15 13:29:01 +02:00
ChrisTerBeke
c9145c6661 Small code improvements 2018-05-15 13:28:33 +02:00
ChrisTerBeke
82a1c95d98 Merge branch 'master' into feature-backup-manager 2018-05-15 12:56:19 +02:00
Ian Paschal
d30bbd48fb CURA-5296 
- Changed API to not use staging
- Fixed crash when pressing cancel
- Added loading icon
 2018-05-15 12:53:05 +02:00
Aleksei S
50dabdbac8 Merge branch 'bugfix-toolbox-update' 2018-05-15 11:51:45 +02:00
ChrisTerBeke
8707d12bf3 Show package version in installed tab 2018-05-15 11:28:00 +02:00
ChrisTerBeke
abcf7bd187 Show package version in installed tab 2018-05-15 11:25:56 +02:00
ChrisTerBeke
0617a95cd0 Add API root as cura version variable 2018-05-15 11:13:27 +02:00
ChrisTerBeke
95c9062913 Merge branch 'master' into feature-backup-manager 2018-05-15 11:05:07 +02:00
Jack Ha
c54957540b Merge branch 'master' into bugfix-toolbox-update 2018-05-15 09:45:14 +02:00
Jack Ha
fccfff14bc Now using api.ultimaker.com instead of api-staging.ultimaker.com 2018-05-15 09:44:58 +02:00
ChrisTerBeke
e14f57892a Merge branch 'master' into feature-backup-manager 2018-05-14 17:16:36 +02:00
Jack Ha
1f088aabc4 Cleanup and simplify toolbox plugin update 2018-05-14 16:11:44 +02:00
Jack Ha
0f0b6a9712 Fix/Implement update in toolbox 2018-05-14 16:01:59 +02:00
Diego Prado Gesto
8ad409ff55
Merge branch 'master' into WIP_improve_initialization 2018-05-14 15:15:02 +02:00
Diego Prado Gesto
04534936c3 CURA-5358 Change the name in the dict to search for the 'qualities' that 
are inside a curapackage.
 2018-05-14 11:36:19 +02:00
Diego Prado Gesto
0bb82f144b Make the toolbox window not resizable. 2018-05-14 10:16:18 +02:00
ChrisTerBeke
aa73b88975
Merge branch 'master' into feature-backup-manager 
* master:
  Fix an issue that kept the plugins in the "installed" list despite of already being removed from the data folder.
  Fix some crashes and issues in the Toolbox when working with no internet connection.
  Use the application language for the dates
  Small fixes and change the "plugins" text to "packages"
  Change layout of the installed plugins tab. - There were some alignment problems when there were more than 2 buttons in a column (disable, uninstall and update) - Now the progress bar shows on top of the "Update" button.
  Don't correct bed origin any more
  Clean up the package manager a bit: - Remove an unused method. - Safely check if the plugin info exist
  Improve translation of short time format
  Adding some love
  Updating changelog about engine icon
 2018-05-13 01:21:20 +02:00
ChrisTerBeke
0e0492327c
Fix missing argument in application stopped signal callback 2018-05-11 18:15:50 +02:00
Diego Prado Gesto
527f269b5d Fix an issue that kept the plugins in the "installed" list despite of 
already being removed from the data folder.
 2018-05-11 16:32:31 +02:00
Diego Prado Gesto
fa97d5830b Fix some crashes and issues in the Toolbox when working with no 
internet connection.
 2018-05-11 15:23:40 +02:00
Diego Prado Gesto
675b5b1997 Use the application language for the dates 2018-05-11 14:47:56 +02:00
Diego Prado Gesto
418bedc8f0 Small fixes and change the "plugins" text to "packages" 2018-05-11 14:10:53 +02:00
Diego Prado Gesto
1ecc52e920 Merge branch 'master' of github.com:Ultimaker/Cura 2018-05-11 14:10:20 +02:00
Diego Prado Gesto
806b1f707f Change layout of the installed plugins tab. 
- There were some alignment problems when there were more than 2 buttons
in a column (disable, uninstall and update)
- Now the progress bar shows on top of the "Update" button.
 2018-05-11 14:03:28 +02:00
Ghostkeeper
9c010076bb
Merge branch 'patch-2' of https://github.com/thopiekar/Cura into thopiekar-patch-2 2018-05-11 13:56:32 +02:00
Diego Prado Gesto
43657010ba CURA-5164 The Preferences is not a singleton class anymore since in some point 
several instances need to be created.

- In the ThreeMFWorkspaceReader we need to create some temporal
instances of Preferences that makes it not singleton anymore.

- The current preferences are kept in the Application class and so all
the calls to the preferences are changed to get the preferences from
Application.

- The method getInstance in Preferences is kept as deprecated since some
external plugins.
 2018-05-11 08:50:42 +02:00
Ian Paschal
3dda3f04fb CURA-5296 Improvement to using CuraVersion 2018-05-10 08:42:14 +02:00
Ian Paschal
20a2ea4f2c CURA-5296 Don't crash if no CuraVersion 2018-05-09 17:09:21 +02:00
Jack Ha
9daf85b632 Merge branch 'master' of github.com:Ultimaker/Cura 2018-05-09 14:19:40 +02:00
Jack Ha
b17685d075 CURA-5296 fix model property mismatch 2018-05-09 13:59:45 +02:00
Ruben D
6772dc9ea7
Show g-code in position it would print 
Rather than trying to retrieve from the g-code what the position was that it was originally sliced. It was trying to find whether it was sliced for a printer with center_is_zero by seeing if there are any negative coordinates in the g-code, which was faulty. Now we don't even try to do that any more. We just find where the print would end up if it were printed with the currently selected printer.

Contributes to issue CURA-5068 and fixes #3634.
 2018-05-09 13:25:41 +02:00
Ruben D
fb2a8c8d57
Fix typing of paths 
There is still something up with the E values. Most probably an actual bug. We'll investigate.

Contributes to issue CURA-5330.
 2018-05-09 13:25:41 +02:00
Ruben D
af06096e08
Add typing 
As per code style.

Contributes to issue CURA-5330.
 2018-05-09 13:25:41 +02:00
Ian Paschal
7ac7f91d5d
Merge pull request #3790 from Ultimaker/CURA-5296_bundled_packages 
Cura-5296 Make bundled resources visible to CuraPackageManager
 2018-05-08 17:03:55 +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
Aleksei S
d083426497 Added MimeTypeDatabase for UFP extension 
CURA-5323
 2018-05-08 10:59:05 +02:00
Aleksei S
9779c41071 Use MimeTypeDatabase to find loaded file extension and set proper project name 
CURA-5323
 2018-05-08 10:47:59 +02:00