diff --git a/CHANGELOG.md b/CHANGELOG.md
index bbdc45db1..86c96c6cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,38 @@
# Change Log
This is the changelog for OutpostHD.
+## [0.8.7] - 2023-04-09
+
+Addresses a few bugs and provides some quality of life balancing.
+
+### Added
+- Basic cheat dialog window (can be brought up with Ctrl+Shift+F10)
+- FreeBSD configuration to be able to build OPHD from source
+
+### Changed
+- Resource values won't glow on first turn
+- Adjusted cost of structures
+- Adjusted cost of robots
+- Mine yields have been increased
+- PhysFS dependency removed
+- Factory list box will now only show progress bars if a factory is actually producing something
+- Alerts will be pushed if there are issues with Warehouse storage and capacity
+- Alerts will be pushed when tasks are completed for robots and construction
+- Alerts will be pushed when robot tasks are canceled
+- Factory Report now shows actual description of products instead of placeholder text
+- Moved factory product descriptions out of the code and into an external definition file
+- Improved exception error messages for better end-user reporting
+
+### Fixed
+- Command Center will no longer collapse if there is no maintenance facility
+- Game Over dialog's "Return to Main Menu" functions properly again
+- Fixed potential crashing with certain UI element event handlers not being properly disconnected
+- Fixed crashing in Factory Report view
+- Fixed potential crashing in event handling that could lead to memory corruption
+- Crime no longer generates until population is landed on the surface
+- Trying to build a tube on a non-bulldozed tile will now issue a warning
+
+
## [0.8.6] - 2022-04-25
Addresses a number of bugs and usability issues between 0.8.x and 0.9.x branches.
diff --git a/OPHD/Constants/Strings.h b/OPHD/Constants/Strings.h
index faa06c7b0..912844318 100644
--- a/OPHD/Constants/Strings.h
+++ b/OPHD/Constants/Strings.h
@@ -17,7 +17,7 @@ namespace constants
// =====================================
// = MISCELLANEOUS
// =====================================
- const std::string Version = "v0.8.6";
+ const std::string Version = "v0.8.7";
const std::string EmptyString = ""; /**< Used in a few places to return an empty string without having to create one. */
const std::string TileBulldozed = "Bulldozed";
diff --git a/OPHD/ophd.rc b/OPHD/ophd.rc
index 374a4c76f..9a8cd9624 100644
--- a/OPHD/ophd.rc
+++ b/OPHD/ophd.rc
@@ -61,8 +61,8 @@ IDI_ICON1 ICON "outpost.ico"
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,8,6,0
- PRODUCTVERSION 0,8,6,0
+ FILEVERSION 0,8,7,0
+ PRODUCTVERSION 0,8,7,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -79,12 +79,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "LairWorks Entertainment, LLC"
VALUE "FileDescription", "OutpostHD"
- VALUE "FileVersion", "0.8.6.0"
+ VALUE "FileVersion", "0.8.7.0"
VALUE "InternalName", "OutpostHD"
- VALUE "LegalCopyright", "Copyright © 2015 - 2022, Leeor Dicker"
+ VALUE "LegalCopyright", "Copyright © 2015 - 2023, Leeor Dicker"
VALUE "OriginalFilename", "OPHD.EXE"
VALUE "ProductName", "OutpostHD"
- VALUE "ProductVersion", "0.8.6.0"
+ VALUE "ProductVersion", "0.8.7.0"
END
END
BLOCK "VarFileInfo"
diff --git a/README.md b/README.md
index 5c9f4df49..94b53ddbe 100644
--- a/README.md
+++ b/README.md
@@ -59,10 +59,13 @@ I'd like to give a special thanks and shout out to the following contributors wh
- FallTime
- Goof
- havkyp
+- Inglonias
- JetMech1999
+- Laura Hild
- lhark
- lordpalandus
- macksting
+- matt-handy
- singthemuse
- Sirbomber
- Vagabond
diff --git a/data b/data
index d4e429a37..84e7de8ab 160000
--- a/data
+++ b/data
@@ -1 +1 @@
-Subproject commit d4e429a378e0da94ccccfe3e3969333b7a236083
+Subproject commit 84e7de8ab05c1caec56dd251b730816d157b616c
diff --git a/nas2d-core b/nas2d-core
index 1078d5fe9..502f3af1c 160000
--- a/nas2d-core
+++ b/nas2d-core
@@ -1 +1 @@
-Subproject commit 1078d5fe986074d2cb4ab7443cc780d49227bad7
+Subproject commit 502f3af1ceee4f2a323c99804345a4f1c6d5b9c1
diff --git a/xcode/OutpostHD.xcodeproj/xcshareddata/xcschemes/Debug.xcscheme b/xcode/OutpostHD.xcodeproj/xcshareddata/xcschemes/Debug.xcscheme
new file mode 100644
index 000000000..e36174253
--- /dev/null
+++ b/xcode/OutpostHD.xcodeproj/xcshareddata/xcschemes/Debug.xcscheme
@@ -0,0 +1,78 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/xcode/OutpostHD.xcodeproj/xcshareddata/xcschemes/Release.xcscheme b/xcode/OutpostHD.xcodeproj/xcshareddata/xcschemes/Release.xcscheme
new file mode 100644
index 000000000..d05a6b576
--- /dev/null
+++ b/xcode/OutpostHD.xcodeproj/xcshareddata/xcschemes/Release.xcscheme
@@ -0,0 +1,78 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+