Commit graph

1560 commits

Author SHA1 Message Date
Jack Ha
b79f0c6d08 Merge branch 'master' into layer_view3_cleanup 2017-01-02 09:25:19 +01:00
Jack Ha
73a8859b0e WIP second slider LayerView 2017-01-02 09:20:27 +01:00
Jack Ha
e3d77de6df Working quite well 2016-12-30 15:43:32 +01:00
Jack Ha
6271774528 Added all kinds of options to layer view 2016-12-30 15:32:06 +01:00
Jack Ha
fc4c60b0dc Added layer view options 2016-12-30 14:31:53 +01:00
Ghostkeeper
341b92860c
Also format g-code in extruder start and end g-code settings
Would be nice, eh?

Contributes to Github issue #1225.
2016-12-29 20:52:08 +01:00
Jack Ha
1217281727 Busy with layer_view options 2016-12-29 16:49:00 +01:00
Ghostkeeper
5c4526f280 Merge branch '2.4' 2016-12-29 10:53:01 +01:00
Jack Ha
0f2fb86cd9 Layer shader now uses own attribute for line dimensions instead of misusing uvs. 2016-12-28 15:20:14 +01:00
Jack Ha
8d2b3654a4 Layer thickness now as array 2016-12-28 13:15:42 +01:00
Jack Ha
9904dad07b Added line thickness to layer view 2016-12-28 11:30:59 +01:00
fieldOfView
cbf553aad1 Fix scale of Add Machine and Select (Per Object) Settings dialogs...
... on fairly high, but non-"retina" screens.

I have a new laptop with a 13" 1080p display, which I use at its native resolution. This works fine for most dialogs, except the mentioned two which are shown comically large.
2016-12-23 12:55:16 +01:00
Jack Ha
c12e6da3ac Started setting layer height and line width in layer view 2016-12-22 14:41:50 +01:00
Jack Ha
c6d56b60f6 Working quite nicely 2016-12-22 09:44:00 +01:00
Jack Ha
47e204038f Got cylinders 2016-12-21 15:44:01 +01:00
Jack Ha
0adb1a4c1c Finally got normals in 2016-12-21 14:37:02 +01:00
Jack Ha
9e6c070ac6 tryout 2016-12-21 09:21:05 +01:00
Jack Ha
3d9bccb7c7 big tryout 2016-12-20 16:32:34 +01:00
Jack Ha
57cec4ec59 wip 2016-12-20 14:00:34 +01:00
Jack Ha
61dcaf8811 wip 2016-12-20 11:45:05 +01:00
Jaime van Kessel
7858e967e7 Minor textual changes for changelog 2016-12-20 09:33:33 +01:00
Jaime van Kessel
7921d05682 Added delta support to changelog 2016-12-20 09:30:45 +01:00
Jaime van Kessel
aa5c169c98 Also added victor9999 in the thanks message of changelog 2016-12-20 09:26:45 +01:00
Jaime van Kessel
323e426ce8 Updated changelog for 2.4 2016-12-19 16:35:20 +01:00
Jaime van Kessel
c25c4c1d77 Moved conflict boxes to be aligned with "headers"
CURA-1263
2016-12-19 13:04:55 +01:00
Ghostkeeper
76c2e87749
Fix more plural forms
Forgot these ones.

Contributes to issue CURA-1263.
2016-12-16 17:17:10 +01:00
Jaime van Kessel
c4e061be60 Changed margins on save & load workspace dialog
CURA-1263
2016-12-16 14:38:31 +01:00
Jaime van Kessel
fa3f473b61 Changed order of buttons 2016-12-16 11:35:08 +01:00
Jaime van Kessel
a7135a0f5f Added machine type to load menu
CURA-1263
2016-12-16 10:38:30 +01:00
Jaime van Kessel
2be773c9a3 Added num user settings to workspace loading
CURA-1263
2016-12-16 10:26:30 +01:00
Jaime van Kessel
e69747577b Added extra timeout when not detecting baudrate through bootloader 2016-12-16 10:14:58 +01:00
Jaime van Kessel
8676f3db40 Added workaround for curaproject.3mf extensions not being handled on osx
CURA-3130
2016-12-16 09:36:40 +01:00
Jack Ha
4bee3b6fdc Changed 'Changes with your printer' to 'Sync with your printer' 2016-12-15 15:30:57 +01:00
Jack Ha
2cf181080a Merge branch 'master' of github.com:Ultimaker/Cura 2016-12-14 16:53:22 +01:00
Jack Ha
a9a9390aa6 Solved (with an ugly fix) that after loading some projects, 'Slicing...' appears without doing anything. CURA-1263 2016-12-14 16:52:49 +01:00
Simon Edwards
22012bdb1c Show the Z seam related settings after upgrade. CURA-2953 2016-12-14 13:52:07 +01:00
Ghostkeeper
f4fa3ac53f
Add translation for UM3 and UM3E from XML profiles
Otherwise it would remove all spaces and put everything lowercase, but that didn't work for UM3E.

Contributes to issue CURA-2575.
2016-12-14 13:50:16 +01:00
fieldOfView
9250520628 Fix variant before definition_changes 2016-12-14 13:08:18 +01:00
fieldOfView
dcae7575e4 Fix extraneous empty ("") container being added 2016-12-14 13:07:12 +01:00
fieldOfView
2c79efd8bd Fix [containers] items must be strings 2016-12-14 13:01:32 +01:00
Jaime van Kessel
0bdd06735e Fixed another race condition that sometimes triggered when loading projects
CURA-1263
2016-12-14 11:52:02 +01:00
Simon Edwards
a6194aa2cf Merge pull request #1242 from fieldOfView/fix_definition_changes_upgrade
Make sure definition_changes containers are not upgraded to stacks
2016-12-14 11:03:41 +01:00
Jaime van Kessel
998f127499 Material resolve box is reset properly
CURA-1263
2016-12-14 10:18:05 +01:00
Jaime van Kessel
8f5d410ff6 Only use T in temp command if num extruders is larger than 1 (instead of larger than 0) 2016-12-14 09:51:15 +01:00
fieldOfView
5718ca7852 Make sure definition_changes containers are not upgraded to stacks 2016-12-13 12:04:04 +01:00
Jack Ha
5b59f3660b Renamed PrintCore to print core 2016-12-12 11:28:00 +01:00
Jaime van Kessel
0d9355daab All added containers are now set as dirty, so they are saved
CURA-1263
2016-12-12 11:07:29 +01:00
jack
8fdc0a40ce Merge pull request #1235 from Ultimaker/project_save_dialog
Project save dialog
2016-12-12 10:41:49 +01:00
Ghostkeeper
ee19794d92
Sync terminology of print cores with the rest of Cura
In other places we've always used 'print cores' as two words.

Contributes to issue CURA-2947.
2016-12-11 17:41:29 +01:00
Jaime van Kessel
1a456253a0 Added not supported message to USB printing if it's not supported 2016-12-09 17:16:59 +01:00