Merge branch 'master' into fix/manx_unusable

mkultraWasHere · web-flow · commit d5a8e44c9926 · 2025-04-10T17:09:10.000-04:00
diff --git a/app/utility/base_world.py b/app/utility/base_world.py
@@ -60,7 +60,7 @@ def jitter(fraction):
         i = fraction.split('/')
         min, max = int(i[0]), int(i[1])
         if min > max:
-            logging.warn(f'Jitter range max value (max={max}) less than min value (min={min}). Using min={max} and max={min}.')
+            logging.warning(f'Jitter range max value (max={max}) less than min value (min={min}). Using min={max} and max={min}.')
             min, max = max, min
         return randint(min, max)
 
diff --git a/plugins/magma b/plugins/magma
@@ -1 +1 @@
-Subproject commit 32b5594321ab96a8d244e3d817d9c7ed846cf05f
+Subproject commit e8c61399473bebc89d718213edc7ef01b6a57cb8
diff --git a/plugins/manx b/plugins/manx
@@ -1 +1 @@
-Subproject commit 8adc3c83d932463dacbcc858852919d5a47f758b
+Subproject commit 261f10b344638e1b3ee36337f4fbb68571ec4a78
