@satisfactory-dev/docs.json.ts 0.12.2 → 0.13.1

package/types-progress--update8.md

@@ -1,6 +1,6 @@
 # Types Progress
 
-100.00% Complete (221 of 221)
+100.00% Complete (508 of 508)
 
 ## Basic Types
 
@@ -13,59 +13,190 @@
 -   [x] color-decimal (common type)
 -   [x] decimal-string (common type)
 -   [x] decimal-string--signed (common type)
--   [x] EditorCurveData
 -   [x] empty-object (common type)
 -   [x] FGBuildingDescriptor
--   [x] FGChainsaw
--   [x] FGChargedWeapon
--   [x] FGGasMask
--   [x] FGGolfCartDispenser
--   [x] FGHoverPack
--   [x] FGJetPack
--   [x] FGJumpingStilts
--   [x] FGObjectScanner
--   [x] FGParachute
--   [x] FGPipeHyperStart
--   [x] FGPoleDescriptor
--   [x] FGPortableMinerDispenser
--   [x] FGRecipe
--   [x] FGResourceDescriptor
--   [x] FGSuitBase
 -   [x] integer-string (common type)
 -   [x] integer-string--signed (common type)
 -   [x] mAspect (common type)
--   [x] MaterialSlotName
 -   [x] mBatteryStatus (common type)
--   [x] mChainsawState
 -   [x] mDamageTypes (common type)
--   [x] mDisableSnapOn
 -   [x] mDockingRuleSet (common type)
 -   [x] mForm (common type)
--   [x] mLightControlData
 -   [x] mOutputInventoryHandlerData
 -   [x] mPlatformDockingStatus (common type)
--   [x] mSnappedPassthroughs
 -   [x] NativeClass (common type)
 -   [x] None (common type)
 -   [x] Texture2D (common type)
 -   [x] transformation (common type)
--   [x] weaponState
 -   [x] xyz-array (common type)
 
 ## common-base
 
+-   [x] common-base--EditorCurveData (common type)
+-   [x] common-base--FGAmmoTypeInstantHit--base (common type)
+-   [x] common-base--FGAmmoTypeInstantHit--chaos (common type)
+-   [x] common-base--FGAmmoTypeInstantHit--standard (common type)
+-   [x] common-base--FGAmmoTypeProjectile (common type)
+-   [x] common-base--FGAmmoTypeProjectile--base (common type)
+-   [x] common-base--FGAmmoTypeSpreadshot (common type)
 -   [x] common-base--FGBuildable--base (common type)
+-   [x] common-base--FGBuildable--circuits-base (common type)
+-   [x] common-base--FGBuildable--consumes-power-base (common type)
+-   [x] common-base--FGBuildable--docking-station-base (common type)
+-   [x] common-base--FGBuildable--extractor-base (common type)
+-   [x] common-base--FGBuildable--extractor-base--shared (common type)
+-   [x] common-base--FGBuildable--occupied (common type)
+-   [x] common-base--FGBuildable--pipeline-accessory (common type)
+-   [x] common-base--FGBuildable--pipeline-accessory--base (common type)
+-   [x] common-base--FGBuildable--pipeline-flow-accessory (common type)
+-   [x] common-base--FGBuildable--pole--base--no-static (common type)
+-   [x] common-base--FGBuildable--pole--base--with-static (common type)
+-   [x] common-base--FGBuildable--power-switch--base (common type)
+-   [x] common-base--FGBuildable--splitter--base (common type)
+-   [x] common-base--FGBuildable--tiered (common type)
+-   [x] common-base--FGBuildableAttachmentMerger (common type)
+-   [x] common-base--FGBuildableAttachmentSplitter (common type)
+-   [x] common-base--FGBuildableBeamLightweight (common type)
+-   [x] common-base--FGBuildableBlueprintDesigner (common type)
+-   [x] common-base--FGBuildableCircuitSwitch (common type)
+-   [x] common-base--FGBuildableConveyorBelt (common type)
+-   [x] common-base--FGBuildableConveyorBelt--base (common type)
+-   [x] common-base--FGBuildableConveyorLift (common type)
+-   [x] common-base--FGBuildableCornerWall (common type)
+-   [x] common-base--FGBuildableDockingStation (common type)
+-   [x] common-base--FGBuildableDoor (common type)
+-   [x] common-base--FGBuildableDoor--automated (common type)
+-   [x] common-base--FGBuildableDoor--base (common type)
+-   [x] common-base--FGBuildableDroneStation (common type)
+-   [x] common-base--FGBuildableFactory--generic (common type)
+-   [x] common-base--FGBuildableFactory--jump-pad (common type)
+-   [x] common-base--FGBuildableFactory--landing-pad (common type)
+-   [x] common-base--FGBuildableFactoryBuilding (common type)
+-   [x] common-base--FGBuildableFactorySimpleProducer (common type)
+-   [x] common-base--FGBuildableFloodlight (common type)
+-   [x] common-base--FGBuildableFoundation (common type)
+-   [x] common-base--FGBuildableFoundation--base (common type)
+-   [x] common-base--FGBuildableFrackingActivator (common type)
+-   [x] common-base--FGBuildableFrackingExtractor (common type)
+-   [x] common-base--FGBuildableGenerator--base (common type)
+-   [x] common-base--FGBuildableGeneratorFuel--base (common type)
+-   [x] common-base--FGBuildableGeneratorFuel--biogen (common type)
+-   [x] common-base--FGBuildableGeneratorFuel--liquid (common type)
+-   [x] common-base--FGBuildableGeneratorFuel--solid (common type)
+-   [x] common-base--FGBuildableGeneratorGeoThermal (common type)
+-   [x] common-base--FGBuildableGeneratorNuclear (common type)
+-   [x] common-base--FGBuildableGeneratorNuclear--mFuel--base (common type)
+-   [x] common-base--FGBuildableGeneratorNuclear--mFuel--NuclearFuelRod (common type)
+-   [x] common-base--FGBuildableGeneratorNuclear--mFuel--PlutoniumFuelRod (common type)
+-   [x] common-base--FGBuildableJumppad (common type)
+-   [x] common-base--FGBuildableLadder (common type)
+-   [x] common-base--FGBuildableLightsControlPanel (common type)
+-   [x] common-base--FGBuildableLightSource (common type)
+-   [x] common-base--FGBuildableLightSource--base (common type)
+-   [x] common-base--FGBuildableMAM (common type)
+-   [x] common-base--FGBuildableManufacturer (common type)
+-   [x] common-base--FGBuildableManufacturer--base (common type)
+-   [x] common-base--FGBuildableManufacturer--blender (common type)
+-   [x] common-base--FGBuildableManufacturer--constructor (common type)
+-   [x] common-base--FGBuildableManufacturer--packager (common type)
+-   [x] common-base--FGBuildableManufacturer--smelter (common type)
+-   [x] common-base--FGBuildableManufacturerVariablePower--base (common type)
+-   [x] common-base--FGBuildableManufacturerVariablePower--HadronCollider (common type)
+-   [x] common-base--FGBuildablePassthrough (common type)
+-   [x] common-base--FGBuildablePillarLightweight (common type)
+-   [x] common-base--FGBuildablePipeHyper (common type)
+-   [x] common-base--FGBuildablePipeline (common type)
+-   [x] common-base--FGBuildablePipelineJunction (common type)
+-   [x] common-base--FGBuildablePipelinePump (common type)
+-   [x] common-base--FGBuildablePipelinePump--valve (common type)
+-   [x] common-base--FGBuildablePipeReservoir (common type)
+-   [x] common-base--FGBuildablePoleLightweight (common type)
+-   [x] common-base--FGBuildablePowerPole (common type)
+-   [x] common-base--FGBuildablePowerStorage (common type)
+-   [x] common-base--FGBuildablePriorityPowerSwitch (common type)
+-   [x] common-base--FGBuildableRadarTower (common type)
+-   [x] common-base--FGBuildableRailroadSignal (common type)
+-   [x] common-base--FGBuildableRailroadStation (common type)
+-   [x] common-base--FGBuildableRailroadTrack (common type)
+-   [x] common-base--FGBuildableRamp (common type)
+-   [x] common-base--FGBuildableResourceExtractor--miner (common type)
+-   [x] common-base--FGBuildableResourceExtractor--miner--base (common type)
+-   [x] common-base--FGBuildableResourceExtractor--miner-mk3 (common type)
+-   [x] common-base--FGBuildableResourceExtractor--oil-extractor (common type)
+-   [x] common-base--FGBuildableResourceSink (common type)
+-   [x] common-base--FGBuildableResourceSinkShop (common type)
+-   [x] common-base--FGBuildableSnowDispenser (common type)
+-   [x] common-base--FGBuildableSpaceElevator (common type)
+-   [x] common-base--FGBuildableSplitterSmart (common type)
+-   [x] common-base--FGBuildableStorage (common type)
+-   [x] common-base--FGBuildableTradingPost (common type)
+-   [x] common-base--FGBuildableTrainPlatform--base (common type)
+-   [x] common-base--FGBuildableTrainPlatformCargo (common type)
+-   [x] common-base--FGBuildableTrainPlatformCargo--FGBuildableRailroadStation (common type)
+-   [x] common-base--FGBuildableWalkway (common type)
+-   [x] common-base--FGBuildableWalkway--base (common type)
+-   [x] common-base--FGBuildableWalkwayLightweight (common type)
+-   [x] common-base--FGBuildableWall--base (common type)
+-   [x] common-base--FGBuildableWall--base--rectangle (common type)
+-   [x] common-base--FGBuildableWaterPump (common type)
+-   [x] common-base--FGBuildableWidgetSign (common type)
+-   [x] common-base--FGBuildableWire (common type)
+-   [x] common-base--FGBuildingDescriptor (common type)
 -   [x] common-base--FGBuildingDescriptor--ClassName (common type)
 -   [x] common-base--FGBuildingDescriptor--mForm (common type)
 -   [x] common-base--FGBuildingDescriptor--mSubCategories (common type)
+-   [x] common-base--FGChainsaw (common type)
+-   [x] common-base--FGChargedWeapon (common type)
+-   [x] common-base--FGConsumableDescriptor (common type)
+-   [x] common-base--FGConsumableDescriptor--base (common type)
+-   [x] common-base--FGConsumableDescriptor--healing (common type)
 -   [x] common-base--FGCustomizationRecipe--FGRecipe (common type)
 -   [x] common-base--FGEquipment--base (common type)
+-   [x] common-base--FGEquipment--placeable (common type)
+-   [x] common-base--FGEquipmentDescriptor (common type)
+-   [x] common-base--FGEquipmentDescriptor--base (common type)
+-   [x] common-base--FGEquipmentStunSpear (common type)
+-   [x] common-base--FGEquipmentStunSpear--base (common type)
+-   [x] common-base--FGEquipmentStunSpear--xeno-zapper (common type)
+-   [x] common-base--FGEquipmentZipline (common type)
+-   [x] common-base--FGGasMask (common type)
+-   [x] common-base--FGGolfCartDispenser (common type)
+-   [x] common-base--FGHoverPack (common type)
 -   [x] common-base--FGItemDescriptor--FGBuildingDescriptor--FGResourceDescriptor (common type)
+-   [x] common-base--FGItemDescriptor--FGResourceDescriptor (common type)
+-   [x] common-base--FGItemDescriptor--FGResourceDescriptor--FGPoleDescriptor (common type)
 -   [x] common-base--FGItemDescriptor--FGResourceDescriptor--FGPoleDescriptor--mSubCategories (common type)
+-   [x] common-base--FGItemDescriptorBiomass (common type)
+-   [x] common-base--FGItemDescriptorNuclearFuel (common type)
+-   [x] common-base--FGItemDescriptorNuclearFuel--waste (common type)
+-   [x] common-base--FGJetPack (common type)
+-   [x] common-base--FGJumpingStilts (common type)
+-   [x] common-base--FGObjectScanner (common type)
+-   [x] common-base--FGParachute (common type)
+-   [x] common-base--FGPipeHyperStart (common type)
+-   [x] common-base--FGPoleDescriptor (common type)
+-   [x] common-base--FGPortableMinerDispenser (common type)
+-   [x] common-base--FGRecipe (common type)
+-   [x] common-base--FGResourceDescriptor (common type)
 -   [x] common-base--FGSchematic--base (common type)
 -   [x] common-base--FGSchematic--base--mSchematicDependencies--mGamePhase (common type)
 -   [x] common-base--FGSchematic--base--mSchematicDependencies--mRequireAllSchematicsToBePurchased (common type)
 -   [x] common-base--FGSchematic--mUnlocks (common type)
+-   [x] common-base--FGSchematic--mUnlocks_Class (common type)
+-   [x] common-base--FGSchematic--with-unlocks (common type)
+-   [x] common-base--FGSuitBase (common type)
+-   [x] common-base--FGVehicleDescriptor--fueled-with-inventory (common type)
+-   [x] common-base--FGVehicleDescriptor--powered-no-inventory (common type)
+-   [x] common-base--FGVehicleDescriptor--with-inventory (common type)
+-   [x] common-base--FGWeapon--base (common type)
+-   [x] common-base--FGWeapon--gun-base (common type)
+-   [x] common-base--FGWeapon--rebar-gun (common type)
+-   [x] common-base--FGWeapon--rifle (common type)
+-   [x] common-base--mChainsawState (common type)
+-   [x] common-base--mDisableSnapOn (common type)
+-   [x] common-base--mLightControlData (common type)
+-   [x] common-base--mSnappedPassthroughs (common type)
+-   [x] common-base--weaponState (common type)
 
 ## FGAmmoType
 
@@ -76,6 +207,21 @@
 -   [x] FGAmmoTypeProjectile
 -   [x] FGAmmoTypeProjectile--base
 
+## FGAmmoTypeInstantHit
+
+-   [x] FGAmmoTypeInstantHit--base--merged
+-   [x] FGAmmoTypeInstantHit--chaos--merged
+-   [x] FGAmmoTypeInstantHit--standard--merged
+
+## FGAmmoTypeProjectile
+
+-   [x] FGAmmoTypeProjectile--base--merged
+-   [x] FGAmmoTypeProjectile--merged
+
+## FGAmmoTypeSpreadshot
+
+-   [x] FGAmmoTypeSpreadshot--merged
+
 ## FGBuildable
 
 -   [x] FGBuildableAttachmentMerger
@@ -140,94 +286,341 @@
 -   [x] FGBuildableWire
 -   [x] FGBuildable--base
 -   [x] FGBuildable--circuits-base
+-   [x] FGBuildable--circuits-base--merged
 -   [x] FGBuildable--consumes-power-base
+-   [x] FGBuildable--consumes-power-base--update8
 -   [x] FGBuildable--docking-station-base
 -   [x] FGBuildable--extractor-base
+-   [x] FGBuildable--extractor-base--merged
 -   [x] FGBuildable--extractor-base--shared
+-   [x] FGBuildable--extractor-base--shared--merged
 -   [x] FGBuildable--occupied
+-   [x] FGBuildable--occupied--merged
 -   [x] FGBuildable--pipeline-accessory
 -   [x] FGBuildable--pipeline-accessory--base
 -   [x] FGBuildable--pipeline-flow-accessory
--   [x] FGBuildable--pole--base
+-   [x] FGBuildable--pole--base--no-static--merged
+-   [x] FGBuildable--pole--base--with-static--merged
 -   [x] FGBuildable--power-switch--base
+-   [x] FGBuildable--power-switch--base--merged
 -   [x] FGBuildable--splitter--base
+-   [x] FGBuildable--splitter--base--merged
 -   [x] FGBuildable--tiered
+-   [x] FGBuildable--tiered--merged
+
+## FGBuildableAttachmentMerger
+
+-   [x] FGBuildableAttachmentMerger--merged
+
+## FGBuildableAttachmentSplitter
+
+-   [x] FGBuildableAttachmentSplitter--merged
+
+## FGBuildableBeamLightweight
+
+-   [x] FGBuildableBeamLightweight--merged
+
+## FGBuildableBlueprintDesigner
+
+-   [x] FGBuildableBlueprintDesigner--merged
+
+## FGBuildableCircuitSwitch
+
+-   [x] FGBuildableCircuitSwitch--merged
 
 ## FGBuildableConveyorBelt
 
 -   [x] FGBuildableConveyorBelt--base
+-   [x] FGBuildableConveyorBelt--base--merged
+-   [x] FGBuildableConveyorBelt--merged
+
+## FGBuildableConveyorLift
+
+-   [x] FGBuildableConveyorLift--merged
+
+## FGBuildableCornerWall
+
+-   [x] FGBuildableCornerWall--merged
+
+## FGBuildableDockingStation
+
+-   [x] FGBuildableDockingStation--merged
 
 ## FGBuildableDoor
 
 -   [x] FGBuildableDoor--automated
+-   [x] FGBuildableDoor--automated--merged
 -   [x] FGBuildableDoor--base
+-   [x] FGBuildableDoor--merged
+
+## FGBuildableDroneStation
+
+-   [x] FGBuildableDroneStation--merged
+-   [x] FGBuildableDroneStation--update8
 
 ## FGBuildableFactory
 
 -   [x] FGBuildableFactory--generic
+-   [x] FGBuildableFactory--generic--merged
 -   [x] FGBuildableFactory--jump-pad
+-   [x] FGBuildableFactory--jump-pad--merged
 -   [x] FGBuildableFactory--landing-pad
+-   [x] FGBuildableFactory--landing-pad--merged
+
+## FGBuildableFactoryBuilding
+
+-   [x] FGBuildableFactoryBuilding--merged
+
+## FGBuildableFactorySimpleProducer
+
+-   [x] FGBuildableFactorySimpleProducer--merged
+
+## FGBuildableFloodlight
+
+-   [x] FGBuildableFloodlight--merged
 
 ## FGBuildableFoundation
 
 -   [x] FGBuildableFoundation--base
+-   [x] FGBuildableFoundation--base--merged
+-   [x] FGBuildableFoundation--merged
+
+## FGBuildableFrackingActivator
+
+-   [x] FGBuildableFrackingActivator--merged
+
+## FGBuildableFrackingExtractor
+
+-   [x] FGBuildableFrackingExtractor--merged
 
 ## FGBuildableGenerator
 
 -   [x] FGBuildableGenerator--base
+-   [x] FGBuildableGenerator--base--merged
 
 ## FGBuildableGeneratorFuel
 
 -   [x] FGBuildableGeneratorFuel--base
+-   [x] FGBuildableGeneratorFuel--base--merged
 -   [x] FGBuildableGeneratorFuel--biogen
+-   [x] FGBuildableGeneratorFuel--biogen--merged
 -   [x] FGBuildableGeneratorFuel--liquid
+-   [x] FGBuildableGeneratorFuel--liquid--merged
 -   [x] FGBuildableGeneratorFuel--solid
+-   [x] FGBuildableGeneratorFuel--solid--merged
+
+## FGBuildableGeneratorGeoThermal
+
+-   [x] FGBuildableGeneratorGeoThermal--merged
+
+## FGBuildableGeneratorNuclear
+
+-   [x] FGBuildableGeneratorNuclear--merged
+
+## FGBuildableJumppad
+
+-   [x] FGBuildableJumppad--merged
+
+## FGBuildableLadder
+
+-   [x] FGBuildableLadder--merged
+
+## FGBuildableLightsControlPanel
+
+-   [x] FGBuildableLightsControlPanel--merged
 
 ## FGBuildableLightSource
 
 -   [x] FGBuildableLightSource--base
+-   [x] FGBuildableLightSource--base--merged
+-   [x] FGBuildableLightSource--merged
+
+## FGBuildableMAM
+
+-   [x] FGBuildableMAM--merged
 
 ## FGBuildableManufacturer
 
 -   [x] FGBuildableManufacturer--base
+-   [x] FGBuildableManufacturer--base--merged
 -   [x] FGBuildableManufacturer--blender
+-   [x] FGBuildableManufacturer--blender--merged
 -   [x] FGBuildableManufacturer--constructor
+-   [x] FGBuildableManufacturer--constructor--merged
+-   [x] FGBuildableManufacturer--merged
 -   [x] FGBuildableManufacturer--packager
+-   [x] FGBuildableManufacturer--packager--merged
 -   [x] FGBuildableManufacturer--smelter
+-   [x] FGBuildableManufacturer--smelter--merged
+
+## FGBuildableManufacturerVariablePower
+
+-   [x] FGBuildableManufacturerVariablePower--base
+-   [x] FGBuildableManufacturerVariablePower--base--merged
+-   [x] FGBuildableManufacturerVariablePower--HadronCollider--merged
+
+## FGBuildablePassthrough
+
+-   [x] FGBuildablePassthrough--merged
+
+## FGBuildablePillarLightweight
+
+-   [x] FGBuildablePillarLightweight--merged
+
+## FGBuildablePipeHyper
+
+-   [x] FGBuildablePipeHyper--merged
+
+## FGBuildablePipeline
+
+-   [x] FGBuildablePipeline--merged
+
+## FGBuildablePipelineJunction
+
+-   [x] FGBuildablePipelineJunction--merged
 
 ## FGBuildablePipelinePump
 
+-   [x] FGBuildablePipelinePump--merged
 -   [x] FGBuildablePipelinePump--valve
+-   [x] FGBuildablePipelinePump--valve--merged
+
+## FGBuildablePipeReservoir
+
+-   [x] FGBuildablePipeReservoir--merged
+
+## FGBuildablePoleLightweight
+
+-   [x] FGBuildablePoleLightweight--merged
+
+## FGBuildablePowerPole
+
+-   [x] FGBuildablePowerPole--merged
+
+## FGBuildablePowerStorage
+
+-   [x] FGBuildablePowerStorage--merged
+
+## FGBuildablePriorityPowerSwitch
+
+-   [x] FGBuildablePriorityPowerSwitch--merged
+
+## FGBuildableRadarTower
+
+-   [x] FGBuildableRadarTower--merged
+
+## FGBuildableRailroadSignal
+
+-   [x] FGBuildableRailroadSignal--merged
+
+## FGBuildableRailroadStation
+
+-   [x] FGBuildableRailroadStation--merged
+
+## FGBuildableRailroadTrack
+
+-   [x] FGBuildableRailroadTrack--merged
+
+## FGBuildableRamp
+
+-   [x] FGBuildableRamp--merged
 
 ## FGBuildableResourceExtractor
 
 -   [x] FGBuildableResourceExtractor--miner
 -   [x] FGBuildableResourceExtractor--miner--base
+-   [x] FGBuildableResourceExtractor--miner--base--merged
+-   [x] FGBuildableResourceExtractor--miner--merged
 -   [x] FGBuildableResourceExtractor--miner-mk3
+-   [x] FGBuildableResourceExtractor--miner-mk3--merged
 -   [x] FGBuildableResourceExtractor--oil-extractor
+-   [x] FGBuildableResourceExtractor--oil-extractor--merged
+
+## FGBuildableResourceSink
+
+-   [x] FGBuildableResourceSink--merged
+
+## FGBuildableResourceSinkShop
+
+-   [x] FGBuildableResourceSinkShop--merged
+
+## FGBuildableSnowDispenser
+
+-   [x] FGBuildableSnowDispenser--merged
+
+## FGBuildableSpaceElevator
+
+-   [x] FGBuildableSpaceElevator--merged
+
+## FGBuildableSplitterSmart
+
+-   [x] FGBuildableSplitterSmart--merged
+
+## FGBuildableStorage
+
+-   [x] FGBuildableStorage--merged
+
+## FGBuildableTradingPost
+
+-   [x] FGBuildableTradingPost--merged
+-   [x] FGBuildableTradingPost--update8
 
 ## FGBuildableTrainPlatform
 
 -   [x] FGBuildableTrainPlatform--base
+-   [x] FGBuildableTrainPlatform--base--merged
 
 ## FGBuildableTrainPlatformCargo
 
 -   [x] FGBuildableTrainPlatformCargo--FGBuildableRailroadStation
+-   [x] FGBuildableTrainPlatformCargo--FGBuildableRailroadStation--merged
+-   [x] FGBuildableTrainPlatformCargo--merged
 
 ## FGBuildableWalkway
 
 -   [x] FGBuildableWalkway--base
+-   [x] FGBuildableWalkway--base--merged
+-   [x] FGBuildableWalkway--merged
+
+## FGBuildableWalkwayLightweight
+
+-   [x] FGBuildableWalkwayLightweight--merged
 
 ## FGBuildableWall
 
 -   [x] FGBuildableWall--base
 -   [x] FGBuildableWall--base--rectangle
 
+## FGBuildableWaterPump
+
+-   [x] FGBuildableWaterPump--merged
+
+## FGBuildableWidgetSign
+
+-   [x] FGBuildableWidgetSign--merged
+
+## FGBuildableWire
+
+-   [x] FGBuildableWire--merged
+
+## FGChainsaw
+
+-   [x] FGChainsaw
+-   [x] FGChainsaw--merged
+
+## FGChargedWeapon
+
+-   [x] FGChargedWeapon
+-   [x] FGChargedWeapon--merged
+
 ## FGConsumableDescriptor
 
 -   [x] FGConsumableDescriptor
 -   [x] FGConsumableDescriptor--base
+-   [x] FGConsumableDescriptor--base--merged
 -   [x] FGConsumableDescriptor--healing
+-   [x] FGConsumableDescriptor--healing--base
+-   [x] FGConsumableDescriptor--merged
 
 ## FGCustomizationRecipe
 
@@ -240,12 +633,40 @@
 -   [x] FGEquipmentZipline
 -   [x] FGEquipment--base
 -   [x] FGEquipment--placeable
+-   [x] FGEquipment--placeable--merged
 -   [x] FGEquipmentDescriptor--base
 
+## FGEquipmentDescriptor
+
+-   [x] FGEquipmentDescriptor--base--merged
+-   [x] FGEquipmentDescriptor--merged
+
 ## FGEquipmentStunSpear
 
 -   [x] FGEquipmentStunSpear--base
+-   [x] FGEquipmentStunSpear--base--merged
+-   [x] FGEquipmentStunSpear--merged
 -   [x] FGEquipmentStunSpear--xeno-zapper
+-   [x] FGEquipmentStunSpear--xeno-zapper--merged
+
+## FGEquipmentZipline
+
+-   [x] FGEquipmentZipline--merged
+
+## FGGasMask
+
+-   [x] FGGasMask
+-   [x] FGGasMask--merged
+
+## FGGolfCartDispenser
+
+-   [x] FGGolfCartDispenser
+-   [x] FGGolfCartDispenser--merged
+
+## FGHoverPack
+
+-   [x] FGHoverPack
+-   [x] FGHoverPack--merged
 
 ## FGItemDescriptor
 
@@ -255,6 +676,59 @@
 -   [x] FGItemDescriptor--FGResourceDescriptor
 -   [x] FGItemDescriptor--FGResourceDescriptor--FGPoleDescriptor
 
+## FGItemDescriptorBiomass
+
+-   [x] FGItemDescriptorBiomass--merged
+
+## FGItemDescriptorNuclearFuel
+
+-   [x] FGItemDescriptorNuclearFuel--merged
+
+## FGJetPack
+
+-   [x] FGJetPack
+-   [x] FGJetPack--merged
+
+## FGJumpingStilts
+
+-   [x] FGJumpingStilts
+-   [x] FGJumpingStilts--merged
+
+## FGObjectScanner
+
+-   [x] FGObjectScanner
+-   [x] FGObjectScanner--merged
+
+## FGParachute
+
+-   [x] FGParachute
+-   [x] FGParachute--merged
+
+## FGPipeHyperStart
+
+-   [x] FGPipeHyperStart
+-   [x] FGPipeHyperStart--merged
+
+## FGPoleDescriptor
+
+-   [x] FGPoleDescriptor
+-   [x] FGPoleDescriptor--merged
+
+## FGPortableMinerDispenser
+
+-   [x] FGPortableMinerDispenser
+-   [x] FGPortableMinerDispenser--merged
+
+## FGRecipe
+
+-   [x] FGRecipe
+-   [x] FGRecipe--merged
+
+## FGResourceDescriptor
+
+-   [x] FGResourceDescriptor
+-   [x] FGResourceDescriptor--merged
+
 ## FGSchematic
 
 -   [x] FGSchematic
@@ -270,19 +744,33 @@
 -   [x] FGSchematic--mUnlocks_mTapeUnlocks (common type)
 -   [x] FGSchematic--mUnlocks_resources_to_scan (common type)
 -   [x] FGSchematic--with-unlocks
+-   [x] FGSchematic--with-unlocks--merged
+
+## FGSuitBase
+
+-   [x] FGSuitBase
+-   [x] FGSuitBase--merged
 
 ## FGVehicleDescriptor
 
 -   [x] FGVehicleDescriptor--fueled-with-inventory
+-   [x] FGVehicleDescriptor--fueled-with-inventory--merged
 -   [x] FGVehicleDescriptor--powered-no-inventory
+-   [x] FGVehicleDescriptor--powered-no-inventory--merged
 -   [x] FGVehicleDescriptor--unfueled-with-inventory
 -   [x] FGVehicleDescriptor--with-inventory
+-   [x] FGVehicleDescriptor--with-inventory--merged
 
 ## FGWeapon
 
 -   [x] FGWeapon--base
+-   [x] FGWeapon--base--merged
+-   [x] FGWeapon--gun-base
+-   [x] FGWeapon--gun-base--merged
 -   [x] FGWeapon--rebar-gun
+-   [x] FGWeapon--rebar-gun--merged
 -   [x] FGWeapon--rifle
+-   [x] FGWeapon--rifle--merged
 
 ## ItemClass