diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
index b973171f8d..0366f51434 100644
--- a/.github/workflows/deployment.yml
+++ b/.github/workflows/deployment.yml
@@ -28,6 +28,13 @@ jobs:
         git commit -m "Update ${GITHUB_REF:1}"
         git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/MindustryGame/docs
         cd ../Mindustry
+    - name: Add Arc release
+      run: |
+        git clone --depth=1 --branch=master https://github.com/Anuken/Arc ../Arc
+        cd ../Arc
+        git tag ${GITHUB_REF}
+        git push https://Anuken:${{ secrets.API_TOKEN_GITHUB }}@github.com/Anuken/Arc ${GITHUB_REF};
+        cd ../Mindustry
     - name: Update F-Droid build string
       run: |
         git clone --depth=1 --branch=master https://github.com/Anuken/MindustryBuilds ../MindustryBuilds
diff --git a/android/build.gradle b/android/build.gradle
index 24de0e599f..604676b570 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -35,7 +35,7 @@ dependencies{
     natives "com.github.Anuken.Arc:natives-box2d-android:${getArcHash()}"
 
     //android dependencies magically disappear during compilation, thanks gradle!
-    def sdkFile = new File(System.getenv("ANDROID_HOME"), "/platforms/android-29/android.jar")
+    def sdkFile = new File((String)System.getenv("ANDROID_HOME"), "/platforms/android-29/android.jar")
     if(sdkFile.exists()) compileOnly files(sdkFile.absolutePath)
 }
 
diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index 24a23b4c94..c267e3daa6 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -2054,7 +2054,7 @@ public class Blocks implements ContentList{
         }};
 
         interplanetaryAccelerator = new Accelerator("interplanetary-accelerator"){{
-            requirements(Category.effect, BuildVisibility.campaignOnly, with(Items.copper, 9000, Items.silicon, 9000, Items.thorium, 9000, Items.titanium, 9000, Items.surgeAlloy, 5000, Items.phaseFabric, 4000));
+            requirements(Category.effect, BuildVisibility.campaignOnly, with(Items.copper, 16000, Items.silicon, 11000, Items.thorium, 13000, Items.titanium, 12000, Items.surgeAlloy, 6000, Items.phaseFabric, 5000));
             researchCostMultiplier = 0.1f;
             size = 7;
             hasPower = true;
diff --git a/core/src/mindustry/content/TechTree.java b/core/src/mindustry/content/TechTree.java
index 17fce59407..bec574d24f 100644
--- a/core/src/mindustry/content/TechTree.java
+++ b/core/src/mindustry/content/TechTree.java
@@ -465,8 +465,7 @@ public class TechTree implements ContentList{
                                     //TODO change positions?
                                     node(impact0078, Seq.with(
                                         new SectorComplete(tarFields),
-                                        new Research(Items.thorium),
-                                        new Research(overdriveProjector)
+                                        new Research(Items.thorium)
                                     ), () -> {
                                         node(desolateRift, Seq.with(
                                             new SectorComplete(impact0078),
diff --git a/core/src/mindustry/net/Administration.java b/core/src/mindustry/net/Administration.java
index 177807090d..b7d0c451e9 100644
--- a/core/src/mindustry/net/Administration.java
+++ b/core/src/mindustry/net/Administration.java
@@ -303,8 +303,6 @@ public class Administration{
     public boolean adminPlayer(String id, String usid){
         PlayerInfo info = getCreateInfo(id);
 
-        if(info.admin && info.adminUsid != null && info.adminUsid.equals(usid)) return false;
-
         info.adminUsid = usid;
         info.admin = true;
         save();
diff --git a/core/src/mindustry/ui/Fonts.java b/core/src/mindustry/ui/Fonts.java
index ee79f301ef..91c7873f2d 100644
--- a/core/src/mindustry/ui/Fonts.java
+++ b/core/src/mindustry/ui/Fonts.java
@@ -129,7 +129,7 @@ public class Fonts{
                 glyph.srcX = 0;
                 glyph.srcY = 0;
                 glyph.width = size;
-                glyph.height = size;
+                glyph.height = (int)((float)region.height / region.width * size);
                 glyph.u = region.u;
                 glyph.v = region.v2;
                 glyph.u2 = region.u2;
diff --git a/core/src/mindustry/ui/fragments/HudFragment.java b/core/src/mindustry/ui/fragments/HudFragment.java
index eb1fc2591f..e558a63422 100644
--- a/core/src/mindustry/ui/fragments/HudFragment.java
+++ b/core/src/mindustry/ui/fragments/HudFragment.java
@@ -53,7 +53,7 @@ public class HudFragment extends Fragment{
             int max = 10;
             int winWave = state.isCampaign() && state.rules.winWave > 0 ? state.rules.winWave : Integer.MAX_VALUE;
             outer:
-            for(int i = state.wave - 1; i <= Math.min(state.wave + max, winWave); i++){
+            for(int i = state.wave - 1; i <= Math.min(state.wave + max, winWave - 2); i++){
                 for(SpawnGroup group : state.rules.spawns){
                     if(group.effect == StatusEffects.boss && group.getSpawned(i) > 0){
                         int diff = (i + 2) - state.wave;
diff --git a/gradle.properties b/gradle.properties
index 29ecfb9b75..0239b07be2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=e327ec0bf805e7ad3cb4d95b242bf8424c487a64
+archash=178412d54b62da44b56f7fde3b2fb9b81c5b0418