GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-15 20:58:01 +08:00
Code Issues Packages Projects Releases Wiki Activity
7,023 Commits 290 Branches 260 Tags
Commit Graph

1757 Commits

Author SHA1 Message Date
Jaime van Kessel
cf06a918a8 Per object tool now also triggers recenter 
CURA-2401
 2016-09-20 13:12:27 +02:00
Ghostkeeper
bc6e7dd24e
Merge branch 'sevaa-feature_x3d_file_format' 2016-09-20 11:49:39 +02:00
Ghostkeeper
d3a9b349d1 Merge pull request #999 from Ultimaker/thopiekar-CURA-1445-use-HTTPS-again 
[CURA-1445] SliceInfo: Using HTTPS again
 2016-09-20 10:44:34 +02:00
fieldOfView
4911eaed00 Fix merge mistakes 
CURA-2299
 2016-09-19 18:30:23 +02:00
fieldOfView
087ad6f472 Move layerdata and busy handling back into LayerView 
This reverts commits 17b12b904809cae093aa59cfdd2e5958978eb6e0 and 66f8a62e6c1cf376ab6fb089a8d4911fc311e4b0.

# Conflicts:
#	plugins/LayerView/LayerPass.py
#	plugins/LayerView/LayerView.py
 2016-09-19 17:59:24 +02:00
fieldOfView
155fe326b7 Remove unnecessary bools 
CURA-2199
 2016-09-19 17:17:03 +02:00
fieldOfView
b05caa8bdc Remove unused uniforms from composite shaders 
CURA-2299
 2016-09-19 17:15:22 +02:00
fieldOfView
7bca6a648a Merge branch 'feature_layerview_ghosts' into ghosts 
# Conflicts:
#	plugins/LayerView/LayerView.py
 2016-09-19 16:43:17 +02:00
Jaime van Kessel
3c0971c375 Legacy profile reader no longer creates profiles for multi-extrusion machines 
CURA-2421
 2016-09-19 16:22:47 +02:00
fieldOfView
a62b0587ad Show correct selected gcode flavor now there are more than 2 options 
CURA-2304
 2016-09-19 14:35:54 +02:00
Jaime van Kessel
799e66c3ac Legacy profiles are now loaded as quality_changes 
CURA-2344
 2016-09-19 14:33:38 +02:00
Aldo Hoeben
9fb4fc3e65 Merge pull request #1000 from thopiekar/master-CURA-1852 
[CURA-1852] Sending material volumina per extruder
 2016-09-19 12:42:56 +02:00
fieldOfView
538a35f81c Add "Repetier" as a GCode flavor option 
The "UltiGCode" and "Reprap (Marlin/Sprinter)" options are not translated, to "Repetier" does not need translation either (?).

CURA-2304
 2016-09-19 11:23:40 +02:00
Thomas Karl Pietrowski
8366cb8c9b CURA-1852: Removing TODO 
Removed the TODO tag, but left a little comment about what is happening in the following section.
 2016-09-19 09:50:09 +02:00
Ghostkeeper
d391639b48
Translate Fan Speed Full At Layer to one-based counting 
All layer counts should increment by 1.

Contributes to issue CURA-2314.
 2016-09-16 16:50:27 +02:00
Thomas Karl Pietrowski
755b2e61e4 CURA-1852: Sending material volumina per extruder 2016-09-16 15:16:34 +02:00
Thomas Karl Pietrowski
41248a5133 SliceInfo: Using HTTPS again 
The problem seems to be related to our HTTP(S) server.
It is expected that the problem will be solved after the weekend.

Contributes to CURA-1445
 2016-09-16 14:36:32 +02:00
Ghostkeeper
ef3b6905b7
Translate skin overlap properly 
From this dict it also gets updated in other places, such as the preferences.

Contributes to issue CURA-844.
 2016-09-15 12:47:39 +02:00
Ghostkeeper
c223044541
Don't modify original dict while iterating over it 
Just store the results in a new dict and return that one.
 2016-09-15 12:47:39 +02:00
fieldOfView
b914aefac6 Allow fractional input 2016-09-15 11:48:48 +02:00
Ghostkeeper
5c5d188889
Remove support_area_smoothing setting 
Contributes to issue CURA-2296.
 2016-09-14 15:41:32 +02:00
Ghostkeeper
5c49adc52e
Also return tuple if upgrading failed 
It is checked if the file data is None or empty (the upgrade is then considered 'failed'). But to unpack the file data, it needs to be a tuple.

Contributes to issue CURA-844.
 2016-09-14 15:41:32 +02:00
Tim Kuipers
479f9ea6d2 refactor: global_inherits_stack ==> limit_to_extruder (CURA-2308) 2016-09-14 10:46:57 +02:00
fieldOfView
6334f74fc6 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-09-14 08:52:05 +02:00
fieldOfView
72b4442320 Show warning in layerview that wireprint display is not accurate 
CURA-2288
 2016-09-14 08:50:46 +02:00
Jaime van Kessel
7caecd0a41 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-13 17:28:08 +02:00
Jaime van Kessel
76e57c940d Added more specific error message when trying to slice with incompatible material 
CURA-2271
 2016-09-13 17:27:29 +02:00
Jack Ha
bfdb5e68a1 Merge branch 'master' of github.com:Ultimaker/Cura 2016-09-13 15:09:46 +02:00
Jack Ha
31b0f74874 Change url of cura stats. CURA-1445 2016-09-13 15:09:33 +02:00
Ghostkeeper
89fb92edbd
Disable upgrading current settings altogether 
The current settings in 2.1 specified a machine instance. In 2.2 they specify a machine definition. There is not enough information in one file to be able to translate that.

Contributes to issue CURA-844.
 2016-09-13 14:58:13 +02:00
Jaime van Kessel
b707c8d806 XML profile now returns serialization data even if it's read only 
This way exporting read only profiles is possible again.

CURA-2359
 2016-09-13 14:57:00 +02:00
jack
7d5eb493c7 Merge pull request #967 from thopiekar/master-CURA-1445 
[CURA-1445] Adding hashes
 2016-09-13 12:55:01 +02:00
fieldOfView
c43b277901 Fixed double import 
3rd time lucky?
 2016-09-13 11:53:46 +02:00
fieldOfView
d907bfb5e3 Fixed copy/paste error 2016-09-13 11:52:18 +02:00
fieldOfView
ebd9332823 Fix imports 2016-09-13 11:49:27 +02:00
fieldOfView
f527da2f3c Add message to layerview about incompatibility with wireprinting 
The message is not currently shown yet, but added before the string freeze. CURA-2288
 2016-09-13 11:01:26 +02:00
Jack Ha
fb3f03b446 Fixed XML setMetaDataEntry for changing too much meta data. Contributes to CURA-2159 2016-09-12 13:55:05 +02:00
Jack Ha
df536e158b Fixed XmlMaterialProfile serialize for booleans. Contributes to CURA-2159 2016-09-12 13:30:14 +02:00
Ghostkeeper
8249200121
Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3 2016-09-09 17:26:12 +02:00
Ghostkeeper
03c3b2ac2f
Make empty profile for current settings when upgrading from UM2+ 
This change causes the stack to make a new profile at the top to store current settings in.

Contributes to issue CURA-844.
 2016-09-09 17:23:13 +02:00
fieldOfView
66fc85c6b2 Fix revert accident 2016-09-09 17:10:45 +02:00
Ghostkeeper
1e23141b18 Fall back to different quality depending on stack 
Falling back to normal.inst.cfg isn't enough. That profile may be filtered out by the machine, variant and material. We need to fall back to a different quality profile depending on the machine, variant and material.

Contributes to issue CURA-844.
 2016-09-09 16:20:06 +02:00
Ghostkeeper
ba6ce52d29 Use translation of built-in profiles instead of constructing it 
Makes the code much simpler, though some repetition is hard-coded now.

Contributes to issue CURA-844.
 2016-09-09 16:20:06 +02:00
Ghostkeeper
e77ab83084 Set quality to normal, not quality type 
Even though this key says it's quality, it's not a quality profile, it's a quality type.

Contributes to issue CURA-844.
 2016-09-09 16:20:06 +02:00
Ghostkeeper
318b6cf87b Always set type to quality_changes 
Custom profiles are always quality changes. They should always say quality in the original anyway; that was an assumption we've made thousands of times.

Contributes to issue CURA-844.
 2016-09-09 16:20:06 +02:00
Ghostkeeper
a4c47f26d6 Always set quality type to normal 
We don't know the actual quality type, the quality profile that this profile is based on. Maybe there isn't one, even. As a solution we always base imported custom quality profiles on normal.

Contributes to issue CURA-844.
 2016-09-09 16:20:06 +02:00
Ghostkeeper
84e91e2bf2 Add missing built-in profiles to _profile_translations 
These profiles were not thought of as built-in. Instead, they were sorta constructed from pieces. That complex piece of code won't be necessary any more after I add this and after Cura 2.3 has proper profile inheritance again.

Contributes to issue CURA-844.
 2016-09-09 16:20:06 +02:00
Jaime van Kessel
c2341f7cd2 Upgrade profile function now returns empty list if something went wrong. 
Fixes CURA-1493
 2016-09-09 13:23:22 +02:00
Jaime van Kessel
f81a5fe301 Removed very annoying message spam 
CURA-2159
 2016-09-09 13:09:15 +02:00
Jaime van Kessel
677d6556fb Refuse to slice when material is mismatched 
CURA-2271
 2016-09-09 13:02:19 +02:00