Mindustry

Files

T

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

# Conflicts:
#	build.gradle
#	core/src/io/anuke/mindustry/Vars.java
#	core/src/io/anuke/mindustry/core/Control.java
#	core/src/io/anuke/mindustry/core/Logic.java
#	core/src/io/anuke/mindustry/core/NetClient.java
#	core/src/io/anuke/mindustry/core/NetServer.java
#	core/src/io/anuke/mindustry/core/UI.java
#	core/src/io/anuke/mindustry/editor/MapSaveDialog.java
#	core/src/io/anuke/mindustry/input/GestureHandler.java
#	core/src/io/anuke/mindustry/mapeditor/MapEditorDialog.java
#	core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java
#	core/src/io/anuke/mindustry/ui/dialogs/JoinDialog.java
#	gradle/wrapper/gradle-wrapper.properties
#	server/src/io/anuke/mindustry/server/ServerControl.java

2018-05-23 10:36:59 -04:00

bundle_de.properties

Changed uranium to thorium, fixed faulty vault transfer issues

2018-03-24 00:53:26 -04:00

bundle_es.properties

Updated spanish bundle, added missing formatted text

2018-05-20 15:50:01 -04:00

bundle_fr.properties

Updated translation bundles, added autowrap to menu

2018-05-05 13:18:21 -04:00

bundle_in_ID.properties

Changed uranium to thorium, fixed faulty vault transfer issues