From 5e9c64391ea07bd538c61b541d11de5825c70a5b Mon Sep 17 00:00:00 2001 From: Summet Date: Sun, 25 Oct 2020 23:17:41 +0300 Subject: [PATCH 1/3] Add shebang --- server/server_template/run_server.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/server/server_template/run_server.sh b/server/server_template/run_server.sh index 8084a7149f..60947d9c2a 100755 --- a/server/server_template/run_server.sh +++ b/server/server_template/run_server.sh @@ -1 +1,2 @@ +#!/bin/bash java -jar server.jar From 899f4fe994611edd456cd33bd97f84c4c4ffe5ca Mon Sep 17 00:00:00 2001 From: Summet Date: Mon, 26 Oct 2020 21:54:51 +0300 Subject: [PATCH 2/3] use user's env --- server/server_template/run_server.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/server_template/run_server.sh b/server/server_template/run_server.sh index 60947d9c2a..f55799380f 100755 --- a/server/server_template/run_server.sh +++ b/server/server_template/run_server.sh @@ -1,2 +1,2 @@ -#!/bin/bash +#!/usr/bin/env bash java -jar server.jar From a7d1f98f7eb3c35583590adbef3ac05d5f581494 Mon Sep 17 00:00:00 2001 From: summetdev Date: Wed, 28 Oct 2020 13:50:32 +0300 Subject: [PATCH 3/3] PayloadConveyor with transportation group --- .../mindustry/world/blocks/distribution/PayloadConveyor.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java b/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java index 08035d9c84..bd3203cc95 100644 --- a/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java +++ b/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java @@ -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;