GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-21 12:09:13 +08:00
Code Issues Packages Projects Releases Wiki Activity
8,067 Commits 290 Branches 260 Tags
Commit Graph

3542 Commits

Author SHA1 Message Date
fieldOfView
577a8d0a3e Fix MaterialView layout issues 
Make scrollview look more in line with the scrollview on the profiles page
 2017-04-30 10:28:03 +02:00
fieldOfView
a1d9b1a37f Force update after unlinking material. 2017-04-29 21:19:54 +02:00
fieldOfView
67b8302d40 Add a notice to linked materials and allow "unlinking" a material. 2017-04-29 21:08:48 +02:00
fieldOfView
23cd6b1c2c Fix rendering of readonly description/adhesion info 2017-04-29 16:43:26 +02:00
fieldOfView
02b978272f Add "Create" button to create a new, unique material. 
The new custom material is still based on generic_pla, but it gets a new GUID and uses itself as base_file so it is not conjoined to another material.
 2017-04-27 11:19:46 +02:00
Mark
d0a95426cb Remove space.. 2017-04-26 13:19:01 +02:00
Mark
f573802e8d Fix to make the extruders line up below the label 
CURA-3609
 2017-04-26 13:01:14 +02:00
Lipu Fei
a5079bfcb3 Merge pull request #1726 from fieldOfView/fix_general_page_scrolling 
Make the general settings page options draggable only vertically
 2017-04-26 11:19:47 +02:00
Jaime van Kessel
1739abbca0 Merge branch 'master' of github.com:Ultimaker/Cura 2017-04-26 09:56:28 +02:00
fieldOfView
0b9f451103 Apply color to layerview legend labels directly 
The Label style property should not be confused with e TextField style property
 2017-04-25 18:15:04 +02:00
fieldOfView
2493bd6fe6 Merge branch 'master' into themed-layer-view 2017-04-25 18:06:12 +02:00
Ghostkeeper
6e5f7ac28a
Merge branch 'feature_support_top_bottom_speed' 
Contributes to issue CURA-3491.
 2017-04-25 16:46:30 +02:00
Ghostkeeper
15593de404
Fix extruder number dependency of support roof pattern 
It was depending on support bottom extruder.

Contributes to issue CURA-3491.
 2017-04-24 17:31:07 +02:00
Jaime van Kessel
01f33d3f28 Merge pull request #1732 from Ultimaker/feature_extruder_contextmenu 
Add Extruders to Context Menu and Refactor
 2017-04-24 14:55:57 +02:00
Ghostkeeper
2eae1cdf22
Move support roof settings above support bottom settings 
This was deemed the most logical ordering.

Contributes to issue CURA-3491.
 2017-04-24 14:28:10 +02:00
Arjen Hiemstra
bca27ad11f Document findItemIndex function in ContextMenu 2017-04-24 13:13:00 +02:00
Arjen Hiemstra
78603bed63 Rename setSelectionExtruder to setExtruderForSelection 
This matches more closely with the naming of the other selection
actions.
 2017-04-24 13:12:00 +02:00
fieldOfView
c1fa927118 Make the general settings page options draggable only in the vertical direction 
... to match other scrollviews. Fixes #1723
 2017-04-22 23:07:13 +02:00
Ghostkeeper
2fda85a6aa
Hide estimated time left if print is aborted or completed 
In fact, only show it if a time estimate is meaningful. We keep showing the estimate while a print is paused though.

Contributes to issue TRI-1550.
 2017-04-21 14:29:40 +02:00
Arjen Hiemstra
e108bd0627 Add extruder selection to Context menu 
Contributes to CURA-3609
 2017-04-20 17:42:06 +02:00
Arjen Hiemstra
03ccdec861 Call the right methods of CuraActions in Actions.qml 
Contributes to CURA-3609
 2017-04-20 17:42:06 +02:00
Arjen Hiemstra
c21895de97 Add a multiplySelection method to CuraActions 
Contributes to CURA-3609
 2017-04-20 17:41:53 +02:00
Arjen Hiemstra
dd73c53ece Introduce center and multiply actions that work on the entire selection 
Instead of working on a single object.

Contributes to CURA-3609
 2017-04-20 17:41:53 +02:00
Arjen Hiemstra
06cc0e9a63 Move the ContextMenu to its own file 
Contributes to CURA-3609
 2017-04-20 17:39:43 +02:00
Ghostkeeper
16bc9db06d
Simplify gradual infill steps maximum formula 
The case where it reaches '20' is incorrect, it should never give an error, so it should've been 999999 or something. This case is also overly complex.
Say that P is 'infill_line_distance > 0' and Q is 'spaghetti_enabled'...
Then it would be the logarithmic if (P and not Q)...
Then it would be 0 or 20 if (not (P and not Q)), which is ((not P) or Q)...
Then it would be 20 if (((not P) or Q) and not Q), which is (not P)...
And it would be 0 if (((not P) or Q) and Q), which is Q.

So therefore it can be simplified to: 20 if (not P) else 0 if Q else logarithmic. But 20 became 999999, hence the above formula.

Contributes to issue CURA-3700.
 2017-04-19 16:24:39 +02:00
Tim Kuipers
50a99eb2b1 fix: dont err on gradual infill when printing hollow (CURA-3700) 2017-04-19 13:50:06 +02:00
Lipu Fei
7db0f0ebb7 Make toggle button labels clickable 2017-04-19 12:46:25 +02:00
Ghostkeeper
f0d4ea43c2
Merge branch 'master' of github.com:Ultimaker/Cura 2017-04-19 10:39:05 +02:00
Ghostkeeper
cc23c72124
Merge branch 'revise_jellybox_support' of github.com:IMADE3D/Cura into IMADE3D-revise_jellybox_support 2017-04-19 10:36:20 +02:00
jack
74726e305e Merge pull request #1698 from Ultimaker/feature_CURA-3574_toggle_button 
CURA-3574: Use a toggle button mode switching
 2017-04-19 10:28:54 +02:00
Jack Ha
232f975092 Removed unused code, added ';' to end of lines. CURA-3574 2017-04-19 10:28:16 +02:00
Ghostkeeper
58bf3e7ab3 Merge branch 'master' of github.com:Rigid3D/Cura into Rigid3D-master 2017-04-19 09:27:54 +02:00
Lipu Fei
61c4631270 Put sizes and numbers for toggle button into theme 
CURA-3574
 2017-04-19 08:56:11 +02:00
Mehmet Sutas
0637719622 Resized Rigid3D Zero2 Platform STL 
Resized Rigid3D Zero2 Platform STL
 2017-04-18 22:49:50 +03:00
Filip Goc
3c85159b05 swap M109 for M104 in the start gcode 
It’s necessary to preheat the nozzle before the auto bed leveling
procedure to loosen up leftover filament that may had hardened on the
nozzle.
 2017-04-18 20:44:55 +02:00
Lipu Fei
6bf0965632 Adjust toggle button size 
CURA-3574
 2017-04-18 16:52:17 +02:00
Lipu Fei
c75887be80 Use a toggle button for mode switching 
CURA-3574
 2017-04-18 16:40:59 +02:00
Tim Kuipers
fdf20fcb15 fix: forgotten floor in descriptions (CURA-3491) 2017-04-18 13:49:55 +02:00
Mark
2d14052f4e Change Label to Text to fix ugly fonts 
CURA-3389
 2017-04-18 13:35:39 +02:00
Mark
8c9eccd1f4 Change Label to Text because of ugle font rendering 
CURA-3389
 2017-04-18 12:11:02 +02:00
Ghostkeeper
7dbb08735a
Merge branch 'master' of github.com:Ultimaker/Cura 2017-04-18 10:30:15 +02:00
Ghostkeeper
e33d4693f0
Merge branch '2.5' 2017-04-18 10:30:01 +02:00
Ghostkeeper
9ad85ce235
Move prime tower 1mm down 
The combination PC-0.4 and PVA-0.8 wouldn't print because the raft was getting so big that it intersected with the prime tower. Moving the prime tower 1mm down allows us to print again.

Contributes to issue CURA-3650.
 2017-04-18 10:29:41 +02:00
Lipu Fei
865ab7135a Merge pull request #1686 from fieldOfView/fix_material_nan 
Fix NaN values on material print settings tab
 2017-04-18 09:52:38 +02:00
Mehmet Sutas
9b0dbdf47c Rigid3D Zero2 Platform 2017-04-16 01:01:16 +03:00
Mehmet Sutas
b908e3a201 Rigid3D Zero2 Machine Definition 2017-04-16 01:00:27 +03:00
Ghostkeeper
7151dc0381
Merge branch '2.5' 2017-04-14 17:06:37 +02:00
Ghostkeeper
c3d18bc256
Remove lower warnings for jerk settings 
It's not a problem to have lower jerk. It'll just print corners quite slow. But sometimes that's necessary, for example for PVA.

Contributes to issue CURA-3650.
 2017-04-14 17:06:18 +02:00
Ghostkeeper
9b06d7dd80
Relax warning constraints for top and bottom thickness 
With very thick layers, fewer layers will still provide enough strength to not sag. 2 is quite a hard minimum though because there are 2 different orientations.

Contributes to issue CURA-3650.
 2017-04-14 16:26:14 +02:00
Ghostkeeper
39fbe542b9
Fix font rendering issues in job spec details 
Labels render with system settings. Text renders with our settings.

Contributes to issue CURA-3389.
 2017-04-14 16:08:12 +02:00