From 501153168caf163aa302112f89cff710c6e8fdd5 Mon Sep 17 00:00:00 2001
From: Changelogs <action@github.com>
Date: Fri, 17 Jul 2020 00:10:16 +0000
Subject: [PATCH] Automatic changelog compile [ci skip]

---
 html/changelog.html                        | 17 +++++++++++++++++
 html/changelogs/.all_changelog.yml         | 15 +++++++++++++++
 html/changelogs/AutoChangeLog-pr-12791.yml |  4 ----
 html/changelogs/AutoChangeLog-pr-12798.yml | 10 ----------
 html/changelogs/AutoChangeLog-pr-12799.yml |  4 ----
 5 files changed, 32 insertions(+), 18 deletions(-)
 delete mode 100644 html/changelogs/AutoChangeLog-pr-12791.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-12798.yml
 delete mode 100644 html/changelogs/AutoChangeLog-pr-12799.yml

diff --git a/html/changelog.html b/html/changelog.html
index ccfb04740f..1442691167 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -50,6 +50,23 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">17 July 2020</h2>
+			<h3 class="author">ShizCalev, Fikou updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Added some sanity checking for varedit values.</li>
+				<li class="bugfix">Fixed an exploit involving coins and mints that could crash the server.</li>
+				<li class="bugfix">Fixed an exploit that would allow you to destroy round-critical / indestructible items with folders.</li>
+				<li class="bugfix">Swarmers can no longer cut power lines by deconstructing catwalks underneath them.</li>
+				<li class="bugfix">Fixed a scenario that allowed infinite resource generation via ore machines.</li>
+				<li class="bugfix">you can no longer inject html in ahelps</li>
+				<li class="admin">you cant either, jannies</li>
+			</ul>
+			<h3 class="author">timothyteakettle updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">fixes a small pickle related issue</li>
+				<li class="rscadd">recent culinary and scientific advancements have brought forth new pickle related technologies</li>
+			</ul>
+
 			<h2 class="date">16 July 2020</h2>
 			<h3 class="author">DeltaFire15 updated:</h3>
 			<ul class="changes bgimages16">
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 662e458972..05e4c0cf69 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -26372,3 +26372,18 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: small error with pet carrier logic fixed and also making sure simple mobs
       are catered for properly inside bluespace jars
   - bugfix: fixes coin related issue
+2020-07-17:
+  ShizCalev, Fikou:
+  - bugfix: Added some sanity checking for varedit values.
+  - bugfix: Fixed an exploit involving coins and mints that could crash the server.
+  - bugfix: Fixed an exploit that would allow you to destroy round-critical / indestructible
+      items with folders.
+  - bugfix: Swarmers can no longer cut power lines by deconstructing catwalks underneath
+      them.
+  - bugfix: Fixed a scenario that allowed infinite resource generation via ore machines.
+  - bugfix: you can no longer inject html in ahelps
+  - admin: you cant either, jannies
+  timothyteakettle:
+  - bugfix: fixes a small pickle related issue
+  - rscadd: recent culinary and scientific advancements have brought forth new pickle
+      related technologies
diff --git a/html/changelogs/AutoChangeLog-pr-12791.yml b/html/changelogs/AutoChangeLog-pr-12791.yml
deleted file mode 100644
index 740e2b2c28..0000000000
--- a/html/changelogs/AutoChangeLog-pr-12791.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes: 
-  - rscadd: "recent culinary and scientific advancements have brought forth new pickle related technologies"
diff --git a/html/changelogs/AutoChangeLog-pr-12798.yml b/html/changelogs/AutoChangeLog-pr-12798.yml
deleted file mode 100644
index 4c44d33b4c..0000000000
--- a/html/changelogs/AutoChangeLog-pr-12798.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-author: "ShizCalev, Fikou"
-delete-after: True
-changes: 
-  - bugfix: "Added some sanity checking for varedit values."
-  - bugfix: "Fixed an exploit involving coins and mints that could crash the server."
-  - bugfix: "Fixed an exploit that would allow you to destroy round-critical / indestructible items with folders."
-  - bugfix: "Swarmers can no longer cut power lines by deconstructing catwalks underneath them."
-  - bugfix: "Fixed a scenario that allowed infinite resource generation via ore machines."
-  - bugfix: "you can no longer inject html in ahelps"
-  - admin: "you cant either, jannies"
diff --git a/html/changelogs/AutoChangeLog-pr-12799.yml b/html/changelogs/AutoChangeLog-pr-12799.yml
deleted file mode 100644
index 98ed063fc1..0000000000
--- a/html/changelogs/AutoChangeLog-pr-12799.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes: 
-  - bugfix: "fixes a small pickle related issue"