From 8916103e89ea69598b51f34e76249743d7cee1de Mon Sep 17 00:00:00 2001
From: Chris Yeninas <844685+PhantomGamers@users.noreply.github.com>
Date: Tue, 26 Oct 2021 11:10:14 -0400
Subject: [PATCH 1/3] 0.7.1 bump

---
 CHANGELOG.md | 5 +++++
 version.json | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index efc915f4d..f8f64e04a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 ## Changelog
 
+0.7.1:
+
+- @starfi5h: Fixed research desync issues
+- @sp00ktober: Fixed error when client upgrades buildings on different planet from the host.
+
 0.7.0:
 
 - @phantomgamers: Fixed instance where error would trigger by loading saves made on earlier Nebula versions. **WARNING: All previous client inventory and position data will be lost!** (should be for the last time!)
diff --git a/version.json b/version.json
index 0ff53a043..5b5b9ce52 100644
--- a/version.json
+++ b/version.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "assemblyVersion": {
     "precision": "build"
   },

From c36880e683b147adb033dfbdf7161a78f3328e00 Mon Sep 17 00:00:00 2001
From: Chris Yeninas <844685+PhantomGamers@users.noreply.github.com>
Date: Fri, 29 Oct 2021 09:36:13 -0400
Subject: [PATCH 2/3] Update RemotePlayerModel.cs

assign the PlayerInstance's mechaArmorModel for compatibility with dsp 0.8.22.9331
---
 NebulaWorld/RemotePlayerModel.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/NebulaWorld/RemotePlayerModel.cs b/NebulaWorld/RemotePlayerModel.cs
index fa3070192..c44f0b789 100644
--- a/NebulaWorld/RemotePlayerModel.cs
+++ b/NebulaWorld/RemotePlayerModel.cs
@@ -50,6 +50,7 @@ public RemotePlayerModel(ushort playerId, string username)
             PlayerTransform.gameObject.name = $"Remote Player ({playerId})";
 
             PlayerInstance = new global::Player();
+            PlayerInstance.transform = PlayerTransform;
             MechaInstance = new Mecha();
             PlayerInstance.mecha = MechaInstance;
             MechaInstance.Init(PlayerInstance);
@@ -59,6 +60,11 @@ public RemotePlayerModel(ushort playerId, string username)
             Material mat = MechaInstance.droneRenderer.mat_0;
             mat.CopyPropertiesFromMaterial(Configs.builtin.mechaDroneMat);
 
+            //Fix MechaArmorModel
+            PlayerInstance.mechaArmorModel = PlayerTransform.GetComponentInChildren<MechaArmorModel>();
+            PlayerInstance.mechaArmorModel.player = PlayerInstance;
+            PlayerInstance.mechaArmorModel.mecha = MechaInstance;
+
             PlayerId = playerId;
             Username = username;
         }

From 2f7bcb1c6ea80c1b0d09c49f49e85f6cfb143ca8 Mon Sep 17 00:00:00 2001
From: Chris Yeninas <844685+PhantomGamers@users.noreply.github.com>
Date: Fri, 29 Oct 2021 09:37:45 -0400
Subject: [PATCH 3/3] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f8f64e04a..d98b2f836 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - @starfi5h: Fixed research desync issues
 - @sp00ktober: Fixed error when client upgrades buildings on different planet from the host.
+- @PhantomGamers: Fixed compatibility with DSP 0.8.22.9331+
 
 0.7.0: