3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-09 23:05:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
25378 commits 313 branches 275 tags 719 MiB
Commit graph

25378 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ghostkeeper
29e4cf06b3
Merge branch 'master' of https://github.com/Sekisback/Cura into Sekisback-master 2021-05-05 14:44:51 +02:00
Jaime van Kessel
7984d38335
Merge pull request #9766 from SynDaverCO/SyndaverMachineCorrection 
correction
 2021-05-05 10:39:27 +02:00
synsuiter
5cfc8fabd7 correction 
correct axi machines gantry height value
 2021-05-04 11:29:18 -06:00
Ghostkeeper
7f1e61b7b8
Fix merge conflict 
Oopsie.
 2021-05-04 17:08:44 +02:00
Ghostkeeper
08976dcc7e
Merge branch '4.9' 
Conflicts:
	resources/themes/cura-light/styles.qml -> Fixes for QML warnings in this theme file, while on Master the icons were renamed.
 2021-05-04 11:58:50 +02:00
Ghostkeeper
acaf378f4b
Disallow Ultimaker PETG for Ultimaker 2+ printer 
Apparently this has been tested and found to not print well.

Contributes to issue CURA-8200.
 2021-05-04 11:54:46 +02:00
KeltE
99ce3b16bf
Move retraction amount and speed to definition for flashforge 
* Update flashforge_global_0.08_ultra.inst.cfg
* Update flashforge_dreamer_nx.def.json
* Update flashforge_global_0.12_super.inst.cfg
* Update flashforge_global_0.16_adaptive.inst.cfg
* Update flashforge_global_0.20_standard.inst.cfg
* Update flashforge_global_0.28_low.inst.cfg
* Update flashforge_global_0.32_draft.inst.cfg
* Update flashforge_global_0.40_coarse.inst.cfg
* Update flashforge_global_0.48_extra_coarse.inst.cfg
* Update flashforge_global_0.08_ultra.inst.cfg
* Update flashforge_global_0.12_super.inst.cfg
* Update flashforge_global_0.16_adaptive.inst.cfg
* Update flashforge_global_0.20_standard.inst.cfg
* Update flashforge_global_0.28_low.inst.cfg
* Update flashforge_global_0.32_draft.inst.cfg
 2021-05-03 16:49:07 +02:00
Jaime van Kessel
784b1d8976
Merge pull request #9596 from MattCatt87/patch-1 
Update creality_ender4.def.json
 2021-05-03 16:19:37 +02:00
Jaime van Kessel
ce38ac3ed7
Merge branch 'master' of https://github.com/Skriware/Cura 2021-05-03 15:38:56 +02:00
Jaime van Kessel
f1f1d661f8
Merge branch 'SyndaverAXI2_MachineProfile' of https://github.com/SynDaverCO/Cura 2021-05-03 15:28:04 +02:00
Jaime van Kessel
aac9ba03ec
Merge branch 'fix_path_minimum_limit' of github.com:Ultimaker/Cura 2021-05-03 15:14:31 +02:00
Jaime van Kessel
c53fde7612
Merge branch '4.9' of github.com:Ultimaker/Cura into CURA_8200_PETG_profiles 2021-05-03 11:14:15 +02:00
fvrmr
7c954fdc2f Update DE translation 
Fixes 9735
Updated de translation. Changed Einstellingen to Konfiguration
 2021-05-03 10:58:53 +02:00
Jelle Spijker
778ab232df
Merge pull request #9732 from fieldOfView/fix_style_theme_undefined 
Fix floods of QML errors in styles.qml
 2021-05-03 10:57:01 +02:00
Kostas Karmas
9b58bf0490
Remove commented out code 2021-05-03 10:49:00 +02:00
Kostas Karmas
1347471fea
Remove unused function 2021-05-03 10:48:54 +02:00
Kostas Karmas
a6d311a0f2
Fix incompatible mypy type 2021-05-03 10:48:47 +02:00
Kostas Karmas
daa0826190
Fix mypy issues with the DigitalLibrary plugin 2021-05-03 10:48:40 +02:00
Jaime van Kessel
9fcc513edd
Add PETG quality profiles 
CURA-8200
 2021-05-03 10:46:35 +02:00
fieldOfView
4974b74109 Update copyright 2021-04-30 14:15:31 +02:00
fieldOfView
04bfd6b820 Use UM.Theme instead of Theme 
This prevents hundreds of QML warning messages logged in some user reports of Cura being slow.

```
2021-04-30 11:42:01,492 - WARNING - [MainThread] UM.Qt.QtApplication.__onQmlWarning [411]: file:///.../cura/../resources/themes/cura-light/styles.qml:335: TypeError: Cannot read property 'getSize' of null
2021-04-30 11:42:01,492 - WARNING - [MainThread] UM.Qt.QtApplication.__onQmlWarning [411]: file:///.../cura/../resources/themes/cura-light/styles.qml:338: TypeError: Cannot read property 'getColor' of null
2021-04-30 11:42:01,500 - WARNING - [MainThread] UM.Qt.QtApplication.__onQmlWarning [411]: file:///.../cura/../resources/themes/cura-light/styles.qml:327: TypeError: Cannot read property 'getSize' of null
2021-04-30 11:42:01,500 - WARNING - [MainThread] UM.Qt.QtApplication.__onQmlWarning [411]: file:///.../cura/../resources/themes/cura-light/styles.qml:329: TypeError: Cannot read property 'getColor' of null
2021-04-30 11:42:01,500 - WARNING - [MainThread] UM.Qt.QtApplication.__onQmlWarning [411]: file:///.../cura/../resources/themes/cura-light/styles.qml:335: TypeError: Cannot read property 'getSize' of null
2021-04-30 11:42:01,500 - WARNING - [MainThread] UM.Qt.QtApplication.__onQmlWarning [411]: file:///.../cura/../resources/themes/cura-light/styles.qml:338: TypeError: Cannot read property 'getColor' of null
2021-04-30 11:42:01,500 - WARNING - [MainThread] UM.Qt.QtApplication.__onQmlWarning [411]: file:///.../cura/../resources/themes/cura-light/styles.qml:327: TypeError: Cannot read property 'getSize' of null
2021-04-30 11:42:01,500 - WARNING - [MainThread] UM.Qt.QtApplication.__onQmlWarning [411]: file:///.../cura/../resources/themes/cura-light/styles.qml:329: TypeError: Cannot read property 'getColor' of null
```
 2021-04-30 12:22:40 +02:00
Jaime van Kessel
c800c2850c
Decrease update interval to 60 sec 
It's the same as what the rest uses and it should decrease the load on our servers a lot
 2021-04-30 10:51:15 +02:00
Ghostkeeper
38061c4044
Merge branch 'master' of https://github.com/lowkeyjoe/Cura into lowkeyjoe-master 2021-04-29 14:24:41 +02:00
freejoe
28b90b1ebe remove material restriction 2021-04-29 16:31:26 +08:00
Konstantinos Karmas
6120d8a054
Merge pull request #9716 from Ultimaker/CURA-8010_new_icons 
Cura 8010 new icons
 2021-04-28 19:02:47 +02:00
Kostas Karmas
f887db23f6 Use detail_level to describe the icons (instead of size) 
Previously the icons were organized according to "size" which could prove to be confusing.
This commit fixes that by organizing them according to "detail_level".

CURA-8010
 2021-04-28 18:53:32 +02:00
Jaime van Kessel
95652556fe
Merge branch 'fix_group_rename' of https://github.com/fieldOfView/Cura 2021-04-28 17:07:33 +02:00
Ghostkeeper
328150cb61
Merge branch 'master' of github.com:Ultimaker/Cura 2021-04-28 16:58:08 +02:00
jelle Spijker
247412b16a
Implemeted new icons in on-boarding dialog 
CURA-8010_new_icons
 2021-04-28 16:54:26 +02:00
Jim Watson
653dd42e87
Fix for crashes on Mac 10.13 in 2010 era hardware 
Not sure I understand why this works - size_x/y are for the end of the line not the start
 2021-04-28 16:35:47 +02:00
Ghostkeeper
171d425bf6
Match precision of input to precision of previous stage output 
It'd probably get cast, but this is better.

Contributes to issue CURA-8189.
 2021-04-28 16:33:24 +02:00
Ghostkeeper
cb87953fe6
Merge branch 'master' of https://github.com/jwrw/Cura into jwrw-master 2021-04-28 16:31:20 +02:00
jelle Spijker
9ea97f7561
SVG are not correlated to pixel size. 
Although this deviates from the UX practices. It tended to confuse the
programmers ;-) The variances in level of detail for the icons are now
placed in the sub-directories. small, default and big.

CURA-8010_new_icons
 2021-04-28 15:45:20 +02:00
Konstantinos Karmas
71ec43d4b9
Merge pull request #9408 from cataclism/MINGDAprofiles 
Added profiles for MINGDA D3/Pro,Rock3/Pro,D4/Pro
 2021-04-28 11:51:12 +02:00
jelle Spijker
5cb56b74e2
Updated the ExtruderIcon to not look completely horrible 
This icon is due for a revisit with ticket:
 - CURA-8011 Replace extruder/material icon

Therefore out-of-scope for this ticket.

CURA-8010_new_icons
 2021-04-28 11:24:33 +02:00
jelle Spijker
845289f708
Removed old theme specific Icons for cloud connect 
This is already taken care of in QML

CURA-8010_new_icons
 2021-04-28 11:17:29 +02:00
jelle Spijker
913369ee41
Removed auto generated text 
CURA-8010_new_icons
 2021-04-28 11:08:27 +02:00
jelle Spijker
886f41603a
Updated Connectivity icons so they can follow theming 
CURA-8010_new_icons
 2021-04-28 11:02:18 +02:00
jelle Spijker
13cd2d677c
Added new icon for Top/Bottom 
CURA-8010_new_icons
 2021-04-28 11:00:52 +02:00
jelle Spijker
2bd6f28f3a
Update Icons 
Subdivided the new icons in 3 size categories. As requested by UX
Used the company naming scheme for uniformity and easy recognition.

Known issues:
- Top/Bottom category wasn't taken into account by UX at the time. Since
 this is a recent addition. Both the Walls and Top/Bottom will be updated.
- Cloud/Network connection icons 12px don't render correctly. Due to the
 theme-ing.
- Extruder Icons do not render correctly.

CURA-8010_new_icons
 2021-04-26 19:42:17 +02:00
Jaime van Kessel
703fee972a
Merge pull request #9702 from gferon/fix-auth-unit-test 
Fix test_wrongServerResponses
 2021-04-26 14:43:34 +02:00
Gabriel Féron
e26cf6f810 Fix test_wrongServerResponses 2021-04-26 11:07:11 +02:00
Jaime van Kessel
1a79580227
Merge pull request #9701 from Ultimaker/issue-forms 
Update bug report and feature request
 2021-04-26 10:57:04 +02:00
Fenne
0c8e9297e0
Merge branch 'master' into issue-forms 2021-04-26 10:12:29 +02:00
fvrmr
ddcd0e5b4f Update bug report and feature request 
Bug report: Added checkbox for project files and log file. Added extra information in additional information and file uploads.
Changed the textarea to markdown so files can be uploaded.
Updated the placeholder to 4.9 in application version.
Feature request:
Changed textarea to markdown.
 2021-04-26 09:53:06 +02:00
Jim Watson
396c26ce3d
Fix for crashes on Mac 10.13 in 2010 era hardware 
Not sure I understand why this works - size_x/y are for the end of the line not the start
 2021-04-24 18:56:08 +01:00
freejoe
ec03dd9727 delete many quality and variants files to reduce number of files 2021-04-23 11:20:37 +08:00
Kostas Karmas
8f46a51ff2 Remove commented out code 2021-04-22 15:16:46 +02:00
Kostas Karmas
c67b4ee3a0 Remove unused function 2021-04-22 15:08:47 +02:00
Kostas Karmas
86bfb3a5aa Fix incompatible mypy type 2021-04-22 15:08:07 +02:00