Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages 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
parent e1fefd1664 9e15434904
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.*;
import mindustry.world.blocks.payloads.*; import mindustry.world.blocks.payloads.*;
import mindustry.world.blocks.production.*; import mindustry.world.blocks.production.*;
import mindustry.world.meta.*;
import static mindustry.Vars.*; import static mindustry.Vars.*;
@@ -24,7 +25,7 @@ public class PayloadConveyor extends Block{
public PayloadConveyor(String name){ public PayloadConveyor(String name){
super(name); super(name);
group = BlockGroup.transportation;
size = 3; size = 3;
rotate = true; rotate = true;
update = true; update = true;

1
server/server_template/run_server.sh
View File

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