From 49e4248cfd4e6b71eb1c1b7c5c6eb5bbab2555e7 Mon Sep 17 00:00:00 2001
From: Mikael Pettersson <mikael.pettersson@wematter.se>
Date: Tue, 4 Apr 2023 10:48:08 +0200
Subject: [PATCH 1/3] mark deprecated functions in `BufferGeometryUtils`

---
 .../examples/jsm/utils/BufferGeometryUtils.d.ts    | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/types/three/examples/jsm/utils/BufferGeometryUtils.d.ts b/types/three/examples/jsm/utils/BufferGeometryUtils.d.ts
index 3bbaa4aa9..e61bfdfb5 100644
--- a/types/three/examples/jsm/utils/BufferGeometryUtils.d.ts
+++ b/types/three/examples/jsm/utils/BufferGeometryUtils.d.ts
@@ -11,8 +11,8 @@ import {
 } from '../../../src/Three';
 
 export function deepCloneAttribute(attribute: BufferAttribute): BufferAttribute;
-export function mergeBufferGeometries(geometries: BufferGeometry[], useGroups?: boolean): BufferGeometry;
-export function mergeBufferAttributes(attributes: BufferAttribute[]): BufferAttribute;
+export function mergeGeometries(geometries: BufferGeometry[], useGroups?: boolean): BufferGeometry;
+export function mergeAttributes(attributes: BufferAttribute[]): BufferAttribute;
 export function interleaveAttributes(attributes: BufferAttribute[]): InterleavedBufferAttribute;
 export function estimateBytesUsed(geometry: BufferGeometry): number;
 export function mergeVertices(geometry: BufferGeometry, tolerance?: number): BufferGeometry;
@@ -34,3 +34,13 @@ export function deinterleaveGeometry(geometry: BufferGeometry): void;
  * @param creaseAngle The crease angle.
  */
 export function toCreasedNormals(geometry: BufferGeometry, creaseAngle?: number): BufferGeometry;
+
+/**
+ * @deprecated Use mergeGeometries instead.
+ */
+export function mergeBufferGeometries(geometries: BufferGeometry[], useGroups?: boolean): BufferGeometry;
+
+/**
+ * @deprecated Use mergeAttributes instead.
+ */
+export function mergeBufferAttributes(attributes: BufferAttribute[]): BufferAttribute;

From a92eb60d9fe54360fc43f60bc7bfe5d0eba8fa24 Mon Sep 17 00:00:00 2001
From: Mikael Pettersson <mikael.pettersson@wematter.se>
Date: Tue, 4 Apr 2023 14:01:22 +0200
Subject: [PATCH 2/3] Add Mik-pe to list of contributors

---
 .all-contributorsrc | 9 +++++++++
 README.md           | 1 +
 2 files changed, 10 insertions(+)

diff --git a/.all-contributorsrc b/.all-contributorsrc
index 78f3388d8..c8a955084 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -705,6 +705,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "Mik-pe",
+      "name": "Mikael Pettersson",
+      "avatar_url": "https://avatars.githubusercontent.com/u/5653426?v=4",
+      "profile": "https://github.com/Mik-pe",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "skipCi": true,
diff --git a/README.md b/README.md
index a96d603a1..7fd51bc9c 100644
--- a/README.md
+++ b/README.md
@@ -123,6 +123,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/rafaelsc"><img src="https://avatars.githubusercontent.com/u/502282?v=4?s=100" width="100px;" alt="Rafael Sliveira Cordeiro"/><br /><sub><b>Rafael Sliveira Cordeiro</b></sub></a><br /><a href="https://github.com/three-types/three-ts-types/commits?author=rafaelsc" title="Code">💻</a> <a href="https://github.com/three-types/three-ts-types/commits?author=rafaelsc" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/HEOJUNFO"><img src="https://avatars.githubusercontent.com/u/100739943?v=4?s=100" width="100px;" alt="HEOJUNFO"/><br /><sub><b>HEOJUNFO</b></sub></a><br /><a href="https://github.com/three-types/three-ts-types/commits?author=HEOJUNFO" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://www.oletus.fi/"><img src="https://avatars.githubusercontent.com/u/453050?v=4?s=100" width="100px;" alt="Olli Etuaho"/><br /><sub><b>Olli Etuaho</b></sub></a><br /><a href="https://github.com/three-types/three-ts-types/commits?author=Oletus" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Mik-pe"><img src="https://avatars.githubusercontent.com/u/5653426?v=4?s=100" width="100px;" alt="Mikael Pettersson"/><br /><sub><b>Mikael Pettersson</b></sub></a><br /><a href="https://github.com/three-types/three-ts-types/commits?author=Mik-pe" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

From 2e05341ddbfa11898942ce34ed461fc521789b14 Mon Sep 17 00:00:00 2001
From: Nathan Bierema <nbierema@gmail.com>
Date: Tue, 25 Apr 2023 09:11:55 -0400
Subject: [PATCH 3/3] Update .all-contributorsrc

---
 .all-contributorsrc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.all-contributorsrc b/.all-contributorsrc
index b6e2c3b68..9d751f380 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -724,6 +724,7 @@
       "contributions": [
         "code"
       ]
+    }
   ],
   "skipCi": true,
   "contributorsPerLine": 7