3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 15:13:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10
28475 commits 307 branches 272 tags 787 MiB
Commit graph

12854 commits

Author SHA1 Message Date
Filip Goc
b467f0a8d4 add JellyBOX machine definition file 
gantry height left to default to effectively disable one at a time
printing for now
 2016-11-13 11:33:49 -05:00
Ghostkeeper
ee9caa80a8
Remove dual-extrusion disallowed areas 
The idea is that these are now computed through combining the disallowed areas of the two extruders (though that doesn't quite work yet).

Contributes to issue CURA-2625.
 2016-11-11 17:15:09 +01:00
Ghostkeeper
066ccc4e51
Remove superfluous disabling of prime location settings 
These are already disabled in the definitions of fdmprinter and fdmextruder. It doesn't need to be disabled again.

Contributes to issue CURA-2625.
 2016-11-11 17:10:23 +01:00
Tim Kuipers
fb92e50262 JSON fix: fixed all start/end gcode references to settings and non-existent variables 2016-11-11 16:28:43 +01:00
fieldOfView
a70e4c8120 Fixed blurSettings 
UM.MainWindow does not derive from QML Item, so it does not have a forceActiveFocus() method.

CURA-2835
 2016-11-11 10:22:17 +01:00
Tim Kuipers
e40abb5d37 feat: cool_fan_speed_0 (CURA-2182) 2016-11-10 16:42:09 +01:00
Tim Kuipers
98bbeae055 lil: rounding error 2016-11-10 13:47:09 +01:00
Tim Kuipers
b86d8b4815 removed default setting 2016-11-10 13:47:09 +01:00
Tim Kuipers
967e5c5776 fix: makerbot output file format: x3g 2016-11-10 13:47:09 +01:00
Tim Kuipers
bba74328f1 fix: Deltabot manufacturer 2016-11-10 13:47:09 +01:00
Jaime van Kessel
f57a17577f Added workspace save option to menu 
CURA-1263
 2016-11-09 14:14:22 +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
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
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
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
9b1a41c74c bugfix: comment fail 
sorry!!

             .-.
            o   \     .-.
               .----.'   \
             .'o)  / `.   o
            /         |
            \_)       /-.
              '_.`    \  \
               `.      |  \
                |       \ |
            .--/`-.     / /
          .'.-/`-. `.  .\|
         /.' /`._ `-    '-.
    ____(|__/`-..`-   '-._ \
   |`------.'-._ `      ||\ \
   || #   /-.   `   /   || \|
   ||   #/   `--'  /  /_::_|)__
   `|____|-._.-`  /  ||`--------`
         \-.___.` | / || #      |
          \       | | ||   #  # |
          /`.___.'\ |.`|________|
          | /`.__.'|'.`
        __/ \    __/ \
       /__.-.)  /__.-.)
 2016-11-07 13:24:28 +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
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
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
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
1b853de981 Revert "JSON refactor: support_mesh ==> overhang_mesh (CURA-2077)" 
This reverts commit d675ffe6e9765e5118b85585502aee7a1cb3283c.
 2016-11-03 20:22:22 +01:00
Tim Kuipers
1787b1e65b JSON refactor: support_mesh ==> overhang_mesh (CURA-2077) 2016-11-03 20:22:22 +01:00
Tim Kuipers
b840711960 JSON feat: support_mesh (CURA-2077) 2016-11-03 20:22:22 +01:00
Tim Kuipers
2c87cddd3c JSON refactor: anti_support_mesh ==> anti_overhang_mesh (CURA-2077) 2016-11-03 20:22:22 +01:00
Tim Kuipers
09a64c7ba0 JSON feat: anti support meshes (CURA-2077) 2016-11-03 20:22:22 +01:00
Tim Kuipers
c430980536 JSON feat: wall_0_wipe_dist (CURA-1698) 2016-11-03 20:15:24 +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
ab06d692d7 Added showAncestor option to settingvisibility page 
CURA-2859
 2016-11-03 14:59:57 +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