mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-08 01:43:59 +07:00
Code Issues Packages Projects Releases Wiki Activity
e6bd259c0e
Mindustry/core/assets/bundles
History
Anuken e6bd259c0e Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/icons/icons.properties
	core/assets/logicids.dat
	core/src/mindustry/ui/dialogs/PlanetDialog.java
	core/src/mindustry/world/blocks/distribution/ItemBridge.java
	core/src/mindustry/world/blocks/liquid/LiquidExtendingBridge.java
	core/src/mindustry/world/blocks/storage/StorageBlock.java
	gradle.properties
2021-08-10 15:15:07 -04:00
..
bundle_be.properties Stone craters name fix 2021-08-09 12:13:07 -04:00
bundle_bg.properties Stone craters name fix 2021-08-09 12:13:07 -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 Stone craters name fix 2021-08-09 12:13:07 -04:00
bundle_es.properties Stone craters name fix 2021-08-09 12:13:07 -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 Stone craters name fix 2021-08-09 12:13:07 -04:00
bundle_hu.properties Stone craters name fix 2021-08-09 12:13:07 -04:00
bundle_in_ID.properties Stone craters name fix 2021-08-09 12:13:07 -04:00
bundle_it.properties Stone craters name fix 2021-08-09 12:13:07 -04:00
bundle_ja.properties Stone craters name fix 2021-08-09 12:13:07 -04:00
bundle_ko.properties Stone craters name fix 2021-08-09 12:13:07 -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 Stone craters name fix 2021-08-09 12:13:07 -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 Stone craters name fix 2021-08-09 12:13:07 -04:00
bundle_ru.properties Stone craters name fix 2021-08-09 12:13:07 -04:00
bundle_sv.properties Stone craters name fix 2021-08-09 12:13:07 -04:00
bundle_th.properties Stone craters name fix 2021-08-09 12:13:07 -04:00
bundle_tk.properties Stone craters name fix 2021-08-09 12:13:07 -04:00
bundle_tr.properties Stone craters name fix 2021-08-09 12:13:07 -04:00
bundle_uk_UA.properties Stone craters name fix 2021-08-09 12:13:07 -04:00
bundle_vi.properties Stone craters name fix 2021-08-09 12:13:07 -04:00
bundle_zh_CN.properties Stone craters name fix 2021-08-09 12:13:07 -04:00
bundle_zh_TW.properties Stone craters name fix 2021-08-09 12:13:07 -04:00
bundle.properties Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-08-10 15:15:07 -04:00