Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
be50997f94fb9ca7cca8b574e6224c69f57da6ea
Mindustry/core/assets/bundles
History
Anuken be50997f94 Merge branches '6.0' and 'splinterface-impl' of https://github.com/Anuken/Mindustry into splinterface-impl 
# Conflicts:
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites3.png
#	core/assets/sprites/sprites5.png
#	core/src/mindustry/Vars.java
#	core/src/mindustry/entities/traits/SaveTrait.java
#	core/src/mindustry/maps/generators/MapGenerator.java
#	core/src/mindustry/ui/dialogs/DeployDialog.java
#	core/src/mindustry/world/blocks/Floor.java
#	desktop/src/mindustry/desktop/DesktopLauncher.java
#	gradle.properties
2020-02-04 12:25:18 -05:00
..
bundle_cs.properties
Czech translation - update (#1432)
2020-01-25 17:51:32 -05:00
bundle_de.properties
Update bundle_de.properties (#1423)
2020-01-23 18:57:24 -05:00
bundle_es.properties
Merge
2020-01-19 11:10:14 -05:00
bundle_et.properties
Merged in liquid void
2020-01-08 11:04:12 -05:00
bundle_eu.properties
Merged in liquid void
2020-01-08 11:04:12 -05:00
bundle_fi.properties
Update finnish language properties (#1396)
2020-01-24 10:09:48 -05:00
bundle_fr_BE.properties
Merged in liquid void
2020-01-08 11:04:12 -05:00
bundle_fr.properties
Merged in liquid void
2020-01-08 11:04:12 -05:00
bundle_in_ID.properties
Merged in liquid void
2020-01-08 11:04:12 -05:00
bundle_it.properties
Update bundle_it.properties (#1431)
2020-01-25 17:51:43 -05:00
bundle_ja.properties
Merged in liquid void
2020-01-08 11:04:12 -05:00
bundle_ko.properties
Update bundle_ko.properties (#1379)
2020-01-23 18:08:47 -05:00
bundle_nl_BE.properties
Merged in liquid void
2020-01-08 11:04:12 -05:00
bundle_nl.properties
Merged in liquid void
2020-01-08 11:04:12 -05:00
bundle_pl.properties
Merged in liquid void
2020-01-08 11:04:12 -05:00
bundle_pt_BR.properties
Merged in liquid void
2020-01-08 11:04:12 -05:00
bundle_pt_PT.properties
Update bundle_pt_PT.properties (#1351)
2020-01-23 18:09:25 -05:00
bundle_ru.properties
PRE 103 RU_updates (#1425)
2020-01-24 11:31:14 -05:00
bundle_sv.properties
Merged in liquid void
2020-01-08 11:04:12 -05:00
bundle_th.properties
Merged in liquid void
2020-01-08 11:04:12 -05:00
bundle_tk.properties
Merged in liquid void
2020-01-08 11:04:12 -05:00
bundle_tr.properties
Merged in liquid void
2020-01-08 11:04:12 -05:00
bundle_uk_UA.properties
Update bundle_uk_UA.properties (#1434)
2020-01-25 17:51:17 -05:00
bundle_zh_CN.properties
Update zh_CN translate (#1412)
2020-01-23 18:09:40 -05:00
bundle_zh_TW.properties
Update bundle_zh_TW.properties (#1438)
2020-01-25 17:51:24 -05:00
bundle.properties
Merge branches '6.0' and 'splinterface-impl' of https://github.com/Anuken/Mindustry into splinterface-impl
2020-02-04 12:25:18 -05:00