Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
5f3cef251bd101fc98ab7a29965f58347f40fb1a
Mindustry/core/assets/bundles
History
Anuken 5f3cef251b Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/logicids.dat
	core/src/mindustry/content/Blocks.java
	gradle.properties
2021-09-28 18:45:09 -04:00
..
bundle_be.properties
Stone craters name fix
2021-08-09 12:13:07 -04:00
bundle_bg.properties
Avoid ambiguity (#5809)
2021-08-23 12:37:34 -04:00
bundle_cs.properties
Stone craters name fix
2021-08-09 12:13:07 -04:00
bundle_da.properties
Stone craters name fix
2021-08-09 12:13:07 -04:00
bundle_de.properties
Avoid ambiguity (#5809)
2021-08-23 12:37:34 -04:00
bundle_es.properties
br (#5990)
2021-09-13 21:08:42 -04:00
bundle_et.properties
Stone craters name fix
2021-08-09 12:13:07 -04:00
bundle_eu.properties
Stone craters name fix
2021-08-09 12:13:07 -04:00
bundle_fi.properties
Stone craters name fix
2021-08-09 12:13:07 -04:00
bundle_fil.properties
Stone craters name fix
2021-08-09 12:13:07 -04:00
bundle_fr.properties
Updates bundle_fr.properties (#5931)
2021-09-12 11:09:46 -04:00
bundle_hu.properties
Avoid ambiguity (#5809)
2021-08-23 12:37:34 -04:00
bundle_in_ID.properties
Avoid ambiguity (#5809)
2021-08-23 12:37:34 -04:00
bundle_it.properties
Stone craters name fix
2021-08-09 12:13:07 -04:00
bundle_ja.properties
Update bundle_ja.properties (#5849)
2021-09-13 08:44:13 -04:00
bundle_ko.properties
Update bundle_ko.properties (#5892)
2021-09-12 11:21:53 -04:00
bundle_lt.properties
Stone craters name fix
2021-08-09 12:13:07 -04:00
bundle_nl_BE.properties
Stone craters name fix
2021-08-09 12:13:07 -04:00
bundle_nl.properties
Stone craters name fix
2021-08-09 12:13:07 -04:00
bundle_pl.properties
Avoid ambiguity (#5809)
2021-08-23 12:37:34 -04:00
bundle_pt_BR.properties
Stone craters name fix
2021-08-09 12:13:07 -04:00
bundle_pt_PT.properties
Stone craters name fix
2021-08-09 12:13:07 -04:00
bundle_ro.properties
[Bundle][RO] Update (#5848)
2021-09-12 11:21:17 -04:00
bundle_ru.properties
[RU] Multiplayer translate (#6014)
2021-09-17 21:39:49 -04:00
bundle_sv.properties
Stone craters name fix
2021-08-09 12:13:07 -04:00
bundle_th.properties
Update bundle_th.properties (#5908)
2021-09-12 11:09:40 -04:00
bundle_tk.properties
Stone craters name fix
2021-08-09 12:13:07 -04:00
bundle_tr.properties
TR Translate before release (#5980)
2021-09-12 11:34:03 -04:00
bundle_uk_UA.properties
Avoid ambiguity (#5809)
2021-08-23 12:37:34 -04:00
bundle_vi.properties
Avoid ambiguity (#5809)
2021-08-23 12:37:34 -04:00
bundle_zh_CN.properties
Update bundle_zh_CN.properties (#5938)
2021-09-12 12:54:32 -04:00
bundle_zh_TW.properties
Update bundle_zh_TW.properties (#5860)
2021-09-12 11:21:09 -04:00
bundle.properties
Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
2021-09-28 18:45:09 -04:00