Merge conflicts with with some logic blocks

Assets/Data/Inventory/BaseInventory.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ffe4ea933ab9da92364324d81c2749faee272a1748758219ee2fa21b503e5044
+oid sha256:fb7987d63a59b05fb303834051f410599c5ebebb77dd2c8047b930403e9aac3f
 size 1059

Assets/Data/Logic Blocks/Diagonal Left.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f0a05826b5823f5f159f5b67277de6e24551a7e1a5cde6113c13371a117fe7ad
-size 798
+oid sha256:7f00c98133cb05b40b3c72c41c5452d27952c118a795de5260f8dcad6fff2bd3
+size 874

Assets/Data/Logic Blocks/Diagonal Left.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 752565cc5a95020498b9ed396343f3c0
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Data/Logic Blocks/Diagonal Right.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:edf4b3bd5a1f10ecf8721fe4410092ee3e909e1e07c25c66f2b0b87012db8569
-size 799
+oid sha256:237c1f27581952747a883ad421b895ac34a794eff2abb2749fb2c4ff4052bb2a
+size 875

Assets/Data/Logic Blocks/Diagonal Right.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: efab8a199b362cb42b3e0bce70dd05f4
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Data/Logic Blocks/Rotate Left.asset

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d41baba051e9b3fd2296d98130f13fcd6ca009d75159fb344e3c081b2a1f35eb
+size 651

Assets/Data/Logic Blocks/Rotate Left.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: aa238796cf1886244951ec8c2fed1855
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Data/Logic Blocks/Rotate Right.asset

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2b32afa87515fe3c4e3257ab206e53acc8d6233357467015b73535f27b56e2d3
+size 652

Assets/Data/Logic Blocks/Rotate Right.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: dbe27449ec71f3e4e8d5d6ada80b1799
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Plugins/IngameDebugConsole.meta → Assets/Scripts/Components.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5f8eae876be4b03438375a82d2c69b4d
+guid: 8d7394d70ec233849a60a26da5f23b75
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}