GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-28 09:09:30 +08:00
Code Issues Packages Projects Releases Wiki Activity
8,963 Commits 292 Branches 265 Tags
Commit Graph

8963 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghostkeeper
23b1f9c1d6
Merge branch '2.6' 2017-05-30 15:41:29 +02:00
Ghostkeeper
f42f323d64
Update translation po files for each language 
These were generated using 'make i18n-update-po' on the 2.6 branch at commit 37fccecce7e5f81d3b5bf70ad981602c97120669. This should add all new strings to all .po files for Cura and retain any old translations that we had.

Contributes to issue CURA-3885.
 2017-05-30 15:39:02 +02:00
Ghostkeeper
21575d6998
Update translation templates 
These templates were generated using 'make extract-messages' on the 2.6 branch at commit 3be6526be3c550862451747041516a453c2a9878.

Contributes to issue CURA-3885.
 2017-05-30 15:39:02 +02:00
Tim Kuipers
a91d6478be Merge branch '2.6' 2017-05-30 15:32:49 +02:00
Tim Kuipers
14e85d7b6b refactor: move spaghetti infill options to experimental category 2017-05-30 15:22:03 +02:00
Ghostkeeper
cbe4891784
Merge branch '2.6' 2017-05-30 13:36:04 +02:00
Ghostkeeper
3be6526be3
Merge branch 'LipuFei-feature_CURA-3810_material_info_button' into 2.6 2017-05-30 13:34:24 +02:00
Ghostkeeper
9132a025d6
Merge branch 'feature_CURA-3810_material_info_button' of https://github.com/LipuFei/Cura into LipuFei-feature_CURA-3810_material_info_button 2017-05-30 13:32:03 +02:00
Lipu Fei
3351f5bd1a Merge pull request #1904 from Ultimaker/fix_macos_extensions 
Use .3mf on MacOS as project extension
 2017-05-30 13:08:24 +02:00
Lipu Fei
8af1cc886f Use .definition to access DefinitionContainer in qml 
CURA-3810
 2017-05-30 12:49:12 +02:00
Lipu Fei
7be05229d8 Fix material info button tooltip position 
CURA-3810
 2017-05-30 11:47:49 +02:00
Tim Kuipers
015d1b79ab Merge pull request #1866 from moritzmair/master 
added 3Dator printer profile and printbed mesh
 2017-05-30 10:59:31 +02:00
Mark
6ba2764efc Use .3mf on MacOS as project extension 
CURA-3886
 2017-05-30 09:57:41 +02:00
Lipu Fei
9333ed1e35 Update copyright in comments 
CURA-3810
 2017-05-30 09:16:58 +02:00
Lipu Fei
68bd5a6e37 Use Item and anchors to set material row layout 
CURA-3810
 2017-05-30 09:16:28 +02:00
Lipu Fei
3a3d9afc24 Use "button" style for material info button 
CURA-3810
 2017-05-29 18:06:42 +02:00
Lipu Fei
c80e1b67a5 Only show material info button for multi-extrusion machines 
CURA-3810
 2017-05-29 18:00:46 +02:00
Arjen Hiemstra
d531d85aa2 Select build environment on CI based on branch name 2017-05-29 17:00:02 +02:00
Tim Kuipers
3b62c4a59a fix: changelog attribution to community members (CURA-3879) 2017-05-29 16:31:11 +02:00
Tim Kuipers
b01f1bdbb3 feat: 2.6 beta changelog (CURA-3879) 2017-05-29 16:27:09 +02:00
Ghostkeeper
bbd852ceb7
Merge branch '2.6' 2017-05-29 15:56:02 +02:00
Ghostkeeper
e0326bbb9b
Merge branch '2.6' of github.com:Ultimaker/Cura into 2.6 2017-05-29 15:55:08 +02:00
Lipu Fei
585bc78892 Only set material for imported quality profile if there is an active material 
CURA-3881

CuraContainerRegistry._activeMaterialId() can return an empty string
if there is no active material, and in this case, importing a custom
quality file will fail.
 2017-05-29 15:52:29 +02:00
Lipu Fei
b797fcc74d Use global stack to evaluate limit_to_extruder value 
CURA-3738

Getting limit_to_extruder from definition in QML returns a
SettingFunction which hasn't been evaluated. This causes the comparison
not to be working. We change it to use the global stack to evaluate so
we can get an actual extruder number string.
 2017-05-29 15:44:57 +02:00
Ghostkeeper
50c4b88050 Let global stack handle limit to extruder 
Contributes to issue CURA-3738.
 2017-05-29 15:44:24 +02:00
Ghostkeeper
b8f290d835
Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-29 15:40:24 +02:00
Ghostkeeper
8ec9337077
Merge branch 'feature_extruder_per_feature' 2017-05-29 15:40:06 +02:00
Lipu Fei
c977a895ee Merge branch '2.6' 2017-05-29 15:29:40 +02:00
Lipu Fei
85e875257b Use "/<version>/<machineName>" as the material info URL suffix 
CURA-3810
 2017-05-29 15:23:52 +02:00
Tim Kuipers
8365d866a3 feat: 2.6 beta changelog (CURA-3879) 2017-05-29 15:19:43 +02:00
Lipu Fei
9b67fa94b4 Add material info button to show Ultimaker.com materials page 
CURA-3810

Add a new info button for materials. When a user clicks on the button,
it will open the materials information page on the Ultimaker website.
 2017-05-29 14:52:05 +02:00
Tim Kuipers
71c2a8edc6 Merge pull request #1861 from fieldOfView/feature_add_tam_series1 
Add Type A Machines series 1 2014 definition and mesh
 2017-05-29 14:24:43 +02:00
Lipu Fei
8ede981a2c Set version in <fdmmaterial> when saving XML material files 
CURA-3884
 2017-05-29 14:19:52 +02:00
Ghostkeeper
baade194fd
Change Extra Skin Wall Count to depend on top/bottom extruder 
The feature is meant to improve the quality of the skins. Whether this is needed should depend on the material of the skin rather than on the material of the inner wall, even though the feature itself is printed with the inner wall extruder.

Contributes to issue CURA-3740.
 2017-05-29 14:10:18 +02:00
Jaime van Kessel
ca922e9e9d The monitor item is now actually used to display information on monitor page 
The UM3 now provides camera image in this way

CURA-3826
 2017-05-29 13:47:41 +02:00
Jaime van Kessel
5dbee706a7 Printer output device can now have a QML item 
This contributes to CURA-3826. This will allow printer output devices to
add custom UI elements to the monitor tab in the future.
 2017-05-29 13:02:00 +02:00
Jaime van Kessel
71bb3c3a22 Added electric print cost calculator plugin 2017-05-29 11:28:23 +02:00
Ghostkeeper
03c8e7e62b
Merge branch 'maukcc-master' 2017-05-24 16:37:10 +02:00
Arjen Hiemstra
586050552b Merge branch '2.6' 
* 2.6:
  Error out when trying to import a profile witha quality_type we dont have
  Add default for colour code of material
  When trying to convert None to RGBA, log it and return a usable default
 2017-05-24 15:47:46 +02:00
Arjen Hiemstra
fafb83c5c4 Enable the Python faulthandler 
This will print a Python backtrace to stderr when SIGSEGV and similar
crashes happen. Hopefully it should help a bit when debugging those.
 2017-05-24 15:47:40 +02:00
Arjen Hiemstra
1c620ac621 Always redirect stdout/stderr to file if application is frozen 
This will make stdout/stderr also redirect to file if we are running a
build on OSX or Linux.
 2017-05-24 15:47:40 +02:00
Arjen Hiemstra
9bda7dbaae Error out when trying to import a profile witha quality_type we dont have 
Rather than successfully importing the profile and then not showing
anything, we now display an error. Not the perfect solution but the
easiest for now.

Contributes to #1873
 2017-05-24 15:43:49 +02:00
Ghostkeeper
ce6814d45d Add default for colour code of material 
Otherwise you get an error that the colour code could not be found.

Fixes #1869.
 2017-05-24 15:20:59 +02:00
Ghostkeeper
3ff9ad5d4e
Add default for colour code of material 
Otherwise you get an error that the colour code could not be found.

Fixes #1869.
 2017-05-24 15:19:12 +02:00
Lipu Fei
374b6d4e35 Merge branch '2.6' 2017-05-24 14:10:26 +02:00
Jaime van Kessel
e6f61f3bbc When trying to convert None to RGBA, log it and return a usable default 
contributes to #1869
 2017-05-24 11:38:38 +02:00
Jaime van Kessel
3c14545e08 Merge branch 'fix_machine_name_conflicts' of https://github.com/fieldOfView/Cura 2017-05-24 11:27:05 +02:00
Lipu Fei
64ae8bb595 Use global stack to evaluate limit_to_extruder value 
CURA-3738

Getting limit_to_extruder from definition in QML returns a
SettingFunction which hasn't been evaluated. This causes the comparison
not to be working. We change it to use the global stack to evaluate so
we can get an actual extruder number string.
 2017-05-24 10:17:13 +02:00
Lipu Fei
29c883d489 Fix option_extruder case for per object settings panel 
CURA-3814
 2017-05-24 09:36:07 +02:00
Tim Kuipers
eab7ce232a JSON fix: default feature extruder_nr = -1 (CURA-3740) 2017-05-23 14:01:01 +02:00