GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-07-07 07:11:50 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,521 Commits 295 Branches 268 Tags
Commit Graph

2336 Commits

Author SHA1 Message Date
Ghostkeeper
6fa36f7c09
Merge branch '2.3' 2016-11-01 16:07:18 +01:00
Ghostkeeper
32653c2df4
Blur settings upon discarding current settings 
Otherwise the currently selected setting doesn't get discarded.

Contributes to issue CURA-2866.
 2016-11-01 16:06:56 +01:00
Ghostkeeper
073c219233
Use spaces instead of tabs 
As per our code standards.
 2016-11-01 12:50:06 +01:00
Ghostkeeper
d889c8370f
Improve Italian translations 
These improvements have been suggested by Nina, who checked this together with a native Italian speaker.
 2016-11-01 12:49:41 +01:00
Ghostkeeper
0db7cf2453
Revert 'Added a comment' and 'Set horizontal expansion' 
This horizontal expansion messes prints with very thin parts. It was probably the wrong solution for the problem. We'll revert the change until we hear more from tests at the materials team.

Contributes to issue CURA-2845.
 2016-11-01 10:28:09 +01:00
Ghostkeeper
0fa93f2214 Merge branch '2.3' 2016-10-31 17:26:51 +01:00
Ghostkeeper
48b57de6df
Filter materials on compatibility for non-machine-specific materials 
This only listens to whether the 'base' XML profile is marked as compatible in its metadata, but since the machine doesn't have its own materials, the base is the only one that exists. This needs to be changed when we change the filtering on fdmprinter, hence the comment in the code.

Contributes to issue CURA-2837.
 2016-10-31 17:26:36 +01:00
Simon Edwards
1fbd179aaa Merge branch '2.3' 2016-10-31 13:30:20 +01:00
Simon Edwards
8c25a91e02 Added a comment to help provide some kind of explaination for this magic value. 
CURA-2845 Prints are slightly oversized
 2016-10-31 11:45:59 +01:00
Ghostkeeper
6999a14821
Merge branch '2.3' 2016-10-31 10:55:54 +01:00
Ghostkeeper
00890abe30
Set horizontal expansion to -0.14mm 
The material team observed that the size of prints was slightly too big. They decided that this adjustment was the best solution.

Contributes to issue CURA-2845.
 2016-10-31 10:55:08 +01:00
Jaime van Kessel
78ab1f1a71 Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-10-28 14:50:07 +02:00
Jaime van Kessel
af10438277 Fixed blurSetting 
CURA-2835
 2016-10-28 14:49:42 +02:00
Ghostkeeper
9f43a740a6
Also validate machine name in rename dialogue 
Otherwise you could still circumvent the length limitation.

Contributes to issue CURA-2692.
 2016-10-28 13:33:37 +02:00
Jaime van Kessel
28eb4297c6 Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-28 11:38:13 +02:00
Jaime van Kessel
fcf3caba5a Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-10-28 10:46:37 +02:00
Jaime van Kessel
74d8148e0c The right stack is now used for limit to extruder setting property provider for single extrusion machine 
This was mostly an issue when switching between printers, where some ids were set to undefined. CURA-2835
 2016-10-28 10:44:57 +02:00
fieldOfView
6e683dffc5 Fix printrbot simple mesh alignment to buildplate grid 2016-10-27 23:35:29 +02:00
Ghostkeeper
717248bd78
Limit number of special characters 
There is also a more advanced attempt that allows more, but I've commented it out because it doesn't quite work yet. Special characters now always count for 12.

Contributes to issue CURA-2652.
 2016-10-27 21:55:58 +02:00
Jaime van Kessel
999380cf1b Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-27 17:15:58 +02:00
Jaime van Kessel
1aa71d6171 Profiles model is now a singleton, to prevent the agressive garbage collecting to break stuff 
CURA-2826
 2016-10-27 14:26:43 +02:00
Jaime van Kessel
4a5d7cbc73 Bindings of inheritance icon now correctly update when switching between machines 
CURA-2752
 2016-10-27 13:08:10 +02:00
Jaime van Kessel
b381186331 Set um2+ height to same as um2 2016-10-27 13:02:38 +02:00
Ghostkeeper
4759bccdb8
Update translation templates after merging secret plug-ins 
The UM3 Network Printing plug-in was secret because the UM3 wasn't released yet. This update contains all texts to be translated as of this writing.
 2016-10-27 11:31:07 +02:00
Jaime van Kessel
f35914299b Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-26 15:44:19 +02:00
Ghostkeeper
07e7521792
Fix spelling mistake 
This is not a bijvoeglijk naamwoord, so it must not get an E at the end.

Contributes to issue CURA-2751.
 2016-10-26 13:41:23 +02:00
Jaime van Kessel
a581942869 Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-26 13:13:27 +02:00
Ghostkeeper
53a4e5e6c0
Remove infill_overlap_mm from Nylon profiles 
This is the result of this week's profile updates from our material tests.
 2016-10-26 11:15:14 +02:00
Simon Edwards
cc33b3be22 Change for the "Advanced" tab to "Custom". 
CURA-2751 Change settings label "Simple" to "Recommended"
 2016-10-26 10:43:00 +02:00
Ghostkeeper
861837ef41 Make generic quality profiles global 
This way they will also be put in the global profile.

Contributes to issue CURA-2723.
 2016-10-26 09:43:11 +02:00
Jaime van Kessel
dd79be6595 Merge branch '2.3' of github.com:Ultimaker/Cura 2016-10-25 16:50:55 +02:00
Arjen Hiemstra
30e14478af Replace quality profiles with optimised versions of Ruben's script 
With the global quality profiles merged this now works properly.

CURA-2645
 2016-10-25 15:40:52 +02:00
Arjen Hiemstra
b0d6d7034a Ensure we re-evaluate the inheritance icon binding when it changes 
Contributes to CURA-2752
 2016-10-25 13:11:04 +02:00
Ghostkeeper
35f43df2f6
Make generic quality profiles global 
This way they will also be put in the global profile.

Contributes to issue CURA-2723.
 2016-10-25 13:06:42 +02:00
fieldOfView
29b357894d Fix homing UM2/UM2+ when printing with RepRap flavor 2016-10-25 11:57:15 +02:00
Jaime van Kessel
a3ff918dde Merge pull request #1075 from fieldOfView/fix_um2_start_gcode 
Fix homing UM2/UM2+ when printing with RepRap flavor
 2016-10-25 11:56:34 +02:00
Ghostkeeper
e3ae3d50f9
Merge branch '2.3' 2016-10-25 11:50:20 +02:00
Arjen Hiemstra
bef3666a88 Still show the inherit button even when the revert is visible 
It was not a bug like I assumed

Contributes to CURA-2752
 2016-10-25 11:40:05 +02:00
Arjen Hiemstra
aed23ca17e Merge branch '2.3' 
* 2.3:
  Expand logic for showing the inherit button in SettingItem
  Add a method to get overrides for a specified (extruder)stack
  Add global profiles for UM3 so this can be tested without dependencies
  Account for empty material when switching quality changes
  Set the global variant and material to empty for multi-extrusion machines
  Also properly set global profile when changing quality_changes profiles
  Add support for global quality profiles
 2016-10-24 17:10:41 +02:00
Arjen Hiemstra
8ce81fec9f Expand logic for showing the inherit button in SettingItem 
Hide it if the revert button is visible and make the overrides check
limit_to_extruder in addition to the active stack.

Contributes to CURA-2752
 2016-10-24 17:10:26 +02:00
fieldOfView
c0824260a3 Fix homing UM2/UM2+ when printing with RepRap flavor 2016-10-24 14:45:26 +02:00
Arjen Hiemstra
588f49fa5f Add global profiles for UM3 so this can be tested without dependencies 
Contributes to CURA-2652
 2016-10-24 11:19:49 +02:00
Chris Pearson
9686c9db1c Add definition for Printrbot Play with heated bed upgrade. 2016-10-22 17:36:21 +01:00
Chris Pearson
8330b953e8 Add definition and mesh for Printrbot Play. 2016-10-22 16:36:06 +01:00
Tim Kuipers
981907d26a Revert "Revert "JSON feat: carve_multiple_volumes (CURA-2712)"" 
This reverts commit 2bff94ba9f6c0293b4f6c6a1fd79548422639a4d.

reapplies 8ee22738bc75353aa9d12f1dcdf8bf41a3881602
 2016-10-21 16:21:08 +02:00
Tim Kuipers
86d682daae Merge branch '2.3' 2016-10-21 16:20:52 +02:00
Tim Kuipers
2bff94ba9f Revert "JSON feat: carve_multiple_volumes (CURA-2712)" 
This reverts commit 8ee22738bc75353aa9d12f1dcdf8bf41a3881602.
 2016-10-21 16:20:39 +02:00
Tim Kuipers
8ee22738bc JSON feat: carve_multiple_volumes (CURA-2712) 2016-10-21 16:07:03 +02:00
Ghostkeeper
19678c1126
Display layer height after profile name in drop-down 
There is no styling in this drop-down, as it is provided by the OS. Just a dash and the layer height will do.

Contributes to issue CURA-2737.
 2016-10-21 14:00:43 +02:00
Ghostkeeper
afd3dd6eec
Make separate theme colour for detail text 
I would use the normal font colour with a lower alpha value here, but it seems that rendering text with transparency doesn't work in Qt.

Contributes to issue CURA-2737.
 2016-10-21 13:06:49 +02:00