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

9150 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Nicolas Liaudat
b0cbae6c33 Update easyarts_ares.def.json 2017-05-29 08:06:50 +02:00
Nicolas Liaudat
f7f1155504 Create easyarts_ares.def.json 2017-05-28 15:46:18 +02:00
Mark
c70f7404b8 Merge branch 'fix_dialog_sizes' of github.com:Ultimaker/Cura into fix_dialog_sizes 2017-05-26 13:47:40 +02:00
Mark
9ea850e3d1 Give text in labels specific width so icons stay aligned 2017-05-26 13:45:44 +02:00
Mark
8006c0f3b3 resize the rename-dialog 2017-05-26 13:45:44 +02:00
Mark
16b9bd0b14 fixed too big dialogs and hidden checkboxes 2017-05-26 13:45:44 +02:00
fieldOfView
817de9d39e Get a list of available themes instead of the hardcoded list 2017-05-24 17:42:11 +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
Mark
c155fb67a4 Give text in labels specific width so icons stay aligned 2017-05-24 14:05:19 +02:00
Mark
cdcba23f02 resize the rename-dialog 2017-05-24 14:05:19 +02:00
Mark
ba6da4a57b fixed too big dialogs and hidden checkboxes 2017-05-24 14:05:19 +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
Lipu Fei
da39ab8093 Remove duplicate "enabled" for "infill_angles" 2017-05-23 13:34:50 +02:00
Moritz Mair
a714d5b370 added 3dator printer profile and mesh 2017-05-23 13:10:47 +02:00
Lipu Fei
9a08e0cc27 Only use <fdmmaterial version> for detecting material file version 
CURA-3540
 2017-05-23 11:51:31 +02:00
fieldOfView
93a36a8503 Add Type A Machines series 1 2014 definition and mesh 2017-05-22 22:12:36 +02:00
Tim Kuipers
6887bcf232 JSON fix: feature extruder settings now use optional_extruder type (CURA-3740) 2017-05-22 16:57:33 +02:00
Ghostkeeper
0f97dd6fde
Let global stack handle limit to extruder 
Contributes to issue CURA-3738.
 2017-05-22 16:56:54 +02:00
Ghostkeeper
884067d844
Merge branch 'master' into feature_extruder_per_feature 2017-05-22 16:22:32 +02:00
Ghostkeeper
2a6a968540
Merge branch 'master' into feature_extruder_per_feature 2017-05-22 16:05:57 +02:00
Ghostkeeper
1f33a0d4cd
Use per-parameter-value compression for signals 
This will only emit one signal for each unique combination of parameters.

Contributes to issue CURA-3803.
 2017-05-22 15:36:46 +02:00
Ghostkeeper
bec43d5b9a
Make sure that the preferred material name variable exists 
Another small bug I found when looking through this MachineManager code. My IDE was complaining that the preferred_material_name was not always initialised and that preferred_material was an unused variable.

Doesn't contribute to issue CURA-3803.
 2017-05-22 15:36:46 +02:00
Jaime van Kessel
cc3402ab81 Added RunTime exception catching for image_reply 
In some cases the c++ object is already deleted. If we just ignore it, nothing breaks.

CURA-3844
 2017-05-22 14:50:03 +02:00
Jaime van Kessel
f9f0fa852f Added RunTime exception catching for image_reply 
In some cases the c++ object is already deleted. If we just ignore it, nothing breaks.

CURA-3844
 2017-05-22 14:48:42 +02:00
Jaime van Kessel
c474642744 Removed debug ID 
CURA-3814
 2017-05-22 14:25:29 +02:00
Jaime van Kessel
92192ff411 Merge branch 'master' of github.com:Ultimaker/Cura 2017-05-22 14:10:27 +02:00
Jaime van Kessel
5aba1731f5 Renamed useOptionalExtruder to addOptional extruder 
This is more in line with the other properties

CURA-3814
 2017-05-22 14:05:10 +02:00