Anuken c0ac84fbc6 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features ...

 Conflicts:

	core/src/mindustry/core/NetServer.java

2022-03-28 15:18:13 -04:00

..

server_template

…

src/mindustry/server

Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features

2022-03-28 15:18:13 -04:00

build.gradle

Slightly less terrible regen projector

2021-12-06 22:13:06 -05:00

run-jar

…

run-server

…