Add Combat Tests and fix a few versions

Author: Nixinova

.gitattributes

@@ -6,4 +6,4 @@ package-lock.json -diff
 
 # Linguist
 *.ts linguist-language=TypeScript
-*.yml linguist-language=CSON
+*.yml linguist-language=JSON5

changelog.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.2.1
+- [Data] Added Combat Test versions.
+- [Data] Changed parent version strings to consistently refer to the version ID.
+- [Data] Fixed a few incorrect versions.
+
 ## 0.2.0
 - [CLI] Added help message.
 - [CLI] Added `[<param>]` argument to display stored data from a given version such as `type` or `date`.

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "minecraft-vers",
-  "version": "0.2.0-2123",
+  "version": "0.2.1-2123",
   "description": "A complete list of all Minecraft versions, for Java and Bedrock, release and snapshot.",
   "keywords": [
     "minecraft",

package.json

@@ -23,7 +23,7 @@ import versionData from 'minecraft-vers' // modern import syntax
 Command-line:
 
 ```cmd
-mcdata [--full] <edition> <phase> [<version>] [<n>]
+mcdata [--full] <edition> <phase> [<version>] [<index>] [<param>]
 ```
 
 ### Output format

readme.md

@@ -77,12 +77,13 @@
 - ['1.0.0', Java, Release, null, [{ type: release, date: 2011-11-18 }]]
 
 ### Pres
+- ['1.17-rc2', Java, Release, '1.17', [{ name: 1.17 Release Candidate 2, type: snapshot, date: 2021-06-07 }]]
 - ['1.17-rc1', Java, Release, '1.17', [{ name: 1.17 Release Candidate 1, type: snapshot, date: 2021-06-04 }]]
-- ['1.17-pre5', Java, Release, '1.17', [{ name: 1.17 Pre-release 5, type: snapshot, date: 2021-06-03 }]]
-- ['1.17-pre4', Java, Release, '1.17', [{ name: 1.17 Pre-release 4, type: snapshot, date: 2021-06-02 }]]
-- ['1.17-pre3', Java, Release, '1.17', [{ name: 1.17 Pre-release 3, type: snapshot, date: 2021-06-01 }]]
-- ['1.17-pre2', Java, Release, '1.17', [{ name: 1.17 Pre-release 2, type: snapshot, date: 2021-05-31 }]]
-- ['1.17-pre1', Java, Release, '1.17', [{ name: 1.17 Pre-release 1, type: snapshot, date: 2021-05-27 }]]
+- ['1.17-pre5', Java, Release, '1.17', [{ name: 1.17 Pre-Release 5, type: snapshot, date: 2021-06-03 }]]
+- ['1.17-pre4', Java, Release, '1.17', [{ name: 1.17 Pre-Release 4, type: snapshot, date: 2021-06-02 }]]
+- ['1.17-pre3', Java, Release, '1.17', [{ name: 1.17 Pre-Release 3, type: snapshot, date: 2021-06-01 }]]
+- ['1.17-pre2', Java, Release, '1.17', [{ name: 1.17 Pre-Release 2, type: snapshot, date: 2021-05-31 }]]
+- ['1.17-pre1', Java, Release, '1.17', [{ name: 1.17 Pre-Release 1, type: snapshot, date: 2021-05-27 }]]
 - ['1.16.5-rc1', Java, Release, '1.16.5', [{ name: 1.16.5 Pre-release 1, type: snapshot, date: 2020-10-22 }, { name: 1.16.5 Release Candidate 1, type: snapshot, date: 2020-10-22 }]]
 - ['1.16.4-rc1', Java, Release, '1.16.4', [{ name: 1.16.4 Release Candidate 1, type: snapshot, date: 2020-10-27 }]]
 - ['1.16.4-pre2', Java, Release, '1.16.4', [{ name: 1.16.4 Pre-release 2, type: snapshot, date: 2020-10-22 }]]
@@ -425,6 +426,8 @@
 - ['13w47d', Java, Release, '1.7.4', [{ type: snapshot, date: 2013-11-22 }]]
 - ['13w47c', Java, Release, '1.7.4', [{ type: snapshot, date: 2013-11-21 }]]
 - ['13w47b', Java, Release, '1.7.4', [{ type: snapshot, date: 2013-11-21 }]]
+- ['13w47a', Java, Release, '1.7.4', [{ type: snapshot, date: 2013-11-21 }]]
+- ['13w47a-preview', Java, Release, '13w47a', [{ type: snapshot, date: 2013-11-20 }]]
 - ['13w43a', Java, Release, '1.7.2', [{ type: snapshot, date: 2013-10-21 }]]
 - ['13w42b', Java, Release, '1.7.2', [{ type: snapshot, date: 2013-10-18 }]]
 - ['13w42a', Java, Release, '1.7.2', [{ type: snapshot, date: 2013-10-17 }]]
@@ -526,6 +529,20 @@
 - ['11w48a', Java, Release, '1.1', [{ type: snapshot, date: 2011-12-01 }]]
 - ['11w47a', Java, Release, '1.1', [{ type: snapshot, date: 2011-11-24 }]]
 
+### Tests
+- ['combat1', Java, Release, undefined, [{ name: '1.14.3 - Combat Test', type: snapshot, date: 2019-06-26 }]]
+- ['combat2', Java, Release, undefined, [{ name: 'Combat Test 2', type: snapshot, date: 2019-08-15 }]]
+- ['combat3', Java, Release, undefined, [{ name: 'Combat Test 3', type: snapshot, date: 2019-11-01 }]]
+- ['combat4', Java, Release, undefined, [{ name: 'Combat Test 4', type: snapshot, date: 2019-11-29 }]]
+- ['combat5', Java, Release, undefined, [{ name: 'Combat Test 5', type: snapshot, date: 2020-01-16 }]]
+- ['combat6', Java, Release, undefined, [{ name: 'Combat Test 6', type: snapshot, date: 2020-08-07 }]]
+- ['combat7a', Java, Release, 'combat7c', [{ name: 'Combat Test 7', type: snapshot, date: 2020-08-12 }]]
+- ['combat7b', Java, Release, 'combat7c', [{ name: 'Combat Test 7b', type: snapshot, date: 2020-08-13 }]]
+- ['combat7c', Java, Release, undefined, [{ name: 'Combat Test 7c', type: snapshot, date: 2020-08-14 }]]
+- ['combat8a', Java, Release, 'combat8b', [{ name: 'Combat Test 8', type: snapshot, date: ~ }]]
+- ['combat8b', Java, Release, undefined, [{ name: 'Combat Test 8b', type: snapshot, date: 2020-08-21 }]]
+- ['combat8c', Java, Release, undefined, [{ name: 'Combat Test 8c', type: snapshot, date: 2020-08-26 }]]
+
 # Beta
 - ['1.9-pre6', Java, Beta, { phase: Release, version: '1.0.0'}, [{ name: 'Beta 1.9 Prerelease 6', type: snapshot, date: 2011-11-11 }]]
 - ['1.9-pre5', Java, Beta, { phase: Release, version: '1.0.0'}, [{ name: 'Beta 1.9 Prerelease 5', type: snapshot, date: 2011-10-27 }]]
@@ -535,8 +552,8 @@
 - ['1.9-pre1', Java, Beta, { phase: Release, version: '1.0.0'}, [{ name: 'Beta 1.9 Prerelease 1', type: snapshot, date: 2011-09-22 }]]
 - ['1.8.1', Java, Beta, null, [{ name: 'Beta 1.8.1', type: release, date: 2011-09-15 }]]
 - ['1.8', Java, Beta, null, [{ name: 'Beta 1.8', type: release, date: 2011-09-14 }]]
-- ['1.8-pre2', Java, Beta, 'Beta 1.8', [{ name: 'Beta 1.8 Pre-release 2 ;)', type: snapshot, date: 2011-09-13 }]]
-- ['1.8-pre1', Java, Beta, 'Beta 1.8', [{ name: 'Beta 1.8 Pre-release', type: snapshot, date: 2011-09-08 }, { name: 'Beta 1.8 Pre-release', type: snapshot, date: 2011-09-09 }]]
+- ['1.8-pre2', Java, Beta, '1.8', [{ name: 'Beta 1.8 Pre-release 2 ;)', type: snapshot, date: 2011-09-13 }]]
+- ['1.8-pre1', Java, Beta, '1.8', [{ name: 'Beta 1.8 Pre-release', type: snapshot, date: 2011-09-08 }, { name: 'Beta 1.8 Pre-release', type: snapshot, date: 2011-09-09 }]]
 - ['1.7.3', Java, Beta, null, [{ name: 'Beta 1.7.3', type: release, date: 2011-07-08 }]]
 - ['1.7.2', Java, Beta, null, [{ name: 'Beta 1.7.2', type: release, date: 2011-07-01 }]]
 - ['1.7_01', Java, Beta, null, [{ name: 'Beta 1.7_01', type: release, date: 2011-06-30 }]]
@@ -548,22 +565,21 @@
 - ['1.6.2', Java, Beta, null, [{ name: 'Beta 1.6.2', type: release, date: 2011-05-26 }]]
 - ['1.6.1', Java, Beta, null, [{ name: 'Beta 1.6.1', type: release, date: 2011-05-26 }]]
 - ['1.6', Java, Beta, null, [{ name: 'Beta 1.6', type: release, date: 2011-05-26 }]]
-- ['1.6-tb3', Java, Beta, 'Beta 1.6', [{ name: 'Beta 1.6 Test Build 3', type: snapshot, date: 2011-05-25 }]]
+- ['1.6-tb3', Java, Beta, '1.6', [{ name: 'Beta 1.6 Test Build 3', type: snapshot, date: 2011-05-25 }]]
+- ['1.6-trailer', Java, Beta, '1.6', [{ name: 'Beta 1.6', type: snapshot, date: 2011-05-23 }]]
 - ['1.5_01', Java, Beta, null, [{ name: 'Beta 1.5_01', type: release, date: 2011-04-20 }]]
 - ['1.5', Java, Beta, null, [{ name: 'Beta 1.5', type: release, date: 2011-04-19 }]]
 - ['1.4_01', Java, Beta, null, [{ name: 'Beta 1.4_01', type: release, date: 2011-04-05 }]]
-- ['1.4', Java, Beta, null, [{ name: 'Beta 1.4', type: release, date: 2011-03-31 }]]
-- ['1.4', Java, Beta, null, [{ name: 'Beta 1.4', type: release, date: 2011-03-31 }]]
+- ['1.4', Java, Beta, null, [{ name: 'Beta 1.4', type: release, date: 2011-03-31 }, { name: 'Beta 1.4', type: release, date: 2011-03-31 }]]
 - ['1.3_01', Java, Beta, null, [{ name: 'Beta 1.3_01', type: release, date: 2011-02-23 }]]
 - ['1.3', Java, Beta, null, [{ name: 'Beta 1.3', type: release, date: 2011-02-22 }, { name: 'Beta 1.3', type: release, date: 2011-02-22 }, { name: 'Beta 1.3', type: release, date: 2011-02-22 }]]
-- ['1.3-demo', Java, Beta, 'Beta 1.3', [{ name: 'Demo (PC Gamer)', type: release, date: 2011-04-19 }]]
+- ['1.3-demo', Java, Beta, '1.3', [{ name: 'Demo (PC Gamer)', type: release, date: 2011-04-19 }]]
 - ['1.2_02', Java, Beta, null, [{ name: 'Beta 1.2_02', type: release, date: 2011-01-21 }]]
 - ['1.2_01', Java, Beta, null, [{ name: 'Beta 1.2_01', type: release, date: 2011-01-14 }]]
 - ['1.2', Java, Beta, null, [{ name: 'Beta 1.2', type: release, date: 2011-01-13 }]]
 - ['1.1_02', Java, Beta, null, [{ name: 'Beta 1.1_02', type: release, date: 2010-12-22 }]]
 - ['1.1_01', Java, Beta, null, [{ name: 'Beta 1.1_01', type: release, date: 2010-12-22 }]]
-- ['1.1', Java, Beta, null, [{ name: 'Beta 1.1', type: release, date: 2010-12-22 }]]
-- ['1.1', Java, Beta, null, [{ name: 'Beta 1.1', type: release, date: 2010-12-22 }]]
+- ['1.1', Java, Beta, null, [{ name: 'Beta 1.1', type: release, date: 2010-12-22 }, { name: 'Beta 1.1', type: release, date: 2010-12-22 }]]
 - ['1.0.2', Java, Beta, null, [{ name: 'Beta 1.0.2', type: release, date: 2010-12-21 }]]
 - ['1.0_01', Java, Beta, null, [{ name: 'Beta 1.0_01', type: release, date: 2010-12-20 }]]
 - ['1.0', Java, Beta, null, [{ name: 'Beta 1.0', type: release, date: 2010-12-20 }]]
@@ -585,6 +601,7 @@
 - ['1.2.0_02', Java, Alpha, null, [{ name: 'Alpha v1.2.0_02', type: release, date: 2010-10-31 }]]
 - ['1.2.0_01', Java, Alpha, null, [{ name: 'Alpha v1.2.0_01', type: release, date: 2010-10-31 }]]
 - ['1.2.0', Java, Alpha, null, [{ name: 'Alpha v1.2.0', type: release, date: 2010-10-30 }]]
+- ['1.2.0-preview', Java, Alpha, '1.2.0', [{ name: 'Alpha v1.2.0', type: release, date: 2010-10-29 }]]
 - ['1.1.2_01', Java, Alpha, null, [{ name: 'Alpha v1.1.2_01', type: release, date: 2010-09-23 }]]
 - ['1.1.2', Java, Alpha, null, [{ name: 'Alpha v1.1.2', type: release, date: 2010-09-18 }]]
 - ['1.1.1', Java, Alpha, null, [{ name: 'Alpha v1.1.1', type: release, date: 2010-09-18 }]]