diff --git a/mpq/arr/units.datex b/mpq/arr/units.datex
index d9d7d070..cc75ed7c 100644
Binary files a/mpq/arr/units.datex and b/mpq/arr/units.datex differ
diff --git a/mpq/arr/weapons.datex b/mpq/arr/weapons.datex
index 253ead61..f5af46ea 100644
Binary files a/mpq/arr/weapons.datex and b/mpq/arr/weapons.datex differ
diff --git a/mpq/rez/network.tbl b/mpq/rez/network.tbl
index 1bd63018..36744512 100644
Binary files a/mpq/rez/network.tbl and b/mpq/rez/network.tbl differ
diff --git a/mpq/unit/cm/a/function-damage.lof b/mpq/unit/cm/a/function-damage.lof
index cb9e2504..b188afe3 100644
Binary files a/mpq/unit/cm/a/function-damage.lof and b/mpq/unit/cm/a/function-damage.lof differ
diff --git a/mpq/unit/cm/a/function-shadow.grp b/mpq/unit/cm/a/function-shadow.grp
index 8e23af20..f8f87dbf 100644
Binary files a/mpq/unit/cm/a/function-shadow.grp and b/mpq/unit/cm/a/function-shadow.grp differ
diff --git a/mpq/unit/cm/a/function.grp b/mpq/unit/cm/a/function.grp
index 05ba786e..cdcab6f3 100644
Binary files a/mpq/unit/cm/a/function.grp and b/mpq/unit/cm/a/function.grp differ
diff --git a/mpq/unit/cm/p/artisan.grp b/mpq/unit/cm/p/artisan.grp
index 502a8a63..2873aadb 100644
Binary files a/mpq/unit/cm/p/artisan.grp and b/mpq/unit/cm/p/artisan.grp differ
diff --git a/mpq/unit/cm/t/magnetar-engine.grp b/mpq/unit/cm/t/magnetar-engine.grp
index 851e08d2..8d0d8800 100644
Binary files a/mpq/unit/cm/t/magnetar-engine.grp and b/mpq/unit/cm/t/magnetar-engine.grp differ
diff --git a/mpq/unit/cm/t/magnetar.grp b/mpq/unit/cm/t/magnetar.grp
index 482c19a4..b5da45fd 100644
Binary files a/mpq/unit/cm/t/magnetar.grp and b/mpq/unit/cm/t/magnetar.grp differ
diff --git a/patchnotes.md b/patchnotes.md
index 93d0e7e2..0ed19ad8 100644
--- a/patchnotes.md
+++ b/patchnotes.md
@@ -35,6 +35,7 @@
 	- Mimicry no longer procs on ability weapons (r. Londier)
 - **Audiovisual:**
 	- Corrected strings for **Izirokor** tech-enable on **Skibact Scab** and **Tethvith Swamp** (r. Mimika)
+	- Corrected armors for **Akreno** and **Abutment** (latter r. TheBeaver99)
 	- Fixed bad shield overlay for **Vulture (Hecaton)** (r. Londier)
 	- Buttons for **Tiangou** and **Cutlass** now show as disabled when no **Scrapyard** is built (r. Pisens)
 	- **Cyclops (Futurist)** now uses its unique shadow and attack sequence instead of the standard variant's (r. lolrsk8s)
@@ -99,12 +100,13 @@
 	- Resource costs 100/100 » 50/100
 	- Build time 30 » 25
 - [Treasury](https://cosmonarchy.com/terran/treasury):
-	- Build time 35 » 40
+	- Build time 35 » 45
 	- Can now train **Mason**s while a **Quarry** is constructed.
 - [Stockade](https://cosmonarchy.com/terran/stockade):
 	- Build time 50 » 45
 - [Fulcrum](https://cosmonarchy.com/terran/fulcrum):
 	- Resource costs 200/50 » 200/75
+	- Build time 50 » 45
 
 ## Terran factions
 - [Hotshot](https://cosmonarchy.com/terran/hotshot):
@@ -127,14 +129,15 @@
 	- Eidolon replacement for Upstart Terrans. Has attack cloaking and an area-damage ground-only grenade launcher.
 
 ## Protoss
-- [Gateway](https://cosmonarchy.com/protoss/gateway):
-	- Resource costs 175/0 » 150/0
 - [Atreus](https://cosmonarchy.com/protoss/atreus):
 	- Sight range 9 » 8
 	- Transport weight 4 » 5
 	- **Dauntless Disruption Cannon:**
 		- Weapon damage 12 » 10
 		- Weapon range 5 » 4
+- [Optecton](https://cosmonarchy.com/protoss/optecton):
+	- Resource costs 500/200 » 500/300
+	- HP 400 » 500
 - [Unar](https://cosmonarchy.com/protoss/unar):
 	- Resource costs 300/125 » 200/200
 	- Build time 50 » 45
@@ -145,9 +148,14 @@
 	- Shields 50 » 40
 	- **Reactive Payload:**
 		- Weapon cooldown 1.33 » 1.25
-- [Optecton](https://cosmonarchy.com/protoss/optecton/):
-	- Resource costs 500/200 » 500/300
-	- HP 400 » 500
+- [Analogue](https://cosmonarchy.com/protoss/analogue):
+	- **Cylindrical Blaster:**
+		- Weapon range 6 » 4
+- [Gateway](https://cosmonarchy.com/protoss/gateway):
+	- Resource costs 175/0 » 150/0
+	- Build time 50 » 55
+- [Grand Library](https://cosmonarchy.com/protoss/grand-library):
+	- Resource costs 225/50 » 300/50
 - [Unitary Union](https://cosmonarchy.com/protoss/unitary-union):
 	- Resource costs 500/250 » 500/300
 
diff --git a/plugins/gptp.qdp b/plugins/gptp.qdp
index 231f03fd..1f8595b9 100644
Binary files a/plugins/gptp.qdp and b/plugins/gptp.qdp differ