 Ghostkeeper
|
28c8dbec40
Merge branch 'feature_machine_settings_fixes' of https://github.com/fieldOfView/Cura into fieldOfView-feature_machine_settings_fixes
|
8 years ago |
|
Ghostkeeper
|
4fbbee52f3
Merge branch 'master' of https://github.com/cederom/Cura into cederom-master
|
8 years ago |
|
Ghostkeeper
|
f7380abafe
Merge branch 'IMADE3D-add_jellybox_printer'
|
8 years ago |
|
Ghostkeeper
|
23adafc686
Merge branch 'add_jellybox_printer' of https://github.com/IMADE3D/Cura into IMADE3D-add_jellybox_printer
|
8 years ago |
|
Arjen Hiemstra
|
554a8a2e6a
Remove stray __init__.py file from plugins dir
|
8 years ago |
|
CeDeROM
|
eced6852d5
Updated reference to an example machine profile.
|
8 years ago |
|
Jaime van Kessel
|
484c7df5bc
Added a bunch of thread yields
|
8 years ago |
|
Jaime van Kessel
|
ef7004fb72
User changes are deserialized by workspacereader if there is no machine conflict
|
8 years ago |
|
Jaime van Kessel
|
bde1e05273
Changing an instanceContainer now re-checks the error state of the stacks
|
8 years ago |
|
Jaime van Kessel
|
361aee3e3c
Resolve value is now correctly displayed in profilesPage
|
8 years ago |
|
Jaime van Kessel
|
a6ea4edfb4
Prime tower for UMODE won't block by default if using both extruders
|
8 years ago |
|
Jaime van Kessel
|
4e4f2f8cc5
Merge branch 'master' of github.com:Ultimaker/Cura
|
8 years ago |
|
Jaime van Kessel
|
7a4deb725a
Clarified switching message
|
8 years ago |
|
Ghostkeeper
|
dcb7e2abaf
Fix capitalisation of setting names
|
8 years ago |
|
Ghostkeeper
|
2835ae8b07
Improve defaults for pre-cooling
|
8 years ago |
|
Jaime van Kessel
|
ef4ad8d2ac
Renamed um3networkprintingplugin to um3networkprinting
|
8 years ago |
|
Jaime van Kessel
|
3bdbb8d568
Merge branch 'UM3NPP_merge' of https://github.com/thopiekar/Cura
|
8 years ago |
|
Jaime van Kessel
|
6d66ea51ad
Setting the support extruder in recommended mode now correctly updates them in custom
|
8 years ago |
|
Jaime van Kessel
|
510c988c43
Moved some setting functions back to definitions
|
8 years ago |
|
Thomas Karl Pietrowski
|
37e57e587a
Merge remote-tracking branch 'UM3NetworkPrintingPlugin/master' into UM3NPP_merge
|
8 years ago |
|
Jaime van Kessel
|
1e54fcda82
Merge branch 'master' of github.com:Ultimaker/Cura
|
8 years ago |
|
Jaime van Kessel
|
823993caaf
ALways add prime areas
|
8 years ago |
|
Tim Kuipers
|
2df6de1814
JSON fix: layer_start_x and y description update for better understanding (CURA-1112)
|
8 years ago |
|
Tim Kuipers
|
de8e49b247
JSON language fix: start_layers_at_same_position is now Start Layers With The Same Part (CURA-1112)
|
8 years ago |
|
Jack Ha
|
c3e086ce82
Merge branch 'master' of github.com:Ultimaker/Cura
|
8 years ago |
|
Jack Ha
|
be2a802aa2
Changed ultimaker3 def so relations are retained.
|
8 years ago |
|
Jaime van Kessel
|
1d2d31c81b
Update Usbprinter output request write
|
8 years ago |
|
Jaime van Kessel
|
79259a2717
Updated requestWrite for new API
|
8 years ago |
|
jack
|
84759e5808
Merge pull request #1176 from Ultimaker/rework_file_handler
|
8 years ago |
|
Jaime van Kessel
|
f3d0ad2292
Merge branch 'master' of github.com:Ultimaker/Cura
|
8 years ago |
|
Jaime van Kessel
|
9a81a24512
Merge branch 'feature_find_settings' of https://github.com/fieldOfView/Cura
|
8 years ago |
|
Jack Ha
|
b88ed76b7c
Solve merge conflict PrinterOutputDevice. CURA-1263
|
8 years ago |
|
Jack Ha
|
072d33ec68
Fixed profiles by removing double entries and changing math.round to round.
|
8 years ago |
|
fieldOfView
|
d045738dc8
Simplify button width logic
|
8 years ago |
|
Jack Ha
|
a8d5537487
Fix XmlMaterialProfile setProperty in correct container. Contributes to CURA-2861
|
8 years ago |
|
Ghostkeeper
|
44f309226a
Make initial layer speed scale with normal speed
|
8 years ago |
|
fieldOfView
|
9dd8a88602
Fix review issues
|
8 years ago |
|
fieldOfView
|
21bcb0e434
Create a definition_changes container instead of a second variant
|
8 years ago |
|
fieldOfView
|
9e048aa6ad
Get gcode flavor options from propertyprovider instead of hardcoding
|
8 years ago |
|
fieldOfView
|
edf4589150
Use fixed width font and no wrapping in start/end gcode editor
|
8 years ago |
|
fieldOfView
|
497b6f99a4
Fix finding existing variant by id
|
8 years ago |
|
fieldOfView
|
78475d68b3
Fix creating variants
|
8 years ago |
|
fieldOfView
|
c8cedb301a
Use insertContainer instead of adding a parameter to addContainer
|
8 years ago |
|
fieldOfView
|
5f147b6c78
Hide nozzle size setting for machines that use variants for nozzle sizes
|
8 years ago |
|
fieldOfView
|
b6689870f5
Make Machine Settings compatible with machines that use variants (UM2+)
|
8 years ago |
|
fieldOfView
|
1325c31882
Remove hardcoded container index
|
8 years ago |
|
Ghostkeeper
|
29e04bb825
Don't change the prime tower size based on prime tower enable
|
8 years ago |
|
Jaime van Kessel
|
8c35c8fbc3
Inheritance manager no longer sees settings as setting if they use enum value
|
8 years ago |
|
Jaime van Kessel
|
c00775c488
Bounding box will no longer sing first part of batman theme
|
8 years ago |
|
Jaime van Kessel
|
b6df2b90dd
Merge branch 'master' of github.com:Ultimaker/Cura
|
8 years ago |
