Anuken f1aadd97a8 Merge branch 'master' of https://github.com/Anuken/Mindustry into 6.0 ...

# Conflicts:
#	core/src/mindustry/core/Logic.java
#	gradle.properties

2020-03-03 12:12:25 -05:00

..

server_template

[formatting] add newline to file(s) (#1508)

2020-02-05 18:36:56 -05:00

src/mindustry/server

Merge branch 'master' of https://github.com/Anuken/Mindustry into 6.0

2020-03-03 12:12:25 -05:00

build.gradle

it is done

2019-12-25 01:39:38 -05:00

run-jar

Moved server run scripts

2019-12-28 17:33:17 -05:00

run-server

Moved server run scripts

2019-12-28 17:33:17 -05:00