mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-01-25 14:01:03 -08:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Anuken 2020-10-28 10:29:40 -04:00
commit d77f1b4fc0
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
core/src/mindustry/world/blocks/distribution/PayloadConveyor.java
View file

@ -12,6 +12,7 @@ import mindustry.graphics.*;
import mindustry.world.*;
import mindustry.world.blocks.payloads.*;
import mindustry.world.blocks.production.*;
import mindustry.world.meta.*;
import static mindustry.Vars.*;
@ -24,7 +25,7 @@ public class PayloadConveyor extends Block{
public PayloadConveyor(String name){
super(name);
group = BlockGroup.transportation;
size = 3;
rotate = true;
update = true;

1
server/server_template/run_server.sh
View file

@ -1 +1,2 @@
#!/usr/bin/env bash
java -jar server.jar