Merge branches 'master' and 'mods' of https://github.com/Anuken/Mindustry

# Conflicts:
#	core/src/io/anuke/mindustry/entities/type/FlyingUnit.java
#	gradle.properties

core/assets/bundles/bundle.properties

@@ -22,6 +22,7 @@ load.map = Maps
 load.image = Images
 load.content = Content
 load.system = System
+load.mod = Mods
 
 stat.wave = Waves Defeated:[accent] {0}
 stat.enemiesDestroyed = Enemies Destroyed:[accent] {0}
@@ -64,6 +65,17 @@ uploadingpreviewfile = Uploading Preview File
 committingchanges = Comitting Changes
 done = Done
 
+mods.alphainfo = Keep in mind that mods are in alpha, and[scarlet] may be very buggy[].\nReport any issues you find to the Mindustry Github or Discord.
+mods.alpha = [scarlet](Alpha)
+mods = Mods
+mods.none = [LIGHT_GRAY]No mods found!
+mod.enabled = [lightgray]Enabled
+mod.disabled = [scarlet]Disabled
+mod.requiresrestart = The game will now close to apply the mod changes.
+mod.import = Import Mod
+mod.remove.confirm = This mod will be deleted.
+mod.author = [LIGHT_GRAY]Author:[] {0}
+
 about.button = About
 name = Name:
 noname = Pick a[accent] player name[] first.