diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex
index bbd963ff..295d194f 100644
Binary files a/mpq/arr/weapons.datex and b/mpq/arr/weapons.datex differ
diff --git a/mpq/tileset/Jungle.vf4 b/mpq/tileset/Jungle.vf4
index 891abbd9..44c99876 100644
Binary files a/mpq/tileset/Jungle.vf4 and b/mpq/tileset/Jungle.vf4 differ
diff --git a/mpq/tileset/platform.cv5 b/mpq/tileset/platform.cv5
index e61e671c..8621a801 100644
Binary files a/mpq/tileset/platform.cv5 and b/mpq/tileset/platform.cv5 differ
diff --git a/mpq/tileset/platform.vf4 b/mpq/tileset/platform.vf4
index b3a226ff..1f32ad1d 100644
Binary files a/mpq/tileset/platform.vf4 and b/mpq/tileset/platform.vf4 differ
diff --git a/mpq/tileset/platform.vr4 b/mpq/tileset/platform.vr4
index 11ecbd07..cc3aa900 100644
Binary files a/mpq/tileset/platform.vr4 and b/mpq/tileset/platform.vr4 differ
diff --git a/mpq/tileset/platform.vx4ex b/mpq/tileset/platform.vx4ex
index f96feb7a..67226580 100644
Binary files a/mpq/tileset/platform.vx4ex and b/mpq/tileset/platform.vx4ex differ
diff --git a/patchnotes.md b/patchnotes.md
index b24c35f8..0140bd70 100644
--- a/patchnotes.md
+++ b/patchnotes.md
@@ -11,8 +11,11 @@ We are still hunting for desyncs! Please submit your critical logs to cm-issues
 Forthcoming.
 
 ## Internals
-- Cleaned up some sound randomization, which may have contributed to sync issues
-- Prospectively fixed 'debug' being the default game mode on first run
+- Cleaned up sound randomization, resolving some desyncs
+- Prospectively fixed 'debug' being the default game mode on first run (c. DF)
+- Overhauled trigger system for custom maps (c. Veeq7)
+
+## General
 - **Minimap**:
 	- Minimap sizes are now scaled more granularly (c. DF)
 	- Minimap camera now updates much more swiftly (c. DF)
@@ -22,6 +25,10 @@ Forthcoming.
 		- Set 'shuffle' to 'true' to randomly receive a color
 		- Colors are only selected if available on a given tileset
 		- In the event of preference conflicts between players, the lower player ID gets the color
+- **Game modes**:
+	- **NEW:** Uprising (commisioned by Btyb)
+		- Neutral hostile camps appear at unoccupied expansions on map start.
+		- **Very WIP!**
 
 ## Computer AI
 - **Priorities**:
@@ -50,6 +57,8 @@ Forthcoming.
 	- Treasuries now leave behind rubble
 	- Ezigrisant regression can no longer break gas node harvestability (r. TheBeaver99)
 	- Ocsal Gosvileths no longer pass on Ocsal debuff to structures (r. TheBeaver99)
+- **Tilesets:**
+	- Fixed height and pathing flags on Jungle World -> dirt cliff south ramps (r. The Shambler)
 - **Audiovisuals**:
 	- Irradiate overlay is now properly inherited by regressing Zerg (r. TheBeaver99)
 	- Olympian Mythical Might SFX no longer plays more often than intended (r. lolrsk8s)
diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp
index b7e08ef2..9d7b1484 100644
Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ