@satisfactory-dev/docs.json.ts 1.0.6 → 1.0.8

package/schema/0.3.7.7/base-classes.json

@@ -11,82 +11,168 @@
 				}
 			}
 		},
-		"has--mStackHeight": {
+		"has--mDisableAttachmentSnapOn": {
 			"type": "object",
-			"required": ["mStackHeight"],
+			"required": ["mDisableAttachmentSnapOn"],
 			"properties": {
-				"mStackHeight": {
-					"$ref": "docs.json.ts--common--types#/$defs/decimal_string"
+				"mDisableAttachmentSnapOn": {
+					"$ref": "docs.json.ts--common--types#/$defs/empty-object"
 				}
 			}
 		},
-		"hasClassName": {
+		"has--mDisableSnapOn": {
 			"type": "object",
-			"required": ["ClassName"],
+			"required": ["mDisableSnapOn"],
 			"properties": {
-				"ClassName": {
-					"type": "string",
-					"templated_string": [
+				"mDisableSnapOn": {
+					"oneOf": [
 						{
-							"type": "string",
-							"minLength": 1
+							"$ref": "docs.json.ts--common--types#/$defs/empty-object"
 						},
-						"_",
 						{
-							"type": "string",
-							"minLength": 1
+							"$ref": "docs.json.ts--0.3.7.7--properties#/$defs/mDisableSnapOn--front--top"
 						},
-						"_C"
+						{
+							"$ref": "docs.json.ts--0.3.7.7--properties#/$defs/mDisableSnapOn--top--bottom"
+						},
+						{
+							"$ref": "docs.json.ts--0.3.7.7--properties#/$defs/mDisableSnapOn--front--bottom"
+						},
+						{
+							"$ref": "docs.json.ts--0.3.7.7--properties#/$defs/mDisableSnapOn--right--left--top--bottom"
+						},
+						{
+							"$ref": "docs.json.ts--0.3.7.7--properties#/$defs/mDisableSnapOn--front--top--bottom"
+						},
+						{
+							"$ref": "docs.json.ts--0.3.7.7--properties#/$defs/mDisableSnapOn--front--left--top--bottom"
+						}
 					]
 				}
 			}
 		},
-		"instructive": {
+		"has--mElevation": {
 			"type": "object",
-			"$ref": "#/$defs/isNamed",
-			"required": ["FullName", "mRelevantEvents"],
+			"required": ["mElevation"],
 			"properties": {
-				"FullName": {
-					"$ref": "docs.json.ts--0.3.7.7--properties#/$defs/BlueprintGeneratedClass--non-quoted"
-				},
-				"mRelevantEvents": {
-					"oneOf": [
-						{
-							"type": "string",
-							"typed_string": ""
-						},
-						{
-							"$ref": "docs.json.ts--0.3.7.7--properties#/$defs/mRelevantEvents"
-						}
-					]
+				"mElevation": {
+					"$ref": "docs.json.ts--common--types#/$defs/decimal_string"
 				}
 			}
 		},
-		"isDescribed": {
+		"has--mHeight": {
 			"type": "object",
-			"$ref": "#/$defs/isNamed",
-			"required": ["mDescription"],
+			"required": ["mHeight"],
 			"properties": {
-				"mDescription": {
+				"mHeight": {
+					"$ref": "docs.json.ts--common--types#/$defs/decimal_string"
+				}
+			}
+		},
+		"has--mMeshLength": {
+			"type": "object",
+			"required": ["mMeshLength"],
+			"properties": {
+				"mMeshLength": {
+					"$ref": "docs.json.ts--common--types#/$defs/decimal_string"
+				}
+			}
+		},
+		"has--mNumCyclesForProductivity": {
+			"type": "object",
+			"required": ["mNumCyclesForProductivity"],
+			"properties": {
+				"mNumCyclesForProductivity": {
+					"$ref": "docs.json.ts--common--types#/$defs/integer_string"
+				}
+			}
+		},
+		"has--mResourceSinkPoints": {
+			"type": "object",
+			"required": ["mResourceSinkPoints"],
+			"properties": {
+				"mResourceSinkPoints": {
+					"$ref": "docs.json.ts--common--types#/$defs/integer_string"
+				}
+			}
+		},
+		"has--mRTPCInterval": {
+			"type": "object",
+			"required": ["mRTPCInterval"],
+			"properties": {
+				"mRTPCInterval": {
+					"$ref": "docs.json.ts--common--types#/$defs/decimal_string"
+				}
+			}
+		},
+		"has--mSignificanceRange": {
+			"type": "object",
+			"required": ["mSignificanceRange"],
+			"properties": {
+				"mSignificanceRange": {
+					"$ref": "docs.json.ts--common--types#/$defs/decimal_string"
+				}
+			}
+		},
+		"has--mSize": {
+			"type": "object",
+			"required": ["mSize"],
+			"properties": {
+				"mSize": {
+					"$ref": "docs.json.ts--common--types#/$defs/decimal_string"
+				}
+			}
+		},
+		"has--mSplineData": {
+			"type": "object",
+			"required": ["mSplineData"],
+			"properties": {
+				"mSplineData": {
 					"type": "string",
-					"minLength": 0
+					"const": ""
 				}
 			}
 		},
-		"isNamed": {
+		"has--mStackHeight": {
 			"type": "object",
-			"$ref": "#/$defs/hasClassName",
-			"required": ["mDisplayName"],
+			"required": ["mStackHeight"],
 			"properties": {
-				"mDisplayName": {
-					"$ref": "docs.json.ts--0.3.7.7--properties#/$defs/mDisplayName"
+				"mStackHeight": {
+					"$ref": "docs.json.ts--common--types#/$defs/decimal_string"
+				}
+			}
+		},
+		"has--mStorageInventorySize": {
+			"type": "object",
+			"required": ["mStorageInventorySize"],
+			"properties": {
+				"mStorageInventorySize": {
+					"$ref": "docs.json.ts--common--types#/$defs/integer_string"
+				}
+			}
+		},
+		"has--mUseStaticHeight": {
+			"type": "object",
+			"required": ["mUseStaticHeight"],
+			"properties": {
+				"mUseStaticHeight": {
+					"$ref": "docs.json.ts--common--types#/$defs/bool_string"
+				}
+			}
+		},
+		"has--mWidth": {
+			"type": "object",
+			"required": ["mWidth"],
+			"properties": {
+				"mWidth": {
+					"$ref": "docs.json.ts--common--types#/$defs/decimal_string"
 				}
 			}
 		},
-		"FGBuildable": {
+		"FGBuildable--base": {
 			"allOf": [
 				{
-					"$ref": "#/$defs/FGBuildable--base"
+					"$ref": "#/$defs/FGBuildable--base--pre-1.0"
 				},
 				{
 					"$ref": "#/$defs/FGBuildable--base--pre-update5"
@@ -96,7 +182,7 @@
 				}
 			]
 		},
-		"FGBuildable--base": {
+		"FGBuildable--base--pre-1.0": {
 			"type": "object",
 			"required": ["mHighlightVector", "mShouldShowHighlight"],
 			"properties": {
@@ -134,7 +220,6 @@
 		},
 		"FGBuildable--base--version-specific": {
 			"type": "object",
-			"$ref": "#/$defs/isDescribed",
 			"required": [
 				"MaxRenderDistance",
 				"mSkipBuildEffect",
@@ -169,27 +254,7 @@
 				}
 			}
 		},
-		"FGBuildable--DisableAttachmentSnapOn": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildable",
-			"required": ["mDisableAttachmentSnapOn"],
-			"properties": {
-				"mDisableAttachmentSnapOn": {
-					"$ref": "docs.json.ts--common--types#/$defs/empty-object"
-				}
-			}
-		},
 		"FGBuildable--docking-station": {
-			"allOf": [
-				{
-					"$ref": "#/$defs/FGBuildable--docking-station--base"
-				},
-				{
-					"$ref": "#/$defs/FGBuildable--powered-storage"
-				}
-			]
-		},
-		"FGBuildable--docking-station--base": {
 			"allOf": [
 				{
 					"$ref": "#/$defs/FGBuildable--docking-station--base--base--base"
@@ -197,14 +262,19 @@
 				{
 					"$ref": "#/$defs/FGBuildable--docking-station--base--with-mMapText"
 				},
+				{
+					"$ref": "#/$defs/FGBuildable--powered-storage"
+				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered-storage--base--base"
+				},
+				{
+					"$ref": "#/$defs/FGBuildable--powered-storage--base--base--base"
 				}
 			]
 		},
 		"FGBuildable--docking-station--base--base--base": {
 			"type": "object",
-			"$ref": "#/$defs/FGBuildable--powered-storage--base--base--base",
 			"required": ["mTransferSpeed", "mStackTransferSize"],
 			"properties": {
 				"mTransferSpeed": {
@@ -217,7 +287,6 @@
 		},
 		"FGBuildable--docking-station--base--with-mMapText": {
 			"type": "object",
-			"$ref": "#/$defs/FGBuildable--docking-station--base--base--base",
 			"required": ["mMapText"],
 			"properties": {
 				"mMapText": {"type": "string"}
@@ -226,7 +295,10 @@
 		"FGBuildable--occupied": {
 			"allOf": [
 				{
-					"$ref": "#/$defs/FGBuildable"
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildable--occupied"
+				},
+				{
+					"$ref": "#/$defs/FGBuildable--base"
 				},
 				{
 					"$ref": "#/$defs/FGBuildable--occupied--base"
@@ -243,125 +315,25 @@
 				}
 			}
 		},
-		"FGBuildable--pole": {
-			"allOf": [
-				{
-					"$ref": "#/$defs/FGBuildable"
-				},
-				{
-					"$ref": "#/$defs/FGBuildable--pole--base"
-				}
-			]
-		},
-		"FGBuildable--pole--base": {
-			"type": "object",
-			"required": ["mUseStaticHeight"],
-			"properties": {
-				"mUseStaticHeight": {
-					"$ref": "docs.json.ts--common--types#/$defs/bool_string"
-				}
-			}
-		},
-		"FGBuildable--pole--with-length-and-power": {
-			"allOf": [
-				{
-					"$ref": "#/$defs/FGBuildable--pole--with-length-and-power--base"
-				},
-				{
-					"$ref": "#/$defs/FGBuildable--powered"
-				}
-			]
-		},
-		"FGBuildable--pole--with-length-and-power--base": {
-			"allOf": [
-				{
-					"$ref": "#/$defs/FGBuildable"
-				},
-				{
-					"$ref": "#/$defs/FGBuildable--pole--with-length-and-power--base--base"
-				},
-				{
-					"$ref": "#/$defs/FGBuildable--powered--base--base--with-mNumCyclesForProductivity"
-				},
-				{
-					"$ref": "#/$defs/FGBuildable--powered--pre-1.0"
-				},
-				{
-					"$ref": "#/$defs/FGBuildable--powered--version-specific"
-				},
-				{
-					"$ref": "#/$defs/FGBuildable--with--mLength"
-				}
-			]
-		},
-		"FGBuildable--pole--with-length-and-power--base--base": {
-			"allOf": [
-				{
-					"$ref": "#/$defs/FGBuildable--pole--base"
-				},
-				{
-					"$ref": "#/$defs/FGBuildable--powered--pre-1.0"
-				},
-				{
-					"$ref": "#/$defs/FGBuildable--powered--version-specific"
-				},
-				{
-					"$ref": "#/$defs/FGBuildable--with--mLength"
-				}
-			]
-		},
 		"FGBuildable--powered": {
 			"allOf": [
 				{
-					"type": "object",
-					"$ref": "#/$defs/FGBuildable",
-					"required": ["mSignificanceBias"],
-					"properties": {
-						"mSignificanceBias": {
-							"$ref": "docs.json.ts--common--types#/$defs/decimal_string"
-						}
-					}
-				},
-				{
-					"$ref": "#/$defs/FGBuildable"
-				},
-				{
-					"$ref": "#/$defs/FGBuildable--powered--base--base--with-mNumCyclesForProductivity"
+					"$ref": "#/$defs/FGBuildable--base"
 				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered--pre-1.0"
 				},
 				{
-					"$ref": "#/$defs/FGBuildable--powered--version-specific"
-				}
-			]
-		},
-		"FGBuildable--powered--base--base--with-mNumCyclesForProductivity": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildable--base",
-			"required": ["mNumCyclesForProductivity"],
-			"properties": {
-				"mNumCyclesForProductivity": {
-					"$ref": "docs.json.ts--common--types#/$defs/integer_string"
-				}
-			}
-		},
-		"FGBuildable--powered--base--resources": {
-			"allOf": [
-				{
-					"$ref": "#/$defs/FGBuildable"
-				},
-				{
-					"$ref": "#/$defs/FGBuildable--powered--base--base--with-mNumCyclesForProductivity"
+					"$ref": "#/$defs/FGBuildable--powered--pre-update4"
 				},
 				{
-					"$ref": "#/$defs/FGBuildable--powered--base--resources--base"
+					"$ref": "#/$defs/FGBuildable--powered--version-specific"
 				},
 				{
-					"$ref": "#/$defs/FGBuildable--powered--pre-1.0"
+					"$ref": "#/$defs/has--mNumCyclesForProductivity"
 				},
 				{
-					"$ref": "#/$defs/FGBuildable--powered--version-specific"
+					"$ref": "#/$defs/has--mSignificanceRange"
 				}
 			]
 		},
@@ -370,20 +342,19 @@
 				{
 					"$ref": "docs.json.ts--0.3.7.7--classes--base.overridable#/$defs/FGBuildableResourceExtractor--only-allow-certain-resources"
 				},
-				{
-					"$ref": "#/$defs/FGBuildable--powered--base--base--with-mNumCyclesForProductivity"
-				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered--pre-1.0"
 				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered--version-specific"
+				},
+				{
+					"$ref": "#/$defs/has--mNumCyclesForProductivity"
 				}
 			]
 		},
 		"FGBuildable--powered--pre-1.0": {
 			"type": "object",
-			"$ref": "#/$defs/isDescribed",
 			"required": [
 				"mMaxPotentialIncreasePerCrystal",
 				"OnReplicationDetailActorCreatedEvent"
@@ -397,9 +368,17 @@
 				}
 			}
 		},
+		"FGBuildable--powered--pre-update4": {
+			"type": "object",
+			"required": ["mSignificanceBias"],
+			"properties": {
+				"mSignificanceBias": {
+					"$ref": "docs.json.ts--common--types#/$defs/decimal_string"
+				}
+			}
+		},
 		"FGBuildable--powered--version-specific": {
 			"type": "object",
-			"$ref": "#/$defs/isDescribed",
 			"required": [
 				"mPowerConsumption",
 				"mPowerConsumptionExponent",
@@ -414,8 +393,7 @@
 				"mFluidStackSizeDefault",
 				"mFluidStackSizeMultiplier",
 				"mEffectUpdateInterval",
-				"mAddToSignificanceManager",
-				"mSignificanceRange"
+				"mAddToSignificanceManager"
 			],
 			"properties": {
 				"mPowerConsumption": {
@@ -460,9 +438,6 @@
 				},
 				"mAddToSignificanceManager": {
 					"$ref": "docs.json.ts--common--types#/$defs/bool_string"
-				},
-				"mSignificanceRange": {
-					"$ref": "docs.json.ts--common--types#/$defs/decimal_string"
 				}
 			}
 		},
@@ -478,12 +453,6 @@
 		},
 		"FGBuildable--powered-storage--base": {
 			"allOf": [
-				{
-					"$ref": "#/$defs/FGBuildable"
-				},
-				{
-					"$ref": "#/$defs/FGBuildable--powered--base--base--with-mNumCyclesForProductivity"
-				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered--pre-1.0"
 				},
@@ -492,14 +461,14 @@
 				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered-storage--base--base"
+				},
+				{
+					"$ref": "#/$defs/has--mNumCyclesForProductivity"
 				}
 			]
 		},
 		"FGBuildable--powered-storage--base--base": {
 			"allOf": [
-				{
-					"$ref": "#/$defs/FGBuildable--powered--base--base--with-mNumCyclesForProductivity"
-				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered--pre-1.0"
 				},
@@ -508,216 +477,61 @@
 				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered-storage--base--base--base"
+				},
+				{
+					"$ref": "#/$defs/has--mNumCyclesForProductivity"
 				}
 			]
 		},
 		"FGBuildable--powered-storage--base--base--base": {
 			"type": "object",
-			"$ref": "#/$defs/FGBuildable--powered--version-specific",
 			"required": ["mStorageSizeX", "mStorageSizeY"],
 			"properties": {
 				"mStorageSizeX": {
 					"$ref": "docs.json.ts--common--types#/$defs/integer_string"
 				},
 				"mStorageSizeY": {
-					"$ref": "docs.json.ts--common--types#/$defs/integer_string"
-				}
-			}
-		},
-		"FGBuildable--spline": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildable--with--mMeshLength",
-			"required": ["mSplineData"],
-			"properties": {
-				"mSplineData": {
-					"type": "string",
-					"const": ""
-				}
-			}
-		},
-		"FGBuildable--tiered": {
-			"allOf": [
-				{
-					"$ref": "#/$defs/FGBuildable"
-				},
-				{
-					"$ref": "#/$defs/FGBuildable--tiered--base"
-				}
-			]
-		},
-		"FGBuildable--tiered--base": {
-			"type": "object",
-			"required": ["Tier"],
-			"properties": {
-				"Tier": {
-					"$ref": "docs.json.ts--0.3.7.7--properties#/$defs/Tier"
-				}
-			}
-		},
-		"FGBuildable--with--mLength": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildable--base--version-specific",
-			"required": ["mLength"],
-			"properties": {
-				"mLength": {
-					"$ref": "docs.json.ts--common--types#/$defs/decimal_string"
-				}
-			}
-		},
-		"FGBuildable--with--mMeshLength": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildable--base--version-specific",
-			"required": ["mMeshLength"],
-			"properties": {
-				"mMeshLength": {
-					"$ref": "docs.json.ts--common--types#/$defs/decimal_string"
-				}
-			}
-		},
-		"FGBuildable--with-height": {
-			"allOf": [
-				{
-					"$ref": "#/$defs/FGBuildable"
-				},
-				{
-					"$ref": "#/$defs/FGBuildable--base--version-specific"
-				},
-				{
-					"$ref": "#/$defs/FGBuildable--with-height--base"
-				}
-			]
-		},
-		"FGBuildable--with-height--base": {
-			"type": "object",
-			"required": ["mHeight"],
-			"properties": {
-				"mHeight": {
-					"$ref": "docs.json.ts--common--types#/$defs/decimal_string"
-				}
-			}
-		},
-		"FGBuildable--with-height-and-elevation": {
-			"allOf": [
-				{
-					"$ref": "#/$defs/FGBuildable--DisableAttachmentSnapOn"
-				},
-				{
-					"$ref": "#/$defs/FGBuildable--with-height"
-				},
-				{
-					"$ref": "#/$defs/FGBuildable--with-size-and-elevation"
-				}
-			]
-		},
-		"FGBuildable--with-height-and-width": {
-			"allOf": [
-				{
-					"$ref": "#/$defs/FGBuildable"
-				},
-				{
-					"$ref": "#/$defs/FGBuildable--with-height-and-width--base"
-				}
-			]
-		},
-		"FGBuildable--with-height-and-width--base": {
-			"allOf": [
-				{
-					"$ref": "#/$defs/FGBuildable--with-height--base"
-				},
-				{
-					"$ref": "#/$defs/FGBuildable--with-width--base"
-				}
-			]
-		},
-		"FGBuildable--with-size": {
-			"allOf": [
-				{
-					"$ref": "#/$defs/FGBuildable"
-				},
-				{
-					"$ref": "#/$defs/FGBuildable--with-size--base"
-				}
-			]
-		},
-		"FGBuildable--with-size--base": {
-			"type": "object",
-			"required": ["mSize"],
-			"properties": {
-				"mSize": {
-					"$ref": "docs.json.ts--common--types#/$defs/decimal_string"
-				}
-			}
-		},
-		"FGBuildable--with-size-and-elevation": {
-			"allOf": [
-				{
-					"$ref": "#/$defs/FGBuildable--with-size"
-				},
-				{
-					"$ref": "#/$defs/FGBuildable--with-size-and-elevation--base"
-				}
-			]
-		},
-		"FGBuildable--with-size-and-elevation--base": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildable--with-size-and-elevation--base--base",
-			"required": ["mDisableSnapOn"],
-			"properties": {
-				"mDisableSnapOn": {
-					"oneOf": [
-						{
-							"$ref": "docs.json.ts--common--types#/$defs/empty-object"
-						},
-						{
-							"$ref": "docs.json.ts--0.3.7.7--properties#/$defs/mDisableSnapOn--front--top"
-						},
-						{
-							"$ref": "docs.json.ts--0.3.7.7--properties#/$defs/mDisableSnapOn--top--bottom"
-						},
-						{
-							"$ref": "docs.json.ts--0.3.7.7--properties#/$defs/mDisableSnapOn--front--bottom"
-						},
-						{
-							"$ref": "docs.json.ts--0.3.7.7--properties#/$defs/mDisableSnapOn--right--left--top--bottom"
-						},
-						{
-							"$ref": "docs.json.ts--0.3.7.7--properties#/$defs/mDisableSnapOn--front--top--bottom"
-						},
-						{
-							"$ref": "docs.json.ts--0.3.7.7--properties#/$defs/mDisableSnapOn--front--left--top--bottom"
-						}
-					]
+					"$ref": "docs.json.ts--common--types#/$defs/integer_string"
 				}
 			}
 		},
-		"FGBuildable--with-size-and-elevation--base--base": {
+		"FGBuildable--tiered": {
+			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildable--tiered"
+				},
+				{
+					"$ref": "#/$defs/FGBuildable--base"
+				},
+				{
+					"$ref": "#/$defs/FGBuildable--tiered--base"
+				}
+			]
+		},
+		"FGBuildable--tiered--base": {
 			"type": "object",
-			"$ref": "#/$defs/FGBuildable--with-size--base",
-			"required": ["mElevation"],
+			"required": ["Tier"],
 			"properties": {
-				"mElevation": {
-					"$ref": "docs.json.ts--common--types#/$defs/decimal_string"
+				"Tier": {
+					"$ref": "docs.json.ts--0.3.7.7--properties#/$defs/Tier"
 				}
 			}
 		},
-		"FGBuildable--with-width": {
+		"FGBuildable--unoccupied-and-untiered": {
 			"allOf": [
 				{
-					"$ref": "#/$defs/FGBuildable"
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildable--unoccupied-and-untiered"
 				},
 				{
-					"$ref": "#/$defs/FGBuildable--base--version-specific"
-				},
-				{
-					"$ref": "#/$defs/FGBuildable--with-width--base"
+					"$ref": "#/$defs/FGBuildable--base"
 				}
 			]
 		},
-		"FGBuildable--with-width--base": {
+		"FGBuildable--with--mLength": {
 			"type": "object",
-			"required": ["mWidth"],
+			"required": ["mLength"],
 			"properties": {
-				"mWidth": {
+				"mLength": {
 					"$ref": "docs.json.ts--common--types#/$defs/decimal_string"
 				}
 			}
@@ -735,10 +549,10 @@
 		"FGBuildableAttachment--base": {
 			"allOf": [
 				{
-					"$ref": "#/$defs/FGBuildable"
+					"$ref": "#/$defs/FGBuildable--base"
 				},
 				{
-					"$ref": "#/$defs/FGBuildable--powered--base--base--with-mNumCyclesForProductivity"
+					"$ref": "#/$defs/FGBuildable--powered--pre-1.0"
 				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered--pre-1.0"
@@ -747,26 +561,16 @@
 					"$ref": "#/$defs/FGBuildable--powered--version-specific"
 				},
 				{
-					"$ref": "#/$defs/FGBuildableAttachment--base--base"
-				}
-			]
-		},
-		"FGBuildableAttachment--base--base": {
-			"allOf": [
-				{
-					"$ref": "#/$defs/FGBuildable--base"
-				},
-				{
-					"$ref": "#/$defs/FGBuildable--powered--base--base--with-mNumCyclesForProductivity"
+					"$ref": "#/$defs/FGBuildable--powered--version-specific"
 				},
 				{
-					"$ref": "#/$defs/FGBuildable--powered--pre-1.0"
+					"$ref": "#/$defs/FGBuildableAttachment--has--mCurrentInventoryIndex"
 				},
 				{
-					"$ref": "#/$defs/FGBuildable--powered--version-specific"
+					"$ref": "#/$defs/has--mNumCyclesForProductivity"
 				},
 				{
-					"$ref": "#/$defs/FGBuildableAttachment--has--mCurrentInventoryIndex"
+					"$ref": "#/$defs/has--mNumCyclesForProductivity"
 				}
 			]
 		},
@@ -810,14 +614,26 @@
 		},
 		"FGBuildableAttachment--splitter--base": {
 			"allOf": [
+				{
+					"$ref": "#/$defs/FGBuildable--base"
+				},
+				{
+					"$ref": "#/$defs/FGBuildable--powered--pre-1.0"
+				},
+				{
+					"$ref": "#/$defs/FGBuildable--powered--version-specific"
+				},
 				{
 					"$ref": "#/$defs/FGBuildableAttachment--base"
 				},
 				{
-					"$ref": "#/$defs/FGBuildableAttachment--base--base"
+					"$ref": "#/$defs/FGBuildableAttachment--has--mCurrentInventoryIndex"
 				},
 				{
 					"$ref": "#/$defs/FGBuildableAttachment--splitter--base--base--base"
+				},
+				{
+					"$ref": "#/$defs/has--mNumCyclesForProductivity"
 				}
 			]
 		},
@@ -836,6 +652,9 @@
 		},
 		"FGBuildableAttachmentMerger": {
 			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildableAttachmentMerger"
+				},
 				{
 					"$ref": "#/$defs/FGBuildableAttachment"
 				},
@@ -847,26 +666,28 @@
 		"FGBuildableAttachmentMerger--base": {
 			"allOf": [
 				{
-					"$ref": "#/$defs/FGBuildableAttachment--base"
+					"$ref": "#/$defs/FGBuildable--base"
 				},
 				{
-					"$ref": "#/$defs/FGBuildableAttachmentMerger--base--base"
-				}
-			]
-		},
-		"FGBuildableAttachmentMerger--base--base": {
-			"allOf": [
+					"$ref": "#/$defs/FGBuildable--powered--pre-1.0"
+				},
 				{
-					"$ref": "#/$defs/FGBuildable--base"
+					"$ref": "#/$defs/FGBuildable--powered--version-specific"
 				},
 				{
-					"$ref": "#/$defs/FGBuildableAttachment--base--base"
+					"$ref": "#/$defs/FGBuildableAttachment--base"
+				},
+				{
+					"$ref": "#/$defs/FGBuildableAttachment--has--mCurrentInventoryIndex"
 				},
 				{
 					"$ref": "#/$defs/FGBuildableAttachment--has--mCurrentInventoryIndex"
 				},
 				{
 					"$ref": "#/$defs/FGBuildableAttachmentMerger--version-specific"
+				},
+				{
+					"$ref": "#/$defs/has--mNumCyclesForProductivity"
 				}
 			]
 		},
@@ -879,71 +700,72 @@
 				}
 			}
 		},
-		"FGBuildableConveyorBelt--base": {
+		"FGBuildableAttachmentSplitter": {
 			"allOf": [
 				{
-					"$ref": "#/$defs/FGBuildable"
-				},
-				{
-					"$ref": "#/$defs/FGBuildable--base--version-specific"
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildableAttachmentSplitter"
 				},
 				{
-					"$ref": "#/$defs/FGBuildableConveyorBelt--base--base"
+					"$ref": "#/$defs/FGBuildableAttachment--splitter"
 				}
 			]
 		},
-		"FGBuildableConveyorBelt--base--base": {
+		"FGBuildableConveyorBelt--pre-1.0": {
 			"type": "object",
-			"$ref": "#/$defs/FGBuildableConveyorBelt--base--base--pre-1.0",
-			"required": ["mItems"],
+			"required": ["mItemMeshMap", "mSpeed"],
 			"properties": {
-				"mItems": {
+				"mItemMeshMap": {
 					"$ref": "docs.json.ts--common--types#/$defs/empty-object"
+				},
+				"mSpeed": {
+					"$ref": "docs.json.ts--common--types#/$defs/decimal_string"
 				}
 			}
 		},
-		"FGBuildableConveyorBelt--base--base--pre-1.0": {
+		"FGBuildableConveyorBelt--pre-update8": {
 			"type": "object",
-			"required": ["mItemMeshMap", "mSpeed"],
+			"required": ["mItems"],
 			"properties": {
-				"mItemMeshMap": {
+				"mItems": {
 					"$ref": "docs.json.ts--common--types#/$defs/empty-object"
-				},
-				"mSpeed": {
-					"$ref": "docs.json.ts--common--types#/$defs/decimal_string"
 				}
 			}
 		},
 		"FGBuildableConveyorBelt--spline": {
 			"allOf": [
 				{
-					"$ref": "#/$defs/FGBuildable--spline"
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildableConveyorBelt"
 				},
 				{
-					"$ref": "#/$defs/FGBuildableConveyorBelt--base"
+					"$ref": "#/$defs/FGBuildable--base"
 				},
 				{
-					"$ref": "#/$defs/FGBuildableConveyorBelt--spline--base"
-				}
-			]
-		},
-		"FGBuildableConveyorBelt--spline--base": {
-			"allOf": [
+					"$ref": "#/$defs/FGBuildableConveyorBelt--pre-1.0"
+				},
+				{
+					"$ref": "#/$defs/FGBuildableConveyorBelt--pre-update8"
+				},
 				{
-					"$ref": "#/$defs/FGBuildable--spline"
+					"$ref": "#/$defs/has--mMeshLength"
 				},
 				{
-					"$ref": "#/$defs/FGBuildableConveyorBelt--base--base"
+					"$ref": "#/$defs/has--mSplineData"
 				}
 			]
 		},
 		"FGBuildableConveyorLift": {
 			"allOf": [
 				{
-					"$ref": "#/$defs/FGBuildableConveyorBelt--base"
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildableConveyorLift"
+				},
+				{
+					"$ref": "#/$defs/FGBuildable--base"
+				},
+				{
+					"$ref": "#/$defs/FGBuildableConveyorBelt--pre-1.0"
 				},
 				{
-					"$ref": "#/$defs/FGBuildableConveyorBelt--base--base"
+					"$ref": "#/$defs/FGBuildableConveyorBelt--pre-update8"
 				},
 				{
 					"$ref": "#/$defs/FGBuildableConveyorLift--base"
@@ -967,17 +789,22 @@
 		},
 		"FGBuildableDockingStation": {
 			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildableDockingStation"
+				},
 				{
 					"$ref": "#/$defs/FGBuildable--docking-station"
 				},
 				{
 					"$ref": "#/$defs/FGBuildableDockingStation--base"
+				},
+				{
+					"$ref": "#/$defs/FGBuildableDockingStation--base--base"
 				}
 			]
 		},
 		"FGBuildableDockingStation--base": {
 			"type": "object",
-			"$ref": "#/$defs/FGBuildableDockingStation--base--base",
 			"required": ["mMapText"],
 			"properties": {
 				"mMapText": {
@@ -989,7 +816,16 @@
 		"FGBuildableDockingStation--base--base": {
 			"allOf": [
 				{
-					"$ref": "#/$defs/FGBuildable--docking-station--base"
+					"$ref": "#/$defs/FGBuildable--docking-station--base--base--base"
+				},
+				{
+					"$ref": "#/$defs/FGBuildable--docking-station--base--with-mMapText"
+				},
+				{
+					"$ref": "#/$defs/FGBuildable--powered-storage--base--base"
+				},
+				{
+					"$ref": "#/$defs/FGBuildable--powered-storage--base--base--base"
 				},
 				{
 					"$ref": "#/$defs/FGBuildableDockingStation--with--mFuelTransferSpeed"
@@ -1004,6 +840,9 @@
 				{
 					"$ref": "#/$defs/FGBuildable--powered-storage--base--base"
 				},
+				{
+					"$ref": "#/$defs/FGBuildable--powered-storage--base--base--base"
+				},
 				{
 					"$ref": "#/$defs/FGBuildableDockingStation--with--mFuelTransferSpeed--base"
 				}
@@ -1011,7 +850,6 @@
 		},
 		"FGBuildableDockingStation--with--mFuelTransferSpeed--base": {
 			"type": "object",
-			"$ref": "#/$defs/FGBuildable--docking-station--base--base--base",
 			"required": ["mFuelTransferSpeed"],
 			"properties": {
 				"mFuelTransferSpeed": {
@@ -1021,6 +859,9 @@
 		},
 		"FGBuildableFactory--jump-pad": {
 			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildableFactory"
+				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered"
 				},
@@ -1031,12 +872,6 @@
 		},
 		"FGBuildableFactory--jump-pad--base": {
 			"allOf": [
-				{
-					"$ref": "#/$defs/FGBuildable"
-				},
-				{
-					"$ref": "#/$defs/FGBuildable--powered--base--base--with-mNumCyclesForProductivity"
-				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered--pre-1.0"
 				},
@@ -1045,14 +880,14 @@
 				},
 				{
 					"$ref": "#/$defs/FGBuildableFactory--jump-pad--base--base"
+				},
+				{
+					"$ref": "#/$defs/has--mNumCyclesForProductivity"
 				}
 			]
 		},
 		"FGBuildableFactory--jump-pad--base--base": {
 			"allOf": [
-				{
-					"$ref": "#/$defs/FGBuildable--powered--base--base--with-mNumCyclesForProductivity"
-				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered--pre-1.0"
 				},
@@ -1061,6 +896,9 @@
 				},
 				{
 					"$ref": "#/$defs/FGBuildableFactory--jump-pad--base--base--base"
+				},
+				{
+					"$ref": "#/$defs/has--mNumCyclesForProductivity"
 				}
 			]
 		},
@@ -1078,22 +916,22 @@
 		},
 		"FGBuildableFactory--landing-pad": {
 			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildableFactory"
+				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered"
 				},
 				{
 					"$ref": "#/$defs/FGBuildableFactory--landing-pad--base"
+				},
+				{
+					"$ref": "#/$defs/FGBuildableFactory--landing-pad--version-specific"
 				}
 			]
 		},
 		"FGBuildableFactory--landing-pad--base": {
 			"allOf": [
-				{
-					"$ref": "#/$defs/FGBuildable"
-				},
-				{
-					"$ref": "#/$defs/FGBuildable--powered--base--base--with-mNumCyclesForProductivity"
-				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered--pre-1.0"
 				},
@@ -1102,14 +940,14 @@
 				},
 				{
 					"$ref": "#/$defs/FGBuildableFactory--landing-pad--base--base"
+				},
+				{
+					"$ref": "#/$defs/has--mNumCyclesForProductivity"
 				}
 			]
 		},
 		"FGBuildableFactory--landing-pad--base--base": {
 			"allOf": [
-				{
-					"$ref": "#/$defs/FGBuildable--powered--base--base--with-mNumCyclesForProductivity"
-				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered--pre-1.0"
 				},
@@ -1118,6 +956,9 @@
 				},
 				{
 					"$ref": "#/$defs/FGBuildableFactory--landing-pad--base--base--base"
+				},
+				{
+					"$ref": "#/$defs/has--mNumCyclesForProductivity"
 				}
 			]
 		},
@@ -1134,24 +975,44 @@
 				}
 			}
 		},
-		"FGBuildableFactorySimpleProducer": {
+		"FGBuildableFactory--landing-pad--version-specific": {
+			"type": "object",
+			"required": ["mDampeningFactor", "mPlayerList"],
+			"properties": {
+				"mDampeningFactor": {
+					"$ref": "docs.json.ts--common--types#/$defs/decimal_string"
+				},
+				"mPlayerList": {
+					"type": "string",
+					"const": ""
+				}
+			}
+		},
+		"FGBuildableFactory--not-a-pad": {
 			"allOf": [
 				{
-					"$ref": "#/$defs/FGBuildable--powered"
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildableFactory"
 				},
 				{
-					"$ref": "#/$defs/FGBuildableFactorySimpleProducer--base"
+					"$ref": "#/$defs/FGBuildable--powered"
 				}
 			]
 		},
-		"FGBuildableFactorySimpleProducer--base": {
+		"FGBuildableFactorySimpleProducer": {
 			"allOf": [
 				{
-					"$ref": "#/$defs/FGBuildable"
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildableFactorySimpleProducer"
 				},
 				{
-					"$ref": "#/$defs/FGBuildable--powered--base--base--with-mNumCyclesForProductivity"
+					"$ref": "#/$defs/FGBuildable--powered"
 				},
+				{
+					"$ref": "#/$defs/FGBuildableFactorySimpleProducer--base"
+				}
+			]
+		},
+		"FGBuildableFactorySimpleProducer--base": {
+			"allOf": [
 				{
 					"$ref": "#/$defs/FGBuildable--powered--pre-1.0"
 				},
@@ -1160,12 +1021,14 @@
 				},
 				{
 					"$ref": "#/$defs/FGBuildableFactorySimpleProducer--base--base"
+				},
+				{
+					"$ref": "#/$defs/has--mNumCyclesForProductivity"
 				}
 			]
 		},
 		"FGBuildableFactorySimpleProducer--base--base": {
 			"type": "object",
-			"$ref": "#/$defs/FGBuildable--powered--version-specific",
 			"required": ["mTimeToProduceItem", "mEventType"],
 			"properties": {
 				"mTimeToProduceItem": {
@@ -1177,6 +1040,31 @@
 				}
 			}
 		},
+		"FGBuildableFoundation": {
+			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildableFoundation"
+				},
+				{
+					"$ref": "#/$defs/FGBuildable--base"
+				},
+				{
+					"$ref": "#/$defs/has--mDisableAttachmentSnapOn"
+				},
+				{
+					"$ref": "#/$defs/has--mDisableSnapOn"
+				},
+				{
+					"$ref": "#/$defs/has--mElevation"
+				},
+				{
+					"$ref": "#/$defs/has--mHeight"
+				},
+				{
+					"$ref": "#/$defs/has--mSize"
+				}
+			]
+		},
 		"FGBuildableGenerator": {
 			"allOf": [
 				{
@@ -1189,12 +1077,6 @@
 		},
 		"FGBuildableGenerator--base": {
 			"allOf": [
-				{
-					"$ref": "#/$defs/FGBuildable"
-				},
-				{
-					"$ref": "#/$defs/FGBuildable--powered--base--base--with-mNumCyclesForProductivity"
-				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered--pre-1.0"
 				},
@@ -1215,6 +1097,9 @@
 				},
 				{
 					"$ref": "#/$defs/FGBuildableGenerator--no-fuel--base--base--base--base"
+				},
+				{
+					"$ref": "#/$defs/has--mNumCyclesForProductivity"
 				}
 			]
 		},
@@ -1271,15 +1156,9 @@
 		},
 		"FGBuildableGenerator--no-fuel": {
 			"allOf": [
-				{
-					"$ref": "#/$defs/FGBuildable"
-				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered"
 				},
-				{
-					"$ref": "#/$defs/FGBuildable--powered--base--base--with-mNumCyclesForProductivity"
-				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered--pre-1.0"
 				},
@@ -1288,14 +1167,14 @@
 				},
 				{
 					"$ref": "#/$defs/FGBuildableGenerator--no-fuel--base--base"
+				},
+				{
+					"$ref": "#/$defs/has--mNumCyclesForProductivity"
 				}
 			]
 		},
 		"FGBuildableGenerator--no-fuel--base--base": {
 			"allOf": [
-				{
-					"$ref": "#/$defs/FGBuildable--powered--base--base--with-mNumCyclesForProductivity"
-				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered--pre-1.0"
 				},
@@ -1304,12 +1183,17 @@
 				},
 				{
 					"$ref": "#/$defs/FGBuildableGenerator--no-fuel--base--base--base"
+				},
+				{
+					"$ref": "#/$defs/FGBuildableGenerator--no-fuel--base--base--base--base"
+				},
+				{
+					"$ref": "#/$defs/has--mNumCyclesForProductivity"
 				}
 			]
 		},
 		"FGBuildableGenerator--no-fuel--base--base--base": {
 			"type": "object",
-			"$ref": "#/$defs/FGBuildableGenerator--no-fuel--base--base--base--base",
 			"required": ["mPowerProductionExponent"],
 			"properties": {
 				"mPowerProductionExponent": {
@@ -1319,7 +1203,6 @@
 		},
 		"FGBuildableGenerator--no-fuel--base--base--base--base": {
 			"type": "object",
-			"$ref": "#/$defs/FGBuildable--powered--version-specific",
 			"required": ["mPowerProduction", "mLoadPercentage"],
 			"properties": {
 				"mPowerProduction": {
@@ -1332,6 +1215,9 @@
 		},
 		"FGBuildableGeneratorFuel--base": {
 			"allOf": [
+				{
+					"$ref": "#/$defs/FGBuildable--powered--version-specific"
+				},
 				{
 					"$ref": "#/$defs/FGBuildableGenerator--base"
 				},
@@ -1346,23 +1232,17 @@
 				},
 				{
 					"$ref": "#/$defs/FGBuildableGenerator--no-fuel--base--base--base--base"
-				},
-				{
-					"$ref": "#/$defs/FGBuildableGeneratorFuel--base--base--base"
 				}
 			]
 		},
-		"FGBuildableGeneratorFuel--base--base--base": {
-			"type": "object",
-			"$ref": "#/$defs/FGBuildableGenerator--base--base--base",
-			"properties": {
-				"mRTPCInterval": {
-					"$ref": "docs.json.ts--common--types#/$defs/decimal_string"
-				}
-			}
-		},
 		"FGBuildableGeneratorFuel--biomass": {
 			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildableGeneratorFuel"
+				},
+				{
+					"$ref": "#/$defs/FGBuildable--base"
+				},
 				{
 					"$ref": "#/$defs/FGBuildableGenerator"
 				},
@@ -1404,6 +1284,12 @@
 		},
 		"FGBuildableGeneratorFuel--coal": {
 			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildableGeneratorFuel"
+				},
+				{
+					"$ref": "#/$defs/FGBuildable--base"
+				},
 				{
 					"$ref": "#/$defs/FGBuildableGenerator"
 				},
@@ -1441,11 +1327,20 @@
 		},
 		"FGBuildableGeneratorFuel--fuel": {
 			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildableGeneratorFuel"
+				},
+				{
+					"$ref": "#/$defs/FGBuildable--base"
+				},
 				{
 					"$ref": "#/$defs/FGBuildableGenerator"
 				},
 				{
 					"$ref": "#/$defs/FGBuildableGeneratorFuel--fuel--base"
+				},
+				{
+					"$ref": "#/$defs/has--mRTPCInterval"
 				}
 			]
 		},
@@ -1478,6 +1373,9 @@
 		},
 		"FGBuildableGeneratorGeoThermal": {
 			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildableGeneratorGeoThermal"
+				},
 				{
 					"$ref": "#/$defs/FGBuildableGenerator--no-fuel"
 				},
@@ -1488,12 +1386,6 @@
 		},
 		"FGBuildableGeneratorGeoThermal--base": {
 			"allOf": [
-				{
-					"$ref": "#/$defs/FGBuildable"
-				},
-				{
-					"$ref": "#/$defs/FGBuildable--powered--base--base--with-mNumCyclesForProductivity"
-				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered--pre-1.0"
 				},
@@ -1505,6 +1397,9 @@
 				},
 				{
 					"$ref": "#/$defs/FGBuildableGeneratorGeoThermal--base--base"
+				},
+				{
+					"$ref": "#/$defs/has--mNumCyclesForProductivity"
 				}
 			]
 		},
@@ -1513,6 +1408,9 @@
 				{
 					"$ref": "#/$defs/FGBuildableGenerator--no-fuel--base--base"
 				},
+				{
+					"$ref": "#/$defs/FGBuildableGenerator--no-fuel--base--base--base--base"
+				},
 				{
 					"$ref": "#/$defs/FGBuildableGeneratorGeoThermal--base--base--base"
 				}
@@ -1520,7 +1418,6 @@
 		},
 		"FGBuildableGeneratorGeoThermal--base--base--base": {
 			"type": "object",
-			"$ref": "#/$defs/FGBuildableGenerator--no-fuel--base--base--base--base",
 			"required": ["mProductionEffectsRunning"],
 			"properties": {
 				"mProductionEffectsRunning": {
@@ -1530,6 +1427,12 @@
 		},
 		"FGBuildableGeneratorNuclear": {
 			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildableGeneratorNuclear"
+				},
+				{
+					"$ref": "#/$defs/FGBuildable--powered--version-specific"
+				},
 				{
 					"$ref": "#/$defs/FGBuildableGenerator"
 				},
@@ -1595,6 +1498,9 @@
 		},
 		"FGBuildableJumppad": {
 			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildableJumppad"
+				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered"
 				},
@@ -1605,12 +1511,6 @@
 		},
 		"FGBuildableJumppad--base": {
 			"allOf": [
-				{
-					"$ref": "#/$defs/FGBuildable"
-				},
-				{
-					"$ref": "#/$defs/FGBuildable--powered--base--base--with-mNumCyclesForProductivity"
-				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered--pre-1.0"
 				},
@@ -1619,14 +1519,14 @@
 				},
 				{
 					"$ref": "#/$defs/FGBuildableJumppad--base--base"
+				},
+				{
+					"$ref": "#/$defs/has--mNumCyclesForProductivity"
 				}
 			]
 		},
 		"FGBuildableJumppad--base--base": {
 			"allOf": [
-				{
-					"$ref": "#/$defs/FGBuildable--powered--base--base--with-mNumCyclesForProductivity"
-				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered--pre-1.0"
 				},
@@ -1635,12 +1535,14 @@
 				},
 				{
 					"$ref": "#/$defs/FGBuildableJumppad--base--base--base"
+				},
+				{
+					"$ref": "#/$defs/has--mNumCyclesForProductivity"
 				}
 			]
 		},
 		"FGBuildableJumppad--base--base--base": {
 			"type": "object",
-			"$ref": "#/$defs/FGBuildable--powered--version-specific",
 			"required": [
 				"mPowerBankCapacity",
 				"mLaunchPowerCost",
@@ -1728,16 +1630,21 @@
 		"FGBuildableLadder": {
 			"allOf": [
 				{
-					"$ref": "#/$defs/FGBuildable--with-width"
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildableLadder"
+				},
+				{
+					"$ref": "#/$defs/FGBuildable--base"
 				},
 				{
 					"$ref": "#/$defs/FGBuildableLadder--base"
+				},
+				{
+					"$ref": "#/$defs/has--mWidth"
 				}
 			]
 		},
 		"FGBuildableLadder--base": {
 			"type": "object",
-			"$ref": "#/$defs/FGBuildable--with-width--base",
 			"required": [
 				"mMeshHeight",
 				"mMaxSegmentCount",
@@ -1762,12 +1669,6 @@
 		},
 		"FGBuildableManufacturer--base": {
 			"allOf": [
-				{
-					"$ref": "#/$defs/FGBuildable"
-				},
-				{
-					"$ref": "#/$defs/FGBuildable--powered--base--base--with-mNumCyclesForProductivity"
-				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered--pre-1.0"
 				},
@@ -1776,14 +1677,14 @@
 				},
 				{
 					"$ref": "#/$defs/FGBuildableManufacturer--base--base"
+				},
+				{
+					"$ref": "#/$defs/has--mNumCyclesForProductivity"
 				}
 			]
 		},
 		"FGBuildableManufacturer--base--base": {
 			"allOf": [
-				{
-					"$ref": "#/$defs/FGBuildable--powered--base--base--with-mNumCyclesForProductivity"
-				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered--pre-1.0"
 				},
@@ -1792,6 +1693,9 @@
 				},
 				{
 					"$ref": "#/$defs/FGBuildableManufacturer--base--base--base"
+				},
+				{
+					"$ref": "#/$defs/has--mNumCyclesForProductivity"
 				}
 			]
 		},
@@ -1832,12 +1736,6 @@
 		},
 		"FGBuildableManufacturer--base--IsPowered": {
 			"allOf": [
-				{
-					"$ref": "#/$defs/FGBuildable"
-				},
-				{
-					"$ref": "#/$defs/FGBuildable--powered--base--base--with-mNumCyclesForProductivity"
-				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered--pre-1.0"
 				},
@@ -1846,14 +1744,14 @@
 				},
 				{
 					"$ref": "#/$defs/FGBuildableManufacturer--base--IsPowered--base"
+				},
+				{
+					"$ref": "#/$defs/has--mNumCyclesForProductivity"
 				}
 			]
 		},
 		"FGBuildableManufacturer--base--IsPowered--base": {
 			"allOf": [
-				{
-					"$ref": "#/$defs/FGBuildable--powered--base--base--with-mNumCyclesForProductivity"
-				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered--pre-1.0"
 				},
@@ -1862,12 +1760,14 @@
 				},
 				{
 					"$ref": "#/$defs/FGBuildableManufacturer--base--IsPowered--base--base"
+				},
+				{
+					"$ref": "#/$defs/has--mNumCyclesForProductivity"
 				}
 			]
 		},
 		"FGBuildableManufacturer--base--IsPowered--base--base": {
 			"type": "object",
-			"$ref": "#/$defs/FGBuildable--powered--version-specific",
 			"required": ["IsPowered"],
 			"properties": {
 				"IsPowered": {
@@ -1877,12 +1777,6 @@
 		},
 		"FGBuildableManufacturer--base--mProductionEffectsRunning": {
 			"allOf": [
-				{
-					"$ref": "#/$defs/FGBuildable"
-				},
-				{
-					"$ref": "#/$defs/FGBuildable--powered--base--base--with-mNumCyclesForProductivity"
-				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered--pre-1.0"
 				},
@@ -1891,14 +1785,14 @@
 				},
 				{
 					"$ref": "#/$defs/FGBuildableManufacturer--base--mProductionEffectsRunning--base"
+				},
+				{
+					"$ref": "#/$defs/has--mNumCyclesForProductivity"
 				}
 			]
 		},
 		"FGBuildableManufacturer--base--mProductionEffectsRunning--base": {
 			"allOf": [
-				{
-					"$ref": "#/$defs/FGBuildable--powered--base--base--with-mNumCyclesForProductivity"
-				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered--pre-1.0"
 				},
@@ -1907,12 +1801,14 @@
 				},
 				{
 					"$ref": "#/$defs/FGBuildableManufacturer--base--mProductionEffectsRunning--base--base"
+				},
+				{
+					"$ref": "#/$defs/has--mNumCyclesForProductivity"
 				}
 			]
 		},
 		"FGBuildableManufacturer--base--mProductionEffectsRunning--base--base": {
 			"type": "object",
-			"$ref": "#/$defs/FGBuildable--powered--version-specific",
 			"required": ["mProductionEffectsRunning"],
 			"properties": {
 				"mProductionEffectsRunning": {
@@ -1922,12 +1818,6 @@
 		},
 		"FGBuildableManufacturer--base--packager": {
 			"allOf": [
-				{
-					"$ref": "#/$defs/FGBuildable"
-				},
-				{
-					"$ref": "#/$defs/FGBuildable--powered--base--base--with-mNumCyclesForProductivity"
-				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered--pre-1.0"
 				},
@@ -1936,14 +1826,14 @@
 				},
 				{
 					"$ref": "#/$defs/FGBuildableManufacturer--base--packager--base"
+				},
+				{
+					"$ref": "#/$defs/has--mNumCyclesForProductivity"
 				}
 			]
 		},
 		"FGBuildableManufacturer--base--packager--base": {
 			"allOf": [
-				{
-					"$ref": "#/$defs/FGBuildable--powered--base--base--with-mNumCyclesForProductivity"
-				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered--pre-1.0"
 				},
@@ -1952,12 +1842,14 @@
 				},
 				{
 					"$ref": "#/$defs/FGBuildableManufacturer--base--packager--base--base"
+				},
+				{
+					"$ref": "#/$defs/has--mNumCyclesForProductivity"
 				}
 			]
 		},
 		"FGBuildableManufacturer--base--packager--base--base": {
 			"type": "object",
-			"$ref": "#/$defs/FGBuildable--powered--version-specific",
 			"required": ["mCurrentColor_VFX", "CurrentPackagingMode"],
 			"properties": {
 				"mCurrentColor_VFX": {
@@ -1971,6 +1863,9 @@
 		},
 		"FGBuildableManufacturer--Build_AssemblerMk1_C": {
 			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildableManufacturer"
+				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered"
 				},
@@ -1984,6 +1879,9 @@
 		},
 		"FGBuildableManufacturer--Build_ConstructorMk1_C": {
 			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildableManufacturer"
+				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered"
 				},
@@ -1997,6 +1895,9 @@
 		},
 		"FGBuildableManufacturer--Build_FoundryMk1_C": {
 			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildableManufacturer"
+				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered"
 				},
@@ -2010,6 +1911,9 @@
 		},
 		"FGBuildableManufacturer--Build_ManufacturerMk1_C": {
 			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildableManufacturer"
+				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered"
 				},
@@ -2020,6 +1924,9 @@
 		},
 		"FGBuildableManufacturer--Build_OilRefinery_C": {
 			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildableManufacturer"
+				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered"
 				},
@@ -2036,6 +1943,9 @@
 		},
 		"FGBuildableManufacturer--Build_Packager_C": {
 			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildableManufacturer"
+				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered"
 				},
@@ -2055,6 +1965,9 @@
 		},
 		"FGBuildableManufacturer--Build_SmelterMk1_C": {
 			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildableManufacturer"
+				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered"
 				},
@@ -2071,9 +1984,6 @@
 		},
 		"FGBuildableManufacturer--Build_SmelterMk1_C--base": {
 			"allOf": [
-				{
-					"$ref": "#/$defs/FGBuildable--powered--base--base--with-mNumCyclesForProductivity"
-				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered--pre-1.0"
 				},
@@ -2085,23 +1995,38 @@
 				},
 				{
 					"$ref": "#/$defs/FGBuildableManufacturer--base--mProductionEffectsRunning--base"
+				},
+				{
+					"$ref": "#/$defs/has--mNumCyclesForProductivity"
 				}
 			]
 		},
 		"FGBuildablePipeHyper": {
 			"allOf": [
 				{
-					"$ref": "#/$defs/FGBuildable"
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildablePipeHyper"
+				},
+				{
+					"$ref": "#/$defs/FGBuildable--base"
+				},
+				{
+					"$ref": "#/$defs/has--mMeshLength"
 				},
 				{
-					"$ref": "#/$defs/FGBuildable--spline"
+					"$ref": "#/$defs/has--mSplineData"
 				}
 			]
 		},
 		"FGBuildablePipeline": {
 			"allOf": [
 				{
-					"$ref": "#/$defs/FGBuildable"
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildablePipeline"
+				},
+				{
+					"$ref": "#/$defs/FGBuildable--base"
+				},
+				{
+					"$ref": "#/$defs/FGBuildablePipeline--base-root"
 				},
 				{
 					"$ref": "#/$defs/FGBuildablePipeline--base-root--quantized"
@@ -2113,9 +2038,6 @@
 		},
 		"FGBuildablePipeline--base": {
 			"allOf": [
-				{
-					"$ref": "#/$defs/FGBuildable--base--version-specific"
-				},
 				{
 					"$ref": "#/$defs/FGBuildablePipeline--base--base"
 				},
@@ -2126,7 +2048,6 @@
 		},
 		"FGBuildablePipeline--base--base": {
 			"type": "object",
-			"$ref": "#/$defs/FGBuildablePipeline--base--no-indicator--base",
 			"required": ["mIndicatorData"],
 			"properties": {
 				"mIndicatorData": {
@@ -2201,7 +2122,6 @@
 		},
 		"FGBuildablePipeline--base-root--quantized": {
 			"type": "object",
-			"$ref": "#/$defs/FGBuildablePipeline--base-root",
 			"required": ["mQuantiziedContent", "mQuantiziedFlow"],
 			"properties": {
 				"mQuantiziedContent": {
@@ -2214,24 +2134,33 @@
 		},
 		"FGBuildablePipeline--base-spline": {
 			"allOf": [
-				{
-					"$ref": "#/$defs/FGBuildable--spline"
-				},
 				{
 					"$ref": "#/$defs/FGBuildablePipeline--base"
 				},
 				{
 					"$ref": "#/$defs/FGBuildablePipeline--base-spline--base"
+				},
+				{
+					"$ref": "#/$defs/has--mMeshLength"
+				},
+				{
+					"$ref": "#/$defs/has--mSplineData"
 				}
 			]
 		},
 		"FGBuildablePipeline--base-spline--base": {
 			"allOf": [
 				{
-					"$ref": "#/$defs/FGBuildable--spline"
+					"$ref": "#/$defs/FGBuildablePipeline--base--base"
 				},
 				{
-					"$ref": "#/$defs/FGBuildablePipeline--base--base"
+					"$ref": "#/$defs/FGBuildablePipeline--base--no-indicator--base"
+				},
+				{
+					"$ref": "#/$defs/has--mMeshLength"
+				},
+				{
+					"$ref": "#/$defs/has--mSplineData"
 				}
 			]
 		},
@@ -2247,12 +2176,6 @@
 		},
 		"FGBuildablePipeline--junction--base": {
 			"allOf": [
-				{
-					"$ref": "#/$defs/FGBuildable"
-				},
-				{
-					"$ref": "#/$defs/FGBuildable--powered--base--base--with-mNumCyclesForProductivity"
-				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered--pre-1.0"
 				},
@@ -2261,14 +2184,23 @@
 				},
 				{
 					"$ref": "#/$defs/FGBuildablePipeline--base--no-indicator--base"
+				},
+				{
+					"$ref": "#/$defs/has--mNumCyclesForProductivity"
 				}
 			]
 		},
 		"FGBuildablePipelineJunction": {
 			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildablePipelineJunction"
+				},
 				{
 					"$ref": "#/$defs/FGBuildablePipeline--junction"
 				},
+				{
+					"$ref": "#/$defs/FGBuildablePipeline--junction--base"
+				},
 				{
 					"$ref": "#/$defs/FGBuildablePipelineJunction--base"
 				}
@@ -2276,7 +2208,6 @@
 		},
 		"FGBuildablePipelineJunction--base": {
 			"type": "object",
-			"$ref": "#/$defs/FGBuildablePipeline--junction--base",
 			"required": ["mFluidBoxVolume"],
 			"properties": {
 				"mFluidBoxVolume": {
@@ -2286,9 +2217,6 @@
 		},
 		"FGBuildablePipelinePump--base--base": {
 			"allOf": [
-				{
-					"$ref": "#/$defs/FGBuildable--powered--base--base--with-mNumCyclesForProductivity"
-				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered--pre-1.0"
 				},
@@ -2298,11 +2226,17 @@
 				{
 					"$ref": "#/$defs/FGBuildablePipeline--base--base"
 				},
+				{
+					"$ref": "#/$defs/FGBuildablePipeline--base--no-indicator--base"
+				},
 				{
 					"$ref": "#/$defs/FGBuildablePipelinePump--powered--version-specific"
 				},
 				{
 					"$ref": "#/$defs/FGBuildablePipelinePump--powered--version-specific"
+				},
+				{
+					"$ref": "#/$defs/has--mNumCyclesForProductivity"
 				}
 			]
 		},
@@ -2369,15 +2303,6 @@
 		},
 		"FGBuildablePipelinePump--powered-base--base": {
 			"allOf": [
-				{
-					"$ref": "#/$defs/FGBuildable"
-				},
-				{
-					"$ref": "#/$defs/FGBuildable--powered--base--base--with-mNumCyclesForProductivity"
-				},
-				{
-					"$ref": "#/$defs/FGBuildable--powered--base--base--with-mNumCyclesForProductivity"
-				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered--pre-1.0"
 				},
@@ -2392,11 +2317,20 @@
 				},
 				{
 					"$ref": "#/$defs/FGBuildablePipelinePump--powered--version-specific"
+				},
+				{
+					"$ref": "#/$defs/has--mNumCyclesForProductivity"
+				},
+				{
+					"$ref": "#/$defs/has--mNumCyclesForProductivity"
 				}
 			]
 		},
 		"FGBuildablePipelinePump--pump": {
 			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildablePipelinePump"
+				},
 				{
 					"$ref": "#/$defs/FGBuildablePipeline--base"
 				},
@@ -2404,7 +2338,7 @@
 					"$ref": "#/$defs/FGBuildablePipeline--base--base"
 				},
 				{
-					"$ref": "#/$defs/FGBuildablePipelinePump--base--base"
+					"$ref": "#/$defs/FGBuildablePipeline--base--no-indicator--base"
 				},
 				{
 					"$ref": "#/$defs/FGBuildablePipelinePump--base--base"
@@ -2447,6 +2381,9 @@
 		},
 		"FGBuildablePipelinePump--valve": {
 			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildablePipelinePump"
+				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered"
 				},
@@ -2464,13 +2401,13 @@
 		"FGBuildablePipelineSupport": {
 			"allOf": [
 				{
-					"$ref": "#/$defs/FGBuildable--base"
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildablePipelineSupport"
 				},
 				{
-					"$ref": "#/$defs/FGBuildable--base--pre-update5"
+					"$ref": "#/$defs/FGBuildable--base"
 				},
 				{
-					"$ref": "#/$defs/FGBuildable--pole--base"
+					"$ref": "#/$defs/FGBuildable--base--pre-update5"
 				},
 				{
 					"$ref": "#/$defs/FGBuildable--with--mLength"
@@ -2483,6 +2420,9 @@
 				},
 				{
 					"$ref": "#/$defs/has--mStackHeight"
+				},
+				{
+					"$ref": "#/$defs/has--mUseStaticHeight"
 				}
 			]
 		},
@@ -2497,6 +2437,9 @@
 		},
 		"FGBuildablePipeReservoir": {
 			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildablePipeReservoir"
+				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered"
 				},
@@ -2507,12 +2450,6 @@
 		},
 		"FGBuildablePipeReservoir--base": {
 			"allOf": [
-				{
-					"$ref": "#/$defs/FGBuildable"
-				},
-				{
-					"$ref": "#/$defs/FGBuildable--powered--base--base--with-mNumCyclesForProductivity"
-				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered--pre-1.0"
 				},
@@ -2521,14 +2458,14 @@
 				},
 				{
 					"$ref": "#/$defs/FGBuildablePipeReservoir--base--base"
+				},
+				{
+					"$ref": "#/$defs/has--mNumCyclesForProductivity"
 				}
 			]
 		},
 		"FGBuildablePipeReservoir--base--base": {
 			"allOf": [
-				{
-					"$ref": "#/$defs/FGBuildable--powered--base--base--with-mNumCyclesForProductivity"
-				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered--pre-1.0"
 				},
@@ -2537,12 +2474,14 @@
 				},
 				{
 					"$ref": "#/$defs/FGBuildablePipeReservoir--base--base--base"
+				},
+				{
+					"$ref": "#/$defs/has--mNumCyclesForProductivity"
 				}
 			]
 		},
 		"FGBuildablePipeReservoir--base--base--base": {
 			"type": "object",
-			"$ref": "#/$defs/FGBuildable--powered--version-specific",
 			"required": [
 				"mStackingHeight",
 				"mFluidBox",
@@ -2572,35 +2511,32 @@
 		"FGBuildablePole": {
 			"allOf": [
 				{
-					"$ref": "#/$defs/FGBuildable--pole"
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildablePole"
 				},
 				{
-					"$ref": "#/$defs/FGBuildablePole--base"
+					"$ref": "#/$defs/FGBuildable--base"
 				},
 				{
 					"$ref": "#/$defs/has--mCanStack"
 				},
+				{
+					"$ref": "#/$defs/has--mHeight"
+				},
 				{
 					"$ref": "#/$defs/has--mStackHeight"
+				},
+				{
+					"$ref": "#/$defs/has--mUseStaticHeight"
 				}
 			]
 		},
-		"FGBuildablePole--base": {
-			"type": "object",
-			"required": ["mHeight"],
-			"properties": {
-				"mHeight": {
-					"$ref": "docs.json.ts--common--types#/$defs/decimal_string"
-				}
-			}
-		},
 		"FGBuildablePowerPole": {
 			"allOf": [
 				{
-					"$ref": "#/$defs/FGBuildable"
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildablePowerPole"
 				},
 				{
-					"$ref": "#/$defs/FGBuildable--base--version-specific"
+					"$ref": "#/$defs/FGBuildable--base"
 				},
 				{
 					"$ref": "#/$defs/FGBuildablePowerPole--base"
@@ -2623,6 +2559,9 @@
 		},
 		"FGBuildableRadarTower": {
 			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildableRadarTower"
+				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered"
 				},
@@ -2633,12 +2572,6 @@
 		},
 		"FGBuildableRadarTower--base": {
 			"allOf": [
-				{
-					"$ref": "#/$defs/FGBuildable"
-				},
-				{
-					"$ref": "#/$defs/FGBuildable--powered--base--base--with-mNumCyclesForProductivity"
-				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered--pre-1.0"
 				},
@@ -2647,6 +2580,9 @@
 				},
 				{
 					"$ref": "#/$defs/FGBuildableRadarTower--base--base"
+				},
+				{
+					"$ref": "#/$defs/has--mNumCyclesForProductivity"
 				}
 			]
 		},
@@ -2692,11 +2628,17 @@
 		},
 		"FGBuildableRailroadStation": {
 			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildableRailroadStation"
+				},
+				{
+					"$ref": "#/$defs/FGBuildable--powered"
+				},
 				{
 					"$ref": "#/$defs/FGBuildableRailroadStation--base"
 				},
 				{
-					"$ref": "#/$defs/FGBuildableTrainPlatform"
+					"$ref": "#/$defs/FGBuildableTrainPlatform--base"
 				}
 			]
 		},
@@ -2737,16 +2679,21 @@
 		"FGBuildableRailroadTrack": {
 			"allOf": [
 				{
-					"$ref": "#/$defs/FGBuildable"
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildableRailroadTrack"
+				},
+				{
+					"$ref": "#/$defs/FGBuildable--base"
 				},
 				{
 					"$ref": "#/$defs/FGBuildableRailroadTrack--base"
+				},
+				{
+					"$ref": "#/$defs/has--mMeshLength"
 				}
 			]
 		},
 		"FGBuildableRailroadTrack--base": {
 			"type": "object",
-			"$ref": "#/$defs/FGBuildable--with--mMeshLength",
 			"required": ["mIsOwnedByPlatform"],
 			"properties": {
 				"mIsOwnedByPlatform": {
@@ -2775,12 +2722,6 @@
 				{
 					"$ref": "docs.json.ts--0.3.7.7--classes--base.overridable#/$defs/FGBuildableResourceExtractor--only-allow-certain-resources"
 				},
-				{
-					"$ref": "#/$defs/FGBuildable"
-				},
-				{
-					"$ref": "#/$defs/FGBuildable--powered--base--base--with-mNumCyclesForProductivity"
-				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered--pre-1.0"
 				},
@@ -2795,6 +2736,9 @@
 				},
 				{
 					"$ref": "#/$defs/FGBuildableResourceExtractor--timed"
+				},
+				{
+					"$ref": "#/$defs/has--mNumCyclesForProductivity"
 				}
 			]
 		},
@@ -2806,15 +2750,6 @@
 				{
 					"$ref": "docs.json.ts--0.3.7.7--classes--base.overridable#/$defs/FGBuildableResourceExtractor--only-allow-certain-resources"
 				},
-				{
-					"$ref": "#/$defs/FGBuildable--powered--base--resources"
-				},
-				{
-					"$ref": "#/$defs/FGBuildable--powered--base--resources--base"
-				},
-				{
-					"$ref": "#/$defs/FGBuildable--powered--base--resources--base"
-				},
 				{
 					"$ref": "#/$defs/FGBuildableResourceExtractor--base"
 				},
@@ -2827,9 +2762,6 @@
 				{
 					"$ref": "#/$defs/FGBuildableResourceExtractor--piped--pre-1.0"
 				},
-				{
-					"$ref": "#/$defs/FGBuildableResourceExtractor--timed"
-				},
 				{
 					"$ref": "#/$defs/FGBuildableResourceExtractor--timed"
 				}
@@ -2856,8 +2788,7 @@
 					"$ref": "docs.json.ts--common--types#/$defs/bool_string"
 				},
 				"mExtractorTypeName": {
-					"type": "string",
-					"const": "Miner"
+					"$ref": "docs.json.ts--0.3.7.7--properties#/$defs/const--Miner"
 				},
 				"mAllowedResourceForms": {
 					"type": "string",
@@ -2878,12 +2809,18 @@
 		},
 		"FGBuildableResourceExtractor--miner--mk1": {
 			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildableResourceExtractor"
+				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered"
 				},
 				{
 					"$ref": "#/$defs/FGBuildableResourceExtractor"
 				},
+				{
+					"$ref": "#/$defs/FGBuildableResourceExtractor--miner"
+				},
 				{
 					"$ref": "#/$defs/FGBuildableResourceExtractor--miner--mk1--base"
 				}
@@ -2891,7 +2828,6 @@
 		},
 		"FGBuildableResourceExtractor--miner--mk1--base": {
 			"type": "object",
-			"$ref": "#/$defs/FGBuildableResourceExtractor--miner",
 			"required": ["mDisplayName"],
 			"properties": {
 				"mDisplayName": {
@@ -2902,6 +2838,9 @@
 		},
 		"FGBuildableResourceExtractor--miner--mk2": {
 			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildableResourceExtractor"
+				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered"
 				},
@@ -2931,12 +2870,6 @@
 				{
 					"$ref": "docs.json.ts--0.3.7.7--classes--base.overridable#/$defs/FGBuildableResourceExtractor--only-allow-certain-resources"
 				},
-				{
-					"$ref": "#/$defs/FGBuildable--powered--base--base--with-mNumCyclesForProductivity"
-				},
-				{
-					"$ref": "#/$defs/FGBuildable--powered--base--resources--base"
-				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered--pre-1.0"
 				},
@@ -2957,6 +2890,9 @@
 				},
 				{
 					"$ref": "#/$defs/FGBuildableResourceExtractor--timed"
+				},
+				{
+					"$ref": "#/$defs/has--mNumCyclesForProductivity"
 				}
 			]
 		},
@@ -2982,13 +2918,10 @@
 					"$ref": "docs.json.ts--0.3.7.7--classes--base.overridable#/$defs/FGBuildableResourceExtractor--only-allow-certain-resources"
 				},
 				{
-					"$ref": "#/$defs/FGBuildable--powered"
-				},
-				{
-					"$ref": "#/$defs/FGBuildable--powered--base--base--with-mNumCyclesForProductivity"
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildableResourceExtractor"
 				},
 				{
-					"$ref": "#/$defs/FGBuildable--powered--base--resources--base"
+					"$ref": "#/$defs/FGBuildable--powered"
 				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered--pre-1.0"
@@ -3016,6 +2949,9 @@
 				},
 				{
 					"$ref": "#/$defs/FGBuildableResourceExtractor--timed"
+				},
+				{
+					"$ref": "#/$defs/has--mNumCyclesForProductivity"
 				}
 			]
 		},
@@ -3034,6 +2970,9 @@
 		},
 		"FGBuildableResourceExtractor--oil": {
 			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildableResourceExtractor"
+				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered"
 				},
@@ -3050,12 +2989,6 @@
 				{
 					"$ref": "docs.json.ts--0.3.7.7--classes--base.overridable#/$defs/FGBuildableResourceExtractor--only-allow-certain-resources"
 				},
-				{
-					"$ref": "#/$defs/FGBuildable--powered--base--resources"
-				},
-				{
-					"$ref": "#/$defs/FGBuildable--powered--base--resources--base"
-				},
 				{
 					"$ref": "#/$defs/FGBuildableResourceExtractor--base"
 				},
@@ -3078,12 +3011,6 @@
 				{
 					"$ref": "docs.json.ts--0.3.7.7--classes--base.overridable#/$defs/FGBuildableResourceExtractor--only-allow-certain-resources"
 				},
-				{
-					"$ref": "#/$defs/FGBuildable--powered--base--base--with-mNumCyclesForProductivity"
-				},
-				{
-					"$ref": "#/$defs/FGBuildable--powered--base--resources--base"
-				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered--pre-1.0"
 				},
@@ -3101,6 +3028,9 @@
 				},
 				{
 					"$ref": "#/$defs/FGBuildableResourceExtractor--timed"
+				},
+				{
+					"$ref": "#/$defs/has--mNumCyclesForProductivity"
 				}
 			]
 		},
@@ -3133,8 +3063,14 @@
 					"$ref": "docs.json.ts--common--types#/$defs/bool_string"
 				},
 				"mExtractorTypeName": {
-					"type": "string",
-					"enum": ["None", "Miner"]
+					"oneOf": [
+						{
+							"$ref": "docs.json.ts--0.3.7.7--properties#/$defs/const--None"
+						},
+						{
+							"$ref": "docs.json.ts--0.3.7.7--properties#/$defs/const--Miner"
+						}
+					]
 				}
 			}
 		},
@@ -3185,6 +3121,9 @@
 		},
 		"FGBuildableResourceExtractor--water": {
 			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildableResourceExtractor"
+				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered"
 				},
@@ -3201,12 +3140,6 @@
 				{
 					"$ref": "docs.json.ts--0.3.7.7--classes--base.overridable#/$defs/FGBuildableResourceExtractor--only-allow-certain-resources"
 				},
-				{
-					"$ref": "#/$defs/FGBuildable--powered--base--resources"
-				},
-				{
-					"$ref": "#/$defs/FGBuildable--powered--base--resources--base"
-				},
 				{
 					"$ref": "#/$defs/FGBuildableResourceExtractor--base"
 				},
@@ -3232,12 +3165,6 @@
 				{
 					"$ref": "docs.json.ts--0.3.7.7--classes--base.overridable#/$defs/FGBuildableResourceExtractor--only-allow-certain-resources"
 				},
-				{
-					"$ref": "#/$defs/FGBuildable--powered--base--base--with-mNumCyclesForProductivity"
-				},
-				{
-					"$ref": "#/$defs/FGBuildable--powered--base--resources--base"
-				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered--pre-1.0"
 				},
@@ -3254,7 +3181,10 @@
 					"$ref": "#/$defs/FGBuildableResourceExtractor--timed"
 				},
 				{
-					"$ref": "#/$defs/FGBuildableResourceExtractor--water--base--base--base"
+					"$ref": "#/$defs/FGBuildableResourceExtractor--water--base--base--base"
+				},
+				{
+					"$ref": "#/$defs/has--mNumCyclesForProductivity"
 				}
 			]
 		},
@@ -3279,8 +3209,7 @@
 					"$ref": "docs.json.ts--common--types#/$defs/bool_string"
 				},
 				"mExtractorTypeName": {
-					"type": "string",
-					"const": "None"
+					"$ref": "docs.json.ts--0.3.7.7--properties#/$defs/const--None"
 				},
 				"mAllowedResourceForms": {
 					"type": "string",
@@ -3375,6 +3304,9 @@
 		},
 		"FGBuildableResourceSink": {
 			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildableResourceSink"
+				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered"
 				},
@@ -3382,52 +3314,12 @@
 					"$ref": "#/$defs/FGBuildableResourceSink--base"
 				},
 				{
-					"type": "object",
-					"required": [
-						"SFXEngineTimeline_EngineAlpha_073E1D2A4BAD246B3958E183E210FAAE",
-						"SFXEngineTimeline__Direction_073E1D2A4BAD246B3958E183E210FAAE",
-						"VFX_SFX_Timeline_EngineAlpha_A2CB706E440839665A39888572D206AA",
-						"VFX_SFX_Timeline__Direction_A2CB706E440839665A39888572D206AA",
-						"HastLostSignificance",
-						"mProcessingTime",
-						"mSavedProducingTimer"
-					],
-					"properties": {
-						"SFXEngineTimeline_EngineAlpha_073E1D2A4BAD246B3958E183E210FAAE": {
-							"$ref": "docs.json.ts--common--types#/$defs/decimal_string"
-						},
-						"SFXEngineTimeline__Direction_073E1D2A4BAD246B3958E183E210FAAE": {
-							"type": "string",
-							"const": "Forward"
-						},
-						"VFX_SFX_Timeline_EngineAlpha_A2CB706E440839665A39888572D206AA": {
-							"$ref": "docs.json.ts--common--types#/$defs/decimal_string"
-						},
-						"VFX_SFX_Timeline__Direction_A2CB706E440839665A39888572D206AA": {
-							"type": "string",
-							"const": "Forward"
-						},
-						"HastLostSignificance": {
-							"$ref": "docs.json.ts--common--types#/$defs/bool_string"
-						},
-						"mProcessingTime": {
-							"$ref": "docs.json.ts--common--types#/$defs/decimal_string"
-						},
-						"mSavedProducingTimer": {
-							"$ref": "docs.json.ts--common--types#/$defs/decimal_string"
-						}
-					}
+					"$ref": "#/$defs/FGBuildableResourceSink--version-specific"
 				}
 			]
 		},
 		"FGBuildableResourceSink--base": {
 			"allOf": [
-				{
-					"$ref": "#/$defs/FGBuildable"
-				},
-				{
-					"$ref": "#/$defs/FGBuildable--powered--base--base--with-mNumCyclesForProductivity"
-				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered--pre-1.0"
 				},
@@ -3436,14 +3328,14 @@
 				},
 				{
 					"$ref": "#/$defs/FGBuildableResourceSink--base--base"
+				},
+				{
+					"$ref": "#/$defs/has--mNumCyclesForProductivity"
 				}
 			]
 		},
 		"FGBuildableResourceSink--base--base": {
 			"allOf": [
-				{
-					"$ref": "#/$defs/FGBuildable--powered--base--base--with-mNumCyclesForProductivity"
-				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered--pre-1.0"
 				},
@@ -3452,12 +3344,14 @@
 				},
 				{
 					"$ref": "#/$defs/FGBuildableResourceSink--base--base--base"
+				},
+				{
+					"$ref": "#/$defs/has--mNumCyclesForProductivity"
 				}
 			]
 		},
 		"FGBuildableResourceSink--base--base--base": {
 			"type": "object",
-			"$ref": "#/$defs/FGBuildable--powered--version-specific",
 			"required": ["mProcessingTime"],
 			"properties": {
 				"mProcessingTime": {
@@ -3465,8 +3359,48 @@
 				}
 			}
 		},
+		"FGBuildableResourceSink--version-specific": {
+			"type": "object",
+			"required": [
+				"SFXEngineTimeline_EngineAlpha_073E1D2A4BAD246B3958E183E210FAAE",
+				"SFXEngineTimeline__Direction_073E1D2A4BAD246B3958E183E210FAAE",
+				"VFX_SFX_Timeline_EngineAlpha_A2CB706E440839665A39888572D206AA",
+				"VFX_SFX_Timeline__Direction_A2CB706E440839665A39888572D206AA",
+				"HastLostSignificance",
+				"mProcessingTime",
+				"mSavedProducingTimer"
+			],
+			"properties": {
+				"SFXEngineTimeline_EngineAlpha_073E1D2A4BAD246B3958E183E210FAAE": {
+					"$ref": "docs.json.ts--common--types#/$defs/decimal_string"
+				},
+				"SFXEngineTimeline__Direction_073E1D2A4BAD246B3958E183E210FAAE": {
+					"type": "string",
+					"const": "Forward"
+				},
+				"VFX_SFX_Timeline_EngineAlpha_A2CB706E440839665A39888572D206AA": {
+					"$ref": "docs.json.ts--common--types#/$defs/decimal_string"
+				},
+				"VFX_SFX_Timeline__Direction_A2CB706E440839665A39888572D206AA": {
+					"type": "string",
+					"const": "Forward"
+				},
+				"HastLostSignificance": {
+					"$ref": "docs.json.ts--common--types#/$defs/bool_string"
+				},
+				"mProcessingTime": {
+					"$ref": "docs.json.ts--common--types#/$defs/decimal_string"
+				},
+				"mSavedProducingTimer": {
+					"$ref": "docs.json.ts--common--types#/$defs/decimal_string"
+				}
+			}
+		},
 		"FGBuildableResourceSinkShop": {
 			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildableResourceSinkShop"
+				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered"
 				},
@@ -3477,12 +3411,6 @@
 		},
 		"FGBuildableResourceSinkShop--base": {
 			"allOf": [
-				{
-					"$ref": "#/$defs/FGBuildable"
-				},
-				{
-					"$ref": "#/$defs/FGBuildable--powered--base--base--with-mNumCyclesForProductivity"
-				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered--pre-1.0"
 				},
@@ -3491,14 +3419,14 @@
 				},
 				{
 					"$ref": "#/$defs/FGBuildableResourceSinkShop--base--base"
+				},
+				{
+					"$ref": "#/$defs/has--mNumCyclesForProductivity"
 				}
 			]
 		},
 		"FGBuildableResourceSinkShop--base--base": {
 			"allOf": [
-				{
-					"$ref": "#/$defs/FGBuildable--powered--base--base--with-mNumCyclesForProductivity"
-				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered--pre-1.0"
 				},
@@ -3507,12 +3435,14 @@
 				},
 				{
 					"$ref": "#/$defs/FGBuildableResourceSinkShop--base--base--base"
+				},
+				{
+					"$ref": "#/$defs/has--mNumCyclesForProductivity"
 				}
 			]
 		},
 		"FGBuildableResourceSinkShop--base--base--base": {
 			"type": "object",
-			"$ref": "#/$defs/FGBuildable--powered--version-specific",
 			"required": ["mShopInventoryDefaultSize"],
 			"properties": {
 				"mShopInventoryDefaultSize": {
@@ -3520,24 +3450,31 @@
 				}
 			}
 		},
-		"FGBuildableSpaceElevator": {
+		"FGBuildableSnowDispenser": {
 			"allOf": [
 				{
-					"$ref": "#/$defs/FGBuildable--powered"
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildableSnowDispenser"
 				},
 				{
-					"$ref": "#/$defs/FGBuildableSpaceElevator--base"
+					"$ref": "#/$defs/FGBuildable--base"
 				}
 			]
 		},
-		"FGBuildableSpaceElevator--base": {
+		"FGBuildableSpaceElevator": {
 			"allOf": [
 				{
-					"$ref": "#/$defs/FGBuildable"
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildableSpaceElevator"
 				},
 				{
-					"$ref": "#/$defs/FGBuildable--powered--base--base--with-mNumCyclesForProductivity"
+					"$ref": "#/$defs/FGBuildable--powered"
 				},
+				{
+					"$ref": "#/$defs/FGBuildableSpaceElevator--base"
+				}
+			]
+		},
+		"FGBuildableSpaceElevator--base": {
+			"allOf": [
 				{
 					"$ref": "#/$defs/FGBuildable--powered--pre-1.0"
 				},
@@ -3546,6 +3483,9 @@
 				},
 				{
 					"$ref": "#/$defs/FGBuildableSpaceElevator--base--base"
+				},
+				{
+					"$ref": "#/$defs/has--mNumCyclesForProductivity"
 				}
 			]
 		},
@@ -3562,33 +3502,34 @@
 		"FGBuildableSplitterSmart": {
 			"allOf": [
 				{
-					"$ref": "#/$defs/FGBuildableAttachment--splitter"
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildableSplitterSmart"
 				},
 				{
-					"$ref": "#/$defs/FGBuildableSplitterSmart--base"
-				}
-			]
-		},
-		"FGBuildableSplitterSmart--base": {
-			"allOf": [
+					"$ref": "#/$defs/FGBuildable--base"
+				},
 				{
-					"$ref": "#/$defs/FGBuildableAttachment--splitter--base"
+					"$ref": "#/$defs/FGBuildable--powered--pre-1.0"
 				},
 				{
-					"$ref": "#/$defs/FGBuildableSplitterSmart--base--base"
-				}
-			]
-		},
-		"FGBuildableSplitterSmart--base--base": {
-			"allOf": [
+					"$ref": "#/$defs/FGBuildable--powered--version-specific"
+				},
+				{
+					"$ref": "#/$defs/FGBuildableAttachment--has--mCurrentInventoryIndex"
+				},
+				{
+					"$ref": "#/$defs/FGBuildableAttachment--splitter"
+				},
 				{
-					"$ref": "#/$defs/FGBuildableAttachment--base--base"
+					"$ref": "#/$defs/FGBuildableAttachment--splitter--base"
 				},
 				{
 					"$ref": "#/$defs/FGBuildableAttachment--splitter--base--base--base"
 				},
 				{
 					"$ref": "#/$defs/FGBuildableSplitterSmart--version-specific"
+				},
+				{
+					"$ref": "#/$defs/has--mNumCyclesForProductivity"
 				}
 			]
 		},
@@ -3629,24 +3570,46 @@
 				}
 			}
 		},
-		"FGBuildableStorage": {
+		"FGBuildableStair": {
 			"allOf": [
 				{
-					"$ref": "#/$defs/FGBuildable--powered"
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildableStair"
 				},
 				{
-					"$ref": "#/$defs/FGBuildableStorage--base"
+					"$ref": "#/$defs/FGBuildable--base"
+				},
+				{
+					"$ref": "#/$defs/has--mDisableAttachmentSnapOn"
+				},
+				{
+					"$ref": "#/$defs/has--mDisableSnapOn"
+				},
+				{
+					"$ref": "#/$defs/has--mElevation"
+				},
+				{
+					"$ref": "#/$defs/has--mHeight"
+				},
+				{
+					"$ref": "#/$defs/has--mSize"
 				}
 			]
 		},
-		"FGBuildableStorage--base": {
+		"FGBuildableStorage": {
 			"allOf": [
 				{
-					"$ref": "#/$defs/FGBuildable"
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildableStorage"
 				},
 				{
-					"$ref": "#/$defs/FGBuildable--powered--base--base--with-mNumCyclesForProductivity"
+					"$ref": "#/$defs/FGBuildable--powered"
 				},
+				{
+					"$ref": "#/$defs/FGBuildableStorage--base"
+				}
+			]
+		},
+		"FGBuildableStorage--base": {
+			"allOf": [
 				{
 					"$ref": "#/$defs/FGBuildable--powered--pre-1.0"
 				},
@@ -3655,14 +3618,14 @@
 				},
 				{
 					"$ref": "#/$defs/FGBuildableStorage--base--base"
+				},
+				{
+					"$ref": "#/$defs/has--mNumCyclesForProductivity"
 				}
 			]
 		},
 		"FGBuildableStorage--base--base": {
 			"allOf": [
-				{
-					"$ref": "#/$defs/FGBuildable--powered--base--base--with-mNumCyclesForProductivity"
-				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered--pre-1.0"
 				},
@@ -3671,12 +3634,14 @@
 				},
 				{
 					"$ref": "#/$defs/FGBuildableStorage--base--base--base"
+				},
+				{
+					"$ref": "#/$defs/has--mNumCyclesForProductivity"
 				}
 			]
 		},
 		"FGBuildableStorage--base--base--base": {
 			"type": "object",
-			"$ref": "#/$defs/FGBuildable--powered--version-specific",
 			"required": [
 				"mStackingHeight",
 				"mInventorySizeX",
@@ -3697,10 +3662,13 @@
 		"FGBuildableTradingPost": {
 			"allOf": [
 				{
-					"$ref": "#/$defs/FGBuildable--powered"
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildableTradingPost"
+				},
+				{
+					"$ref": "#/$defs/FGBuildable--base"
 				},
 				{
-					"$ref": "#/$defs/FGBuildable--powered--base--base--with-mNumCyclesForProductivity"
+					"$ref": "#/$defs/FGBuildable--powered"
 				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered--pre-1.0"
@@ -3719,6 +3687,12 @@
 				},
 				{
 					"$ref": "#/$defs/FGBuildableTradingPost--version-specific"
+				},
+				{
+					"$ref": "#/$defs/has--mNumCyclesForProductivity"
+				},
+				{
+					"$ref": "#/$defs/has--mStorageInventorySize"
 				}
 			]
 		},
@@ -3755,7 +3729,6 @@
 		},
 		"FGBuildableTradingPost--pre-update8": {
 			"type": "object",
-			"$ref": "#/$defs/FGBuildable--powered--version-specific",
 			"required": ["Meshes"],
 			"properties": {
 				"Meshes": {
@@ -3779,7 +3752,6 @@
 				"mMamFreeText",
 				"mMamOccupiedText",
 				"mGenerators",
-				"mStorageInventorySize",
 				"mStorageVisibilityLevel",
 				"mSpawningGroundZOffset",
 				"mGroundSearchZDistance",
@@ -3805,9 +3777,6 @@
 					"type": "string",
 					"const": ""
 				},
-				"mStorageInventorySize": {
-					"$ref": "docs.json.ts--common--types#/$defs/integer_string"
-				},
 				"mStorageVisibilityLevel": {
 					"$ref": "docs.json.ts--common--types#/$defs/integer_string"
 				},
@@ -3823,24 +3792,8 @@
 				}
 			}
 		},
-		"FGBuildableTrainPlatform": {
-			"allOf": [
-				{
-					"$ref": "#/$defs/FGBuildable--powered"
-				},
-				{
-					"$ref": "#/$defs/FGBuildableTrainPlatform--base"
-				}
-			]
-		},
 		"FGBuildableTrainPlatform--base": {
 			"allOf": [
-				{
-					"$ref": "#/$defs/FGBuildable"
-				},
-				{
-					"$ref": "#/$defs/FGBuildable--powered--base--base--with-mNumCyclesForProductivity"
-				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered--pre-1.0"
 				},
@@ -3849,6 +3802,9 @@
 				},
 				{
 					"$ref": "#/$defs/FGBuildableTrainPlatform--base--base"
+				},
+				{
+					"$ref": "#/$defs/has--mNumCyclesForProductivity"
 				}
 			]
 		},
@@ -3912,11 +3868,14 @@
 		},
 		"FGBuildableTrainPlatform--with-storage": {
 			"allOf": [
+				{
+					"$ref": "#/$defs/FGBuildable--powered"
+				},
 				{
 					"$ref": "#/$defs/FGBuildable--powered-storage"
 				},
 				{
-					"$ref": "#/$defs/FGBuildableTrainPlatform"
+					"$ref": "#/$defs/FGBuildableTrainPlatform--base"
 				},
 				{
 					"$ref": "#/$defs/FGBuildableTrainPlatform--with-storage--base"
@@ -3958,6 +3917,9 @@
 		},
 		"FGBuildableTrainPlatformCargo": {
 			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildableTrainPlatformCargo"
+				},
 				{
 					"$ref": "#/$defs/FGBuildableTrainPlatform--with-storage"
 				},
@@ -4067,13 +4029,61 @@
 				}
 			}
 		},
+		"FGBuildableTrainPlatformEmpty": {
+			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildableTrainPlatformEmpty"
+				},
+				{
+					"$ref": "#/$defs/FGBuildable--powered"
+				},
+				{
+					"$ref": "#/$defs/FGBuildableTrainPlatform--base"
+				}
+			]
+		},
+		"FGBuildableWalkway": {
+			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildableWalkway"
+				},
+				{
+					"$ref": "#/$defs/FGBuildable--base"
+				},
+				{
+					"$ref": "#/$defs/has--mDisableSnapOn"
+				},
+				{
+					"$ref": "#/$defs/has--mElevation"
+				},
+				{
+					"$ref": "#/$defs/has--mSize"
+				}
+			]
+		},
+		"FGBuildableWall": {
+			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildableWall"
+				},
+				{
+					"$ref": "#/$defs/FGBuildable--base"
+				},
+				{
+					"$ref": "#/$defs/has--mHeight"
+				},
+				{
+					"$ref": "#/$defs/has--mWidth"
+				}
+			]
+		},
 		"FGBuildableWire": {
 			"allOf": [
 				{
-					"$ref": "#/$defs/FGBuildable"
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildableWire"
 				},
 				{
-					"$ref": "#/$defs/FGBuildable--base--version-specific"
+					"$ref": "#/$defs/FGBuildable--base"
 				},
 				{
 					"$ref": "#/$defs/FGBuildableWire--base"
@@ -4091,13 +4101,25 @@
 					"$ref": "docs.json.ts--common--types#/$defs/decimal_string"
 				},
 				"mConnections": {
-					"type": "string",
-					"const": "None"
+					"$ref": "docs.json.ts--0.3.7.7--properties#/$defs/const--None"
 				}
 			}
 		},
+		"FGBuildingDescriptor": {
+			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGBuildingDescriptor"
+				},
+				{
+					"$ref": "#/$defs/FGDescriptor--BuildMenu"
+				}
+			]
+		},
 		"FGChainsaw": {
 			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGChainsaw"
+				},
 				{
 					"$ref": "#/$defs/FGChainsaw--pre-1.0"
 				},
@@ -4110,6 +4132,9 @@
 				{
 					"$ref": "#/$defs/FGEquipment"
 				},
+				{
+					"$ref": "#/$defs/FGEquipment--base"
+				},
 				{
 					"$ref": "#/$defs/FGEquipment--has--mPlayingSound"
 				}
@@ -4193,9 +4218,15 @@
 		},
 		"FGColorGun": {
 			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGColorGun"
+				},
 				{
 					"$ref": "#/$defs/FGColorGun--base"
 				},
+				{
+					"$ref": "#/$defs/FGColorGun--base--base"
+				},
 				{
 					"$ref": "#/$defs/FGWeaponProjectile--instant"
 				}
@@ -4203,7 +4234,6 @@
 		},
 		"FGColorGun--base": {
 			"type": "object",
-			"$ref": "#/$defs/FGColorGun--base--base",
 			"required": ["mPrimaryColor", "mSecondaryColor", "mArmAnimation"],
 			"properties": {
 				"mPrimaryColor": {
@@ -4220,7 +4250,6 @@
 		},
 		"FGColorGun--base--base": {
 			"type": "object",
-			"$ref": "#/$defs/hasClassName",
 			"required": [
 				"mRedundantTargetCrosshairColor",
 				"mNoTargetCrosshairColor",
@@ -4244,17 +4273,22 @@
 		},
 		"FGConsumableDescriptor": {
 			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGConsumableDescriptor"
+				},
 				{
 					"$ref": "#/$defs/FGConsumableDescriptor--base"
 				},
 				{
 					"$ref": "#/$defs/FGDescriptor--sinkable"
+				},
+				{
+					"$ref": "#/$defs/has--mResourceSinkPoints"
 				}
 			]
 		},
 		"FGConsumableDescriptor--base": {
 			"type": "object",
-			"$ref": "#/$defs/FGDescriptor--sinkable--base",
 			"required": [
 				"mCustomHandsMeshScale",
 				"mCustomRotation",
@@ -4278,26 +4312,35 @@
 		"FGConsumableEquipment": {
 			"allOf": [
 				{
-					"$ref": "#/$defs/FGConsumableEquipment--base"
+					"$ref": "docs.json.ts--common--classes#/$defs/FGConsumableEquipment"
 				},
 				{
-					"$ref": "#/$defs/FGEquipment"
-				}
-			]
-		},
-		"FGConsumableEquipment--base": {
-			"allOf": [
+					"$ref": "#/$defs/FGConsumableEquipment--pre-update4"
+				},
 				{
 					"$ref": "#/$defs/FGConsumableEquipment--pre-update8"
 				},
 				{
 					"$ref": "#/$defs/FGConsumableEquipment--version-specific"
 				},
+				{
+					"$ref": "#/$defs/FGEquipment"
+				},
 				{
 					"$ref": "#/$defs/FGEquipment--base"
 				}
 			]
 		},
+		"FGConsumableEquipment--pre-update4": {
+			"type": "object",
+			"required": ["mArmAnimation"],
+			"properties": {
+				"mArmAnimation": {
+					"type": "string",
+					"enum": ["AE_Consumables", "AE_OneHandEquipment"]
+				}
+			}
+		},
 		"FGConsumableEquipment--pre-update8": {
 			"type": "object",
 			"properties": {
@@ -4320,21 +4363,42 @@
 				"mRandomAnim": {
 					"$ref": "docs.json.ts--common--types#/$defs/integer_string"
 				},
-				"mCanPress": {
-					"$ref": "docs.json.ts--common--types#/$defs/bool_string"
+				"mCanPress": {
+					"$ref": "docs.json.ts--common--types#/$defs/bool_string"
+				},
+				"mCurrentAnimData": {
+					"$ref": "docs.json.ts--common--types#/$defs/empty-object"
+				},
+				"mAttachSocket": {
+					"type": "string",
+					"const": "hand_rSocket"
+				}
+			}
+		},
+		"FGConveyorPoleStackable": {
+			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGConveyorPoleStackable"
+				},
+				{
+					"$ref": "#/$defs/FGBuildable--base"
+				},
+				{
+					"$ref": "#/$defs/has--mCanStack"
 				},
-				"mCurrentAnimData": {
-					"$ref": "docs.json.ts--common--types#/$defs/empty-object"
+				{
+					"$ref": "#/$defs/has--mHeight"
 				},
-				"mAttachSocket": {
-					"type": "string",
-					"const": "hand_rSocket"
+				{
+					"$ref": "#/$defs/has--mStackHeight"
+				},
+				{
+					"$ref": "#/$defs/has--mUseStaticHeight"
 				}
-			}
+			]
 		},
 		"FGDescriptor": {
 			"type": "object",
-			"$ref": "#/$defs/FGDescriptor--base",
 			"required": ["mForm", "mPersistentBigIcon", "mSmallIcon"],
 			"properties": {
 				"mForm": {
@@ -4346,8 +4410,7 @@
 							"$ref": "docs.json.ts--0.3.7.7--properties#/$defs/Texture2D"
 						},
 						{
-							"type": "string",
-							"const": "None"
+							"$ref": "docs.json.ts--0.3.7.7--properties#/$defs/const--None"
 						}
 					]
 				},
@@ -4357,8 +4420,7 @@
 							"$ref": "docs.json.ts--0.3.7.7--properties#/$defs/Texture2D"
 						},
 						{
-							"type": "string",
-							"const": "None"
+							"$ref": "docs.json.ts--0.3.7.7--properties#/$defs/const--None"
 						}
 					]
 				}
@@ -4366,7 +4428,6 @@
 		},
 		"FGDescriptor--base": {
 			"type": "object",
-			"$ref": "#/$defs/isDescribed",
 			"required": [
 				"mAbbreviatedDisplayName",
 				"mStackSize",
@@ -4414,8 +4475,7 @@
 							"$ref": "docs.json.ts--0.3.7.7--properties#/$defs/Texture2D--base"
 						},
 						{
-							"type": "string",
-							"const": "None"
+							"$ref": "docs.json.ts--0.3.7.7--properties#/$defs/const--None"
 						}
 					]
 				},
@@ -4425,8 +4485,7 @@
 							"$ref": "docs.json.ts--0.3.7.7--properties#/$defs/Texture2D--base"
 						},
 						{
-							"type": "string",
-							"const": "None"
+							"$ref": "docs.json.ts--0.3.7.7--properties#/$defs/const--None"
 						}
 					]
 				},
@@ -4440,6 +4499,9 @@
 				{
 					"$ref": "#/$defs/FGDescriptor"
 				},
+				{
+					"$ref": "#/$defs/FGDescriptor--base"
+				},
 				{
 					"$ref": "#/$defs/FGDescriptor--BuildMenu--base"
 				}
@@ -4447,7 +4509,6 @@
 		},
 		"FGDescriptor--BuildMenu--base": {
 			"type": "object",
-			"$ref": "#/$defs/FGDescriptor--base",
 			"required": ["mSubCategories", "mBuildMenuPriority"],
 			"properties": {
 				"mSubCategories": {
@@ -4464,23 +4525,15 @@
 					"$ref": "#/$defs/FGDescriptor"
 				},
 				{
-					"$ref": "#/$defs/FGDescriptor--sinkable--base"
+					"$ref": "#/$defs/FGDescriptor--base"
+				},
+				{
+					"$ref": "#/$defs/has--mResourceSinkPoints"
 				}
 			]
 		},
-		"FGDescriptor--sinkable--base": {
-			"type": "object",
-			"$ref": "#/$defs/FGDescriptor--base",
-			"required": ["mResourceSinkPoints"],
-			"properties": {
-				"mResourceSinkPoints": {
-					"$ref": "docs.json.ts--common--types#/$defs/integer_string"
-				}
-			}
-		},
 		"FGEquipment": {
 			"type": "object",
-			"$ref": "#/$defs/FGEquipment--base",
 			"required": ["mAttachSocket"],
 			"properties": {
 				"mAttachSocket": {
@@ -4508,9 +4561,6 @@
 				},
 				{
 					"$ref": "#/$defs/FGEquipment--pre-1.0"
-				},
-				{
-					"$ref": "#/$defs/hasClassName"
 				}
 			]
 		},
@@ -4519,6 +4569,9 @@
 				{
 					"$ref": "#/$defs/FGEquipment"
 				},
+				{
+					"$ref": "#/$defs/FGEquipment--base"
+				},
 				{
 					"$ref": "#/$defs/FGEquipment--has--mPlaceDistanceMax"
 				}
@@ -4615,9 +4668,18 @@
 				}
 			}
 		},
+		"FGEquipmentDescriptor": {
+			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGEquipmentDescriptor"
+				},
+				{
+					"$ref": "#/$defs/FGDescriptor--sinkable"
+				}
+			]
+		},
 		"FGEquipmentStunSpear--base": {
 			"type": "object",
-			"$ref": "#/$defs/FGEquipmentStunSpear--base--base",
 			"required": ["mDamage"],
 			"properties": {
 				"mDamage": {
@@ -4630,6 +4692,9 @@
 				{
 					"$ref": "#/$defs/FGEquipment"
 				},
+				{
+					"$ref": "#/$defs/FGEquipment--base"
+				},
 				{
 					"$ref": "#/$defs/FGEquipmentStunSpear--base--version-specific"
 				}
@@ -4671,9 +4736,15 @@
 		},
 		"FGEquipmentStunSpear--xenobasher": {
 			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGEquipmentStunSpear"
+				},
 				{
 					"$ref": "#/$defs/FGEquipmentStunSpear--base"
 				},
+				{
+					"$ref": "#/$defs/FGEquipmentStunSpear--base--base"
+				},
 				{
 					"$ref": "#/$defs/FGEquipmentStunSpear--xenobasher--base"
 				}
@@ -4684,6 +4755,9 @@
 				{
 					"$ref": "#/$defs/FGEquipment"
 				},
+				{
+					"$ref": "#/$defs/FGEquipment--base"
+				},
 				{
 					"$ref": "#/$defs/FGEquipmentStunSpear--base--pre-1.0"
 				},
@@ -4710,8 +4784,7 @@
 			],
 			"properties": {
 				"mCurrentMontageSection": {
-					"type": "string",
-					"const": "None"
+					"$ref": "docs.json.ts--0.3.7.7--properties#/$defs/const--None"
 				},
 				"mSecondAttackTimer": {
 					"$ref": "docs.json.ts--common--types#/$defs/decimal_string"
@@ -4732,9 +4805,15 @@
 		},
 		"FGEquipmentStunSpear--xenozapper": {
 			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGEquipmentStunSpear"
+				},
 				{
 					"$ref": "#/$defs/FGEquipmentStunSpear--base"
 				},
+				{
+					"$ref": "#/$defs/FGEquipmentStunSpear--base--base"
+				},
 				{
 					"$ref": "#/$defs/FGEquipmentStunSpear--xenozapper--base"
 				}
@@ -4745,6 +4824,9 @@
 				{
 					"$ref": "#/$defs/FGEquipment"
 				},
+				{
+					"$ref": "#/$defs/FGEquipment--base"
+				},
 				{
 					"$ref": "#/$defs/FGEquipment--has--mPlayingSound"
 				},
@@ -4764,9 +4846,15 @@
 		},
 		"FGGasMask": {
 			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGGasMask"
+				},
 				{
 					"$ref": "#/$defs/FGEquipment"
 				},
+				{
+					"$ref": "#/$defs/FGEquipment--base"
+				},
 				{
 					"$ref": "#/$defs/FGEquipment--has--mFilterDuration"
 				},
@@ -4804,6 +4892,9 @@
 		},
 		"FGGolfCartDispenser": {
 			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGGolfCartDispenser"
+				},
 				{
 					"$ref": "#/$defs/FGEquipment--dispenser"
 				},
@@ -4822,8 +4913,31 @@
 				}
 			}
 		},
+		"FGItemDescriptor": {
+			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGItemDescriptor"
+				},
+				{
+					"$ref": "#/$defs/FGDescriptor--sinkable"
+				}
+			]
+		},
+		"FGItemDescriptorBiomass": {
+			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGItemDescriptorBiomass"
+				},
+				{
+					"$ref": "#/$defs/FGDescriptor--sinkable"
+				}
+			]
+		},
 		"FGItemDescriptorNuclearFuel": {
 			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGItemDescriptorNuclearFuel"
+				},
 				{
 					"$ref": "#/$defs/FGDescriptor--sinkable"
 				},
@@ -4834,7 +4948,6 @@
 		},
 		"FGItemDescriptorNuclearFuel--version-specific": {
 			"type": "object",
-			"$ref": "#/$defs/FGDescriptor--sinkable--base",
 			"required": ["mAmountOfWaste"],
 			"properties": {
 				"mAmountOfWaste": {
@@ -4844,6 +4957,9 @@
 		},
 		"FGJetPack": {
 			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGJetPack"
+				},
 				{
 					"$ref": "#/$defs/FGEquipment"
 				},
@@ -4861,6 +4977,9 @@
 				},
 				{
 					"$ref": "#/$defs/FGJetPack--version-specific"
+				},
+				{
+					"$ref": "#/$defs/has--mRTPCInterval"
 				}
 			]
 		},
@@ -4934,7 +5053,6 @@
 			"required": [
 				"mCurrentFuel",
 				"mDefaultAirControl",
-				"mRTPCInterval",
 				"mIsThrusting",
 				"mArmAnimation",
 				"mBackAnimation"
@@ -4946,9 +5064,6 @@
 				"mDefaultAirControl": {
 					"$ref": "docs.json.ts--common--types#/$defs/decimal_string"
 				},
-				"mRTPCInterval": {
-					"$ref": "docs.json.ts--common--types#/$defs/decimal_string"
-				},
 				"mIsThrusting": {
 					"$ref": "docs.json.ts--common--types#/$defs/bool_string"
 				},
@@ -4964,9 +5079,15 @@
 		},
 		"FGJumpingStilts": {
 			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGJumpingStilts"
+				},
 				{
 					"$ref": "#/$defs/FGEquipment"
 				},
+				{
+					"$ref": "#/$defs/FGEquipment--base"
+				},
 				{
 					"$ref": "#/$defs/FGJumpingStilts--base"
 				}
@@ -4994,6 +5115,9 @@
 		},
 		"FGNobeliskDetonator": {
 			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGNobeliskDetonator"
+				},
 				{
 					"$ref": "#/$defs/FGNobeliskDetonator--base"
 				},
@@ -5014,9 +5138,15 @@
 		},
 		"FGObjectScanner": {
 			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGObjectScanner"
+				},
 				{
 					"$ref": "#/$defs/FGEquipment"
 				},
+				{
+					"$ref": "#/$defs/FGEquipment--base"
+				},
 				{
 					"$ref": "#/$defs/FGEquipment--has--mPlayingSound"
 				},
@@ -5112,9 +5242,15 @@
 		},
 		"FGParachute": {
 			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGParachute"
+				},
 				{
 					"$ref": "#/$defs/FGEquipment"
 				},
+				{
+					"$ref": "#/$defs/FGEquipment--base"
+				},
 				{
 					"$ref": "#/$defs/FGParachute--has--mIsDeployed"
 				},
@@ -5144,7 +5280,19 @@
 		"FGPipeHyperStart": {
 			"allOf": [
 				{
-					"$ref": "#/$defs/FGBuildable--pole--with-length-and-power"
+					"$ref": "docs.json.ts--common--classes#/$defs/FGPipeHyperStart"
+				},
+				{
+					"$ref": "#/$defs/FGBuildable--powered"
+				},
+				{
+					"$ref": "#/$defs/FGBuildable--powered--pre-1.0"
+				},
+				{
+					"$ref": "#/$defs/FGBuildable--powered--version-specific"
+				},
+				{
+					"$ref": "#/$defs/FGBuildable--with--mLength"
 				},
 				{
 					"$ref": "#/$defs/FGPipeHyperStart--base"
@@ -5152,31 +5300,39 @@
 				{
 					"$ref": "#/$defs/has--mCanStack"
 				},
+				{
+					"$ref": "#/$defs/has--mNumCyclesForProductivity"
+				},
 				{
 					"$ref": "#/$defs/has--mStackHeight"
+				},
+				{
+					"$ref": "#/$defs/has--mUseStaticHeight"
 				}
 			]
 		},
 		"FGPipeHyperStart--base": {
 			"allOf": [
 				{
-					"$ref": "#/$defs/FGBuildable--pole--with-length-and-power--base"
+					"$ref": "#/$defs/FGBuildable--powered--pre-1.0"
 				},
 				{
-					"$ref": "#/$defs/FGPipeHyperStart--base--base"
-				}
-			]
-		},
-		"FGPipeHyperStart--base--base": {
-			"allOf": [
+					"$ref": "#/$defs/FGBuildable--powered--version-specific"
+				},
 				{
-					"$ref": "#/$defs/FGBuildable--pole--with-length-and-power--base--base"
+					"$ref": "#/$defs/FGBuildable--with--mLength"
 				},
 				{
 					"$ref": "#/$defs/FGPipeHyperStart--base--base--base"
 				},
 				{
 					"$ref": "#/$defs/FGPipeHyperStart--pre-update8"
+				},
+				{
+					"$ref": "#/$defs/has--mNumCyclesForProductivity"
+				},
+				{
+					"$ref": "#/$defs/has--mUseStaticHeight"
 				}
 			]
 		},
@@ -5231,8 +5387,21 @@
 				}
 			}
 		},
+		"FGPoleDescriptor": {
+			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGPoleDescriptor"
+				},
+				{
+					"$ref": "#/$defs/FGDescriptor--BuildMenu"
+				}
+			]
+		},
 		"FGPortableMinerDispenser": {
 			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGPortableMinerDispenser"
+				},
 				{
 					"$ref": "#/$defs/FGEquipment--dispenser"
 				},
@@ -5253,32 +5422,30 @@
 		"FGRecipe": {
 			"allOf": [
 				{
-					"$ref": "#/$defs/FGRecipe--base--version-specific"
+					"$ref": "docs.json.ts--common--classes#/$defs/FGRecipe"
+				},
+				{
+					"$ref": "#/$defs/FGRecipe--pre-update4"
 				},
 				{
-					"$ref": "#/$defs/FGRecipe--mProducedIn"
+					"$ref": "#/$defs/FGRecipe--pre-update5"
+				},
+				{
+					"$ref": "#/$defs/FGRecipe--version-specific"
 				}
 			]
 		},
-		"FGRecipe--base": {
+		"FGRecipe--pre-update4": {
 			"type": "object",
-			"$ref": "#/$defs/instructive",
-			"required": [
-				"mManufactoringDuration",
-				"mManualManufacturingMultiplier"
-			],
+			"required": ["mProducedIn"],
 			"properties": {
-				"mManufactoringDuration": {
-					"$ref": "docs.json.ts--common--types#/$defs/decimal_string"
-				},
-				"mManualManufacturingMultiplier": {
-					"$ref": "docs.json.ts--common--types#/$defs/decimal_string"
+				"mProducedIn": {
+					"$ref": "docs.json.ts--0.3.7.7--properties#/$defs/mProducedIn"
 				}
 			}
 		},
-		"FGRecipe--base--version-specific": {
+		"FGRecipe--pre-update5": {
 			"type": "object",
-			"$ref": "#/$defs/FGRecipe--base",
 			"required": ["mIngredients", "mProduct"],
 			"properties": {
 				"mIngredients": {
@@ -5289,18 +5456,26 @@
 				}
 			}
 		},
-		"FGRecipe--mProducedIn": {
+		"FGRecipe--version-specific": {
 			"type": "object",
-			"$ref": "#/$defs/instructive",
-			"required": ["mProducedIn"],
+			"required": [
+				"mManufactoringDuration",
+				"mManualManufacturingMultiplier"
+			],
 			"properties": {
-				"mProducedIn": {
-					"$ref": "docs.json.ts--0.3.7.7--properties#/$defs/mProducedIn"
+				"mManufactoringDuration": {
+					"$ref": "docs.json.ts--common--types#/$defs/decimal_string"
+				},
+				"mManualManufacturingMultiplier": {
+					"$ref": "docs.json.ts--common--types#/$defs/decimal_string"
 				}
 			}
 		},
 		"FGResourceDescriptor": {
 			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGResourceDescriptor"
+				},
 				{
 					"$ref": "#/$defs/FGDescriptor--sinkable"
 				},
@@ -5351,6 +5526,9 @@
 				{
 					"$ref": "docs.json.ts--0.3.7.7--classes--base.overridable#/$defs/FGSchematic--version-specific"
 				},
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGSchematic"
+				},
 				{
 					"$ref": "#/$defs/FGSchematic--pre-1.0"
 				},
@@ -5359,9 +5537,6 @@
 				},
 				{
 					"$ref": "#/$defs/FGSchematic--pre-update6"
-				},
-				{
-					"$ref": "#/$defs/instructive"
 				}
 			]
 		},
@@ -5602,8 +5777,20 @@
 			}
 		},
 		"FGSnowballWeapon": {
+			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGSnowballWeapon"
+				},
+				{
+					"$ref": "#/$defs/FGSnowballWeapon--version-specific"
+				},
+				{
+					"$ref": "#/$defs/FGWeaponProjectile--thrown"
+				}
+			]
+		},
+		"FGSnowballWeapon--version-specific": {
 			"type": "object",
-			"$ref": "#/$defs/FGWeaponProjectile--thrown",
 			"required": ["mArmAnimation"],
 			"properties": {
 				"mArmAnimation": {
@@ -5617,9 +5804,15 @@
 				{
 					"$ref": "docs.json.ts--0.3.7.7--classes--base.overridable#/$defs/FGSuitBase--pre-1.0"
 				},
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGSuitBase"
+				},
 				{
 					"$ref": "#/$defs/FGEquipment"
 				},
+				{
+					"$ref": "#/$defs/FGEquipment--base"
+				},
 				{
 					"$ref": "#/$defs/FGEquipment--has--mFilterDuration"
 				},
@@ -5647,8 +5840,43 @@
 				}
 			}
 		},
-		"FGWeaponInstantFire": {
+		"FGVehicleDescriptor": {
+			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGVehicleDescriptor"
+				},
+				{
+					"$ref": "#/$defs/FGDescriptor--BuildMenu"
+				}
+			]
+		},
+		"FGWeapon--Equip_RebarGun_Projectile_C": {
+			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGWeapon--Equip_RebarGun_Projectile_C"
+				},
+				{
+					"$ref": "#/$defs/FGWeaponProjectile"
+				},
+				{
+					"$ref": "#/$defs/FGWeaponProjectile--base"
+				},
+				{
+					"$ref": "#/$defs/FGWeaponProjectile--has--mAttachSocket"
+				},
+				{
+					"$ref": "#/$defs/FGWeaponProjectileFire--base--random"
+				},
+				{
+					"$ref": "#/$defs/FGWeaponProjectileFire--base--version-specific"
+				}
+			]
+		},
+		"FGWeapon--Equip_Rifle_C": {
 			"allOf": [
+				{
+					"$ref": "docs.json.ts--common--classes#/$defs/FGWeapon--Equip_Rifle_C"
+				},
 				{
 					"$ref": "#/$defs/FGWeaponInstantFire--base"
 				},
@@ -5675,7 +5903,6 @@
 		},
 		"FGWeaponInstantFire--base--base--base": {
 			"type": "object",
-			"$ref": "#/$defs/FGWeaponProjectile--has--mAttachSocket",
 			"required": ["Fire", "mHasReloadedOnce", "mArmAnimation"],
 			"properties": {
 				"Fire": {
@@ -5701,6 +5928,9 @@
 		},
 		"FGWeaponProjectile": {
 			"allOf": [
+				{
+					"$ref": "#/$defs/FGEquipment"
+				},
 				{
 					"$ref": "#/$defs/FGWeaponProjectile--base"
 				},
@@ -5755,7 +5985,6 @@
 		},
 		"FGWeaponProjectile--base--version-specific": {
 			"type": "object",
-			"$ref": "#/$defs/FGEquipment",
 			"required": ["mMagSize", "mCurrentAmmo"],
 			"properties": {
 				"mMagSize": {
@@ -5781,6 +6010,9 @@
 				{
 					"$ref": "#/$defs/FGWeaponProjectile"
 				},
+				{
+					"$ref": "#/$defs/FGWeaponProjectile--base"
+				},
 				{
 					"$ref": "#/$defs/FGWeaponProjectile--instant--base"
 				},
@@ -5801,7 +6033,6 @@
 		},
 		"FGWeaponProjectile--instant--base--version-specific": {
 			"type": "object",
-			"$ref": "#/$defs/FGWeaponProjectile--base",
 			"required": ["mInstantHitDamage", "mWeaponTraceLength"],
 			"properties": {
 				"mInstantHitDamage": {
@@ -5819,12 +6050,17 @@
 				},
 				{
 					"$ref": "#/$defs/FGWeaponProjectile--thrown--base"
+				},
+				{
+					"$ref": "#/$defs/FGWeaponProjectile--thrown--base--base"
+				},
+				{
+					"$ref": "#/$defs/FGWeaponProjectile--thrown--base--pre-1.0"
 				}
 			]
 		},
 		"FGWeaponProjectile--thrown--base": {
 			"type": "object",
-			"$ref": "#/$defs/FGWeaponProjectile--thrown--base--base",
 			"required": [
 				"mExplosiveData",
 				"mDispensedExplosives",
@@ -5899,7 +6135,6 @@
 		},
 		"FGWeaponProjectile--thrown--base--base": {
 			"type": "object",
-			"$ref": "#/$defs/FGWeaponProjectile--thrown--base--pre-1.0",
 			"required": ["mIsPendingExecuteFire"],
 			"properties": {
 				"mIsPendingExecuteFire": {
@@ -5922,25 +6157,6 @@
 				}
 			}
 		},
-		"FGWeaponProjectileFire": {
-			"allOf": [
-				{
-					"$ref": "#/$defs/FGWeaponProjectile"
-				},
-				{
-					"$ref": "#/$defs/FGWeaponProjectile--base"
-				},
-				{
-					"$ref": "#/$defs/FGWeaponProjectile--has--mAttachSocket"
-				},
-				{
-					"$ref": "#/$defs/FGWeaponProjectileFire--base--random"
-				},
-				{
-					"$ref": "#/$defs/FGWeaponProjectileFire--base--version-specific"
-				}
-			]
-		},
 		"FGWeaponProjectileFire--base--random": {
 			"allOf": [
 				{