Merge branch 'master' into underbarrel-guns

shiptest-ss13 · Dec 30, 2024 · 686b2a5 · 686b2a5
2 parents ec792ad + 4039e46
commit 686b2a5
Show file tree

Hide file tree

Showing 225 changed files with 16,812 additions and 133,998 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -34,7 +34,7 @@ RUN git init \
     && git remote add origin \$AUXMOS_REPO \
     && git fetch --depth 1 origin \$AUXMOS_VERSION" \
     && git checkout FETCH_HEAD \
-    && env PKG_CONFIG_ALLOW_CROSS=1 cargo build --release --target=i686-unknown-linux-gnu --features "all_reaction_hooks,katmos"
+    && env PKG_CONFIG_ALLOW_CROSS=1 cargo build --release --target=i686-unknown-linux-gnu --features "citadel_reactions,katmos"
 
 # Install nodejs which is required to deploy Shiptest
 FROM base as node