Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
c307fc02cf1e2d0299b855ae00e4449a33ae9cfa
Mindustry/core/assets/bundles
History
Anuken 32d28a4070 Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0 
# Conflicts:
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites2.png
#	core/assets/sprites/sprites3.png
#	core/assets/sprites/sprites5.png
#	core/src/io/anuke/mindustry/ctype/ContentType.java
#	core/src/io/anuke/mindustry/ctype/UnlockableContent.java
#	core/src/io/anuke/mindustry/io/LegacyMapIO.java
#	core/src/io/anuke/mindustry/type/WeatherEvent.java
#	gradle.properties
2019-12-24 12:40:23 -05:00
..
bundle_cs.properties
Make scroll zoom by default, remove zoom hold keybind
2019-12-12 12:23:32 -08:00
bundle_de.properties
Update german language bundle (#1226)
2019-12-22 11:13:38 -05:00
bundle_es.properties
Updated Spanish translation (#1227)
2019-12-22 11:20:59 -05:00
bundle_et.properties
Make scroll zoom by default, remove zoom hold keybind
2019-12-12 12:23:32 -08:00
bundle_eu.properties
Make scroll zoom by default, remove zoom hold keybind
2019-12-12 12:23:32 -08:00
bundle_fi.properties
Make scroll zoom by default, remove zoom hold keybind
2019-12-12 12:23:32 -08:00
bundle_fr_BE.properties
Make scroll zoom by default, remove zoom hold keybind
2019-12-12 12:23:32 -08:00
bundle_fr.properties
Merge pull request #1206 from joshuaptfan/zoom-no-hold
2019-12-12 18:35:29 -05:00
bundle_in_ID.properties
Make scroll zoom by default, remove zoom hold keybind
2019-12-12 12:23:32 -08:00
bundle_it.properties
Make scroll zoom by default, remove zoom hold keybind
2019-12-12 12:23:32 -08:00
bundle_ja.properties
Make scroll zoom by default, remove zoom hold keybind
2019-12-12 12:23:32 -08:00
bundle_ko.properties
Make scroll zoom by default, remove zoom hold keybind
2019-12-12 12:23:32 -08:00
bundle_nl_BE.properties
Make scroll zoom by default, remove zoom hold keybind
2019-12-12 12:23:32 -08:00
bundle_nl.properties
Make scroll zoom by default, remove zoom hold keybind
2019-12-12 12:23:32 -08:00
bundle_pl.properties
Make scroll zoom by default, remove zoom hold keybind
2019-12-12 12:23:32 -08:00
bundle_pt_BR.properties
Make scroll zoom by default, remove zoom hold keybind
2019-12-12 12:23:32 -08:00
bundle_pt.properties
Make scroll zoom by default, remove zoom hold keybind
2019-12-12 12:23:32 -08:00
bundle_ru.properties
RU updates (#1225)
2019-12-22 12:01:03 -05:00
bundle_sv.properties
Make scroll zoom by default, remove zoom hold keybind
2019-12-12 12:23:32 -08:00
bundle_th.properties
Thai trabslation
2019-11-21 07:53:13 +07:00
bundle_tk.properties
Make scroll zoom by default, remove zoom hold keybind
2019-12-12 12:23:32 -08:00
bundle_tr.properties
Make scroll zoom by default, remove zoom hold keybind
2019-12-12 12:23:32 -08:00
bundle_uk_UA.properties
Merge pull request #1206 from joshuaptfan/zoom-no-hold
2019-12-12 18:35:29 -05:00
bundle_zh_CN.properties
Make scroll zoom by default, remove zoom hold keybind
2019-12-12 12:23:32 -08:00
bundle_zh_TW.properties
Update bundle_zh_TW.properties (#1211)
2019-12-22 12:01:27 -05:00
bundle.properties
Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0
2019-12-24 12:40:23 -05:00