GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-16 22:56:41 +08:00
Code Issues Packages Projects Releases Wiki Activity
9,304 Commits 290 Branches 260 Tags
Commit Graph

9304 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lipu Fei
adfe6ce63a Add #version 120 to make shaders work on Windows 
USL-32
 2017-06-16 10:59:47 +02:00
Ghostkeeper
3240338f6d
Merge branch 'master' of github.com:Ultimaker/Cura 2017-06-16 09:25:50 +02:00
Ghostkeeper
175ac67e18
Merge branch 'nliaudat-patch-1' 2017-06-16 09:25:33 +02:00
Ghostkeeper
6c02c46168
Merge branch 'patch-1' of https://github.com/nliaudat/Cura into nliaudat-patch-1 2017-06-16 09:23:19 +02:00
Jaime van Kessel
f7fd28b656 Merge branch 'master' of github.com:Ultimaker/Cura 2017-06-15 21:18:06 +02:00
Jaime van Kessel
856a490acc Removed unneeded shader duplication. 
The work done for USL-43 ensures that all this duplication is no longer needed.
 2017-06-15 21:17:21 +02:00
Jaime van Kessel
2adf97ba2d Also apply the filtering on the quality and user profiles model 
CURA-3935
 2017-06-15 17:18:04 +02:00
Ghostkeeper
b4559eba2d
Rename forgotten sanding settings to ironing 
Oops.

Contributes to issue CURA-3903.
 2017-06-15 16:38:12 +02:00
Ghostkeeper
29b90d26b8
Re-enable centre camera on selection 
With Qt 5.8 it works again on Windows.
 2017-06-15 16:16:56 +02:00
Jaime van Kessel
c93acc12e7 Merge branch '2.6' of github.com:Ultimaker/Cura 2017-06-15 15:28:34 +02:00
Ghostkeeper
092483cac5
Rename setting ids for sanding to ironing 
This makes the code easier to follow since we consistently use the same terms for things in our code as what is user-visible.

Contributes to issue CURA-3903.
 2017-06-15 15:19:45 +02:00
Ghostkeeper
a7ed0d011a
Rename speed settings for sanding to ironing 
This is consistent with the rest. I had forgotten these since they are in a different category.

Contributes to issue CURA-3903.
 2017-06-15 15:17:42 +02:00
Ghostkeeper
e003abf895
Only display global quality changes profiles 
There's one copy for every stack. It doesn't matter which one we take as long as they have the same name. Global is always present, even in single extrusion. Seems the most logical one to display.

Contributes to issue CURA-3935.
 2017-06-15 14:38:04 +02:00
Ghostkeeper
66f5b236d6
Merge branch '2.6' 2017-06-15 09:54:19 +02:00
Ghostkeeper
4c8d65a2f4
Re-enable Brazillian Portuguese translation 
It's complete again. Thanks Patola.

Contributes to issue CURA-3885.
 2017-06-15 09:42:30 +02:00
Ghostkeeper
53d870148d
Merge branch 'Patola-2.6' into 2.6 2017-06-15 09:30:38 +02:00
Ghostkeeper
c7260611ca
Merge branch '2.6' of https://github.com/Patola/Cura into Patola-2.6 2017-06-15 09:27:49 +02:00
Ghostkeeper
0c9556a48c
Rename Sanding to Ironing 
Just the user-visible name.

Contributes to issue CURA-3903.
 2017-06-15 08:54:44 +02:00
Cláudio Sampaio (Patola)
24e4aa59ad updated strings for cura 2.6 2017-06-14 10:47:40 -03:00
Ghostkeeper
ebd2f0b415
Fix switching to quality changes profiles 
It would put the global quality changes profile in each of the extruders, thus not giving any per-extruder settings.

Contributes to issue CURA-3935.
 2017-06-14 15:30:55 +02:00
Ghostkeeper
f4e620c458
Remove unused variable 
Contributes to issue CURA-3935.
 2017-06-14 13:40:57 +02:00
Jaime van Kessel
7551c83612 QualityChanges are now also removed if a machine has a parentDefinition 
CURA-3929
 2017-06-14 11:04:22 +02:00
Ghostkeeper
8bce6e060c
Merge branch '2.6' 2017-06-14 10:58:11 +02:00
fieldOfView
49f2fb2cea
Fix filtering maerials after editing materials 
NB: previously the "approximate_diameter" metadata was stored as a number. This caused some issues passing arguments from QML to Python. Now "approximate_diameter" is stored as a string.
 2017-06-14 10:42:04 +02:00
fieldOfView
8f7471a892
Remove debug statement 2017-06-14 10:41:53 +02:00
fieldOfView
ed6f4d851c
Update documentation 2017-06-14 10:41:39 +02:00
fieldOfView
c9998ca6fe
Set properties for all containers with the same base_file metadata entry 2017-06-14 10:41:23 +02:00
fieldOfView
a7cdf49018
Fix setting metadata on fdmmaterial containers 2017-06-14 10:41:12 +02:00
fieldOfView
1f49a87acb
Update material_diameter when editing the material in MaterialView.qml 2017-06-14 10:41:02 +02:00
fieldOfView
5550fe0da8
Fix confusion around the use of the word "global" 2017-06-14 10:40:52 +02:00
fieldOfView
944318d44a
Fix loading material diameter and GUID from XML file 2017-06-14 10:40:43 +02:00
Jaime van Kessel
932a9d23f0 Merge branch '2.6' of github.com:Ultimaker/Cura into 2.6 2017-06-14 09:44:05 +02:00
Jaime van Kessel
a7a2740690 No longer add material to qualityChanges 
QualityChanges are never supposed to have Material.

CURA-3929
 2017-06-14 09:41:33 +02:00
Jaime van Kessel
1020b0a2f3 Finding all qualities no longer does silly things with materials 
The fetchContainer function also did magical material filtering, which caused it to go haywire.

CURA-3929
 2017-06-14 09:40:11 +02:00
Ghostkeeper
baef713f50
Disable incomplete languages 
These translations are incomplete for the 2.6 release.

Contributes to issue CURA-3885.
 2017-06-14 09:37:55 +02:00
Jaime van Kessel
d89af03432 Merge branch 'master' of github.com:Ultimaker/Cura 2017-06-13 16:29:14 +02:00
Jaime van Kessel
4fa9b94e30 Minor code cleanup 2017-06-13 16:28:41 +02:00
Lipu Fei
0e09094a3d Merge branch '2.6' 2017-06-13 15:06:37 +02:00
Lipu Fei
dd65248968 Only set metadata/material for quality_changes if material is not None 
CURA-3929
 2017-06-13 14:35:27 +02:00
Jaime van Kessel
c8d9720a8a Merge branch '2.6' of github.com:Ultimaker/Cura 2017-06-13 13:51:55 +02:00
Jaime van Kessel
ec73abecb5 Custom material now defaults to PLA. 
This is not an ideal solution, but it bandaids a problem for the moment.

CURA-3911
 2017-06-13 13:48:34 +02:00
Arjen Hiemstra
e5df4c4c5e Merge branch '2.6' 
* 2.6:
  Merge pull request #1910 from Ultimaker/fix_dialog_sizes
  Fix ordering of merged PlatformPhysicsOperation
 2017-06-13 13:23:35 +02:00
Mark
8ab5c7e4cd Merge pull request #1910 from Ultimaker/fix_dialog_sizes 
Fix dialog sizes.
Tested on different OSes and screens, all looked good.
 2017-06-13 13:14:44 +02:00
Arjen Hiemstra
d44caa281b Fix ordering of merged PlatformPhysicsOperation 
This makes sure we undo the PP operation before the other operation, so
the ordering of operations is still correct.

Contributes to CURA-3912
 2017-06-13 13:10:59 +02:00
Jaime van Kessel
e0e5114163 Merge branch '2.5' of github.com:Ultimaker/Cura 2017-06-12 15:25:45 +02:00
Jaime van Kessel
df67ae18f1 Merge branch '2.6' of github.com:Ultimaker/Cura 2017-06-12 15:25:35 +02:00
Jaime van Kessel
9a54ff426b FindAllQualitiesForMachineMaterial only looks with basic materials if it found them 
CURA-3911
 2017-06-12 15:14:25 +02:00
Jaime van Kessel
a306b4dada We now properly fall back if no basic material is found 
CURA-3911
 2017-06-12 13:53:35 +02:00
Lipu Fei
82224c0ed0 Copy material into metadata if machine has specific material profiles when duplicating a quality profile 
CURA-3929
 2017-06-12 10:56:01 +02:00
Ghostkeeper
8302819310
Merge branch '2.6' 2017-06-12 09:23:41 +02:00