From 463a61176c757c733e1c1a35c7a1e108e0ce9866 Mon Sep 17 00:00:00 2001 From: Mayegelt <20280410+Mayegelt@users.noreply.github.com> Date: Thu, 5 Sep 2024 19:47:35 +0100 Subject: [PATCH] More fixes more fixes --- 2022 - LA - Salamanders.cat | 28 +- 2022 - Mechanicum.cat | 4158 +++++++++++++++++++++++++++-------- 2 files changed, 3311 insertions(+), 875 deletions(-) diff --git a/2022 - LA - Salamanders.cat b/2022 - LA - Salamanders.cat index 4d3eea47..6e5244e3 100644 --- a/2022 - LA - Salamanders.cat +++ b/2022 - LA - Salamanders.cat @@ -8196,7 +8196,11 @@ +<<<<<<< Updated upstream +======= + +>>>>>>> Stashed changes @@ -8258,7 +8282,9 @@ - + + + diff --git a/2022 - Mechanicum.cat b/2022 - Mechanicum.cat index 8559804f..2b1cec0b 100644 --- a/2022 - Mechanicum.cat +++ b/2022 - Mechanicum.cat @@ -1,5 +1,5 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + @@ -1211,11 +1657,24 @@ - + + + - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + @@ -1682,18 +2299,32 @@ - + + + - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + - + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + @@ -3401,9 +4637,20 @@ This unit may be upgraded freely as described in their profile, though they may - + + + - + + + + + + + + + + @@ -3413,9 +4660,16 @@ This unit may be upgraded freely as described in their profile, though they may - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3676,9 +5010,21 @@ This unit may be upgraded freely as described in their profile, though they may - + + + - + + + + + + + + + + + @@ -3688,9 +5034,16 @@ This unit may be upgraded freely as described in their profile, though they may - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + - + + + + + + + - + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + @@ -4828,15 +6544,27 @@ At the beginning of each of the controlling player’s Shooting phases for the r - + + + + + + - + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + - + + + + + + + + + + + + @@ -5314,7 +7196,13 @@ At the beginning of each of the controlling player’s Shooting phases for the r - + + + + + + + + + + + + @@ -5349,14 +7243,28 @@ At the beginning of each of the controlling player’s Shooting phases for the r - + + + + + + + - + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + - + + + + - + + + + - + + + + - + + + + - + + + + - + + + + - + + + + - + + + + + + + + + + + + + + - + + + + + + + + +