Merge remote-tracking branch 'origin' into feature/net8.0

CHANGELOG.md

@@ -9,10 +9,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Interfaces to support proper DI
 - Register types to be parsed with DI
 
+<<<<<<< HEAD
 ## [2.1.0] - 2023-11-18
 ### Changed
 - support .net8
 
+=======
+>>>>>>> origin
 ## [2.1.0] - 2023-09-10
 ### Changed
 - support .net6
@@ -25,15 +28,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 - add HISTORY_GAMESTATE_REPLCIATED_TIME_AS_DOUBLE (by [chrisai-dev](https://github.com/chrisai-dev))
 
+<<<<<<< HEAD
 ## [2.0.6] - 2023-06-10
+=======
+## [2.0.6] - 2024-06-10
+>>>>>>> origin
 ### Changed
 - adding support for v25.00
 
-## [2.0.5] - 2022-09-19
+## [2.0.5] - 2022-12-04
 ### Changed
 - support new network version
 
-## [2.0.4] - 2022-09-19
+## [2.0.4] - 2022-10-04
 ### Changed
 - fix issue in Oodle decompress (by [SL-x-TnT](https://github.com/SL-x-TnT))
 
@@ -110,4 +117,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [1.1.0]: https://github.com/Shiqan/FortniteReplayDecompressor/releases/tag/1.1.0
 [1.1.1]: https://github.com/Shiqan/FortniteReplayDecompressor/releases/tag/1.1.1
 [1.1.2]: https://github.com/Shiqan/FortniteReplayDecompressor/releases/tag/1.1.2
-[2.0.0]: https://github.com/Shiqan/FortniteReplayDecompressor/releases/tag/2.0.0
+[2.0.0]: https://github.com/Shiqan/FortniteReplayDecompressor/releases/tag/2.0.0