Merge branch 'master' into develop

Author: Lunaretic

xivModdingFramework/Items/Categories/Gear.cs

@@ -72,11 +72,12 @@ public async Task<List<XivGear>> GetUnCachedGearList()
             // These are the offsets to relevant data
             // These will need to be changed if data gets added or removed with a patch
             const int modelDataCheckOffset = 30;
-            int dataLength = 168;
+            int dataLength = 160;
             const int nameDataOffset = 14;
             const int modelDataOffset = 24;
             const int iconDataOffset = 136;
-            int slotDataOffset = 156;
+            int slotDataOffset = 154;
+
 
             if( _xivLanguage == XivLanguage.Korean)
             {

xivModdingFramework/Items/Categories/Housing.cs

@@ -91,7 +91,7 @@ private async Task<List<XivFurniture>> GetIndoorFurniture()
             const int itemCategoryOffset = 14;
 
             const int itemNameDataOffset = 14;
-            int itemDataLength = 168;
+            int itemDataLength = 160;
             const int itemIconDataOffset = 136;
 
             if(_xivLanguage == XivLanguage.Korean)
@@ -183,7 +183,7 @@ private async Task<List<XivFurniture>> GetPaintings()
 
             const int itemNameDataOffset = 14;
             const int housingIndexOffset = 112;
-            int itemDataLength = 168;
+            int itemDataLength = 160;
             const int itemIconDataOffset = 136;
 
             var ex = new Ex(_gameDirectory, _xivLanguage);
@@ -265,7 +265,7 @@ private async Task<List<XivFurniture>> GetOutdoorFurniture()
             const int itemCategoryOffset = 13;
 
             const int itemNameDataOffset = 14;
-            int itemDataLength = 168;
+            int itemDataLength = 160;
             const int itemIconDataOffset = 136;
 
             if ( _xivLanguage == XivLanguage.Korean)