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

2018-03-16 22:18:58 -04:00
parent 714fdc751a e2effa1c5d
commit 4a7c722673
31 changed files with 305 additions and 95 deletions
--- a/core/src/io/anuke/mindustry/game/GameMode.java
+++ b/core/src/io/anuke/mindustry/game/GameMode.java
@@ -18,6 +18,10 @@ public enum GameMode{
 	public boolean infiniteResources;
 	public boolean disableWaveTimer;

+	public String description(){
+		return Bundles.get("mode."+name()+".description");
+	}
+
 	@Override
 	public String toString(){
 		return Bundles.get("mode."+name()+".name");