Merge branch 'master' of https://github.com/Anuken/Mindustry into v105

core/assets/bundles/bundle.properties

@@ -106,6 +106,7 @@ mods.guide = Modding Guide
 mods.report = Report Bug
 mods.openfolder = Open Folder
 mods.reload = Reload
+mods.reloadexit = The game will now exit, to reload mods.
 mod.display = [gray]Mod:[orange] {0}
 mod.enabled = [lightgray]Enabled
 mod.disabled = [scarlet]Disabled
@@ -120,10 +121,11 @@ mod.noerrorplay = [scarlet]You have mods with errors.[] Either disable the affec
 mod.nowdisabled = [scarlet]Mod '{0}' is missing dependencies:[accent] {1}\n[lightgray]These mods need to be downloaded first.\nThis mod will be automatically disabled.
 mod.enable = Enable
 mod.requiresrestart = The game will now close to apply the mod changes.
-mod.reloadrequired = [scarlet]Reload Required
+mod.reloadrequired = [scarlet]Restart Required
 mod.import = Import Mod
 mod.import.file = Import File
 mod.import.github = Import From GitHub
+mod.jarwarn = [scarlet]JAR mods are inherently unsafe.[]\nMake sure you're importing this mod from a trustworthy source!
 mod.item.remove = This item is part of the[accent] '{0}'[] mod. To remove it, uninstall that mod.
 mod.remove.confirm = This mod will be deleted.
 mod.author = [lightgray]Author:[] {0}
@@ -196,8 +198,8 @@ server.admins.none = No admins found!
 server.add = Add Server
 server.delete = Are you sure you want to delete this server?
 server.edit = Edit Server
-server.outdated = [crimson]Outdated Server![]
-server.outdated.client = [crimson]Outdated Client![]
+server.outdated = [scarlet]Outdated Server![]
+server.outdated.client = [scarlet]Outdated Client![]
 server.version = [gray]v{0} {1}
 server.custombuild = [accent]Custom Build
 confirmban = Are you sure you want to ban "{0}[white]"?
@@ -219,7 +221,7 @@ connecting.data = [accent]Loading world data...
 server.port = Port:
 server.addressinuse = Address already in use!
 server.invalidport = Invalid port number!
-server.error = [crimson]Error hosting server.
+server.error = [scarlet]Error hosting server.
 save.new = New Save
 save.overwrite = Are you sure you want to overwrite\nthis save slot?
 overwrite = Overwrite
@@ -229,8 +231,8 @@ save.delete.confirm = Are you sure you want to delete this save?
 save.delete = Delete
 save.export = Export Save
 save.import.invalid = [accent]This save is invalid!
-save.import.fail = [crimson]Failed to import save: [accent]{0}
-save.export.fail = [crimson]Failed to export save: [accent]{0}
+save.import.fail = [scarlet]Failed to import save: [accent]{0}
+save.export.fail = [scarlet]Failed to export save: [accent]{0}
 save.import = Import Save
 save.newslot = Save name:
 save.rename = Rename
@@ -460,7 +462,9 @@ requirement.core = Destroy Enemy Core in {0}
 requirement.unlock = Unlock {0}
 resume = Resume Zone:\n[lightgray]{0}
 bestwave = [lightgray]Best Wave: {0}
+#TODO fix/remove this
 launch = < LAUNCH >
+launch.text = Launch
 launch.title = Launch Successful
 launch.next = [lightgray]next opportunity at wave {0}
 launch.unable2 = [scarlet]Unable to LAUNCH.[]
@@ -468,13 +472,14 @@ launch.confirm = This will launch all resources in your core.\nYou will not be a
 launch.skip.confirm = If you skip now, you will not be able to launch until later waves.
 uncover = Uncover
 configure = Configure Loadout
+#TODO
+loadout = Loadout
+resources = Resources 
 bannedblocks = Banned Blocks
 addall = Add All
-configure.locked = [lightgray]Unlock configuring loadout: {0}.
 configure.invalid = Amount must be a number between 0 and {0}.
 zone.unlocked = [lightgray]{0} unlocked.
 zone.requirement.complete = Requirement for {0} completed:[lightgray]\n{1}
-zone.config.unlocked = Loadout unlocked:[lightgray]\n{0}
 zone.resources = [lightgray]Resources Detected:
 zone.objective = [lightgray]Objective: [accent]{0}
 zone.objective.survival = Survive
@@ -482,7 +487,7 @@ zone.objective.attack = Destroy Enemy Core
 add = Add...
 boss.health = Boss Health
 
-connectfail = [crimson]Connection error:\n\n[accent]{0}
+connectfail = [scarlet]Connection error:\n\n[accent]{0}
 error.unreachable = Server unreachable.\nIs the address spelled correctly?
 error.invalidaddress = Invalid address.
 error.timedout = Timed out!\nMake sure the host has port forwarding set up, and that the address is correct!
@@ -541,7 +546,7 @@ unplaceable.sectorcaptured = [scarlet]Requires captured sector
 yes = Yes
 no = No
 info.title = Info
-error.title = [crimson]An error has occured
+error.title = [scarlet]An error has occured
 error.crashtitle = An error has occured
 unit.nobuild = [scarlet]Unit can't build
 blocks.input = Input
@@ -583,6 +588,8 @@ blocks.reload = Shots/Second
 blocks.ammo = Ammo
 
 bar.drilltierreq = Better Drill Required
+bar.noresources = Missing Resources
+bar.corereq = Core Base Required
 bar.drillspeed = Drill Speed: {0}/s
 bar.pumpspeed = Pump Speed: {0}/s
 bar.efficiency = Efficiency: {0}%
@@ -664,7 +671,6 @@ setting.effects.name = Display Effects
 setting.destroyedblocks.name = Display Destroyed Blocks
 setting.blockstatus.name = Display Block Status
 setting.conveyorpathfinding.name = Conveyor Placement Pathfinding
-setting.coreselect.name = Allow Schematic Cores
 setting.sensitivity.name = Controller Sensitivity
 setting.saveinterval.name = Save Interval
 setting.seconds = {0} seconds
@@ -678,6 +684,7 @@ setting.blockselectkeys.name = Show Block Select Keys
 setting.vsync.name = VSync
 setting.pixelate.name = Pixelate
 setting.minimap.name = Show Minimap
+setting.coreitems.name = Display Core Items (WIP)
 setting.position.name = Show Player Position
 setting.musicvol.name = Music Volume
 setting.atmosphere.name = Show Planet Atmosphere
@@ -703,6 +710,7 @@ keybinds.mobile = [scarlet]Most keybinds here are not functional on mobile. Only
 category.general.name = General
 category.view.name = View
 category.multiplayer.name = Multiplayer
+category.blocks.name = Block Select
 command.attack = Attack
 command.rally = Rally
 command.retreat = Retreat
@@ -827,7 +835,6 @@ liquid.water.name = Water
 liquid.slag.name = Slag
 liquid.oil.name = Oil
 liquid.cryofluid.name = Cryofluid
-item.corestorable = [lightgray]Storable in Core: {0}
 item.explosiveness = [lightgray]Explosiveness: {0}%
 item.flammability = [lightgray]Flammability: {0}%
 item.radioactivity = [lightgray]Radioactivity: {0}%
@@ -1046,21 +1053,7 @@ team.orange.name = orange
 team.derelict.name = derelict
 team.green.name = green
 team.purple.name = purple
-unit.spirit.name = Spirit Repair Drone
-unit.draug.name = Draug Miner Drone
-unit.phantom.name = Phantom Builder Drone
-unit.dagger.name = Dagger
-unit.crawler.name = Crawler
-unit.titan.name = Titan
-unit.ghoul.name = Ghoul Bomber
-unit.wraith.name = Wraith Fighter
-unit.fortress.name = Fortress
-unit.revenant.name = Revenant
-unit.eruptor.name = Eruptor
-unit.chaos-array.name = Chaos Array
-unit.eradicator.name = Eradicator
-unit.lich.name = Lich
-unit.reaper.name = Reaper
+
 tutorial.next = [lightgray]<Tap to continue>
 tutorial.intro = You have entered the[scarlet] Mindustry Tutorial.[]\nUse[accent] [[WASD][] to move.\n[accent]Scroll[] to zoom in and out.\nBegin by[accent] mining copper[]. Move close to it, then tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper
 tutorial.intro.mobile = You have entered the[scarlet] Mindustry Tutorial.[]\nSwipe the screen to move.\n[accent]Pinch with 2 fingers[] to zoom in and out.\nBegin by[accent] mining copper[]. Move close to it, then tap a copper ore vein near your core to do this.\n\n[accent]{0}/{1} copper
@@ -1103,17 +1096,7 @@ liquid.water.description = The most useful liquid. Commonly used for cooling mac
 liquid.slag.description = Various different types of molten metal mixed together. Can be separated into its constituent minerals, or sprayed at enemy units as a weapon.
 liquid.oil.description = A liquid used in advanced material production. Can be converted into coal as fuel, or sprayed and set on fire as a weapon.
 liquid.cryofluid.description = An inert, non-corrosive liquid created from water and titanium. Has extremely high heat capacity. Extensively used as coolant.
-unit.draug.description = A primitive mining drone. Cheap to produce. Expendable. Automatically mines copper and lead in the vicinity. Delivers mined resources to the closest core.
-unit.spirit.description = A modified draug drone, designed for repair instead of mining. Automatically fixes any damaged blocks in the area.
-unit.phantom.description = An advanced drone unit. Follows users. Assists in block construction. Rebuilds destroyed blocks.
-unit.dagger.description = The most basic ground mech. Cheap to produce. Overwhelming when used in swarms.
-unit.crawler.description = A ground unit consisting of a stripped-down frame with high explosives strapped on top. Not particular durable. Explodes on contact with enemies.
-unit.titan.description = An advanced, armored ground unit. Attacks both ground and air targets. Equipped with two miniature Scorch-class flamethrowers.
-unit.fortress.description = A heavy artillery mech. Equipped with two modified Hail-type cannons for long-range assault on enemy structures and units.
-unit.eruptor.description = A heavy mech designed to take down structures. Fires a stream of slag at enemy fortifications, melting them and setting volatiles on fire.
-unit.wraith.description = A fast, hit-and-run interceptor unit. Targets power generators.
-unit.ghoul.description = A heavy carpet bomber. Rips through enemy structures, targeting critical infrastructure.
-unit.revenant.description = A heavy, hovering missile array.
+
 block.message.description = Stores a message. Used for communication between allies.
 block.graphite-press.description = Compresses chunks of coal into pure sheets of graphite.
 block.multi-press.description = An upgraded version of the graphite press. Employs water and power to process coal quickly and efficiently.