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

# Conflicts:
#	core/assets-raw/sprites/blocks/chainturret-icon.png
#	core/assets-raw/sprites/blocks/chainturret.png
#	core/assets-raw/sprites/blocks/titancannon-icon.png
#	core/assets-raw/sprites/blocks/titancannon.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/version.properties
#	core/src/io/anuke/mindustry/entities/effect/TeslaOrb.java
#	core/src/io/anuke/mindustry/graphics/BlockRenderer.java
#	core/src/io/anuke/mindustry/input/InputHandler.java
#	core/src/io/anuke/mindustry/input/PlaceMode.java

2018-04-21 18:47:43 -04:00

..

bundle_de.properties

Changed uranium to thorium, fixed faulty vault transfer issues

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

bundle_es_LA.properties

Changed uranium to thorium, fixed faulty vault transfer issues

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

bundle_fr_FR.properties

Changed uranium to thorium, fixed faulty vault transfer issues

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

bundle_in_ID.properties

Changed uranium to thorium, fixed faulty vault transfer issues

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

bundle_ita.properties

Added italian bundle

2018-04-21 18:32:56 -04:00

bundle_ko.properties

Changed uranium to thorium, fixed faulty vault transfer issues

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

bundle_pl_PL.properties

Changed uranium to thorium, fixed faulty vault transfer issues

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

bundle_pt_BR.properties

Changed uranium to thorium, fixed faulty vault transfer issues

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

bundle_ru.properties

Changed uranium to thorium, fixed faulty vault transfer issues

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

bundle_uk_UA.properties

Changed uranium to thorium, fixed faulty vault transfer issues

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

bundle.properties

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

2018-04-21 18:47:43 -04:00