Merge branch 'master' of https://github.com/MineYourMind/Wiki

docs/source/Knowledge_Base/Account_Merges.rst

@@ -0,0 +1,32 @@
+++++++++++++++++++++
+Forum Account Merges
+++++++++++++++++++++
+
+Introduction
+============
+
+Occasionally, players lose access to their Minecraft account, and decide to simply buy a new one. When this happens, the player will not be able to connect the old forum account with the new minecraft account.
+
+=====
+
+**There are two possible remedies for this.**
+
+**The first method is used if you still have access to your previous forum account:**
+
+1. Create a forum support post here[link] titled "Account Merge", requesting the merge.
+2. Create a new forum account linked to your NEW Minecraft account.
+3. Respond to your support request with the NEW forum account, authorizing the merge.
+4. Wait for an Administrator to complete the merge for you.
+
+
+
+**The second method is used if you do not have access to your previous forum account:**
+
+1. Create a new forum account linked to your NEW Minecraft account.
+2. Create a forum support post here[link] titled "Account Merge", requesting the merge.
+3. Once an Administrator responds to your support post, DM them on the forum with either the Email or Date of Birth associated with your old forum account (Do not DM an Administrator before they have responded to your support post).
+4. Wait for an Administrator to complete the merge for you.
+
+======
+
+Once the merge is complete, all ranks, kits, etc should be transferred to your new account. Any claim transfers, inventory transfers, etc will need to be requested at this time. Any issues that arise due to the merge can be reported in the same support thread.

yarn.lock

@@ -303,9 +303,9 @@ backo2@1.0.2:
   integrity sha1-MasayLEpNjRj41s+u2n038+6eUc=
 
 balanced-match@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
-  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
+  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
 base64-arraybuffer@0.1.5:
   version "0.1.5"
@@ -698,7 +698,7 @@ component-inherit@0.0.3:
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
-  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
+  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
 concat-stream@^1.6.0:
   version "1.6.2"
@@ -2111,9 +2111,9 @@ mime@1.4.1:
   integrity sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==
 
 minimatch@^3.0.2, minimatch@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
+  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
   dependencies:
     brace-expansion "^1.1.7"