diff --git a/CHANGELOG.md b/CHANGELOG.md index a25b096de..c613f09cd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ Thanks to the following contributors who worked on this release: - Tuning dictionary changes (#367) - The tuning dictionary in the user prefs folder (`tunings.json`) now only stores custom tunings instead of the entire tuning dictionary - The user tuning dictionary is now combined with the default tuning dictionary when loaded, ensuring that updates to the default tunings take effect + - Reordered the default tuning dictionary so that "Down 1/2 Step", "Down 1 Step" etc tunings are next to the standard tuning (#363) ### Fixed diff --git a/source/build/data/tunings.json b/source/build/data/tunings.json index af70259eb..850cbb882 100755 --- a/source/build/data/tunings.json +++ b/source/build/data/tunings.json @@ -58,108 +58,108 @@ "capo": 0 }, { - "name": "Bass-Dropped-D", - "notes": [ - 43, - 38, - 33, - 26 - ], - "offset": 0, - "sharps": true, - "capo": 0 - }, - { - "name": "Bass-Down 1/2 Step Dropped-Db", + "name": "Bass-Down 1/2 Step", "notes": [ 42, 37, 32, - 25 + 27 ], "offset": 1, "sharps": false, "capo": 0 }, { - "name": "Bass-Down 1 Step Dropped-C", + "name": "Bass-Down 1 Step", "notes": [ 41, 36, 31, - 24 + 26 ], "offset": 2, "sharps": true, "capo": 0 }, { - "name": "Bass-Down 1 1/2 Step Dropped-B", + "name": "Bass-Down 1 1/2 Steps", "notes": [ 40, 35, 30, - 23 + 25 ], "offset": 3, - "sharps": true, + "sharps": false, "capo": 0 }, { - "name": "Bass-Down 2 Steps Dropped-Bb", + "name": "Bass-Down 2 Steps", "notes": [ 39, 34, 29, - 22 + 24 ], "offset": 4, "sharps": false, "capo": 0 }, { - "name": "Bass-Down 1/2 Step", + "name": "Bass-Dropped-D", + "notes": [ + 43, + 38, + 33, + 26 + ], + "offset": 0, + "sharps": true, + "capo": 0 + }, + { + "name": "Bass-Down 1/2 Step Dropped-Db", "notes": [ 42, 37, 32, - 27 + 25 ], "offset": 1, "sharps": false, "capo": 0 }, { - "name": "Bass-Down 1 Step", + "name": "Bass-Down 1 Step Dropped-C", "notes": [ 41, 36, 31, - 26 + 24 ], "offset": 2, "sharps": true, "capo": 0 }, { - "name": "Bass-Down 1 1/2 Steps", + "name": "Bass-Down 1 1/2 Step Dropped-B", "notes": [ 40, 35, 30, - 25 + 23 ], "offset": 3, - "sharps": false, + "sharps": true, "capo": 0 }, { - "name": "Bass-Down 2 Steps", + "name": "Bass-Down 2 Steps Dropped-Bb", "notes": [ 39, 34, 29, - 24 + 22 ], "offset": 4, "sharps": false, @@ -323,130 +323,130 @@ "capo": 0 }, { - "name": "Bass-Standard C", - "notes": [ - 48, - 43, - 38, - 33, - 40 - ], - "offset": 0, - "sharps": true, - "capo": 0 - }, - { - "name": "Bass-Dropped A", - "notes": [ - 43, - 38, - 33, - 28, - 21 - ], - "offset": 0, - "sharps": true, - "capo": 0 - }, - { - "name": "Bass-Down 1/2 Step Dropped Ab", + "name": "Bass-Down 1/2 Step", "notes": [ 42, 37, 32, 27, - 20 + 22 ], "offset": 1, "sharps": false, "capo": 0 }, { - "name": "Bass-Down 1 Step Dropped G", + "name": "Bass-Down 1 Step", "notes": [ 41, 36, 31, 26, - 19 + 21 ], "offset": 2, "sharps": true, "capo": 0 }, { - "name": "Bass-Down 1 1/2 Steps Dropped Gb", + "name": "Bass-Down 1 1/2 Steps", "notes": [ 40, 35, 30, 25, - 18 + 20 ], "offset": 3, "sharps": false, "capo": 0 }, { - "name": "Bass-Down 2 Steps Dropped F", + "name": "Bass-Down 2 Steps", "notes": [ 39, 34, 29, 24, - 17 + 19 ], "offset": 4, "sharps": false, "capo": 0 }, { - "name": "Bass-Down 1/2 Step", + "name": "Bass-Standard C", + "notes": [ + 48, + 43, + 38, + 33, + 40 + ], + "offset": 0, + "sharps": true, + "capo": 0 + }, + { + "name": "Bass-Dropped A", + "notes": [ + 43, + 38, + 33, + 28, + 21 + ], + "offset": 0, + "sharps": true, + "capo": 0 + }, + { + "name": "Bass-Down 1/2 Step Dropped Ab", "notes": [ 42, 37, 32, 27, - 22 + 20 ], "offset": 1, "sharps": false, "capo": 0 }, { - "name": "Bass-Down 1 Step", + "name": "Bass-Down 1 Step Dropped G", "notes": [ 41, 36, 31, 26, - 21 + 19 ], "offset": 2, "sharps": true, "capo": 0 }, { - "name": "Bass-Down 1 1/2 Steps", + "name": "Bass-Down 1 1/2 Steps Dropped Gb", "notes": [ 40, 35, 30, 25, - 20 + 18 ], "offset": 3, "sharps": false, "capo": 0 }, { - "name": "Bass-Down 2 Steps", + "name": "Bass-Down 2 Steps Dropped F", "notes": [ 39, 34, 29, 24, - 19 + 17 ], "offset": 4, "sharps": false, @@ -831,198 +831,198 @@ "capo": 0 }, { - "name": "Bass-Standard", + "name": "Down 1/2 Step", "notes": [ + 63, + 58, + 54, + 49, + 44, + 39 + ], + "offset": 1, + "sharps": false, + "capo": 0 + }, + { + "name": "Down 1 Step", + "notes": [ + 62, + 57, + 53, 48, 43, - 38, - 33, - 28, - 23 + 38 ], - "offset": 0, - "sharps": true, + "offset": 2, + "sharps": false, "capo": 0 }, { - "name": "Dropped-D", + "name": "Down 1 1/2 Steps", "notes": [ - 64, - 59, + 61, + 56, + 52, + 47, + 42, + 37 + ], + "offset": 3, + "sharps": false, + "capo": 0 + }, + { + "name": "Down 2 Steps", + "notes": [ + 60, 55, - 50, - 45, - 38 + 51, + 46, + 41, + 36 ], - "offset": 0, - "sharps": true, + "offset": 4, + "sharps": false, "capo": 0 }, { - "name": "Double Dropped-D", + "name": "Down 2 1/2 Steps", "notes": [ - 62, 59, - 55, + 54, 50, 45, - 38 + 40, + 35 ], - "offset": 0, + "offset": 5, "sharps": true, "capo": 0 }, { - "name": "Down 1/2 Step Dropped-Db", + "name": "Down 3 Steps", "notes": [ - 63, 58, - 54, + 53, 49, 44, - 37 + 39, + 34 ], - "offset": 1, + "offset": 6, "sharps": false, "capo": 0 }, { - "name": "Down 1 Step Dropped-C", + "name": "Down 3 1/2 Steps", "notes": [ - 62, 57, - 53, + 52, 48, 43, - 36 + 38, + 33 ], - "offset": 2, + "offset": 7, "sharps": true, "capo": 0 }, { - "name": "Down 1 1/2 Step Dropped-B", + "name": "Dropped-D", "notes": [ - 61, - 56, - 52, - 47, - 42, - 35 + 64, + 59, + 55, + 50, + 45, + 38 ], - "offset": 3, + "offset": 0, "sharps": true, "capo": 0 }, { - "name": "Down 2 Steps Dropped-Bb", + "name": "Double Dropped-D", "notes": [ - 60, + 62, + 59, 55, - 51, - 46, - 41, - 34 + 50, + 45, + 38 ], - "offset": 4, - "sharps": false, + "offset": 0, + "sharps": true, "capo": 0 }, { - "name": "Down 1/2 Step", + "name": "Down 1/2 Step Dropped-Db", "notes": [ 63, 58, 54, 49, 44, - 39 + 37 ], "offset": 1, "sharps": false, "capo": 0 }, { - "name": "Down 1 Step", + "name": "Down 1 Step Dropped-C", "notes": [ 62, 57, 53, 48, 43, - 38 + 36 ], "offset": 2, - "sharps": false, + "sharps": true, "capo": 0 }, { - "name": "Down 1 1/2 Steps", + "name": "Down 1 1/2 Step Dropped-B", "notes": [ 61, 56, 52, 47, 42, - 37 + 35 ], "offset": 3, - "sharps": false, + "sharps": true, "capo": 0 }, { - "name": "Down 2 Steps", + "name": "Down 2 Steps Dropped-Bb", "notes": [ 60, 55, 51, 46, 41, - 36 - ], - "offset": 4, - "sharps": false, - "capo": 0 - }, - { - "name": "Down 2 1/2 Steps", - "notes": [ - 59, - 54, - 50, - 45, - 40, - 35 - ], - "offset": 5, - "sharps": true, - "capo": 0 - }, - { - "name": "Down 3 Steps", - "notes": [ - 58, - 53, - 49, - 44, - 39, 34 ], - "offset": 6, + "offset": 4, "sharps": false, "capo": 0 }, { - "name": "Down 3 1/2 Steps", + "name": "Bass-Standard", "notes": [ - 57, - 52, 48, 43, 38, - 33 + 33, + 28, + 23 ], - "offset": 7, + "offset": 0, "sharps": true, "capo": 0 }, @@ -1587,6 +1587,66 @@ "sharps": true, "capo": 0 }, + { + "name": "Down 1/2 Step", + "notes": [ + 63, + 58, + 54, + 49, + 44, + 39, + 34 + ], + "offset": 1, + "sharps": false, + "capo": 0 + }, + { + "name": "Down 1 Step", + "notes": [ + 62, + 57, + 53, + 48, + 43, + 38, + 33 + ], + "offset": 2, + "sharps": true, + "capo": 0 + }, + { + "name": "Down 1 1/2 Step", + "notes": [ + 61, + 56, + 52, + 47, + 42, + 37, + 32 + ], + "offset": 3, + "sharps": false, + "capo": 0 + }, + { + "name": "Down 2 Steps", + "notes": [ + 60, + 55, + 51, + 46, + 41, + 36, + 31 + ], + "offset": 4, + "sharps": false, + "capo": 0 + }, { "name": "Bass-Standard", "notes": [ @@ -1786,66 +1846,6 @@ "sharps": true, "capo": 0 }, - { - "name": "Down 1/2 Step", - "notes": [ - 63, - 58, - 54, - 49, - 44, - 39, - 34 - ], - "offset": 1, - "sharps": false, - "capo": 0 - }, - { - "name": "Down 1 Step", - "notes": [ - 62, - 57, - 53, - 48, - 43, - 38, - 33 - ], - "offset": 2, - "sharps": true, - "capo": 0 - }, - { - "name": "Down 1 1/2 Step", - "notes": [ - 61, - 56, - 52, - 47, - 42, - 37, - 32 - ], - "offset": 3, - "sharps": false, - "capo": 0 - }, - { - "name": "Down 2 Steps", - "notes": [ - 60, - 55, - 51, - 46, - 41, - 36, - 31 - ], - "offset": 4, - "sharps": false, - "capo": 0 - }, { "name": "Open G", "notes": [ @@ -1937,4 +1937,4 @@ "capo": 0 } ] -} \ No newline at end of file +}