3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-21 13:47:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 18
28255 commits 306 branches 270 tags 779 MiB
Commit graph

28255 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ghostkeeper
901b05d1a6
Merge branch '4.11' 2021-08-17 13:35:00 +02:00
Ghostkeeper
33edc4a8c9
Fix display of unlinking button 
It was not being displayed with Qt 5.15 due to the following error:
MaterialsView.qml:34:5: Unable to assign QStringList to QString
This is correct. And it should not just concatenate all of these material names; it should add a comma between them for human-readable display in the text label above the button.

Fixes #10235.
 2021-08-17 13:34:43 +02:00
AnnaKang0219
1662398cda Add Jr.Pro Xe+ Definition 
Add Jr.Pro Xe+ Definition
 2021-08-17 17:17:40 +08:00
AnnaKang0219
778855c06f Add XYZprinting Printer Definitions 
Hi,
I just add Definitions for XYZprinting Printers,
Please help to check,thank you.
 2021-08-17 14:12:16 +08:00
fieldOfView
91b2a9b325 Fix typo 2021-08-16 21:07:55 +02:00
X40-Community
0b666cce20 Error in line 24 fixed 2021-08-16 18:51:39 +02:00
Konstantinos Karmas
e0e4a3f2c0 Add shadow behind the what's new pages 
As discussed during the eCCB.
 2021-08-16 17:00:30 +02:00
Konstantinos Karmas
2299f90808 Add shadow behind the what's new pages 
As discussed during the eCCB.
 2021-08-16 16:57:57 +02:00
fieldOfView
f11869034b Add {material_type} and {material_name} as replacement patterns 2021-08-16 14:28:40 +02:00
nani
01aa6772fa minor changes 2021-08-16 16:07:54 +05:30
fieldOfView
e4a04c186f Merge branch 'master' into feature_pause_at_height_optional_parking 
# Conflicts:
#	plugins/PostProcessingPlugin/scripts/PauseAtHeight.py
 2021-08-16 12:19:49 +02:00
fieldOfView
6c585deb1e Make parking optional 
Not adding parking gcode makes the repetier @pause method suitable for use with OctoPrint.

Contributes to #7842
 2021-08-16 12:15:38 +02:00
Jaime van Kessel
d5d163377b Merge branch '4.11' of github.com:Ultimaker/Cura 2021-08-16 11:16:29 +02:00
Jaime van Kessel
a124342127 Fix Pause at height issue 
Fixes #8575

Thanks to @EGOiST1991 for suggesting the fix!
 2021-08-16 11:15:30 +02:00
Jaime van Kessel
bb2651bc0b Merge branch 'master' of https://github.com/NilsRo/Cura 2021-08-16 11:11:46 +02:00
X40-Community
f848f1c937 Code corrected, duplicate parameters deleted 2021-08-15 19:08:32 +02:00
Jelle Spijker
7f79ccdf33
Merge pull request #10261 from Ultimaker/CURA-8468_fix_project_loading 
Fix project loading Arachne
 2021-08-13 09:27:28 +02:00
root
2939294018 Merge branch 'master' of https://github.com/x40-Community/Cura 
M192 removed from start code, parking position changed to X351 in start code
 2021-08-12 22:14:37 +02:00
root
742c8fed21 M192 removed from start code, parking position changed to X351 2021-08-12 22:12:49 +02:00
NilsRo
b33f4640ad Updated Acceleration to firmware default 
Updated Acceleration to firmware default to increase time estimation accuracy and match firmware default
 2021-08-12 22:10:37 +02:00
x40-Community
0c762dcd81
Merge branch 'Ultimaker:master' into master 2021-08-12 22:03:58 +02:00
root
9ea6dbf668 Since I can't program a phyton, the script author doesn't have time for a revision and I haven't found any in the X40 community either, I deleted the X40Snapshot.py script. 2021-08-12 22:01:48 +02:00
Jelle Spijker
4986861727
Merge branch 'master' into libArachne_rebased 2021-08-12 18:50:29 +02:00
Jaime van Kessel
44ba8e3d1f Merge branch '4.11' of github.com:Ultimaker/Cura 2021-08-12 15:49:41 +02:00
Jaime van Kessel
3dec4e228b Use leftpadding instead of binding anchors outside of siblings 2021-08-12 15:48:58 +02:00
Jaime van Kessel
4b324095ec Remove incorrect log 
There is absolutely no reason that needed to be logged, since it
happens on *every* boot. It was also not a place where an exception
even happend.
 2021-08-12 15:43:11 +02:00
Jaime van Kessel
1f523053d9 Add even more logging to authorization service 2021-08-12 15:35:14 +02:00
Jaime van Kessel
5bc6ed25da Merge branch '4.11' of github.com:Ultimaker/Cura 2021-08-12 15:28:12 +02:00
Jaime van Kessel
79ccccb1a1 Fix qml warning spam 2021-08-12 15:27:39 +02:00
Jaime van Kessel
7762def1ef Merge branch 'master' of https://github.com/heed818/Cura 2021-08-12 15:20:42 +02:00
Jaime van Kessel
9890d12c57
Merge pull request #10271 from Ultimaker/CURA-8459_middle_line_split_and_add_thresholds 
[CURA-8459] Differentiate even vs. uneven nr. of walls for add/split middle wall transitions.
 2021-08-12 13:47:21 +02:00
Jaime van Kessel
7eb0da9987 Merge branch '4.11' of github.com:Ultimaker/Cura 2021-08-12 11:18:11 +02:00
Jaime van Kessel
21a076aea4 Set type of engine crash message to Error 2021-08-12 11:17:38 +02:00
Jaime van Kessel
b60ae92d60 Merge branch '4.11' of github.com:Ultimaker/Cura 2021-08-12 11:15:38 +02:00
Jaime van Kessel
34905857ee
Merge pull request #10267 from Ultimaker/CURA-8473_backwards_compat_messages_411 
Digital Library plugin needs to be backwards compatible.
 2021-08-12 11:15:01 +02:00
Remco Burema
3061490675
Fix look for string in enum-type. 
CURA-8473
 2021-08-12 10:05:16 +02:00
Konstantinos Karmas
f5bf88e546 Fix crashing when clicking the "Manage in browser" 
The parenthesis should be placed at the end.
 2021-08-12 09:51:27 +02:00
Remco Burema
dece6ac40d
Differentiate even vs. uneven nr. of walls for add/split middle wall transitions. 
This replaces the single and confusingly named 'Line Compactness' with a set of 2 settings that give both more detailed control and will hopefully a bit easier to understand.

CURA-8459
 2021-08-12 09:06:54 +02:00
AnnaKang0219
e7e5970647 Remove the files not CZ-300 
Remove the files not CZ-300
 2021-08-12 09:35:15 +08:00
root
3ed8e6ee3f Quality profiles renamed 2021-08-11 19:59:16 +02:00
Konstantinos Karmas
7c8153eede Don't crash if the keyring password cannot be decoded 
Fixes Sentry issue CURA-2S0
 2021-08-11 17:25:45 +02:00
Konstantinos Karmas
0e26b9125a Merge branch '4.11' of https://github.com/Ultimaker/Cura into 4.11 2021-08-11 17:05:46 +02:00
Konstantinos Karmas
71748bff8d Don't crash if the reply cannot be loaded 
Fixes Sentry issue CURA-2RQ
 2021-08-11 17:05:36 +02:00
Jaime van Kessel
fb18b278bf
Merge pull request #10245 from Ultimaker/CURA-7279_back_pressure_compensation 
[CURA-7279] Back-Pressure Compensation
 2021-08-11 15:52:32 +02:00
Jelle Spijker
fd79192055
Merge pull request #10266 from Ultimaker/CURA-8472_4.11_translations 
CURA-8472: Prepare for the 4.11 translations
 2021-08-11 13:19:58 +02:00
Remco Burema
ecf820f3db
Fix tests. 
CURA-8473
 2021-08-11 12:35:54 +02:00
Remco Burema
5d7804deae
Digital Library plugin needs to be backwards compatible. 
Message-types are a new parameter to Messages, so they can't be used in SDK/API versions smaller than 7.7.0.

CURA-8473
 2021-08-11 12:14:02 +02:00
Konstantinos Karmas
d36435db5f Update po files for 4.11 translations 
CURA-8472
 2021-08-11 11:12:25 +02:00
Konstantinos Karmas
df5dad3066 Update pot files for 4.11 translations 
CURA-8472
 2021-08-11 11:05:20 +02:00
Jaime van Kessel
2c2e7f2c16 Add even more logging to authorization service 2021-08-11 10:19:27 +02:00