Merge branch 'main' into stable

kaisalmen · Oct 4, 2021 · b8fcd04 · b8fcd04
2 parents 0f5969f + 3b9b699
commit b8fcd04
Show file tree

Hide file tree

Showing 5 changed files with 4,873 additions and 827 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 4.0.1
+- `three.js` is no longer a **peerDependency**. It is just a **dependency**. This resolves issue #58.
+- Updated **devDependencies** to resolve potential security issues.
+
 ## 4.0.0
 - All worker related functionality has been moved to external `WorkerTaskManager`, see [three-wtm](https://github.com/kaisalmen/three-wtm).
 - Introduction of potentially Infinite running `WorkerTaskManager` example `wtm_potentially_infinite.html`

diff --git a/README.md b/README.md
@@ -35,9 +35,9 @@ If you want to get started see take a look at the following examples. They get m
 
 ## Main Branches
 
-Main development now takes place on branch [dev](https://github.com/kaisalmen/WWOBJLoader/tree/dev).
+Main development now takes place on branch [main](https://github.com/kaisalmen/WWOBJLoader/tree/main).
 <br>
-The stable branch contains the release versions available with three.js is available on branch [stable](https://github.com/kaisalmen/WWOBJLoader/tree/stable).
+The [stable](https://github.com/kaisalmen/WWOBJLoader/tree/stable) branch contains the release versions.
 
 ## Docs
 Run `npm run doc` to create the documentation in directory **build/docs**.