Merge remote-tracking branch 'upstream/master' into torp-factory-1.5

.github/workflows/extra_pr_labels.yml

@@ -19,7 +19,7 @@ jobs:
           commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."
       - name: Apply labels based on changed files
         if: github.event_name != 'push'
-        uses: actions/labeler@main
+        uses: actions/labeler@v4.3.0
         with:
           repo-token: "${{ secrets.GITHUB_TOKEN }}"
           sync-labels: true

html/changelog.html

@@ -191,14 +191,6 @@ <h3 class="author">someone543 updated:</h3>
 				<li class="bugfix">fixed Kadesh cruisers from being boarded</li>
 				<li class="tweak">borgs can now leftclick to enter transport small crafts</li>
 			</ul>
-
-			<h2 class="date">06 October 2023</h2>
-			<h3 class="author">SerynEngi updated:</h3>
-			<ul class="changes bgimages16">
-				<li class="rscadd">Added new nucleum preset engineering tile</li>
-				<li class="rscadd">Nucleum tank to the Gladius</li>
-				<li class="tweak">Added nucleum gas to the nucleum tanks on the Gladius, Galactica, Tycoon and Aetherwhisp</li>
-			</ul>
 		</div>
 
 <b>GoonStation 13 Development Team</b>