3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-06 13:34:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10
3760 commits 313 branches 275 tags 718 MiB
Commit graph

1689 commits

Author SHA1 Message Date
Tim Kuipers
779f66967e JSON fix: support speed was only enabled when roofs were enabled 2016-07-12 14:48:40 +02:00
Ghostkeeper
dc7ca47be9 Fix setting enabling for support roof 
Support roof settings should not be enabled if support roof is enabled but support itself isn't enabled.
 2016-07-12 14:45:09 +02:00
Tim Kuipers
878bf35356 JSON feat: firmware acceleration and jerk settings for ultimaker printers (CURA-1646) 2016-07-12 14:43:10 +02:00
Tim Kuipers
7d2ae57f86 JSON fix: unit of jerk: mm/s³ ==> mm/s (CURA-1646) 2016-07-12 14:41:10 +02:00
Tim Kuipers
94acf810d0 JSON fix: redo all commits (squashed) which got undone in merge 
Merge branch 'feature_firmware_travel_settings'  c755479b1b
overwrote fdmprinter.def.json with the feature branch version, rather than merging it with the master version.

This commit is just fdmprinter.def.json as it was at 2c09fc4a67
 2016-07-12 14:38:39 +02:00
Ghostkeeper
f63acc98b8
Fix setting enabling for support roof 
Support roof settings should not be enabled if support roof is enabled but support itself isn't enabled.
 2016-07-12 13:47:25 +02:00
Tim Kuipers
26612e17b6 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-12 11:22:37 +02:00
Tim Kuipers
c755479b1b Merge branch 'feature_firmware_travel_settings' 2016-07-12 11:22:32 +02:00
fieldOfView
a7cfe1b5af Emphasize settings that have a value in the user or quality profile 
(in a subtle way)
 2016-07-11 21:15:09 +02:00
fieldOfView
cd09017328 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-11 17:26:19 +02:00
fieldOfView
151bf1f8de Make style of sections on the Materials page match sections on the profiles page 
CURA-342
 2016-07-11 17:25:59 +02:00
Tim Kuipers
5d256e5e59 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-11 16:44:04 +02:00
Tim Kuipers
2c09fc4a67 JSON fix: infill mesh order defaults to higher than for normal meshes (CURA-833) 2016-07-11 16:43:55 +02:00
Arjen Hiemstra
5393beb8de Fix binding loop warnings that would sometimes occur when editing Brand entry 
Contributes to CURA-342
 2016-07-11 16:41:57 +02:00
Ghostkeeper
c3d395b71d
Define extruder_prime_pos_* in fdmextruder too 
We need to have it in both, because it needs to be changed by the inheriting definitions (so it needs to be defined in fdmextruder) but it also needs to be defined for single-extrusion printers (so it needs to be in fdmprinter). I copied these definitions from fdmprinter.

Contributes to issue CURA-1816.
 2016-07-11 16:29:39 +02:00
fieldOfView
7a63f957cb More gracefully handle cases where no profile is selected in the profiles list 2016-07-11 15:48:41 +02:00
Arjen Hiemstra
4d2d889604 Do not complain when currentItem is null 
Contributes to CURA-342
 2016-07-11 14:57:28 +02:00
Arjen Hiemstra
d6ba70c552 Do not try to set a material's metadata when we know it has not changed 
Contributes to CURA-342
 2016-07-11 14:57:28 +02:00
fieldOfView
3bdffd83cd Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-11 14:54:19 +02:00
fieldOfView
4aa95ab317 Prevent showing custom profiles twice and fix separator in the profiles dropdown 
CURA-1887
 2016-07-11 14:54:08 +02:00
Jaime van Kessel
5638246fa2 Merge branch 'feature_cubic_isometric_infill' of github.com:Ultimaker/Cura 2016-07-11 14:40:54 +02:00
Ghostkeeper
f424097387
Improve defaults for raft settings 
These better defaults and formulas are coming from Paul, one of our material testers.
 2016-07-11 14:01:45 +02:00
Arjen Hiemstra
898c621b6f Recreate editingFinished signal behaviour without using TextArea::editingFinished 
Apparently, editingFinished was only added in Qt 5.6, so we cannot use
it. So we have to manually recreate the behaviour.

Contributes to CURA-342
 2016-07-11 11:36:21 +02:00
fieldOfView
c01b7091c8 Wait until the nozzle temperature is reached before starting to print 
CURA-1794
 2016-07-09 18:14:16 +02:00
Jaime van Kessel
8a4ea5c710 Added warnings to top/bottom thickness if it exceeds machine height 
CURA-1706
 2016-07-08 15:26:41 +02:00
Jaime van Kessel
91a3e90dfe Merge branch 'feature_ux_dialogs' of github.com:Ultimaker/Cura 2016-07-08 13:23:44 +02:00
Ghostkeeper
21ae73fca0
Capitalise Euclidean dimension names 
X, Y and Z.

Contributes to issue CURA-1816.
 2016-07-08 11:53:58 +02:00
fieldOfView
6eb502730c Add reusable messagebox based on QML MessageDialog 
Contributes to CURA-1730 and CURA-1850
 2016-07-08 11:24:37 +02:00
fieldOfView
2f3ffe2a18 Fix tabs when automatically switching to the monitor tab (on print start) 
CURA-1036
 2016-07-08 11:22:07 +02:00
Tim Kuipers
802e0b14b2 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-08 00:01:20 +02:00
Tim Kuipers
6cdab33eb6 JSON fix: negative angles for conical overhang are possible (CURA-1412) 2016-07-07 23:59:19 +02:00
fieldOfView
08f2143790 Simplify showing each material length individually 
CURA-1687
 2016-07-07 23:58:14 +02:00
fieldOfView
c4a2e659e3 Merge branch 'master' of https://github.com/Ultimaker/Cura 2016-07-07 22:17:55 +02:00
fieldOfView
9c492342cb Show each material length individually 
CURA-1687
 2016-07-07 22:17:35 +02:00
Tim Kuipers
df780023ed JSON feat: infill_mesh_order (CURA-833) 2016-07-07 21:22:44 +02:00
Tim Kuipers
91082404be JSON feat: infill_mesh_order (CURA-833) 2016-07-07 21:18:46 +02:00
Tim Kuipers
d6c25fcd10 JSON feat: infill mesh (CURA-833) 2016-07-07 21:04:23 +02:00
awhiemstra
90af9e3986 Merge pull request #846 from Ultimaker/feature_material_editing 
Material Editing Support
 2016-07-07 17:34:57 +02:00
Arjen Hiemstra
6b9689c2c7 Use clearer styling of disabled entry fields on the materials page 
Contributes to CURA-342
 2016-07-07 17:32:49 +02:00
Arjen Hiemstra
7df5008d3c Disable spool weight etc. fields since they are not yet functional 
Contributes to CURA-342
 2016-07-07 17:32:11 +02:00
Arjen Hiemstra
975106b90e Also update description and adhesion info when they change 
Contributes to CURA-342
 2016-07-07 17:31:12 +02:00
Jaime van Kessel
bea9f7590c Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-07 17:02:59 +02:00
Jaime van Kessel
0477955974 Sidebar stuff is now properly done in a loader (and in seperate files) 
CURA-1036
 2016-07-07 17:02:29 +02:00
Jack Ha
3e869048fd Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-07 16:23:53 +02:00
Jack Ha
342d4f1b82 Changed tooltip extremely small. 
CURA-1671
 2016-07-07 16:23:27 +02:00
Tim Kuipers
7fc37e7a74 Merge branch 'master' of github.com:Ultimaker/Cura 2016-07-07 15:18:57 +02:00
Tim Kuipers
101b22528b JSOn feat: nozzle startup prime location (CURA-1816) 2016-07-07 15:15:22 +02:00
Arjen Hiemstra
d8555fe57d Merge branch 'master' of github.com:ultimaker/Cura into feature_material_editing 
* 'master' of github.com:ultimaker/Cura: (38 commits)
  Fixed profile file case-sensitivity.
  Fix UMO Checkup button size
  Remove debug statement and commented-out code CURA-1385
  Show "ready" state when a printer is connected but jobstate is not yet set
  Added deepcopy function
  Made exception handling of slice info plugin way more robust
  Restart timer after slicing is performed when not enabled.
  Update GUID for PLA to match the GUID in the official repository
  Set default extruder index to -1 (so global is default)
  Ensure that the display matches with the backend active extruder data
  Update UM2 Extended build volume height to value published in marketing materials
  Fixed firmware upgrade for um2+
  Capitalise setting label
  CHeckup action now correctly resets every time you start it
  Remove unused name/id when importing a profile from a gcode file
  Just a little typo
  BQ Hephestos2: Heat up nozzle while leveling
  Saving g-code no longer crashes
  Removed update firmware from extensions; This is now handled by machine actions
  Changing active extruder no longer trigger re-slice
  ...
 2016-07-07 11:29:18 +02:00
fieldOfView
35efea3d11 Show "ready" state when a printer is connected but jobstate is not yet set 
CURA-1036
 2016-07-07 09:52:53 +02:00
Arjen Hiemstra
17ff92bdc9 Add support for import/export to the Materials page 
Contributes to CURA-341
 2016-07-07 01:43:44 +02:00