From 50589626a2bfc92356e05b5f17bc1816481f33f8 Mon Sep 17 00:00:00 2001 From: Bob <80072466+bob0005@users.noreply.github.com> Date: Fri, 27 Dec 2024 16:55:25 +0100 Subject: [PATCH] Fix/merge main into next (#2613) * Merge into main (#2603) * Fix missing arrival when sending lords & donkeys (#2594) * contracts: fix share points check * contracts: fix share points check * Add resource filter for contributions (#2596) * Add resource filter for contributions * Change % for specific resource contribution * Fix missing donkeys in bridge step 2 (#2598) * Fix missing donkeys in bridge step 2 * fix rerenders * Remove filter * Fix registration delay (#2602) * Fix registration delay * styling * Open popup on load * Add burned donkeys back (#2601) --------- Co-authored-by: Credence Co-authored-by: Loaf <90423308+ponderingdemocritus@users.noreply.github.com> * merge into main (#2605) * Fix missing arrival when sending lords & donkeys (#2594) * contracts: fix share points check * contracts: fix share points check * Add resource filter for contributions (#2596) * Add resource filter for contributions * Change % for specific resource contribution * Fix missing donkeys in bridge step 2 (#2598) * Fix missing donkeys in bridge step 2 * fix rerenders * Remove filter * Fix registration delay (#2602) * Fix registration delay * styling * Open popup on load * Add burned donkeys back (#2601) * im (#2604) --------- Co-authored-by: Credence Co-authored-by: Loaf <90423308+ponderingdemocritus@users.noreply.github.com> * Fix build (#2610) --------- Co-authored-by: Credence Co-authored-by: Loaf <90423308+ponderingdemocritus@users.noreply.github.com>