GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-24 13:39:05 +08:00
Code Issues Packages Projects Releases Wiki Activity
29,052 Commits 291 Branches 265 Tags
Commit Graph

13224 Commits

Author SHA1 Message Date
Remco Burema
d8738867f8 Merge branch 'master' into scale_fan_speed 2022-03-25 15:37:19 +01:00
Jaime van Kessel
efdb60e153 Remove area_deviation from ultimaker.def.json 
CURA-9036
 2022-03-25 14:41:56 +01:00
Jaime van Kessel
835bdf8a08 Merge branch 'CURA-9036_fix_average_width_simplify' of github.com:Ultimaker/Cura 2022-03-25 13:53:28 +01:00
Jaime van Kessel
894615914a Merge branch 'new-splashscreen' of github.com:Ultimaker/Cura 2022-03-25 10:49:16 +01:00
10r3n20
32153b0e57 removed wrong enterprise image 2022-03-25 10:44:50 +01:00
Jaime van Kessel
4f98025acc Remove unrecognised properties from fdmprinter 
No idea how they got there, but it caused a warning spam
 2022-03-25 10:31:50 +01:00
10r3n20
fa3aa696fb updated payoff 2022-03-25 10:22:46 +01:00
Tim Kuipers
d7e307bf81 remove wall_order_center_last 
We decided this setting had no real use to the user
 2022-03-25 09:05:30 +01:00
Tim Kuipers
f05b3aad66 fix default for inset_direction 2022-03-25 09:05:01 +01:00
Remco Burema
5ea08ad66e Revert "Set the default value of the Maximum Extrusion Area Deviation to 50.000um2 and remove the warning levels." 
This reverts commit 3c4c91947e4eed82babe58550316789ffcde2444.
 2022-03-24 17:56:06 +01:00
Jaime van Kessel
1532779d1b Remove Extruders property from global stack 
CURA-7810
 2022-03-24 14:26:03 +01:00
Jaime van Kessel
58a63aed02 Remove "cornerSide", "shadowColor" and "shadowEnabled" from ActionButton 
CURA-7810
 2022-03-24 13:56:14 +01:00
Jaime van Kessel
e925f07aad Remove old arranger code 
Major vesion upgrade, time to clean some stuff up!

CURA-7810
 2022-03-24 13:37:29 +01:00
j.spijker@ultimaker.com
55cb86ebbd
use namespace AlignmentFlag 
Contributes to CURA-8640
 2022-03-24 11:58:42 +01:00
Jelle Spijker
3f8907d02a
Merge branch 'master' into CURA-8640_PyQt6 
# Conflicts:
#	cura/CuraApplication.py
#	resources/qml/Preferences/Materials/MaterialsSyncDialog.qml
#	resources/qml/Preferences/Materials/MaterialsView.qml
 2022-03-24 11:53:44 +01:00
Jaime van Kessel
049d8c0d35
Merge pull request #11589 from Ultimaker/spiralize_bottom_fix 
disable 100% infill bottom layers trick for spiralize
 2022-03-23 16:22:48 +01:00
Jaime van Kessel
43da68c898 Merge branch 'fix_scrollview_scrollbars' of https://github.com/fieldOfView/Cura 2022-03-22 16:13:46 +01:00
fieldOfView
09c3ae628e Fix "double"/non-functional scrollbars on ScrollViews 2022-03-22 14:46:14 +01:00
Tim Kuipers
10b3747287
Fix Transitioning angle description with what it's actually for (#11335) 
* Fix Transitioning angle description with what it's actually for

* Transitioning Angle Spelling and grammar.

--author=Ruben

Co-authored-by: Ghostkeeper <Ghostkeeper@users.noreply.github.com>

* Simpler description for Wall Transitioning Threshold Angle

* lil typo

Co-authored-by: Ghostkeeper <Ghostkeeper@users.noreply.github.com>
 2022-03-22 14:34:30 +01:00
casper
5d3b22f45a Don't check on type equality to check if material is set 
As suggested by code review

CURA-9044
 2022-03-22 13:46:31 +01:00
casper
1e15197d44 Show active material in italics 
behaviour is not perfect; only one (of the possible multiple if you have
multiple materials) active material is shown in italics. However, this
behavior is similar as the behavior in cura v4.13

see
https://github.com/Ultimaker/Cura/pull/11668/files#diff-ba2e4797d4d21e847be25e2c272d6a7a45e3bab97def420bed7643d762be8cfaL54

CURA-9044
 2022-03-22 12:00:56 +01:00
casper
d7cf7ee97d Re-implement showing active profile as italic 
This went got removed during a merge conflict

see
https://github.com/Ultimaker/Cura/pull/11696
https://github.com/Ultimaker/Uranium/pull/798

CURA-9044
 2022-03-22 11:43:36 +01:00
casper
a8e63005f1 Merge branch 'master' into CURA-8979_Materials_Preference_Page 
# Conflicts:
#	resources/qml/Preferences/ProfilesPage.qml
 2022-03-21 14:06:59 +01:00
Casper Lamboo
d45c70142f
Merge pull request #11695 from Ultimaker/8980_Fix_buttons_in_USB_monitoring_ 
CURA-8980 fix buttons in usb monitoring
 2022-03-21 14:04:41 +01:00
casper
adccc5fd19 Use correct font and line height for the category btn in materials list 
CURA-8979
 2022-03-21 13:50:10 +01:00
casper
bfa8118c9f Merge branch 'master' into CURA-8979_Materials_Preference_Page 
# Conflicts:
#	resources/qml/ColorDialog.qml
#	resources/qml/Preferences/ProfilesPage.qml
 2022-03-21 13:39:16 +01:00
Jaime van Kessel
a9bad453a6
Merge pull request #11696 from Ultimaker/CURA-9044_show_italic_for_active_profile 
Remove reference to Cura in UM component
 2022-03-21 13:33:18 +01:00
casper
10339555f4 Simplify materials preference page by wrapping scroll items in ListView 
CURA-8979
 2022-03-21 13:20:41 +01:00
casper
9b19eaf84f Add scroll bar to print monitor if content is overflowing 
Fixes https://github.com/Ultimaker/Cura/issues/11629

CURA-8980
 2022-03-21 11:27:47 +01:00
casper
a4f1907b12 Show Yes and No buttons in abort dialog 
CURA-8980
 2022-03-21 10:23:05 +01:00
Tyler Adler
7830cd5bf9 Neptune 2 and 2D 
This adds machine_head_with_fans_polygon and gantry height as well as support for neptune 2D
 2022-03-20 20:19:19 -07:00
j.delarago
a3892c8147 Remove reference to Cura in UM component 
Add isActiveModelFunction that can be overwritten in inheriting components

Override isActiveModelFunction in Profiles page, this is done because quality models do not have a unique id that can be assigned to activeId

CURA-9044
 2022-03-18 16:44:56 +01:00
j.delarago
c10865b179 Fixes this error 
QML Column: ScrollBar must be attached to a Flickable or ScrollView

by wrapping the Column in a ScrollView the same way that is done for the information page.

CURA-8979
 2022-03-18 14:45:03 +01:00
j.delarago
bd91078e6e Accept click events on materials items in materials list 
CURA-8979
 2022-03-18 14:08:20 +01:00
j.delarago
c6bd020dec Anchor material name to star icon so text doesn't display under star icon. 
CURA-8979
 2022-03-18 13:58:41 +01:00
j.delarago
c7bb97aa6c Add tooltip to materials list itmes. 
CURA-8979
 2022-03-18 13:56:19 +01:00
10r3n20
c8f34e26c7 updated image 2022-03-18 13:46:17 +01:00
j.delarago
503f21090e Swap materials page SpinBox for NumericTextFieldWithUnit 
This fixes,
filament cost iterating backwards with spinbox ( who knows why it did this )
text not updating when different material selected
value with decimals not saving

Remove margin from NumericTextFieldWithUnit.qml. Not sure why this was present, it made the TextField slightly smaller than the rest.

Remove some parsing str to float/int. Not needed since settings are stored as str

CURA-8979
 2022-03-18 13:42:55 +01:00
Remco Burema
17e18e76d7
Merge pull request #11639 from Ultimaker/more_intuitive_line_thresholds 
More intuitive line thresholds
 2022-03-17 14:55:59 +01:00
Joey de l'Arago
fcfc47920f
Merge pull request #11674 from Ultimaker/CURA-9039_combobox_open_out_of_window 
[CURA-9039] fix combobox scrolling out of view
 2022-03-17 07:46:56 +00:00
Jaime van Kessel
40fc587d64
Merge pull request #11675 from Ultimaker/PP-115_unify-wall-thickness 
PP-115_unify-wall-thickness
 2022-03-16 17:04:22 +01:00
10r3n20
044c3e9da2 updated splash screens 2022-03-16 17:03:03 +01:00
Remco Burema
7dfcac7bbe
Merge pull request #11663 from Ultimaker/CURA-9007_burger_menu 
[CURA-9007] Update Burger Menus
 2022-03-16 15:59:32 +01:00
Jaime van Kessel
f0bfe4f3a2 Merge branch 'PP-126_set_horizontal_expansion' of github.com:Ultimaker/Cura 2022-03-16 15:53:32 +01:00
Remco Burema
f4e57b82f8
Merge pull request #11664 from Ultimaker/CURA-8921 
[CURA-8921] Workaround for windows not giving dialogs the correct width.
 2022-03-16 15:29:32 +01:00
Remco Burema
51752d162c
Merge pull request #11635 from Ultimaker/CURA-8981_resolve_for_interface_and_raft_extruder 
Add resolve values for raft & interface extruders
 2022-03-16 14:46:20 +01:00
j.delarago
84d7443c18 Change OnYChanged out for OnPositionChanged inside scrollbar. Makes a bit more sense logically and this can be reused in ScrollViews as well. 
Added OnPositionChanged to General Page
CURA-8979
 2022-03-16 13:59:22 +01:00
Rolzad73
5a12265446 - fixed snapmaker2 End-Gcode definition for Z return variable 2022-03-15 16:56:06 -04:00
Jaime van Kessel
d8f6173dd9
Merge pull request #11660 from Ultimaker/CURA-8890_combobox_width 
[CURA-8890] combobox width
 2022-03-15 16:51:02 +01:00
Jaime van Kessel
74e46c6009 Merge branch 'CURA-8945_spinbox_behaviour' of github.com:Ultimaker/Cura 2022-03-15 16:44:57 +01:00