diff --git a/android/build.gradle b/android/build.gradle
index f1dc45aa74..6f349ef7b7 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -30,8 +30,8 @@ task deploy(type: Copy){
 
 android{
     namespace = "io.anuke.mindustry"
-    buildToolsVersion = '34.0.0'
-    compileSdk = 34
+    buildToolsVersion = '36.0.0'
+    compileSdk = 36
     sourceSets{
         main{
             manifest.srcFile 'AndroidManifest.xml'
@@ -57,8 +57,8 @@ android{
 
         applicationId "io.anuke.mindustry"
         minSdkVersion 14
-        targetSdkVersion 34
-        
+        targetSdkVersion 36
+
         versionName versionNameResult
         versionCode = vcode
 
diff --git a/core/src/mindustry/editor/EditorRenderer.java b/core/src/mindustry/editor/EditorRenderer.java
index 1d77c542dd..5fdf5cadc0 100644
--- a/core/src/mindustry/editor/EditorRenderer.java
+++ b/core/src/mindustry/editor/EditorRenderer.java
@@ -90,6 +90,9 @@ public class EditorRenderer implements Disposable{
         boolean prev = renderer.animateWater;
         renderer.animateWater = false;
 
+        Tmp.m4.set(Draw.trans());
+        Draw.trans().idt();
+
         Tmp.v3.set(Core.camera.position);
         Core.camera.position.set(world.width()/2f * tilesize, world.height()/2f * tilesize);
         Core.camera.width = 999999f;
@@ -144,7 +147,9 @@ public class EditorRenderer implements Disposable{
             }
         }
 
+
         Core.camera.position.set(Tmp.v3);
+        Draw.trans(Tmp.m4);
     }
 
     void updateStatic(int x, int y){
diff --git a/gradle.properties b/gradle.properties
index 7213fa8e41..2cca50fc9c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -26,4 +26,4 @@ org.gradle.caching=true
 org.gradle.internal.http.socketTimeout=100000
 org.gradle.internal.http.connectionTimeout=100000
 android.enableR8.fullMode=false
-archash=caf89c8fee
+archash=cde6d76804