Merge pull request #50 from hazardousmedic/7302483

Update to 7302483
monkeyman192 · Sep 3, 2021 · bf87d89 · bf87d89
2 parents a952a6a + cb1aea6
commit bf87d89
Show file tree

Hide file tree

Showing 18 changed files with 3 additions and 2 deletions.
diff --git a/data/.version b/data/.version
@@ -1 +1 @@
-7288625
+7302483
diff --git a/data/GCCHARACTERGLOBALS.GLOBAL.MBIN b/data/GCCHARACTERGLOBALS.GLOBAL.MBIN
diff --git a/data/GCGAMEPLAYGLOBALS.GLOBAL.MBIN b/data/GCGAMEPLAYGLOBALS.GLOBAL.MBIN
diff --git a/data/GCSETTLEMENTGLOBALS.MBIN b/data/GCSETTLEMENTGLOBALS.MBIN
diff --git a/data/GCUIGLOBALS.GLOBAL.MBIN b/data/GCUIGLOBALS.GLOBAL.MBIN
diff --git a/data/METADATA/BASEBUILDINGAUTOGENERATEDPARTSDATA.MBIN b/data/METADATA/BASEBUILDINGAUTOGENERATEDPARTSDATA.MBIN
diff --git a/data/METADATA/BASEBUILDINGOBJECTSTABLE.MBIN b/data/METADATA/BASEBUILDINGOBJECTSTABLE.MBIN
diff --git a/data/METADATA/COREMISSIONTABLE.MBIN b/data/METADATA/COREMISSIONTABLE.MBIN
diff --git a/data/METADATA/GCACTIONSETS.MBIN b/data/METADATA/GCACTIONSETS.MBIN
diff --git a/data/METADATA/GCINPUTBINDINGS_WIN_KEYBOARD.MBIN b/data/METADATA/GCINPUTBINDINGS_WIN_KEYBOARD.MBIN
diff --git a/data/METADATA/MISSIONSCHEDULESTABLE.MBIN b/data/METADATA/MISSIONSCHEDULESTABLE.MBIN
diff --git a/data/METADATA/NMS_DIALOG_GCALIENPUZZLETABLE.MBIN b/data/METADATA/NMS_DIALOG_GCALIENPUZZLETABLE.MBIN
diff --git a/data/METADATA/NMS_REALITY_GCPRODUCTTABLE.MBIN b/data/METADATA/NMS_REALITY_GCPRODUCTTABLE.MBIN
diff --git a/data/METADATA/NPCSETTLEMENTBEHAVIOURS.MBIN b/data/METADATA/NPCSETTLEMENTBEHAVIOURS.MBIN
diff --git a/data/METADATA/RECURRINGMISSIONTABLE.MBIN b/data/METADATA/RECURRINGMISSIONTABLE.MBIN
diff --git a/data/METADATA/UNLOCKABLEITEMTREES.MBIN b/data/METADATA/UNLOCKABLEITEMTREES.MBIN
diff --git a/data/MODELS/PLACEMENTDATA.ENTITY.MBIN b/data/MODELS/PLACEMENTDATA.ENTITY.MBIN
diff --git a/data/index.xml b/data/index.xml
@@ -312,6 +312,7 @@
 		<file name="ASTEROIDDESTROY.MBIN" path="MODELS\EFFECTS\EXPLOSION\ASTEROIDDESTROY.MBIN"/>
 		<file name="PLACEMENTDATA.ENTITY.MBIN" path="MODELS\PLANETS\BIOMES\COMMON\BUILDINGS\PARTS\BUILDABLEPARTS\MAINROOMCUBE_PLACEMENT\ENTITIES\PLACEMENTDATA.ENTITY.MBIN"/>
 		<file name="SMOKE_BLACK.MBIN" path="MODELS\EFFECTS\SMOKE\SMOKE_BLACK.MBIN"/>
+		<file name="PLACEMENTDATA.ENTITY.MBIN" path="MODELS\PLANETS\BIOMES\COMMON\BUILDINGS\PARTS\BUILDABLEPARTS\UTILITYPARTS\POWERLINE_PLACEMENT\ENTITIES\PLACEMENTDATA.ENTITY.MBIN"/>
 	</folder>
 	<folder name="SCENES">
 		<file name="SOLARSYSTEM1.MBIN" path="SCENES\DEMOS\SPRINGEVENT2016\MAINSETTINGS\SOLARSYSTEMS\SOLARSYSTEM1.MBIN"/>
@@ -355,7 +356,7 @@
 	<file name="GCROBOTGLOBALS.MBIN" path="GCROBOTGLOBALS.MBIN"/>
 	<file name="GCSCENEOPTIONS.GLOBAL.MBIN" path="GCSCENEOPTIONS.GLOBAL.MBIN"/>
 	<file name="GCSCRATCHPADGLOBALS.GLOBAL.MBIN" path="GCSCRATCHPADGLOBALS.GLOBAL.MBIN"/>
-	<file name="GCSETTLEMENTGLOBALS.GLOBAL.MBIN" path="GCSETTLEMENTGLOBALS.GLOBAL.MBIN"/>
+	<file name="GCSETTLEMENTGLOBALS.MBIN" path="GCSETTLEMENTGLOBALS.MBIN"/>
 	<file name="GCSIMULATIONGLOBALS.GLOBAL.MBIN" path="GCSIMULATIONGLOBALS.GLOBAL.MBIN"/>
 	<file name="GCSKYGLOBALS.GLOBALS.MBIN" path="GCSKYGLOBALS.GLOBALS.MBIN"/>
 	<file name="GCSMOKETESTOPTIONS.GLOBAL.MBIN" path="GCSMOKETESTOPTIONS.GLOBAL.MBIN"/>