3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-23 22:54:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
6205 commits 306 branches 272 tags 787 MiB
Commit graph

6205 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ghostkeeper
4fbbee52f3 Merge branch 'master' of https://github.com/cederom/Cura into cederom-master 2016-11-28 11:15:11 +01:00
Ghostkeeper
f7380abafe
Merge branch 'IMADE3D-add_jellybox_printer' 2016-11-28 11:11:42 +01:00
Ghostkeeper
23adafc686 Merge branch 'add_jellybox_printer' of https://github.com/IMADE3D/Cura into IMADE3D-add_jellybox_printer 2016-11-28 11:11:06 +01:00
Arjen Hiemstra
554a8a2e6a Remove stray __init__.py file from plugins dir 
Since it completely breaks plugin loading as the plugin system thinks it
is a plugin it needs to load.

Fixes CURA-3041
 2016-11-28 10:21:12 +01:00
CeDeROM
eced6852d5 Updated reference to an example machine profile. 
Signed-off-by: CeDeROM <CeDeROM@tlen.pl>
 2016-11-27 14:22:05 +01:00
Jaime van Kessel
484c7df5bc Added a bunch of thread yields 
CURA-1263
 2016-11-25 16:25:24 +01:00
Jaime van Kessel
ef7004fb72 User changes are deserialized by workspacereader if there is no machine conflict 
CURA-1263
 2016-11-25 16:17:46 +01:00
Jaime van Kessel
bde1e05273 Changing an instanceContainer now re-checks the error state of the stacks 
CURA-2861
 2016-11-25 14:54:32 +01:00
Jaime van Kessel
361aee3e3c Resolve value is now correctly displayed in profilesPage 
CURA-2844
 2016-11-25 13:29:46 +01:00
Jaime van Kessel
a6ea4edfb4 Prime tower for UMODE won't block by default if using both extruders 
CURA-3032
 2016-11-25 11:51:43 +01:00
Jaime van Kessel
4e4f2f8cc5 Merge branch 'master' of github.com:Ultimaker/Cura 2016-11-25 11:44:20 +01:00
Jaime van Kessel
7a4deb725a Clarified switching message 
CURA-2898
 2016-11-25 11:43:56 +01:00
Ghostkeeper
dcb7e2abaf
Fix capitalisation of setting names 
Saw a few inconsistencies.
 2016-11-25 11:36:24 +01:00
Ghostkeeper
2835ae8b07
Improve defaults for pre-cooling 
This is a profile update from the materials team. Micro-profile-update. This should make prints much better with high temperature materials such as CPE+.
 2016-11-25 11:36:23 +01:00
Jaime van Kessel
ef4ad8d2ac Renamed um3networkprintingplugin to um3networkprinting 
CURA-2862
 2016-11-25 11:34:49 +01:00
Jaime van Kessel
3bdbb8d568 Merge branch 'UM3NPP_merge' of https://github.com/thopiekar/Cura 2016-11-25 11:31:23 +01:00
Jaime van Kessel
6d66ea51ad Setting the support extruder in recommended mode now correctly updates them in custom 
CURA-3033
 2016-11-25 11:28:38 +01:00
Jaime van Kessel
510c988c43 Moved some setting functions back to definitions 
CURA-3018
 2016-11-25 09:39:19 +01:00
Thomas Karl Pietrowski
37e57e587a Merge remote-tracking branch 'UM3NetworkPrintingPlugin/master' into UM3NPP_merge 2016-11-24 21:40:07 +01:00
Jaime van Kessel
1e54fcda82 Merge branch 'master' of github.com:Ultimaker/Cura 2016-11-24 17:57:00 +01:00
Jaime van Kessel
823993caaf ALways add prime areas 
CURA-2625
 2016-11-24 17:56:17 +01:00
Tim Kuipers
2df6de1814 JSON fix: layer_start_x and y description update for better understanding (CURA-1112) 2016-11-24 17:28:34 +01:00
Tim Kuipers
de8e49b247 JSON language fix: start_layers_at_same_position is now Start Layers With The Same Part (CURA-1112) 2016-11-24 17:25:38 +01:00
Jack Ha
c3e086ce82 Merge branch 'master' of github.com:Ultimaker/Cura 2016-11-24 17:05:22 +01:00
Jack Ha
be2a802aa2 Changed ultimaker3 def so relations are retained. 2016-11-24 17:05:06 +01:00
Jaime van Kessel
1d2d31c81b Update Usbprinter output request write 2016-11-24 16:03:56 +01:00
Jaime van Kessel
79259a2717 Updated requestWrite for new API 2016-11-24 16:00:28 +01:00
jack
84759e5808 Merge pull request #1176 from Ultimaker/rework_file_handler 
Rework file handler CURA-1263
 2016-11-24 14:56:05 +01:00
Jaime van Kessel
f3d0ad2292 Merge branch 'master' of github.com:Ultimaker/Cura 2016-11-24 14:52:10 +01:00
Jaime van Kessel
9a81a24512 Merge branch 'feature_find_settings' of https://github.com/fieldOfView/Cura 2016-11-24 14:47:02 +01:00
Jack Ha
b88ed76b7c Solve merge conflict PrinterOutputDevice. CURA-1263 2016-11-24 13:55:22 +01:00
Jack Ha
072d33ec68 Fixed profiles by removing double entries and changing math.round to round. 2016-11-24 12:58:33 +01:00
fieldOfView
d045738dc8 Simplify button width logic 2016-11-24 11:51:35 +01:00
Jack Ha
a8d5537487 Fix XmlMaterialProfile setProperty in correct container. Contributes to CURA-2861 2016-11-24 11:19:46 +01:00
Ghostkeeper
44f309226a
Make initial layer speed scale with normal speed 
All profiles that set the print speed are edited as well to make sure that the initial layer speed is still the same.

Contributes to issue #1170.
 2016-11-24 10:19:49 +01:00
fieldOfView
9dd8a88602 Fix review issues 2016-11-24 10:12:11 +01:00
Ghostkeeper
29e04bb825
Don't change the prime tower size based on prime tower enable 
The prime tower is properly disabled in the engine nowadays if prime_tower_enable is false.
 2016-11-23 17:35:17 +01:00
Jaime van Kessel
8c35c8fbc3 Inheritance manager no longer sees settings as setting if they use enum value 2016-11-23 17:27:27 +01:00
Jaime van Kessel
c00775c488 Bounding box will no longer sing first part of batman theme 
CURA-2963
 2016-11-23 16:36:09 +01:00
Jaime van Kessel
b6df2b90dd Merge branch 'master' of github.com:Ultimaker/Cura 2016-11-23 14:06:17 +01:00
Jaime van Kessel
a8887406ac ValidationState checking in MachineManager now properly takes functions into account 
CURA-2840
 2016-11-23 14:05:33 +01:00
Jack Ha
06ed55b0ef Merge branch 'master' of github.com:Ultimaker/Cura 2016-11-23 13:33:27 +01:00
Jack Ha
c3320bb1a4 Change settings to settings/overrides in selected messages. CURA-2898 2016-11-23 13:33:12 +01:00
Jaime van Kessel
f7e9914401 Camera stream is now restored if the printer got a timeout 
CURA-2411
 2016-11-23 13:23:01 +01:00
Jaime van Kessel
e77d7f1f20 PrinterOutput now keeps track of camera state 
CURA-2411
 2016-11-23 13:22:02 +01:00
Jaime van Kessel
8aa5ea5864 Merge branch 'master' of github.com:Ultimaker/Cura 2016-11-23 12:48:24 +01:00
Jaime van Kessel
c1dda7505c Inheritance manager now also checks for inheritance if enabled property changed 
CURA-2860
 2016-11-23 12:47:54 +01:00
Ghostkeeper
54df4c17e1
Add Dutch translation for 'Information' title 
This is to make it easier to test whether this title can be translated, both for me and for our QA team.

Contributes to issue CURA-2808.
 2016-11-23 12:45:12 +01:00
Jaime van Kessel
c69ffd5b32 Merge branch 'master' of github.com:Ultimaker/Cura 2016-11-23 12:42:17 +01:00
Jaime van Kessel
716ffe94ff Don't show inheritance icon for resovled values 
CURA-2860
 2016-11-23 12:41:53 +01:00