Anuken 186a2aaa45 Merge branches 'master' and 'mech-rework' of https://github.com/Anuken/Mindustry into mech-rework ... # 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/ai/BlockIndexer.java # core/src/mindustry/core/World.java # core/src/mindustry/entities/traits/Entity.java # core/src/mindustry/entities/type/BaseEntity.java # core/src/mindustry/entities/type/TileEntity.java # core/src/mindustry/world/blocks/defense/MendProjector.java # core/src/mindustry/world/blocks/defense/OverdriveProjector.java # core/src/mindustry/world/blocks/production/Drill.java # gradle.properties		2019-12-27 01:41:06 -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
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 'master' and 'mech-rework' of https://github.com/Anuken/Mindustry into mech-rework	2019-12-27 01:41:06 -05:00