diff --git a/core/assets/bundles/bundle_es.properties b/core/assets/bundles/bundle_es.properties
index ffaba3891d..65e970f7ec 100644
--- a/core/assets/bundles/bundle_es.properties
+++ b/core/assets/bundles/bundle_es.properties
@@ -303,7 +303,7 @@ text.blocks.powerdamage = Power/Damage
 text.blocks.inputitemcapacity = Capacidad de Entrada de los Objetos
 text.blocks.outputitemcapacity = Capacidad de Salida de los Objetos
 text.blocks.itemcapacity = Capacidad de Objetos
-text.blocks.basepowergeneration = Base Power Generation
+text.blocks.basepowergeneration = Generación de energía base
 text.blocks.powertransferspeed = Transferencia de Energía
 text.blocks.craftspeed = Velocidad de Producción
 text.blocks.inputliquid = Líquidos de Entrada
@@ -410,22 +410,22 @@ mode.custom.warning.read = Just to make sure you've read it:\n[scarlet]UNLOCKS I
 mode.freebuild.name = construcción libre
 mode.freebuild.description = recursos limitados y no hay temporizador para las hordas.
 mode.pvp.name = PvP
-mode.pvp.description = fight against other players locally.
+mode.pvp.description = Pelea contra otros jugadores localmente.
 content.item.name = Objetos
 content.liquid.name = Líquidos
 content.unit.name = Units
 content.recipe.name = Bloques
-content.mech.name = Mechs
+content.mech.name = Mecanoides
 item.stone.name = Piedra
 item.stone.description = Un material muy común. Usado para separar y para refinarse a otros objetos, y también derretir en lava.
-item.copper.name = Copper
-item.copper.description = A useful structure material. Used extensively in all types of blocks.
+item.copper.name = Cobre
+item.copper.description = Un útil material estructural. Usado extensivamente en todo tipo de bloques.
 item.lead.name = Plomo
 item.lead.description = Un material básico. Usado extensivamente en electrónicos y bloques de transferencia de líquidos.
 item.coal.name = Carbón
 item.coal.description = Un combustible común y preparado para ser quemado.
-item.dense-alloy.name = Dense Alloy
-item.dense-alloy.description = A tough alloy made with lead and copper. Used in advanced transportation blocks and high-tier drills.
+item.dense-alloy.name = Aleación Densa
+item.dense-alloy.description = Una dura aleación fabricada con plomo y cobre. Usado en bloques de transporte avanzados y taladros de alto nivel.
 item.titanium.name = Titanio
 item.titanium.description = Un metal raro super ligero usado extensivamente en transportación de liquidos, taladros y aeronaves.
 item.thorium.name = Torio
@@ -435,9 +435,9 @@ item.silicon.description = Un semiconductor muy útil, se usa para paneles solar
 item.plastanium.name = Plastanio
 item.plastanium.description = Un material dúctil, ligero usado en aeronaves y proyectiles de fragmentación.
 item.phase-fabric.name = Phase Fabric
-item.phase-fabric.description = A near-weightless substance used in advanced electronics and self-repairing technology.
+item.phase-fabric.description = Una sustancia casi sin peso usada en electrónica avanzada y en tecnología autoreparadora.
 item.surge-alloy.name = Surge Alloy
-item.surge-alloy.description = An advanced alloy with unique electrical properties.
+item.surge-alloy.description = Una aleación avanzada con propiedades eléctricas únicas.
 item.biomatter.name = Biomateria
 item.biomatter.description = Una bola de restos orgánicos; usado para convertirlo a petróleo o combustible básico.
 item.sand.name = Arena
@@ -445,7 +445,7 @@ item.sand.description = Un material común que es usado extensivamente en la fun
 item.blast-compound.name = Compuesto Explosivo
 item.blast-compound.description = Un compuesto volatil usado en bombas y explosivos. Aunque se puede quemar como combustible, esto no es recomendable.
 item.pyratite.name = Pirotita
-item.pyratite.description = Una substancia extremadamente inflamable usada en armas incendiarias.
+item.pyratite.description = Una sustancia extremadamente inflamable usada en armas incendiarias.
 liquid.water.name = Agua
 liquid.lava.name = Lava
 liquid.oil.name = Petróleo
@@ -468,12 +468,12 @@ mech.omega-mech.ability = Armored Configuration
 mech.omega-mech.description = A bulky and well-armored mech, made for front-line assaults. Its armor ability can block up to 90% of incoming damage.
 mech.dart-ship.name = Dart
 mech.dart-ship.weapon = Repeater
-mech.dart-ship.description = The standard ship. Reasonably fast and light, but has little offensive capability and low mining speed.
-mech.javelin-ship.name = Javelin
+mech.dart-ship.description = La nave normal. Bastante ligera y rápida, pero tiene poca capacidad ofensiva y baja velocidad minado.
+mech.javelin-ship.name = Jabalina
 mech.javelin-ship.description = A hit-and-run strike ship. While initially slow, it can accelerate to great speeds and fly by enemy outposts, dealing large amounts of damage with its lightning ability and missiles.
 mech.javelin-ship.weapon = Burst Missiles
 mech.javelin-ship.ability = Discharge Booster
-mech.trident-ship.name = Trident
+mech.trident-ship.name = Tridente
 mech.trident-ship.description = A heavy bomber. Reasonably well armored.
 mech.trident-ship.weapon = Bomb Bay
 mech.glaive-ship.name = Glaive
@@ -485,17 +485,17 @@ text.item.radioactivity = [LIGHT_GRAY]Radioactividad: {0}
 text.item.fluxiness = [LIGHT_GRAY]Poder como Fundente: {0}
 text.unit.health = [LIGHT_GRAY]Vida: {0}
 text.unit.speed = [LIGHT_GRAY]Velocidad: {0}
-text.mech.weapon = [LIGHT_GRAY]Weapon: {0}
-text.mech.armor = [LIGHT_GRAY]Armor: {0}
-text.mech.itemcapacity = [LIGHT_GRAY]Item Capacity: {0}
-text.mech.minespeed = [LIGHT_GRAY]Mining Speed: {0}
-text.mech.minepower = [LIGHT_GRAY]Mining Power: {0}
-text.mech.ability = [LIGHT_GRAY]Ability: {0}
+text.mech.weapon = [LIGHT_GRAY]Arma: {0}
+text.mech.armor = [LIGHT_GRAY]Armadura: {0}
+text.mech.itemcapacity = [LIGHT_GRAY]Capacidad de objetos: {0}
+text.mech.minespeed = [LIGHT_GRAY]Velocidad de minado: {0}
+text.mech.minepower = [LIGHT_GRAY]Potencia de minado: {0}
+text.mech.ability = [LIGHT_GRAY]Hablidad: {0}
 text.liquid.heatcapacity = [LIGHT_GRAY]Capacidad Térmica: {0}
 text.liquid.viscosity = [LIGHT_GRAY]Viscosidad: {0}
 text.liquid.temperature = [LIGHT_GRAY]Temperatura: {0}
 block.spawn.name = Enemy Spawn
-block.core.name = Core
+block.core.name = núcleo
 block.metalfloor.name = Metal Floor
 block.deepwater.name = aguas profundas
 block.water.name = agua
@@ -512,14 +512,14 @@ block.shrub.name = arbusto
 block.rock.name = roca
 block.blackrock.name = roca negra
 block.icerock.name = roca de hielo
-block.copper-wall.name = Copper Wall
-block.copper-wall-large.name = Large Copper Wall
-block.dense-alloy-wall.name = Dense Alloy Wall
-block.dense-alloy-wall-large.name = Large Dense Alloy Wall
+block.copper-wall.name = Muro de cobre
+block.copper-wall-large.name = Muro de cobre grande
+block.dense-alloy-wall.name = Muro de aleación densa
+block.dense-alloy-wall-large.name = Muro de aleación densa grande
 block.phase-wall.name = Phase Wall
 block.phase-wall-large.name = Large Phase Wall
 block.thorium-wall.name = Pared de Torio
-block.thorium-wall-large.name = Pared de Torio Larga
+block.thorium-wall-large.name = Pared de Torio grande
 block.door.name = Puerta
 block.door-large.name = Puerta Larga
 block.duo.name = Dúo
@@ -547,13 +547,13 @@ block.biomattercompressor.name = Compresor de Biomateria
 block.separator.name = Separador
 block.centrifuge.name = Centrifugadora
 block.power-node.name = Nodo de Energía
-block.power-node-large.name = Nodo de Energía Largo
+block.power-node-large.name = Nodo de Energía Grande
 block.battery.name = Batería
-block.battery-large.name = Batería Larga
+block.battery-large.name = Batería Grande
 block.combustion-generator.name = Generador de Combustión
 block.turbine-generator.name = Turbina
-block.mechanical-drill.name = Mechanical Drill
-block.pneumatic-drill.name = Pneumatic Drill
+block.mechanical-drill.name = Taladro mecánico
+block.pneumatic-drill.name = Taladro neumático
 block.laser-drill.name = Taladro Laser
 block.water-extractor.name = Extractor de Agua
 block.cultivator.name = Cultivador
@@ -585,7 +585,7 @@ block.pyratite-mixer.name = Mezclador de Pirotita
 block.blast-mixer.name = Mezclador de Explosivos
 block.solidifer.name = Solidificador
 block.solar-panel.name = Panel Solar
-block.solar-panel-large.name = Panel Solar Largo
+block.solar-panel-large.name = Panel Solar Grande
 block.oil-extractor.name = Extractor de Petróleo
 block.spirit-factory.name = Spirit Drone Factory
 block.phantom-factory.name = Phantom Drone Factory
@@ -603,7 +603,7 @@ block.liquid-tank.name = Tanque de Líquido
 block.liquid-junction.name = Cruce de Líquidos
 block.bridge-conduit.name = Conducto Puente
 block.rotary-pump.name = Bomba Rotatoria
-block.thorium-reactor.name = Thorium Reactor
+block.thorium-reactor.name = TReactor de Torio
 block.command-center.name = Centro de Comando
 block.mass-driver.name = Teletransportador de Masa
 block.blast-drill.name = Taladro Gigante
@@ -613,28 +613,27 @@ block.alloy-smelter.name = Alloy Smtler
 block.mend-projector.name = Mend Projector
 block.surge-wall.name = Surge Wall
 block.surge-wall-large.name = Large Surge Wall
-block.cyclone.name = Cyclone
+block.cyclone.name = Ciclón
 block.fuse.name = Fuse
 block.shock-mine.name = Shock Mine
 block.overdrive-projector.name = Overdrive Projector
 block.force-projector.name = Force Projector
 block.arc.name = Arc
-block.rtg-generator.name = RTG Generator
+block.rtg-generator.name = Generador RTG
 block.spectre.name = Spectre
 block.meltdown.name = Meltdown
 block.container.name = Container
-block.core.description = The most important building in the game.
-team.blue.name = blue
-team.red.name = red
-team.orange.name = orange
-team.none.name = gray
-team.green.name = green
-team.purple.name = purple
+team.blue.name = azul
+team.red.name = rojo
+team.orange.name = naranja
+team.none.name = gris
+team.green.name = verde
+team.purple.name = púrpura
 unit.alpha-drone.name = Alpha Drone
 unit.spirit.name = Spirit Drone
-unit.spirit.description = The starter drone unit. Spawns in the core by default. Automatically mines ores, collects items and repairs blocks.
+unit.spirit.description = El dron del comienzo. Aparece en el núcleo por defecto. Mina automáticamente minerales, recoge objetos y repara bloques.
 unit.phantom.name = Phantom Drone
-unit.phantom.description = An advanced drone unit. Automatically mines ores, collects items and repairs blocks. Significantly more effective than a drone.
+unit.phantom.description = Un dron avanzado. Mina automáticamente minerales, recoge objetos y repra bloques. Bastante más efectivo que un dron normal.
 unit.dagger.name = Daga
 unit.dagger.description = Una unidad de terreno. Útil con enjambres.
 unit.titan.name = Titán
@@ -715,29 +714,29 @@ block.solidifer.description = Cools lava to stone at a fast pace.
 block.melter.description = Heats up stone to very high temperatures to obtain lava.
 block.incinerator.description = Gets rid of any excess item or liquid.
 block.biomattercompressor.description = Compresses biomatter in order to retrieve oil.
-block.separator.description = Exposes stone to water pressure in order to obtain various minerals contained in the stone.
-block.centrifuge.description = More efficient than the separator, but also more expensive to build and requires power.
-block.power-node.description = Transmits power to connected nodes. Up to four power sources, sinks or nodes can be connected. The node will receive power from or supply power to any adjacent blocks.
-block.power-node-large.description = Has a larger radius than the power node and connects to up to six power sources, sinks or nodes.
-block.battery.description = Stores power whenever there is an abundance and provides power whenever there is a shortage, as long as there is capacity left.
-block.battery-large.description = Stores much more power than a regular battery.
-block.combustion-generator.description = Generates power by burning oil or flammable materials.
-block.turbine-generator.description = More efficient than a combustion generator, but requires additional water.
-block.thermal-generator.description = Generates a large amount of power from lava.
-block.solar-panel.description = Provides a small amount of power from the sun.
-block.solar-panel-large.description = Provides much better power supply than a standard solar panel, but is also much more expensive to build.
-block.thorium-reactor.description = Generates huge amounts of power from highly radioactive thorium. Requires constant cooling. Will explode violently if insufficient amounts of coolant are supplied.
-block.rtg-generator.description = A radioisotope thermoelectric generator which does not require cooling but provides less power than a thorium reactor.
-block.unloader.description = Unloads items from a container, vault or core onto a conveyor or directly into an adjacent block. The type of item to be unloaded can be changed by tapping on the unloader.
-block.container.description = Stores a small amount of items. Use it for creating buffers when there is a non-constant demand of materials. An[LIGHT_GRAY] unloader[] can be used to retrieve items from the container.
-block.vault.description = Stores a large amount of items. Use it for creating buffers when there is a non-constant demand of materials. An[LIGHT_GRAY] unloader[] can be used to retrieve items from the vault.
-block.mechanical-drill.description = A cheap drill. When placed on appropriate tiles, outputs items at a slow pace indefinitely.
-block.pneumatic-drill.description = An improved drill which is faster and able to process harder materials by making use of air pressure.
-block.laser-drill.description = Allows drilling even faster through laser technology, but requires power. Additionally, radioactive thorium can be retrieved with this drill.
+block.separator.description = Expone piedra a la presión del agua para obtener diversos minerales contenidos en la piedra.
+block.centrifuge.description = Más eficiente que un separador, pero es más caro de construir y requiere energía.
+block.power-node.description = Transmite energía a nodos conectados, conecta hasta cuatro fuentes de energía, edificios que usan energía o nodos. El nodo obtendrá o transmitirá energía de cualquier bloque adyacente.
+block.power-node-large.description = Tiene un radio más amplio que el nodo de energía y conecta hasta seis fuentes de energía, edificios que usan energía o nodos.
+block.battery.description = Guarda energía cuando hay abundancia y proporciona energía cuando hay escasez de energía mientras la batería tenga energía.
+block.battery-large.description = Almacena mucha más energía que una batería normal.
+block.combustion-generator.description = Genera energía quemando aceite o matteriales inflamables.
+block.turbine-generator.description = Más eficiente que un generador de combustión, pero requiere agua adicional.
+block.thermal-generator.description = Genera una gran cantidad de energía con la lava.
+block.solar-panel.description = Proporciona una pequeña cantidad de energía procedente del sol.
+block.solar-panel-large.description = Genera un mucho mejor suministro de energía que un panel solar estándar, pero también es mucho más caro de construir.
+block.thorium-reactor.description = Genera grandes cantidades de energía del torio altamente radioactivo. Necesita enfriamiento constante. Explotará violentamente si no se le aporta suficiente enfriamiento.
+block.rtg-generator.description = Un generador radioisótropo termoeléctrico que no necesita enfriamiento pero proporciona menos energía que un reactor de torio.
+block.unloader.description = Descarga objetos de un contenedor, almacén o el núcleo a un transportador o directamente a un bloque adyacente. El tipo de objeto descargado puede ser cambiado tocando el descagador.
+block.container.description = Almacena una pequeña cantidad de objetos. Úsalo para crear almacenes cuando no hay una demanda constante de materales. Un [LIGHT_GRAY] unloader[] puede usarse para obtener objetos del contenedor.
+block.vault.description = Almacena una gran cantidad de objetos. Úsalo para crear almacenes cuando no hay una demanda constante de materales. Un [LIGHT_GRAY] unloader[] puede usarse para obtener objetos del almacén.
+block.mechanical-drill.description = Un taladro barato. Cuando es colocado en casillas apropiadas, extrae objetos lentamente de forma indefinida.
+block.pneumatic-drill.description = Un taladro mejorado que es más rápido y puede obtener minerales más duros usando la presión.
+block.laser-drill.description = Permite obtener minerales incluso más rápido con la tecnología láser, pero requiere energía. Además, se puede obtener torio radioactivo con este taladro.
 block.blast-drill.description = The ultimate drill. Requires large amounts of power.
-block.water-extractor.description = Extracts water from the ground. Use it when there is no lake nearby.
-block.cultivator.description = Cultivates the soil with water in order to obtain biomatter.
-block.oil-extractor.description = Uses large amounts of power in order to extract oil from sand. Use it when there is no direct source of oil nearby.
+block.water-extractor.description = Extrae agua de la tierra. Úsalo cuando no haya lagos cercanos.
+block.cultivator.description = Cultiva la tierra para obtener biomateria.
+block.oil-extractor.description = Usa grandes cantidades de energía para extraer aceite de la arena. Úsalo cuando no hay fuentes directas de aceite cerca.
 block.dart-ship-pad.description = Leave your current vessel and change into a basic fighter aircraft.\nUse the pad by double tapping while standing on it.
 block.trident-ship-pad.description = Leave your current vessel and change into a reasonably well armored heavy bomber.\nUse the pad by double tapping while standing on it.
 block.javelin-ship-pad.description = Leave your current vessel and change into a strong and fast interceptor with lightning weapons.\nUse the pad by double tapping while standing on it.
@@ -745,15 +744,15 @@ block.glaive-ship-pad.description = Leave your current vessel and change into a
 block.tau-mech-pad.description = Leave your current vessel and change into a support mech which can heal friendly buildings and units.\nUse the pad by double tapping while standing on it.
 block.delta-mech-pad.description = Leave your current vessel and change into a fast, lightly-armored mech made for hit-and-run attacks.\nUse the pad by double tapping while standing on it.
 block.omega-mech-pad.description = Leave your current vessel and change into a bulky and well-armored mech, made for front-line assaults.\nUse the pad by double tapping while standing on it.
-block.spirit-factory.description = Produces light drones which mine ore and repair blocks.
+block.spirit-factory.description = Produce drones ligeros que obtienen minerales y reparan bloques.
 block.phantom-factory.description = Produces advanced drone units which are significantly more effective than a spirit drone.
 block.wraith-factory.description = Produces fast, hit-and-run interceptor units.
 block.ghoul-factory.description = Produces heavy carpet bombers.
-block.dagger-factory.description = Produces basic ground units.
+block.dagger-factory.description = Produce unidades terrestres básicas.
 block.titan-factory.description = Produces advanced, armored ground units.
 block.fortress-factory.description = Produces heavy artillery ground units.
 block.revenant-factory.description = Produces heavy laser ground units.
-block.repair-point.description = Continuously heals the closest damaged unit in its vicinity.
+block.repair-point.description = Repara la unidad dañada más cercana a su alrededor.
 block.command-center.description = Allows changing friendly AI behavior. Currently, attack, retreat and patrol commands are supported.
 block.conduit.description = Basic liquid transport block. Works like a conveyor, but with liquids. Best used with extractors, pumps or other conduits.
 block.pulse-conduit.description = Advanced liquid transport block. Transports liquids faster and stores more than standard conduits.