GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-31 10:35:31 +08:00
Code Issues Packages Projects Releases Wiki Activity
12,148 Commits 294 Branches 267 Tags
Commit Graph

12148 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tamara Hogenhout
6d028f4ef2 Added the location of the log-file on Ubuntu. 2015-10-19 14:04:57 +02:00
Arjen Hiemstra
63765eb522 Properly position groups and nodes once ungrouped 
CURA-273 #Review
 2015-10-16 17:40:55 +02:00
Ghostkeeper
e7f2c9de70 Move PerObjectSettings to Cura 
This was already done in master.
 2015-10-16 17:06:06 +02:00
Ghostkeeper
da1d59ff98 Merge branch 15.10 into master 
Where automatic merging failed, the version of 15.10 was used.
 2015-10-16 16:56:59 +02:00
Tamara Hogenhout
886083d2eb Merge branch '15.10' of https://github.com/Ultimaker/Cura into 15.10 2015-10-16 12:12:47 +02:00
Tamara Hogenhout
c022dc68ae shortcut for engine log 2015-10-16 12:11:58 +02:00
Arjen Hiemstra
c1eab9c3a3 Fix inherit function for infill line distance 
For some reason using parent value here creates odd override bugs
 2015-10-16 11:23:33 +02:00
Tamara Hogenhout
4ffbfcf69f Merge branch '15.10' of https://github.com/Ultimaker/Cura into 15.10 2015-10-16 11:02:27 +02:00
Tamara Hogenhout
a7d43efe15 Binds the backspace button to deleteSelection functionality 
fixes #CURA-249
 2015-10-16 11:02:02 +02:00
Tim Kuipers
484454dbaf Merge branch '15.10' of https://github.com/Ultimaker/Cura into 15.10 2015-10-16 10:36:07 +02:00
Tim Kuipers
509cb4627e JSON: update raft defaults 2015-10-16 10:35:44 +02:00
Tim Kuipers
a07e99a9f3 JSON: raft interface => raft middle; raft surface => raft top 2015-10-16 10:35:09 +02:00
Tim Kuipers
22c9b464ed JSON: update raft defaults 2015-10-16 10:30:45 +02:00
Arjen Hiemstra
6effacb1de Change infill settings back to not being children of infill density 
For some reason, making them children causes them to disappear
 2015-10-16 10:15:01 +02:00
Arjen Hiemstra
0b9047f6ca Properly set the current folder on file open 
This makes sure the next time the file dialog is opened the last folder
used is openend.

CURA-246 #Start-Review
 2015-10-15 09:42:52 +02:00
Arjen Hiemstra
e42ffb23ca Move the infill pattern and infill overlap settings back as children of infill_density 
This makes the inherit functions work properly
 2015-10-15 01:04:32 +02:00
Arjen Hiemstra
769ff84c15 Delay showing the main window a little so we do not get garbage on the window 
CURA-160 #Start-Review
 2015-10-14 17:57:00 +02:00
Tamara Hogenhout
58d5487eb9 The print job name changes to empty when there is no mesh. 
Only the machine abbreviation remains.

fixes #CURA-122
 2015-10-14 16:36:12 +02:00
Tamara Hogenhout
4ceb48c3fd Makes the page display the separate test-values. 
When the user doesn't finish the checkup and later on re-checks on it, it doens't look like they can't proceed with the check-up.

fixes #CURA-256
 2015-10-14 16:19:24 +02:00
Tamara Hogenhout
6c14177401 Merge branch '15.10' of https://github.com/Ultimaker/Cura into 15.10 2015-10-14 16:03:53 +02:00
Tamara Hogenhout
ed693d57a9 Fixes that the firmware update kan be called from the add machine -> add UMO wizard 
fixes #CURA-256
 2015-10-14 16:03:29 +02:00
awhiemstra
99447c4cba Merge pull request #480 from bq/BQ_profiles_update 
Added profiles for 2nd Gen printers from BQ
 2015-10-14 15:29:55 +02:00
Tamara Hogenhout
f9f0969a6d Fixes problems with the upgraded parts page of the add Original wizard 
The setMachineSettingValue functionalities are now bound to whether the checkboxes are checked or not instead of onClicked. Also the wizard now saves the values, so the user cannot get confused when revisiting this part of the wizard.

commits to #143
contributes to #CURA-256
 2015-10-14 15:00:27 +02:00
Nicanor Romero Venier
ead30e71ec Added profiles for 2nd Gen printers from BQ 2015-10-14 12:49:43 +02:00
Tamara Hogenhout
861b535f9d Implementing missing functionalities on the addmachine -> add original wizard 
contributes to #CURA-256
 2015-10-14 11:53:53 +02:00
Arjen Hiemstra
463fbae9aa Fail loading the 3MF file if no meshes were found 
This way we indicate loading the 3MF file failed instead of indicating
success but not actually loading anything.

CURA-236
 2015-10-13 18:42:01 +02:00
Arjen Hiemstra
3bbefd588b Increase the amount of spacing from platform physics 
This creates a stable situation more quickly

CURA-203 #Start-Review
 2015-10-13 15:40:40 +02:00
awhiemstra
20fc9759b0 Merge pull request #479 from mpbomil/patch-1 
Typo's in PrinterConnection.py
 2015-10-13 15:28:05 +02:00
mpbomil
31a3124e45 Typo's in PrinterConnection.py 
Some of the "threading.Thread.daemon"s have typo's.
 2015-10-13 13:54:28 +02:00
Tamara Hogenhout
a855da5c4c contributes to #CURA-256 2015-10-12 18:39:53 +02:00
Tamara Hogenhout
9aeb9bb37d cleanup 2015-10-09 17:18:14 +02:00
Tamara Hogenhout
a45dfe6a57 15.10 Restyling of the post-processing-plugin 
Contributes to issue CURA-47
 2015-10-09 15:38:22 +02:00
Arjen Hiemstra
9c6c06d501 Clean up "View" configuration page 
Contributes to CURA-211
 2015-10-08 17:48:22 +02:00
Arjen Hiemstra
d77903871d Fix crash handler to not complain about debug_mode not being set 2015-10-08 15:28:38 +02:00
Hajo Nils Krabbenhöft
1e5a2ddab9 hide jumps from line view + fix solid display 2015-10-08 15:28:38 +02:00
Hajo Nils Krabbenhöft
3ed5a466a3 regenerate python protobuf reader 2015-10-08 15:28:38 +02:00
Hajo Nils Krabbenhöft
cead06e925 colors 2015-10-08 15:28:38 +02:00
Hajo Nils Krabbenhöft
5505d5dc74 introduce combind and retraction polygon types 2015-10-08 15:28:38 +02:00
Hajo Nils Krabbenhöft
8dd46be2ca add _current_layer_jumps 2015-10-08 15:28:38 +02:00
Arjen Hiemstra
3f5d609baa Set version to master 2015-10-08 12:13:35 +02:00
Arjen Hiemstra
c5ca763621 If we have no active machine, return None in getEngineCommand 
This fixes a race condition on Windows where setting the active machine
takes too long
 2015-10-08 11:54:22 +02:00
Arjen Hiemstra
a435004459 Fix crash handler to not complain about debug_mode not being set 2015-10-08 11:54:22 +02:00
Tamara Hogenhout
9258501a3a Makes that only the name of the first model is displayed in the Printjob Name textfield. 
fixes #224
 2015-10-07 14:56:28 +02:00
Tim Kuipers
152406cd44 Merge branch '15.10' of https://github.com/Ultimaker/Cura into 15.10 2015-10-07 09:39:40 +02:00
Tim Kuipers
d5e646ce3d JSON: made top_layers default coincide with its inherited value when parent is set to default 2015-10-07 09:39:23 +02:00
Tim Kuipers
b88950a732 Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-10-07 09:38:43 +02:00
Tim Kuipers
7af749bdb7 JSON: made top_layers default coincide with its inherited value when parent is set to default 2015-10-07 09:38:32 +02:00
Arjen Hiemstra
0dee306c7f Remove extruder_x_temperature options 2015-10-06 16:55:31 +02:00
Arjen Hiemstra
50e6455875 Send the actual machine JSON to the engine 2015-10-06 16:54:57 +02:00
Arjen Hiemstra
b23bbe02fd Send the dual extrusion file as base JSON to the engine 2015-10-06 14:54:24 +02:00