diff --git a/PckStudio.Core/Properties/Resources.Designer.cs b/PckStudio.Core/Properties/Resources.Designer.cs
index a6ce72c8..a79dddef 100644
--- a/PckStudio.Core/Properties/Resources.Designer.cs
+++ b/PckStudio.Core/Properties/Resources.Designer.cs
@@ -239,6 +239,29 @@ namespace PckStudio.Core.Properties {
}
}
+ ///
+ /// Looks up a localized string similar to {
+ /// "bat": {
+ /// "textureSize": { "X": 64, "Y": 64 },
+ /// "parts": [
+ /// {
+ /// "name": "head",
+ /// "boxes": [
+ /// { "pos": { "X": -3, "Y": -3, "Z": -3 }, "size": { "X": 6, "Y": 6, "Z": 6 }, "uv": { "X": 0, "Y": 0 } }
+ /// ]
+ /// },
+ /// {
+ /// "name": "body",
+ /// "boxes": [
+ /// { "pos": { "X": -3, "Y": 4, "Z": -3 }, "size": { "X": 6, "Y": 12, "Z": 6 }, "uv": { "X": 0, "Y": 16 } },
+ /// { "pos": { "X": -5, "Y": 16, "Z": 0 }, "size": { "X": 10, "Y": 6, "Z": [rest of string was truncated]";.
+ ///
+ public static string defaultModels {
+ get {
+ return ResourceManager.GetString("defaultModels", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
@@ -456,6 +479,40 @@ namespace PckStudio.Core.Properties {
}
}
+ ///
+ /// Looks up a localized string similar to {
+ /// "bat": {
+ /// "textureLocations": [
+ /// "res/mob/bat"
+ /// ],
+ /// "materialName": "bat",
+ /// "parts": [
+ /// {
+ /// "name": "head",
+ /// "children": [
+ /// { "name": "rightEar" },
+ /// { "name": "leftEar" }
+ /// ]
+ /// },
+ /// {
+ /// "name": "body",
+ /// "children": [
+ /// {
+ /// "name": "rightWing",
+ /// "children": [
+ /// { "name": "rightWingTip" }
+ /// ]
+ /// },
+ /// {
+ /// "name": "leftWing",
+ /// [rest of string was truncated]";.
+ ///
+ public static string modelMetaData {
+ get {
+ return ResourceManager.GetString("modelMetaData", resourceCulture);
+ }
+ }
+
///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
diff --git a/PckStudio.Core/Properties/Resources.resx b/PckStudio.Core/Properties/Resources.resx
index e9483c24..213558b6 100644
--- a/PckStudio.Core/Properties/Resources.resx
+++ b/PckStudio.Core/Properties/Resources.resx
@@ -151,6 +151,9 @@
..\Resources\compass.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\defaultModels.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252
+
..\Resources\armor\diamond.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -190,6 +193,9 @@
..\Resources\atlas\map_icons.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\modelMetaData.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252
+
..\Resources\atlas\moonPhaseData.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;iso-8859-1
diff --git a/PckStudio.ModelSupport/Resources/defaultModels.json b/PckStudio.Core/Resources/defaultModels.json
similarity index 100%
rename from PckStudio.ModelSupport/Resources/defaultModels.json
rename to PckStudio.Core/Resources/defaultModels.json
diff --git a/PckStudio.ModelSupport/Resources/modelMetaData.json b/PckStudio.Core/Resources/modelMetaData.json
similarity index 100%
rename from PckStudio.ModelSupport/Resources/modelMetaData.json
rename to PckStudio.Core/Resources/modelMetaData.json
diff --git a/PckStudio.ModelSupport/GameModelImporter.cs b/PckStudio.ModelSupport/GameModelImporter.cs
index 5730d551..39ec5165 100644
--- a/PckStudio.ModelSupport/GameModelImporter.cs
+++ b/PckStudio.ModelSupport/GameModelImporter.cs
@@ -29,11 +29,10 @@ using Newtonsoft.Json.Linq;
using OMI.Formats.Model;
-using PckStudio.Core.Json;
+using PckStudio.Core.Properties;
using PckStudio.Core.Extensions;
using PckStudio.Core;
using PckStudio.ModelSupport.Format.External;
-using PckStuido.ModelSupport.Properties;
using NamedTexture = PckStudio.Core.NamedData;
namespace PckStudio.ModelSupport
diff --git a/PckStudio.ModelSupport/PckStudio.ModelSupport.csproj b/PckStudio.ModelSupport/PckStudio.ModelSupport.csproj
index d7697c87..9d3fe392 100644
--- a/PckStudio.ModelSupport/PckStudio.ModelSupport.csproj
+++ b/PckStudio.ModelSupport/PckStudio.ModelSupport.csproj
@@ -88,9 +88,5 @@
Designer
-
-
-
-
\ No newline at end of file
diff --git a/PckStudio.ModelSupport/Properties/Resources.Designer.cs b/PckStudio.ModelSupport/Properties/Resources.Designer.cs
index b98cf665..cde2fbe8 100644
--- a/PckStudio.ModelSupport/Properties/Resources.Designer.cs
+++ b/PckStudio.ModelSupport/Properties/Resources.Designer.cs
@@ -59,62 +59,5 @@ namespace PckStuido.ModelSupport.Properties {
resourceCulture = value;
}
}
-
- ///
- /// Looks up a localized string similar to {
- /// "bat": {
- /// "textureSize": { "X": 64, "Y": 64 },
- /// "parts": [
- /// {
- /// "name": "head",
- /// "boxes": [
- /// { "pos": { "X": -3, "Y": -3, "Z": -3 }, "size": { "X": 6, "Y": 6, "Z": 6 }, "uv": { "X": 0, "Y": 0 } }
- /// ]
- /// },
- /// {
- /// "name": "body",
- /// "boxes": [
- /// { "pos": { "X": -3, "Y": 4, "Z": -3 }, "size": { "X": 6, "Y": 12, "Z": 6 }, "uv": { "X": 0, "Y": 16 } },
- /// { "pos": { "X": -5, "Y": 16, "Z": 0 }, "size": { "X": 10, "Y": 6, "Z": [rest of string was truncated]";.
- ///
- internal static string defaultModels {
- get {
- return ResourceManager.GetString("defaultModels", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to {
- /// "bat": {
- /// "textureLocations": [
- /// "res/mob/bat"
- /// ],
- /// "materialName": "bat",
- /// "parts": [
- /// {
- /// "name": "head",
- /// "children": [
- /// { "name": "rightEar" },
- /// { "name": "leftEar" }
- /// ]
- /// },
- /// {
- /// "name": "body",
- /// "children": [
- /// {
- /// "name": "rightWing",
- /// "children": [
- /// { "name": "rightWingTip" }
- /// ]
- /// },
- /// {
- /// "name": "leftWing",
- /// [rest of string was truncated]";.
- ///
- internal static string modelMetaData {
- get {
- return ResourceManager.GetString("modelMetaData", resourceCulture);
- }
- }
}
}
diff --git a/PckStudio.ModelSupport/Properties/Resources.resx b/PckStudio.ModelSupport/Properties/Resources.resx
index b1909c61..1af7de15 100644
--- a/PckStudio.ModelSupport/Properties/Resources.resx
+++ b/PckStudio.ModelSupport/Properties/Resources.resx
@@ -117,11 +117,4 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- ..\Resources\defaultModels.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252
-
-
- ..\Resources\modelMetaData.json;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;iso-8859-1
-
\ No newline at end of file