GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-01 00:04:27 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,586 Commits 291 Branches 260 Tags
Commit Graph

5586 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jaime van Kessel
3d30762c41 Improved difference between active and passive infill icons 
CURA-2768
 2016-11-04 09:53:14 +01:00
Jaime van Kessel
c769a05408 Added start & stop camera interface 
CURA-2411
 2016-11-04 09:41:26 +01:00
Tim Kuipers
c430980536 JSON feat: wall_0_wipe_dist (CURA-1698) 2016-11-03 20:15:24 +01:00
Jaime van Kessel
761efa1681 Unable to slice message now shows what settings are in error state 
CURA-2481
 2016-11-03 16:25:36 +01:00
Jaime van Kessel
c35b606807 Added a bunch more yielding, which should decrease the stutter in GUI 
contributes to CURA-2687
 2016-11-03 15:48:42 +01:00
Jaime van Kessel
a969b45372 Increased width of support extruder combobox 
CURA-2792
 2016-11-03 15:41:15 +01:00
Jaime van Kessel
e67f5bdd44 PerObject tool is now disabled when group or multiple objects are selected 
CURA-2287
 2016-11-03 15:33:18 +01:00
Jaime van Kessel
8b4cdedd89 Fixed loading files from command line 2016-11-03 15:07:38 +01:00
Jaime van Kessel
d2ead852dd Decreased severity of logging of socket error 
CURA-2809
 2016-11-03 15:04:09 +01:00
Jaime van Kessel
ab06d692d7 Added showAncestor option to settingvisibility page 
CURA-2859
 2016-11-03 14:59:57 +01:00
Jaime van Kessel
7eec074b0f Firmware flasher now uses logger instead of print 
CURA-1809
 2016-11-03 14:26:41 +01:00
Jaime van Kessel
450eb5443f Updated text to be more clear 
CURA-2726
 2016-11-03 14:21:13 +01:00
Ghostkeeper
0f374a2e23
Merge branch 'feature_infill_support' 2016-11-03 13:37:26 +01:00
Jaime van Kessel
fce75febef 3MF now handles loading of multiple nodes correctly 
Contributes to CURA-1263
 2016-11-03 13:31:51 +01:00
Jaime van Kessel
0a9db4ee0f Merge branch 'master' of github.com:Ultimaker/Cura 2016-11-02 17:30:19 +01:00
Jaime van Kessel
d8e4e11b86 3MF reader now handles object types 
CURA-382
 2016-11-02 17:27:22 +01:00
Ghostkeeper
612ef1c0c6
Fix spelling and grammar of Remove Mesh Intersection 
'objecs' to 'objects'.
Removed superfluous 'is'.

Contributes to issue CURA-2712.
 2016-11-02 14:54:19 +01:00
Ghostkeeper
24f78a7ee6
Capitalise setting name for Hollow Objects 
This is in line with other setting names.

Contributes to issue CURA-2748.
 2016-11-01 16:31:42 +01:00
Thomas Karl Pietrowski
982029a627 Merge pull request #977 from Ultimaker/thopiekar-i18n-de-desktop-file-comment 
i18n: de: Adding translated comment
 2016-11-01 16:21:10 +01:00
Simon Edwards
cadf2115ac Merge pull request #1058 from Ultimaker/cura-2730 
Changed MachineManager.isActiveStackValid to areStacksValid. CURA-2730
 2016-11-01 16:17:04 +01:00