3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-21 21:58:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 16
6705 commits 306 branches 270 tags 786 MiB
Commit graph

6705 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jaime van Kessel
304696c809 OutputDevices now take file_handler into account 
CURA-1263
 2016-11-09 14:03:57 +01:00
Jaime van Kessel
fdbbda07be Merge pull request #1122 from fieldOfView/fix_qml_errors 
Fix qml errors
 2016-11-09 13:44:42 +01:00
Ghostkeeper
35d714efb3
Merge branch 'feature_retract_at_layer_change' 2016-11-09 13:38:30 +01:00
fieldOfView
189e3e30d9 Fix error about casting undefined to QString 2016-11-09 13:25:04 +01:00
fieldOfView
35a3bdc924 Fix qml error about stopCamera when no printer is connected 2016-11-09 13:18:15 +01:00
Simon Edwards
ba0fba0844 Bump the Python version number for Cura. 
CURA-2150 Upgrade to PyQt 5.6 and Python 3.5
 2016-11-09 12:56:11 +01:00
Ghostkeeper
4c89e8253f
Merge branch 'fieldOfView-feature_multiply_options' 2016-11-09 10:28:28 +01:00
Ghostkeeper
a34c3954ce Merge branch 'feature_multiply_options' of https://github.com/fieldOfView/Cura into fieldOfView-feature_multiply_options 2016-11-09 10:24:17 +01:00
fieldOfView
eeff3b65ec Change wording from "duplicate" to "multiply" 2016-11-09 09:27:44 +01:00
Jaime van Kessel
e30038435c Added pre-read check for 3mf Reader 
CURA-1263
 2016-11-08 17:36:41 +01:00
Jaime van Kessel
164f378dd4 Added supported Extensions to workspace reader 
CURA-1263
 2016-11-08 17:26:01 +01:00
Jaime van Kessel
a859c9883c Added loadWorkspace option to menu 
CURA-1263
 2016-11-08 15:33:31 +01:00
Ghostkeeper
59fb0bc739
Merge branch 'feature_extruder_temp_layer_0' 2016-11-08 14:46:15 +01:00
Jaime van Kessel
efc9719ff0 Added stub workspace reader 
CURA-1263
 2016-11-08 10:00:00 +01:00
Jaime van Kessel
5b89f5e8ee Merge branch 'master' of github.com:Ultimaker/Cura 2016-11-07 17:06:32 +01:00
Jaime van Kessel
42b8df86d3 Information text is now translated 
CURA-2808
 2016-11-07 16:54:28 +01:00
Tim Kuipers
3a69d91636 JSON refactor: move UltiGcode setting enabled dependency to fdmprinter (CURA-2781, CURA-2736) 2016-11-07 15:25:32 +01:00
Tim Kuipers
f014a87494 JSON fix: no standby temperature for single extrusion machines and UM2 family (CURA-2781, CURA-2736) 2016-11-07 15:18:43 +01:00
Tim Kuipers
71d015eeec JSON fix: no initial layer temperature commands for the UM2 family (CURA-2781, CURA-2736) 2016-11-07 15:17:32 +01:00
Tim Kuipers
75f0452b1f JSON fix: dont enable center_mesh by default (CURA-566) 2016-11-07 15:03:59 +01:00
fieldOfView
0ce4b5f2de Add "..." to Duplicate Model menu entry to indicate there is a dialog 2016-11-07 14:07:06 +01:00
fieldOfView
6752a18435 Add dialog to set number of copies when duplicating models 2016-11-07 14:02:19 +01:00
Tim Kuipers
d20d97d4c1 Merge branch 'master' of github.com:Ultimaker/Cura 2016-11-07 13:25:56 +01:00
Tim Kuipers
9b1a41c74c bugfix: comment fail 
sorry!!

             .-.
            o   \     .-.
               .----.'   \
             .'o)  / `.   o
            /         |
            \_)       /-.
              '_.`    \  \
               `.      |  \
                |       \ |
            .--/`-.     / /
          .'.-/`-. `.  .\|
         /.' /`._ `-    '-.
    ____(|__/`-..`-   '-._ \
   |`------.'-._ `      ||\ \
   || #   /-.   `   /   || \|
   ||   #/   `--'  /  /_::_|)__
   `|____|-._.-`  /  ||`--------`
         \-.___.` | / || #      |
          \       | | ||   #  # |
          /`.___.'\ |.`|________|
          | /`.__.'|'.`
        __/ \    __/ \
       /__.-.)  /__.-.)
 2016-11-07 13:24:28 +01:00
Jaime van Kessel
1610f50da0 Merge branch 'master' of github.com:Ultimaker/Cura 2016-11-07 13:15:14 +01:00
Jaime van Kessel
826c3edd50 Added per object setting retrieval for 3MF 
CURA-1263
 2016-11-07 13:14:45 +01:00
Tim Kuipers
e51f9ba678 fix: exclude command line settings from being viewed in the frontend (CURA-566) 2016-11-07 11:54:47 +01:00
Tim Kuipers
5490d9cce9 JSON fix: introduce command line settigns in machine json file (CURA-566) 2016-11-07 11:54:47 +01:00
Ghostkeeper
a4bf4b3502 Merge branch 'feature_wall_wipe' 2016-11-07 11:36:30 +01:00
Ghostkeeper
41595f8025 Merge branch 'feature_wall_wipe' of github.com:Ultimaker/Cura into feature_wall_wipe 2016-11-07 11:34:24 +01:00
Ghostkeeper
5c3310a01e
Merge branch 'master' of github.com:Ultimaker/Cura 2016-11-07 11:33:28 +01:00
Jaime van Kessel
e7df64da8b Fixed merging for already grouped objects 2016-11-07 11:19:03 +01:00
Thomas Karl Pietrowski
8503492b4d USBPrinting: stk500v2 cleanups 
* Removing unneeded import of "os"
* Removing unused "e" from SerialException
* Adding #@UndefinedVariable tags for PyDev
* Making message in Logger.log more detailed for portList(). Might be confusing in the logs to see just a list of ports without knowing where it is from.

Contributes to CURA-1809
 2016-11-06 15:45:45 +01:00
Thomas Karl Pietrowski
f8a5ee8c9b USBPrinting: Removing superfluous empty lines 
Contributes to CURA-1809
 2016-11-06 15:45:33 +01:00
Thomas Karl Pietrowski
87ac3cf792 Merge remote-tracking branch 'upstream/master' 2016-11-06 15:31:07 +01:00
Jaime van Kessel
35a4fe60d0 Put the XML warning in the right spot 2016-11-04 17:12:20 +01:00
Jaime van Kessel
d367747e87 Merge branch 'master' of github.com:Ultimaker/Cura 2016-11-04 17:04:17 +01:00
Jaime van Kessel
726b935b78 3mf reader now gives warning if it couldn't load cElementTree 2016-11-04 17:03:52 +01:00
Ghostkeeper
fe21dbb784
Merge remote-tracking branch 'origin/feature_extruder_temp_layer_0' 2016-11-04 16:56:24 +01:00
Ghostkeeper
070767f0db
Blur focus upon changing profiles, material, variant, etc. 
Otherwise the currently focussed setting gets taken along to after the switch.
 2016-11-04 16:02:08 +01:00
Jaime van Kessel
867463f718 InheritanceManager now checks if a setting function can actually change before labeling it 
CURA-2860
 2016-11-04 15:59:01 +01:00
Jaime van Kessel
ed5244bcb0 Merge branch 'feature_concentric_3d_infill' of github.com:Ultimaker/Cura 2016-11-04 14:53:57 +01:00
Jaime van Kessel
642a415262 Merge branch 'master' of github.com:Ultimaker/Cura 2016-11-04 14:33:14 +01:00
Jaime van Kessel
2eb1c61033 Merge branch 'feature_drag_curaprofile' of github.com:Ultimaker/Cura 2016-11-04 14:31:58 +01:00
Ghostkeeper
ccd0daee12
Set layer start position defaults 
Originally this was only extruder_prime_pos_x and _y, but that setting is different per extruder. So now it computes the average prime position.

Contributes to issue CURA-1112.
 2016-11-04 11:36:20 +01:00
Ghostkeeper
871a19091d
Merge branch 'feature_start_layer_far_away' 2016-11-04 10:52:38 +01:00
Ghostkeeper
9de94d8a5b
Merge branch 'master' of github.com:Ultimaker/Cura 2016-11-04 10:47:57 +01:00
Ghostkeeper
de2c6a7444
Merge branch '2.3' 2016-11-04 10:14:36 +01:00
Ghostkeeper
d7a6173407
Update change log with texts from marketing 
These are the texts that they came up with. And we corrected them. And they came up with factually wrong texts again. We corrected them again. Now we won't allow any changes any more. Pft.
 2016-11-04 10:08:54 +01:00
Jaime van Kessel
720f37b17f Quality changes can now only be removed if they are not in use anywere 
CURA-2846
 2016-11-04 10:02:13 +01:00