Merge branch 'main' of git.h3cx.dev:h3cx/fphysics

main.c

@@ -3,6 +3,9 @@
 #include "consts.h"
 #include "gravity.h"
 #include "mechanics.h"
+<<<<<<< HEAD
+#include "magnetism.h"
+=======
 #include "objects.h"
 #include "vec_utils.h"
 #include <bits/time.h>
@@ -35,6 +38,7 @@ void *physics(void *args) {
     clock_gettime(CLOCK_MONOTONIC, &ct);
     gravity(uni);
     mechanics(uni);
+    magnetism(uni);
     ot = ct;
     long long elapsed = timespec_diff_ns(ct, ot);
     long long remaining = TIMESTEP / simx - elapsed;