Merge

core/src/mindustry/core/NetClient.java

@@ -96,6 +96,7 @@ public class NetClient implements ApplicationListener{
             state.set(State.menu);
             logic.reset();
             platform.updateRPC();
+            player.name = Core.settings.getString("name");
 
             if(quiet) return;
 

core/src/mindustry/entities/def/BuilderComp.java

@@ -76,6 +76,9 @@ abstract class BuilderComp implements Unitc, DrawLayerFlyingc{
                 requests.removeFirst();
                 return;
             }
+        }else if(tile.team() != team()){
+            requests.removeFirst();
+            return;
         }
 
         if(tile.entity instanceof BuildEntity && !current.initialized){

core/src/mindustry/input/InputHandler.java

@@ -263,19 +263,10 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
         if(lastSchematic == null) return;
 
         ui.showTextInput("$schematic.add", "$name", "", text -> {
-            Schematic replacement = schematics.all().find(s -> s.name().equals(text));
-            if(replacement != null){
-                ui.showConfirm("$confirm", "$schematic.replace", () -> {
-                    schematics.overwrite(replacement, lastSchematic);
-                    ui.showInfoFade("$schematic.saved");
-                    ui.schematics.showInfo(replacement);
-                });
-            }else{
-                lastSchematic.tags.put("name", text);
-                schematics.add(lastSchematic);
-                ui.showInfoFade("$schematic.saved");
-                ui.schematics.showInfo(lastSchematic);
-            }
+            lastSchematic.tags.put("name", text);
+            schematics.add(lastSchematic);
+            ui.showInfoFade("$schematic.saved");
+            ui.schematics.showInfo(lastSchematic);
         });
     }
 

core/src/mindustry/ui/dialogs/SchematicsDialog.java

@@ -1,7 +1,7 @@
 package mindustry.ui.dialogs;
 
 import arc.*;
-import arc.struct.*;
+import arc.files.*;
 import arc.graphics.*;
 import arc.graphics.Texture.*;
 import arc.graphics.g2d.*;
@@ -10,6 +10,7 @@ import arc.scene.ui.*;
 import arc.scene.ui.ImageButton.*;
 import arc.scene.ui.TextButton.*;
 import arc.scene.ui.layout.*;
+import arc.struct.*;
 import arc.util.*;
 import mindustry.core.GameState.*;
 import mindustry.game.*;
@@ -214,14 +215,27 @@ public class SchematicsDialog extends FloatingDialog{
                     Core.app.setClipboardText(schematics.writeBase64(s));
                 }).marginLeft(12f);
                 t.row();
-                t.addImageTextButton("$schematic.exportfile", Icon.export, style, () -> platform.showFileChooser(false, schematicExtension, file -> {
-                    dialog.hide();
-                    try{
-                        Schematics.write(s, file);
-                    }catch(Exception e){
-                        ui.showException(e);
+                t.addImageTextButton("$schematic.exportfile", Icon.export, style, () -> {
+                    if(!ios){
+                        platform.showFileChooser(false, schematicExtension, file -> {
+                            dialog.hide();
+                            try{
+                                Schematics.write(s, file);
+                            }catch(Throwable e){
+                                ui.showException(e);
+                            }
+                        });
+                    }else{
+                        dialog.hide();
+                        try{
+                            Fi file = Core.files.local(s.name() + "." + schematicExtension);
+                            Schematics.write(s, file);
+                            platform.shareFile(file);
+                        }catch(Throwable e){
+                            ui.showException(e);
+                        }
                     }
-                })).marginLeft(12f);
+                }).marginLeft(12f);
             });
         });
 

core/src/mindustry/ui/dialogs/SettingsMenuDialog.java

@@ -330,7 +330,12 @@ public class SettingsMenuDialog extends SettingsDialog{
         if(Shaders.shield != null){
             graphics.checkPref("animatedshields", !mobile);
         }
-        graphics.checkPref("bloom", !mobile, val -> renderer.toggleBloom(val));
+        if(!ios){
+            graphics.checkPref("bloom", !mobile, val -> renderer.toggleBloom(val));
+        }else{
+            Core.settings.put("bloom", false);
+        }
+
         graphics.checkPref("pixelate", false, val -> {
             if(val){
                 Events.fire(Trigger.enablePixelation);

core/src/mindustry/world/blocks/production/Separator.java

@@ -107,6 +107,7 @@ public class Separator extends Block{
             entity.consume();
 
             if(item != null && entity.items().get(item) < itemCapacity){
+                useContent(tile, item);
                 offloadNear(tile, item);
             }
         }

core/src/mindustry/world/blocks/production/SolidPump.java

@@ -110,6 +110,7 @@ public class SolidPump extends Pump{
             tile.entity.liquids().add(result, maxPump);
             entity.lastPump = maxPump;
             entity.warmup = Mathf.lerpDelta(entity.warmup, 1f, 0.02f);
+            if(tile.entity.timer.get(timerContentCheck, 10)) useContent(tile, result);
             if(Mathf.chance(entity.delta() * updateEffectChance))
                 updateEffect.at(entity.getX() + Mathf.range(size * 2f), entity.getY() + Mathf.range(size * 2f));
         }else{