Custom wave patterns / Fixed checkbox sprite / Bugfixes

core/assets/bundles/bundle.properties

@@ -195,6 +195,14 @@ editor.mapinfo = Map Info
 editor.author = Author:
 editor.description = Description:
 editor.waves = Waves:
+waves.title = Waves
+waves.remove = Remove
+waves.never = <never>
+waves.every = every
+waves.waves = wave(s)
+waves.perspawn = per spawn
+waves.to = to
+waves.boss = Boss
 editor.default = [LIGHT_GRAY]<Default>
 edit = Edit...
 editor.name = Name:

core/assets/bundles/bundle_cs.properties

@@ -192,11 +192,23 @@ editor.oregen.info = Generování nerostných zdrojů:
 editor.mapinfo = Informace o mapě
 editor.author = Autor:
 editor.description = Popis:
+editor.waves = Waves:
+waves.title = Waves
+waves.remove = Remove
+waves.never = <never>
+waves.every = every
+waves.waves = wave(s)
+waves.perspawn = per spawn
+waves.to = to
+waves.boss = Boss
+editor.default = [LIGHT_GRAY]<Default>
+edit = Edit...
 editor.name = Jméno:
 editor.teams = Týmy
 editor.elevation = Výška
-editor.errorimageload = Chyba při načítání souboru:\n[accent]{0}
+editor.errorload = Error loading file:\n[accent]{0}
-editor.errorimagesave = Chyba při ukládání souboru:\n[accent]{0}
+editor.errorsave = Error saving file:\n[accent]{0}
+editor.errorname = Map has no name defined.
 editor.generate = Generovat
 editor.resize = Změnit velikost
 editor.loadmap = Načíst mapu
@@ -273,14 +285,9 @@ zone.groundZero.name = Ground Zero
 zone.craters.name = The Craters
 zone.frozenForest.name = Frozen Forest
 zone.ruinousShores.name = Ruinous Shores
-zone.crags.name = Crags
 zone.stainedMountains.name = Stained Mountains
-zone.impact0079.name = Impact 0079
 zone.desolateRift.name = Desolate Rift
-zone.arcticDesert.name = Arctic Desert
-zone.dryWastes.name = Dry Wastes
 zone.nuclearComplex.name = Nuclear Production Complex
-zone.moltenFault.name = Molten Fault
 settings.language = Jazyk
 settings.reset = nastavit výchozí
 settings.rebind = Přenastavit
@@ -300,6 +307,7 @@ info.title = Informace
 error.title = [crimson]Objevila se chyba
 error.crashtitle = Objevila se chyba
 blocks.outputspeed = Drill Speed: {0}/s
+blocks.efficiency = Efficiency: {0}%
 blocks.unknown = [LIGHT_GRAY]???
 blocks.blockinfo = Informace o bloku
 blocks.powerbalance = Power: {0}
@@ -307,6 +315,7 @@ blocks.poweroutput = Power Output: {0}
 blocks.powercapacity = Kapacita energie
 blocks.powershot = Energie na výstřel
 blocks.targetsair = Zaměřuje vzdušné jednotky
+blocks.items = Items: {0}
 blocks.itemsmoved = Move Speed
 blocks.shootrange = Dostřel
 blocks.size = velikost
@@ -369,6 +378,7 @@ category.items = Předměty
 category.crafting = Vyžaduje
 category.shooting = Střílí
 category.optional = Volitelné vylepšení
+setting.animatedwater.name = Animated Water
 setting.indicators.name = Indikátor pro spojence
 setting.autotarget.name = Automaticky zaměřuje
 setting.fpscap.name = Max FPS
@@ -523,6 +533,15 @@ mech.ability = [LIGHT_GRAY]Schopnost: {0}
 liquid.heatcapacity = [LIGHT_GRAY]Kapacita teploty: {0}
 liquid.viscosity = [LIGHT_GRAY]Viskozita: {0}
 liquid.temperature = [LIGHT_GRAY]Teplota: {0}
+block.grass.name = Grass
+block.salt.name = Salt
+block.sandrocks.name = Sand Rocks
+block.spore-pine.name = Spore Pine
+block.shale.name = Shale
+block.shale-boulder.name = Shale Boulder
+block.moss.name = Moss
+block.spore-moss.name = Spore Moss
+block.shalerocks.name = Shale Rocks
 block.scrap-wall.name = Scrap Wall
 block.scrap-wall-large.name = Large Scrap Wall
 block.scrap-wall-huge.name = Huge Scrap Wall
@@ -557,13 +576,6 @@ block.pine.name = Pine
 block.white-tree-dead.name = White Tree Dead
 block.white-tree.name = White Tree
 block.spore-cluster.name = Spore Cluster
-block.stained-rocks.name = Stained Rocks
-block.stained-stone.name = Stained Stone
-block.stained-rocks-red.name = Stained Rocks Red
-block.stained-stone-red.name = Stained Stone Red
-block.stained-rocks-yellow.name = Stained Rocks Yellow
-block.stained-stone-yellow.name = Stained Stone Yellow
-block.stained-boulder.name = Stained Boulde
 block.metal-floor.name = Metal Floor
 block.metal-floor-2.name = Metal Floor 2
 block.metal-floor-3.name = Metal Floor 3
@@ -650,6 +662,7 @@ block.phantom-factory.name = Továrna na Fantom Drony
 block.wraith-factory.name = Továrna na Wraithy
 block.ghoul-factory.name = Továrna na Ghůl Bombardéry
 block.dagger-factory.name = Továrna na Dagger Mechy
+block.crawler-factory.name = Crawler Mech Factory
 block.titan-factory.name = Továrna na Titán Mechy
 block.fortress-factory.name = Továrna na Fortress Mechy
 block.revenant-factory.name = Továrna na Revenanty

core/assets/bundles/bundle_de.properties

@@ -192,11 +192,23 @@ editor.oregen.info = Erze generiert:
 editor.mapinfo = Karten Info
 editor.author = Author:
 editor.description = Beschreibung:
+editor.waves = Waves:
+waves.title = Waves
+waves.remove = Remove
+waves.never = <never>
+waves.every = every
+waves.waves = wave(s)
+waves.perspawn = per spawn
+waves.to = to
+waves.boss = Boss
+editor.default = [LIGHT_GRAY]<Default>
+edit = Edit...
 editor.name = Name:
 editor.teams = Teams
 editor.elevation = Höhe
-editor.errorimageload = Fehler beim Laden des Bildes: [accent] {0}
+editor.errorload = Error loading file:\n[accent]{0}
-editor.errorimagesave = Fehler beim Speichern des Bildes: [accent] {0}
+editor.errorsave = Error saving file:\n[accent]{0}
+editor.errorname = Map has no name defined.
 editor.generate = Generieren
 editor.resize = Grösse\nanpassen
 editor.loadmap = Karte\nladen
@@ -273,14 +285,9 @@ zone.groundZero.name = Ground Zero
 zone.craters.name = The Craters
 zone.frozenForest.name = Frozen Forest
 zone.ruinousShores.name = Ruinous Shores
-zone.crags.name = Crags
 zone.stainedMountains.name = Stained Mountains
-zone.impact0079.name = Impact 0079
 zone.desolateRift.name = Desolate Rift
-zone.arcticDesert.name = Arctic Desert
-zone.dryWastes.name = Dry Wastes
 zone.nuclearComplex.name = Nuclear Production Complex
-zone.moltenFault.name = Molten Fault
 settings.language = Sprache
 settings.reset = Auf Standard zurücksetzen
 settings.rebind = Zuweisen
@@ -300,6 +307,7 @@ info.title = [accent]Info
 error.title = [crimson] Ein Fehler ist aufgetreten
 error.crashtitle = Ein Fehler ist aufgetreten!
 blocks.outputspeed = Drill Speed: {0}/s
+blocks.efficiency = Efficiency: {0}%
 blocks.unknown = [LIGHT_GRAY]???
 blocks.blockinfo = Blockinfo:
 blocks.powerbalance = Power: {0}
@@ -307,6 +315,7 @@ blocks.poweroutput = Power Output: {0}
 blocks.powercapacity = Kapazität
 blocks.powershot = Stromverbrauch/Schuss
 blocks.targetsair = Visiert Luft Einheiten an
+blocks.items = Items: {0}
 blocks.itemsmoved = Move Speed
 blocks.shootrange = Reichweite
 blocks.size = Größe
@@ -369,6 +378,7 @@ category.items = Materialien
 category.crafting = Erzeugung
 category.shooting = Schießen
 category.optional = Optional Enhancements
+setting.animatedwater.name = Animated Water
 setting.indicators.name = Ally Indicators
 setting.autotarget.name = Auto-Zielauswahl
 setting.fpscap.name = Max FPS
@@ -523,6 +533,15 @@ mech.ability = [LIGHT_GRAY]Fähigkeit: {0}
 liquid.heatcapacity = [LIGHT_GRAY]Wärmekapazität: {0}
 liquid.viscosity = [LIGHT_GRAY]Viskosität: {0}
 liquid.temperature = [LIGHT_GRAY]Temperatur: {0}
+block.grass.name = Grass
+block.salt.name = Salt
+block.sandrocks.name = Sand Rocks
+block.spore-pine.name = Spore Pine
+block.shale.name = Shale
+block.shale-boulder.name = Shale Boulder
+block.moss.name = Moss
+block.spore-moss.name = Spore Moss
+block.shalerocks.name = Shale Rocks
 block.scrap-wall.name = Scrap Wall
 block.scrap-wall-large.name = Large Scrap Wall
 block.scrap-wall-huge.name = Huge Scrap Wall
@@ -557,13 +576,6 @@ block.pine.name = Pine
 block.white-tree-dead.name = White Tree Dead
 block.white-tree.name = White Tree
 block.spore-cluster.name = Spore Cluster
-block.stained-rocks.name = Stained Rocks
-block.stained-stone.name = Stained Stone
-block.stained-rocks-red.name = Stained Rocks Red
-block.stained-stone-red.name = Stained Stone Red
-block.stained-rocks-yellow.name = Stained Rocks Yellow
-block.stained-stone-yellow.name = Stained Stone Yellow
-block.stained-boulder.name = Stained Boulde
 block.metal-floor.name = Metal Floor
 block.metal-floor-2.name = Metal Floor 2
 block.metal-floor-3.name = Metal Floor 3
@@ -650,6 +662,7 @@ block.phantom-factory.name = Phantom-Drohnenfabrik
 block.wraith-factory.name = Wraith Fighter-Fabrik
 block.ghoul-factory.name = Ghoul Bomber-Fabrik
 block.dagger-factory.name = Dagger Mech-Fabrik
+block.crawler-factory.name = Crawler Mech Factory
 block.titan-factory.name = Titan Mech-Fabrik
 block.fortress-factory.name = Fortress Mech-Fabrik
 block.revenant-factory.name = Revenant Fighter-Fabrik

core/assets/bundles/bundle_es.properties

@@ -192,11 +192,23 @@ editor.oregen.info = Generación de Minerales:
 editor.mapinfo = Info del Mapa
 editor.author = Autor:
 editor.description = Descripción:
+editor.waves = Waves:
+waves.title = Waves
+waves.remove = Remove
+waves.never = <never>
+waves.every = every
+waves.waves = wave(s)
+waves.perspawn = per spawn
+waves.to = to
+waves.boss = Boss
+editor.default = [LIGHT_GRAY]<Default>
+edit = Edit...
 editor.name = Nombre:
 editor.teams = Equipos
 editor.elevation = Elevación
-editor.errorimageload = Error cargando el archivo:\n[accent] {0}
+editor.errorload = Error loading file:\n[accent]{0}
-editor.errorimagesave = Error guardando el archivo:\n[accent] {0}
+editor.errorsave = Error saving file:\n[accent]{0}
+editor.errorname = Map has no name defined.
 editor.generate = Generar
 editor.resize = Cambiar Tamaño
 editor.loadmap = Cargar Mapa
@@ -273,14 +285,9 @@ zone.groundZero.name = Ground Zero
 zone.craters.name = The Craters
 zone.frozenForest.name = Frozen Forest
 zone.ruinousShores.name = Ruinous Shores
-zone.crags.name = Crags
 zone.stainedMountains.name = Stained Mountains
-zone.impact0079.name = Impact 0079
 zone.desolateRift.name = Desolate Rift
-zone.arcticDesert.name = Arctic Desert
-zone.dryWastes.name = Dry Wastes
 zone.nuclearComplex.name = Nuclear Production Complex
-zone.moltenFault.name = Molten Fault
 settings.language = Lenguaje
 settings.reset = Reiniciar por los de defecto
 settings.rebind = Reasignar
@@ -300,6 +307,7 @@ info.title = [accent]Información
 error.title = [crimson]Un error ha ocurrido.
 error.crashtitle = Un error ha ocurrido.
 blocks.outputspeed = Drill Speed: {0}/s
+blocks.efficiency = Efficiency: {0}%
 blocks.unknown = [LIGHT_GRAY]???
 blocks.blockinfo = Información del Bloque
 blocks.powerbalance = Power: {0}
@@ -307,6 +315,7 @@ blocks.poweroutput = Power Output: {0}
 blocks.powercapacity = Capacidad de Energía
 blocks.powershot = Energía/Disparo
 blocks.targetsair = Apunta al Aire
+blocks.items = Items: {0}
 blocks.itemsmoved = Move Speed
 blocks.shootrange = Rango
 blocks.size = Tamaño
@@ -369,6 +378,7 @@ category.items = Objetos
 category.crafting = Fabricación
 category.shooting = Disparo
 category.optional = Mejoras Opcionales
+setting.animatedwater.name = Animated Water
 setting.indicators.name = Ally Indicators
 setting.autotarget.name = Auto apuntado
 setting.fpscap.name = Máx FPS
@@ -523,6 +533,15 @@ mech.ability = [LIGHT_GRAY]Hablidad: {0}
 liquid.heatcapacity = [LIGHT_GRAY]Capacidad Térmica: {0}
 liquid.viscosity = [LIGHT_GRAY]Viscosidad: {0}
 liquid.temperature = [LIGHT_GRAY]Temperatura: {0}
+block.grass.name = Grass
+block.salt.name = Salt
+block.sandrocks.name = Sand Rocks
+block.spore-pine.name = Spore Pine
+block.shale.name = Shale
+block.shale-boulder.name = Shale Boulder
+block.moss.name = Moss
+block.spore-moss.name = Spore Moss
+block.shalerocks.name = Shale Rocks
 block.scrap-wall.name = Scrap Wall
 block.scrap-wall-large.name = Large Scrap Wall
 block.scrap-wall-huge.name = Huge Scrap Wall
@@ -557,13 +576,6 @@ block.pine.name = Pine
 block.white-tree-dead.name = White Tree Dead
 block.white-tree.name = White Tree
 block.spore-cluster.name = Spore Cluster
-block.stained-rocks.name = Stained Rocks
-block.stained-stone.name = Stained Stone
-block.stained-rocks-red.name = Stained Rocks Red
-block.stained-stone-red.name = Stained Stone Red
-block.stained-rocks-yellow.name = Stained Rocks Yellow
-block.stained-stone-yellow.name = Stained Stone Yellow
-block.stained-boulder.name = Stained Boulde
 block.metal-floor.name = Metal Floor
 block.metal-floor-2.name = Metal Floor 2
 block.metal-floor-3.name = Metal Floor 3
@@ -650,6 +662,7 @@ block.phantom-factory.name = Fábrica de Drones Fantasmales
 block.wraith-factory.name = Fábrica de Wraith Fighter
 block.ghoul-factory.name = Fábrica de Ghoul Bomber
 block.dagger-factory.name = Fábrica de Dagas
+block.crawler-factory.name = Crawler Mech Factory
 block.titan-factory.name = Fábrica de Titanes
 block.fortress-factory.name = Fábrica de mecanoide Fortress
 block.revenant-factory.name = Fábrica de Revenant Fighter

core/assets/bundles/bundle_fr.properties

@@ -192,11 +192,23 @@ editor.oregen.info = Génération de minerais:
 editor.mapinfo = Infos sur la carte
 editor.author = Auteur:
 editor.description = Description:
+editor.waves = Waves:
+waves.title = Waves
+waves.remove = Remove
+waves.never = <never>
+waves.every = every
+waves.waves = wave(s)
+waves.perspawn = per spawn
+waves.to = to
+waves.boss = Boss
+editor.default = [LIGHT_GRAY]<Default>
+edit = Edit...
 editor.name = Nom:
 editor.teams = Équipe
 editor.elevation = Élevation
-editor.errorimageload = Erreur lors du chargement du fichier:\n[accent]{0}
+editor.errorload = Error loading file:\n[accent]{0}
-editor.errorimagesave = Erreur lors de la sauvegarde du fichier:\n[accent]{0}
+editor.errorsave = Error saving file:\n[accent]{0}
+editor.errorname = Map has no name defined.
 editor.generate = Générer
 editor.resize = Redimensionner
 editor.loadmap = Charger une carte
@@ -273,14 +285,9 @@ zone.groundZero.name = Ground Zero
 zone.craters.name = The Craters
 zone.frozenForest.name = Frozen Forest
 zone.ruinousShores.name = Ruinous Shores
-zone.crags.name = Crags
 zone.stainedMountains.name = Stained Mountains
-zone.impact0079.name = Impact 0079
 zone.desolateRift.name = Desolate Rift
-zone.arcticDesert.name = Arctic Desert
-zone.dryWastes.name = Dry Wastes
 zone.nuclearComplex.name = Nuclear Production Complex
-zone.moltenFault.name = Molten Fault
 settings.language = Langage
 settings.reset = Valeur par défaut.
 settings.rebind = Réatttribuer
@@ -300,6 +307,7 @@ info.title = Info
 error.title = [crimson]Une erreur s'est produite
 error.crashtitle = Une erreur s'est produite
 blocks.outputspeed = Drill Speed: {0}/s
+blocks.efficiency = Efficiency: {0}%
 blocks.unknown = [LIGHT_GRAY]???
 blocks.blockinfo = Info sur le bloc
 blocks.powerbalance = Power: {0}
@@ -307,6 +315,7 @@ blocks.poweroutput = Power Output: {0}
 blocks.powercapacity = capacité d'énergie
 blocks.powershot = Énergie/Tir
 blocks.targetsair = Cible les unités aériennes
+blocks.items = Items: {0}
 blocks.itemsmoved = Move Speed
 blocks.shootrange = Portée
 blocks.size = Taille
@@ -369,6 +378,7 @@ category.items = Objets
 category.crafting = Fabrication
 category.shooting = Défense
 category.optional = Optional Enhancements
+setting.animatedwater.name = Animated Water
 setting.indicators.name = Ally Indicators
 setting.autotarget.name = Visée automatique
 setting.fpscap.name = Max FPS
@@ -523,6 +533,15 @@ mech.ability = [LIGHT_GRAY]Compétence: {0}
 liquid.heatcapacity = [LIGHT_GRAY]Capacité Thermique: {0}
 liquid.viscosity = [LIGHT_GRAY]Viscosité: {0}
 liquid.temperature = [LIGHT_GRAY]Température: {0}
+block.grass.name = Grass
+block.salt.name = Salt
+block.sandrocks.name = Sand Rocks
+block.spore-pine.name = Spore Pine
+block.shale.name = Shale
+block.shale-boulder.name = Shale Boulder
+block.moss.name = Moss
+block.spore-moss.name = Spore Moss
+block.shalerocks.name = Shale Rocks
 block.scrap-wall.name = Scrap Wall
 block.scrap-wall-large.name = Large Scrap Wall
 block.scrap-wall-huge.name = Huge Scrap Wall
@@ -557,13 +576,6 @@ block.pine.name = Pine
 block.white-tree-dead.name = White Tree Dead
 block.white-tree.name = White Tree
 block.spore-cluster.name = Spore Cluster
-block.stained-rocks.name = Stained Rocks
-block.stained-stone.name = Stained Stone
-block.stained-rocks-red.name = Stained Rocks Red
-block.stained-stone-red.name = Stained Stone Red
-block.stained-rocks-yellow.name = Stained Rocks Yellow
-block.stained-stone-yellow.name = Stained Stone Yellow
-block.stained-boulder.name = Stained Boulde
 block.metal-floor.name = Metal Floor
 block.metal-floor-2.name = Metal Floor 2
 block.metal-floor-3.name = Metal Floor 3
@@ -650,6 +662,7 @@ block.phantom-factory.name = Usine de "Drones fantômes"
 block.wraith-factory.name = Usine de "Combattants spectraux"
 block.ghoul-factory.name = Usine de "Bombardiers goules"
 block.dagger-factory.name = Usine de "Poignards"
+block.crawler-factory.name = Crawler Mech Factory
 block.titan-factory.name = Usine de "Titans"
 block.fortress-factory.name = Usine de "Forteresse"
 block.revenant-factory.name = Usine de "Revenants"

core/assets/bundles/bundle_fr_BE.properties

@@ -192,11 +192,23 @@ editor.oregen.info = Génération de minerais:
 editor.mapinfo = Infos sur la carte
 editor.author = Auteur:
 editor.description = Description:
+editor.waves = Waves:
+waves.title = Waves
+waves.remove = Remove
+waves.never = <never>
+waves.every = every
+waves.waves = wave(s)
+waves.perspawn = per spawn
+waves.to = to
+waves.boss = Boss
+editor.default = [LIGHT_GRAY]<Default>
+edit = Edit...
 editor.name = Nom:
 editor.teams = Équipes
 editor.elevation = Élévation
-editor.errorimageload = Erreur lors du chargement du fichier image:\n[accent]{0}
+editor.errorload = Error loading file:\n[accent]{0}
-editor.errorimagesave = Erreur lors de la sauvegarde du fichier image:\n[accent]{0}
+editor.errorsave = Error saving file:\n[accent]{0}
+editor.errorname = Map has no name defined.
 editor.generate = Générer
 editor.resize = Redimensionner
 editor.loadmap = Charger une carte
@@ -273,14 +285,9 @@ zone.groundZero.name = Ground Zero
 zone.craters.name = The Craters
 zone.frozenForest.name = Frozen Forest
 zone.ruinousShores.name = Ruinous Shores
-zone.crags.name = Crags
 zone.stainedMountains.name = Stained Mountains
-zone.impact0079.name = Impact 0079
 zone.desolateRift.name = Desolate Rift
-zone.arcticDesert.name = Arctic Desert
-zone.dryWastes.name = Dry Wastes
 zone.nuclearComplex.name = Nuclear Production Complex
-zone.moltenFault.name = Molten Fault
 settings.language = Langage
 settings.reset = Valeur par défaut.
 settings.rebind = Réatttribuer
@@ -300,6 +307,7 @@ info.title = Info
 error.title = [crimson]Une erreur s'est produite
 error.crashtitle = Une erreur s'est produite
 blocks.outputspeed = Drill Speed: {0}/s
+blocks.efficiency = Efficiency: {0}%
 blocks.unknown = [LIGHT_GRAY]???
 blocks.blockinfo = Info sur le bloc
 blocks.powerbalance = Power: {0}
@@ -307,6 +315,7 @@ blocks.poweroutput = Power Output: {0}
 blocks.powercapacity = Capacité d'énergie
 blocks.powershot = Énergie/Tir
 blocks.targetsair = Cible les unités aériennes
+blocks.items = Items: {0}
 blocks.itemsmoved = Move Speed
 blocks.shootrange = Portée
 blocks.size = Taille
@@ -369,6 +378,7 @@ category.items = Objets
 category.crafting = Fabrication
 category.shooting = Défense
 category.optional = Améliorations facultatives
+setting.animatedwater.name = Animated Water
 setting.indicators.name = Indicateurs d'alliés
 setting.autotarget.name = Visée automatique
 setting.fpscap.name = Max FPS
@@ -523,6 +533,15 @@ mech.ability = [LIGHT_GRAY]Compétence: {0}
 liquid.heatcapacity = [LIGHT_GRAY]Capacité Thermique {0}
 liquid.viscosity = [LIGHT_GRAY]Viscosité: {0}
 liquid.temperature = [LIGHT_GRAY]Température: {0}
+block.grass.name = Grass
+block.salt.name = Salt
+block.sandrocks.name = Sand Rocks
+block.spore-pine.name = Spore Pine
+block.shale.name = Shale
+block.shale-boulder.name = Shale Boulder
+block.moss.name = Moss
+block.spore-moss.name = Spore Moss
+block.shalerocks.name = Shale Rocks
 block.scrap-wall.name = Scrap Wall
 block.scrap-wall-large.name = Large Scrap Wall
 block.scrap-wall-huge.name = Huge Scrap Wall
@@ -557,13 +576,6 @@ block.pine.name = Pine
 block.white-tree-dead.name = White Tree Dead
 block.white-tree.name = White Tree
 block.spore-cluster.name = Spore Cluster
-block.stained-rocks.name = Stained Rocks
-block.stained-stone.name = Stained Stone
-block.stained-rocks-red.name = Stained Rocks Red
-block.stained-stone-red.name = Stained Stone Red
-block.stained-rocks-yellow.name = Stained Rocks Yellow
-block.stained-stone-yellow.name = Stained Stone Yellow
-block.stained-boulder.name = Stained Boulde
 block.metal-floor.name = Metal Floor
 block.metal-floor-2.name = Metal Floor 2
 block.metal-floor-3.name = Metal Floor 3
@@ -650,6 +662,7 @@ block.phantom-factory.name = Usine de "Drones fantômes"
 block.wraith-factory.name = Usine de "Combattants spectraux"
 block.ghoul-factory.name = Usine de "Bombardiers goules"
 block.dagger-factory.name = Usine de "Poignards"
+block.crawler-factory.name = Crawler Mech Factory
 block.titan-factory.name = Usine de "Titans"
 block.fortress-factory.name = Usine de "Forteresse"
 block.revenant-factory.name = Usine de "Revenants"

core/assets/bundles/bundle_in_ID.properties

@@ -192,11 +192,23 @@ editor.oregen.info = Ore Generation:
 editor.mapinfo = Map Info
 editor.author = Author:
 editor.description = Description:
+editor.waves = Waves:
+waves.title = Waves
+waves.remove = Remove
+waves.never = <never>
+waves.every = every
+waves.waves = wave(s)
+waves.perspawn = per spawn
+waves.to = to
+waves.boss = Boss
+editor.default = [LIGHT_GRAY]<Default>
+edit = Edit...
 editor.name = Name:
 editor.teams = Teams
 editor.elevation = Elevation
-editor.errorimageload = Kesalahan saat memuat file gambar:\n[accent]{0}
+editor.errorload = Error loading file:\n[accent]{0}
-editor.errorimagesave = Kesalahan saat menyimpan file gambar:\n[accent]{0}
+editor.errorsave = Error saving file:\n[accent]{0}
+editor.errorname = Map has no name defined.
 editor.generate = Hasilkan
 editor.resize = Ubah ukuran
 editor.loadmap = Buka Peta
@@ -273,14 +285,9 @@ zone.groundZero.name = Ground Zero
 zone.craters.name = The Craters
 zone.frozenForest.name = Frozen Forest
 zone.ruinousShores.name = Ruinous Shores
-zone.crags.name = Crags
 zone.stainedMountains.name = Stained Mountains
-zone.impact0079.name = Impact 0079
 zone.desolateRift.name = Desolate Rift
-zone.arcticDesert.name = Arctic Desert
-zone.dryWastes.name = Dry Wastes
 zone.nuclearComplex.name = Nuclear Production Complex
-zone.moltenFault.name = Molten Fault
 settings.language = Bahasa
 settings.reset = Atur ulang ke Default
 settings.rebind = Rebind
@@ -300,6 +307,7 @@ info.title = [accent]Info
 error.title = [crimson]Telah terjadi kesalahan
 error.crashtitle = Telah terjadi kesalahan
 blocks.outputspeed = Drill Speed: {0}/s
+blocks.efficiency = Efficiency: {0}%
 blocks.unknown = [LIGHT_GRAY]???
 blocks.blockinfo = Info Blok
 blocks.powerbalance = Power: {0}
@@ -307,6 +315,7 @@ blocks.poweroutput = Power Output: {0}
 blocks.powercapacity = Kapasitas Tenaga
 blocks.powershot = Tenaga/tembakan
 blocks.targetsair = Targets Air
+blocks.items = Items: {0}
 blocks.itemsmoved = Move Speed
 blocks.shootrange = Range
 blocks.size = Ukuran
@@ -369,6 +378,7 @@ category.items = Items
 category.crafting = Crafting
 category.shooting = Shooting
 category.optional = Optional Enhancements
+setting.animatedwater.name = Animated Water
 setting.indicators.name = Ally Indicators
 setting.autotarget.name = Auto-Target
 setting.fpscap.name = Max FPS
@@ -523,6 +533,15 @@ mech.ability = [LIGHT_GRAY]Ability: {0}
 liquid.heatcapacity = [LIGHT_GRAY]Heat Capacity: {0}
 liquid.viscosity = [LIGHT_GRAY]Viscosity: {0}
 liquid.temperature = [LIGHT_GRAY]Temperature: {0}
+block.grass.name = Grass
+block.salt.name = Salt
+block.sandrocks.name = Sand Rocks
+block.spore-pine.name = Spore Pine
+block.shale.name = Shale
+block.shale-boulder.name = Shale Boulder
+block.moss.name = Moss
+block.spore-moss.name = Spore Moss
+block.shalerocks.name = Shale Rocks
 block.scrap-wall.name = Scrap Wall
 block.scrap-wall-large.name = Large Scrap Wall
 block.scrap-wall-huge.name = Huge Scrap Wall
@@ -557,13 +576,6 @@ block.pine.name = Pine
 block.white-tree-dead.name = White Tree Dead
 block.white-tree.name = White Tree
 block.spore-cluster.name = Spore Cluster
-block.stained-rocks.name = Stained Rocks
-block.stained-stone.name = Stained Stone
-block.stained-rocks-red.name = Stained Rocks Red
-block.stained-stone-red.name = Stained Stone Red
-block.stained-rocks-yellow.name = Stained Rocks Yellow
-block.stained-stone-yellow.name = Stained Stone Yellow
-block.stained-boulder.name = Stained Boulde
 block.metal-floor.name = Metal Floor
 block.metal-floor-2.name = Metal Floor 2
 block.metal-floor-3.name = Metal Floor 3
@@ -650,6 +662,7 @@ block.phantom-factory.name = Phantom Drone Factory
 block.wraith-factory.name = Wraith Fighter Factory
 block.ghoul-factory.name = Ghoul Bomber Factory
 block.dagger-factory.name = Dagger Mech Factory
+block.crawler-factory.name = Crawler Mech Factory
 block.titan-factory.name = Titan Mech Factory
 block.fortress-factory.name = Fortress Mech Factory
 block.revenant-factory.name = Revenant Fighter Factory

core/assets/bundles/bundle_it.properties

@@ -192,11 +192,23 @@ editor.oregen.info = Generazione dei minerali:
 editor.mapinfo = Informazioni mappa
 editor.author = Autore:
 editor.description = Descrizione:
+editor.waves = Waves:
+waves.title = Waves
+waves.remove = Remove
+waves.never = <never>
+waves.every = every
+waves.waves = wave(s)
+waves.perspawn = per spawn
+waves.to = to
+waves.boss = Boss
+editor.default = [LIGHT_GRAY]<Default>
+edit = Edit...
 editor.name = Nome:
 editor.teams = Squadre
 editor.elevation = Elevazione
-editor.errorimageload = Errore durante il caricamento del file immagine:\n [accent]{0}
+editor.errorload = Error loading file:\n[accent]{0}
-editor.errorimagesave = Errore durante il salvataggio del file immagine:\n [accent]{0}
+editor.errorsave = Error saving file:\n[accent]{0}
+editor.errorname = Map has no name defined.
 editor.generate = Genera
 editor.resize = Ridimensiona
 editor.loadmap = Carica\nmappa
@@ -273,14 +285,9 @@ zone.groundZero.name = Ground Zero
 zone.craters.name = The Craters
 zone.frozenForest.name = Frozen Forest
 zone.ruinousShores.name = Ruinous Shores
-zone.crags.name = Crags
 zone.stainedMountains.name = Stained Mountains
-zone.impact0079.name = Impact 0079
 zone.desolateRift.name = Desolate Rift
-zone.arcticDesert.name = Arctic Desert
-zone.dryWastes.name = Dry Wastes
 zone.nuclearComplex.name = Nuclear Production Complex
-zone.moltenFault.name = Molten Fault
 settings.language = Lingua
 settings.reset = Resetta Alle Impostazioni Predefinite
 settings.rebind = Reinposta
@@ -300,6 +307,7 @@ info.title = [accent] Info
 error.title = [crimson]Si è verificato un errore
 error.crashtitle = Si è verificato un errore
 blocks.outputspeed = Drill Speed: {0}/s
+blocks.efficiency = Efficiency: {0}%
 blocks.unknown = [LIGHT_GRAY]???
 blocks.blockinfo = info sul blocco
 blocks.powerbalance = Power: {0}
@@ -307,6 +315,7 @@ blocks.poweroutput = Power Output: {0}
 blocks.powercapacity = Capacità Energetica
 blocks.powershot = Danno/Colpo
 blocks.targetsair = Attacca nemici aerei
+blocks.items = Items: {0}
 blocks.itemsmoved = Move Speed
 blocks.shootrange = Raggio
 blocks.size = Grandezza
@@ -369,6 +378,7 @@ category.items = Oggetti
 category.crafting = Produzione
 category.shooting = Potenza di fuoco
 category.optional = Optional Enhancements
+setting.animatedwater.name = Animated Water
 setting.indicators.name = Ally Indicators
 setting.autotarget.name = Auto-Target
 setting.fpscap.name = Limite FPS
@@ -523,6 +533,15 @@ mech.ability = [LIGHT_GRAY]Abilità: {0}
 liquid.heatcapacity = [LIGHT_GRAY]Capacità calorifica: {0}
 liquid.viscosity = [LIGHT_GRAY]Viscosità: {0}
 liquid.temperature = [LIGHT_GRAY]Temperatura: {0}
+block.grass.name = Grass
+block.salt.name = Salt
+block.sandrocks.name = Sand Rocks
+block.spore-pine.name = Spore Pine
+block.shale.name = Shale
+block.shale-boulder.name = Shale Boulder
+block.moss.name = Moss
+block.spore-moss.name = Spore Moss
+block.shalerocks.name = Shale Rocks
 block.scrap-wall.name = Scrap Wall
 block.scrap-wall-large.name = Large Scrap Wall
 block.scrap-wall-huge.name = Huge Scrap Wall
@@ -557,13 +576,6 @@ block.pine.name = Pine
 block.white-tree-dead.name = White Tree Dead
 block.white-tree.name = White Tree
 block.spore-cluster.name = Spore Cluster
-block.stained-rocks.name = Stained Rocks
-block.stained-stone.name = Stained Stone
-block.stained-rocks-red.name = Stained Rocks Red
-block.stained-stone-red.name = Stained Stone Red
-block.stained-rocks-yellow.name = Stained Rocks Yellow
-block.stained-stone-yellow.name = Stained Stone Yellow
-block.stained-boulder.name = Stained Boulde
 block.metal-floor.name = Metal Floor
 block.metal-floor-2.name = Metal Floor 2
 block.metal-floor-3.name = Metal Floor 3
@@ -650,6 +662,7 @@ block.phantom-factory.name = Phantom Drone Factory
 block.wraith-factory.name = Wraith Fighter Factory
 block.ghoul-factory.name = Ghoul Bomber Factory
 block.dagger-factory.name = Dagger Mech Factory
+block.crawler-factory.name = Crawler Mech Factory
 block.titan-factory.name = Titan Mech Factory
 block.fortress-factory.name = Fortress Mech Factory
 block.revenant-factory.name = Revenant Fighter Factory

core/assets/bundles/bundle_ja.properties

@@ -192,11 +192,23 @@ editor.oregen.info = 鉱石の生成:
 editor.mapinfo = マップ情報
 editor.author = 作者:
 editor.description = 説明:
+editor.waves = Waves:
+waves.title = Waves
+waves.remove = Remove
+waves.never = <never>
+waves.every = every
+waves.waves = wave(s)
+waves.perspawn = per spawn
+waves.to = to
+waves.boss = Boss
+editor.default = [LIGHT_GRAY]<Default>
+edit = Edit...
 editor.name = 名前:
 editor.teams = チーム
 editor.elevation = 標高
-editor.errorimageload = ファイルの読み込みエラー:\n[accent]{0}
+editor.errorload = Error loading file:\n[accent]{0}
-editor.errorimagesave = ファイルの保存エラー:\n[accent]{0}
+editor.errorsave = Error saving file:\n[accent]{0}
+editor.errorname = Map has no name defined.
 editor.generate = 生成
 editor.resize = リサイズ
 editor.loadmap = マップを読み込む
@@ -273,14 +285,9 @@ zone.groundZero.name = Ground Zero
 zone.craters.name = The Craters
 zone.frozenForest.name = Frozen Forest
 zone.ruinousShores.name = Ruinous Shores
-zone.crags.name = Crags
 zone.stainedMountains.name = Stained Mountains
-zone.impact0079.name = Impact 0079
 zone.desolateRift.name = Desolate Rift
-zone.arcticDesert.name = Arctic Desert
-zone.dryWastes.name = Dry Wastes
 zone.nuclearComplex.name = Nuclear Production Complex
-zone.moltenFault.name = Molten Fault
 settings.language = 言語
 settings.reset = デフォルトにリセット
 settings.rebind = 再設定
@@ -300,6 +307,7 @@ info.title = 情報
 error.title = [crimson]エラーが発生しました
 error.crashtitle = エラーが発生しました
 blocks.outputspeed = Drill Speed: {0}/s
+blocks.efficiency = Efficiency: {0}%
 blocks.unknown = [LIGHT_GRAY]???
 blocks.blockinfo = ブロック情報
 blocks.powerbalance = Power: {0}
@@ -307,6 +315,7 @@ blocks.poweroutput = Power Output: {0}
 blocks.powercapacity = 電力容量
 blocks.powershot = 電力/ショット
 blocks.targetsair = 対空攻撃
+blocks.items = Items: {0}
 blocks.itemsmoved = Move Speed
 blocks.shootrange = 範囲
 blocks.size = 大きさ
@@ -369,6 +378,7 @@ category.items = アイテム
 category.crafting = 製作速度
 category.shooting = 攻撃速度
 category.optional = 機能強化オプション
+setting.animatedwater.name = Animated Water
 setting.indicators.name = 味方の方角表示
 setting.autotarget.name = 自動ターゲット
 setting.fpscap.name = 最大FPS
@@ -523,6 +533,15 @@ mech.ability = [LIGHT_GRAY]能力: {0}
 liquid.heatcapacity = [LIGHT_GRAY]熱容量: {0}
 liquid.viscosity = [LIGHT_GRAY]粘度: {0}
 liquid.temperature = [LIGHT_GRAY]温度: {0}
+block.grass.name = Grass
+block.salt.name = Salt
+block.sandrocks.name = Sand Rocks
+block.spore-pine.name = Spore Pine
+block.shale.name = Shale
+block.shale-boulder.name = Shale Boulder
+block.moss.name = Moss
+block.spore-moss.name = Spore Moss
+block.shalerocks.name = Shale Rocks
 block.scrap-wall.name = Scrap Wall
 block.scrap-wall-large.name = Large Scrap Wall
 block.scrap-wall-huge.name = Huge Scrap Wall
@@ -557,13 +576,6 @@ block.pine.name = Pine
 block.white-tree-dead.name = White Tree Dead
 block.white-tree.name = White Tree
 block.spore-cluster.name = Spore Cluster
-block.stained-rocks.name = Stained Rocks
-block.stained-stone.name = Stained Stone
-block.stained-rocks-red.name = Stained Rocks Red
-block.stained-stone-red.name = Stained Stone Red
-block.stained-rocks-yellow.name = Stained Rocks Yellow
-block.stained-stone-yellow.name = Stained Stone Yellow
-block.stained-boulder.name = Stained Boulde
 block.metal-floor.name = Metal Floor
 block.metal-floor-2.name = Metal Floor 2
 block.metal-floor-3.name = Metal Floor 3
@@ -650,6 +662,7 @@ block.phantom-factory.name = ファントムドローン製造機
 block.wraith-factory.name = レースファイター製造機
 block.ghoul-factory.name = グールボンバー製造機
 block.dagger-factory.name = ダガーユニット製造機
+block.crawler-factory.name = Crawler Mech Factory
 block.titan-factory.name = タイタンユニット製造機
 block.fortress-factory.name = フォートレスユニット製造機
 block.revenant-factory.name = レベナントファイター製造機

core/assets/bundles/bundle_ko.properties

@@ -14,7 +14,6 @@ screenshot = 화면 캡쳐가 {0} 경로에 저장되었습니다.
 gameover = 게임 오버
 gameover.pvp = [accent]{0}[] 팀이 승리했습니다!
 highscore = [accent]최고점수 달성!
-
 stat.wave = 웨이브 성공:[accent]{0}
 stat.enemiesDestroyed = 파괴한 적 수:[accent]{0}
 stat.built = 건설한 건물 수:[accent]{0}
@@ -22,7 +21,6 @@ stat.destroyed = 파괴된 건물 수:[accent]{0}
 stat.deconstructed = 해체한 건물 수:[accent]{0}
 stat.delivered = 획득한 자원:
 stat.rank = 최종 기록: [accent]{0}
-
 map.delete = 정말로 "[accent]{0}[]" 맵을 삭제하시겠습니까?\n
 level.highscore = 최고 점수: [accent]{0}
 level.select = 맵 선택
@@ -194,11 +192,23 @@ editor.oregen.info = 광물 무작위 생성:
 editor.mapinfo = 맵 정보
 editor.author = 만든이:
 editor.description = 설명:
+editor.waves = Waves:
+waves.title = Waves
+waves.remove = Remove
+waves.never = <never>
+waves.every = every
+waves.waves = wave(s)
+waves.perspawn = per spawn
+waves.to = to
+waves.boss = Boss
+editor.default = [LIGHT_GRAY]<Default>
+edit = Edit...
 editor.name = 이름:
 editor.teams = 팀
 editor.elevation = 지형 높이
-editor.errorimageload = [accent]{0}[] 파일을 불러오는데 오류가 발생했습니다.
+editor.errorload = Error loading file:\n[accent]{0}
-editor.errorimagesave = [accent]{0}[] 파일 저장중 오류가 발생했습니다.
+editor.errorsave = Error saving file:\n[accent]{0}
+editor.errorname = Map has no name defined.
 editor.generate = 생성
 editor.resize = 맵 크기조정
 editor.loadmap = 맵 불러오기
@@ -242,7 +252,6 @@ tutorial = 게임 방법
 editor = 편집기
 mapeditor = 맵 편집기
 donate = 기부
-
 abandon = 버리기
 abandon.text = 이 구역과 모든 자원이 적에게 빼앗길 것입니다.
 locked = 잠김
@@ -263,7 +272,6 @@ zone.config.complete = 웨이브 {0} 달성:\n로드아웃 설정 잠금 해제
 zone.resources = 자원 감지됨:
 add = 추가...
 boss.health = 보스 체력
-
 connectfail = [crimson]{0}[accent] 서버에 연결하지 못했습니다.[]
 error.unreachable = 서버에 연결하지 못했습니다.\n서버 주소가 정확히 입력되었나요?
 error.invalidaddress = 잘못된 주소입니다.
@@ -273,20 +281,13 @@ error.alreadyconnected = 이미 접속중입니다.
 error.mapnotfound = 맵 파일을 찾을 수 없습니다!
 error.io = 네트워크 I/O 오류.
 error.any = 알 수 없는 네트워크 오류.
-
 zone.groundZero.name = 그라운드 제로
 zone.craters.name = 분화구
 zone.frozenForest.name = 얼어붙은 숲
 zone.ruinousShores.name = 파멸의 기슭
-zone.crags.name = 바위산
 zone.stainedMountains.name = 얼룩진 산맥
-zone.impact0079.name = 임팩트 0079
 zone.desolateRift.name = 황량한 강
-zone.arcticDesert.name = 북극 사막
-zone.dryWastes.name = 건조한 폐허
 zone.nuclearComplex.name = 핵 생산 단지
-zone.moltenFault.name = 녹은 결점
-
 settings.language = 언어
 settings.reset = 설정 초기화
 settings.rebind = 키 재설정
@@ -306,6 +307,7 @@ info.title = [accent]정보
 error.title = [crimson]오류가 발생했습니다.
 error.crashtitle = 오류가 발생했습니다.
 blocks.outputspeed = 채광 속도: {0}/s
+blocks.efficiency = Efficiency: {0}%
 blocks.unknown = [LIGHT_GRAY]???
 blocks.blockinfo = 블록 정보
 blocks.powerbalance = 전력: {0}
@@ -313,6 +315,7 @@ blocks.poweroutput = 전력 출력: {0}
 blocks.powercapacity = 전력 용량
 blocks.powershot = 1발당 전력 소모량
 blocks.targetsair = 공중공격 가능
+blocks.items = Items: {0}
 blocks.itemsmoved = 이동 속도
 blocks.shootrange = 사거리
 blocks.size = 크기
@@ -530,6 +533,15 @@ mech.ability = [LIGHT_GRAY]능력: {0}
 liquid.heatcapacity = [LIGHT_GRAY]발열 용량: {0}
 liquid.viscosity = [LIGHT_GRAY]점도: {0}
 liquid.temperature = [LIGHT_GRAY]온도: {0}
+block.grass.name = Grass
+block.salt.name = Salt
+block.sandrocks.name = Sand Rocks
+block.spore-pine.name = Spore Pine
+block.shale.name = Shale
+block.shale-boulder.name = Shale Boulder
+block.moss.name = Moss
+block.spore-moss.name = Spore Moss
+block.shalerocks.name = Shale Rocks
 block.scrap-wall.name = 조각벽
 block.scrap-wall-large.name = 큰 조각벽
 block.scrap-wall-huge.name = 거대한 조각 벽
@@ -564,13 +576,6 @@ block.pine.name = 소나무
 block.white-tree-dead.name = 죽은 하얀나무
 block.white-tree.name = 하얀 나무
 block.spore-cluster.name = 포자낭
-block.stained-rocks.name = 얼룩진 바위
-block.stained-stone.name = 얼룩진 돌
-block.stained-rocks-red.name = 얼룩진 빨간 바위
-block.stained-stone-red.name = 얼룩진 빨간 돌
-block.stained-rocks-yellow.name = 얼룩진 노란 바위
-block.stained-stone-yellow.name = 얼룩진 노란 돌
-block.stained-boulder.name = 얼룩진 둥근 돌
 block.metal-floor.name = 메탈 바닥
 block.metal-floor-2.name = 메탈 바닥 2
 block.metal-floor-3.name = 메탈 바닥 3
@@ -657,6 +662,7 @@ block.phantom-factory.name = 팬텀 드론 공장
 block.wraith-factory.name = 유령 전투기 공장
 block.ghoul-factory.name = 구울 폭격기 공장
 block.dagger-factory.name = 디거 기체 공장
+block.crawler-factory.name = Crawler Mech Factory
 block.titan-factory.name = 타이탄 기체 공장
 block.fortress-factory.name = 포트리스 기체 공장
 block.revenant-factory.name = 레비던트 전투기 공장

core/assets/bundles/bundle_nl.properties

@@ -192,11 +192,23 @@ editor.oregen.info = Ore Generation:
 editor.mapinfo = Map Info
 editor.author = Author:
 editor.description = Description:
+editor.waves = Waves:
+waves.title = Waves
+waves.remove = Remove
+waves.never = <never>
+waves.every = every
+waves.waves = wave(s)
+waves.perspawn = per spawn
+waves.to = to
+waves.boss = Boss
+editor.default = [LIGHT_GRAY]<Default>
+edit = Edit...
 editor.name = Name:
 editor.teams = Teams
 editor.elevation = Elevation
-editor.errorimageload = Error loading file:\n[accent]{0}
+editor.errorload = Error loading file:\n[accent]{0}
-editor.errorimagesave = Error saving file:\n[accent]{0}
+editor.errorsave = Error saving file:\n[accent]{0}
+editor.errorname = Map has no name defined.
 editor.generate = Generate
 editor.resize = Resize
 editor.loadmap = Load Map
@@ -273,14 +285,9 @@ zone.groundZero.name = Ground Zero
 zone.craters.name = The Craters
 zone.frozenForest.name = Frozen Forest
 zone.ruinousShores.name = Ruinous Shores
-zone.crags.name = Crags
 zone.stainedMountains.name = Stained Mountains
-zone.impact0079.name = Impact 0079
 zone.desolateRift.name = Desolate Rift
-zone.arcticDesert.name = Arctic Desert
-zone.dryWastes.name = Dry Wastes
 zone.nuclearComplex.name = Nuclear Production Complex
-zone.moltenFault.name = Molten Fault
 settings.language = Language
 settings.reset = Reset to Defaults
 settings.rebind = Rebind
@@ -300,6 +307,7 @@ info.title = Info
 error.title = [crimson]An error has occured
 error.crashtitle = An error has occured
 blocks.outputspeed = Drill Speed: {0}/s
+blocks.efficiency = Efficiency: {0}%
 blocks.unknown = [LIGHT_GRAY]???
 blocks.blockinfo = Block Info
 blocks.powerbalance = Power: {0}
@@ -307,6 +315,7 @@ blocks.poweroutput = Power Output: {0}
 blocks.powercapacity = Power Capacity
 blocks.powershot = Power/Shot
 blocks.targetsair = Targets Air
+blocks.items = Items: {0}
 blocks.itemsmoved = Move Speed
 blocks.shootrange = Range
 blocks.size = Size
@@ -369,6 +378,7 @@ category.items = Items
 category.crafting = Crafting
 category.shooting = Shooting
 category.optional = Optional Enhancements
+setting.animatedwater.name = Animated Water
 setting.indicators.name = Ally Indicators
 setting.autotarget.name = Auto-Target
 setting.fpscap.name = Max FPS
@@ -523,6 +533,15 @@ mech.ability = [LIGHT_GRAY]Ability: {0}
 liquid.heatcapacity = [LIGHT_GRAY]Heat Capacity: {0}
 liquid.viscosity = [LIGHT_GRAY]Viscosity: {0}
 liquid.temperature = [LIGHT_GRAY]Temperature: {0}
+block.grass.name = Grass
+block.salt.name = Salt
+block.sandrocks.name = Sand Rocks
+block.spore-pine.name = Spore Pine
+block.shale.name = Shale
+block.shale-boulder.name = Shale Boulder
+block.moss.name = Moss
+block.spore-moss.name = Spore Moss
+block.shalerocks.name = Shale Rocks
 block.scrap-wall.name = Scrap Wall
 block.scrap-wall-large.name = Large Scrap Wall
 block.scrap-wall-huge.name = Huge Scrap Wall
@@ -557,13 +576,6 @@ block.pine.name = Pine
 block.white-tree-dead.name = White Tree Dead
 block.white-tree.name = White Tree
 block.spore-cluster.name = Spore Cluster
-block.stained-rocks.name = Stained Rocks
-block.stained-stone.name = Stained Stone
-block.stained-rocks-red.name = Stained Rocks Red
-block.stained-stone-red.name = Stained Stone Red
-block.stained-rocks-yellow.name = Stained Rocks Yellow
-block.stained-stone-yellow.name = Stained Stone Yellow
-block.stained-boulder.name = Stained Boulder
 block.metal-floor.name = Metal Floor
 block.metal-floor-2.name = Metal Floor 2
 block.metal-floor-3.name = Metal Floor 3
@@ -650,6 +662,7 @@ block.phantom-factory.name = Phantom Drone Factory
 block.wraith-factory.name = Wraith Fighter Factory
 block.ghoul-factory.name = Ghoul Bomber Factory
 block.dagger-factory.name = Dagger Mech Factory
+block.crawler-factory.name = Crawler Mech Factory
 block.titan-factory.name = Titan Mech Factory
 block.fortress-factory.name = Fortress Mech Factory
 block.revenant-factory.name = Revenant Fighter Factory

core/assets/bundles/bundle_pl.properties

@@ -192,11 +192,23 @@ editor.oregen.info = Generacja złóż:
 editor.mapinfo = Informacje o mapie
 editor.author = Autor:
 editor.description = Opis:
+editor.waves = Waves:
+waves.title = Waves
+waves.remove = Remove
+waves.never = <never>
+waves.every = every
+waves.waves = wave(s)
+waves.perspawn = per spawn
+waves.to = to
+waves.boss = Boss
+editor.default = [LIGHT_GRAY]<Default>
+edit = Edit...
 editor.name = Nazwa:
 editor.teams = Drużyny
 editor.elevation = Poziom terenu
-editor.errorimageload = Błąd podczas ładowania pliku obrazu: [accent]{0}
+editor.errorload = Error loading file:\n[accent]{0}
-editor.errorimagesave = Błąd podczas zapisywania pliku obrazu: [accent]{0}
+editor.errorsave = Error saving file:\n[accent]{0}
+editor.errorname = Map has no name defined.
 editor.generate = Generuj
 editor.resize = Zmień rozmiar
 editor.loadmap = Załaduj mapę
@@ -273,14 +285,9 @@ zone.groundZero.name = Wybuch Lądowy
 zone.craters.name = Kratery
 zone.frozenForest.name = Zamrożony Las
 zone.ruinousShores.name = Zniszczone Przybrzerza
-zone.crags.name = Urwiska
 zone.stainedMountains.name = Zabarwione Góry
-zone.impact0079.name = Uderzenie 0079
 zone.desolateRift.name = Ponura Szczelina
-zone.arcticDesert.name = Lodowa Pustynia
-zone.dryWastes.name = Suche Pustki
 zone.nuclearComplex.name = Centrum Wyrobu Jądrowego
-zone.moltenFault.name = Stopiony Uskok
 settings.language = Język
 settings.reset = Przywróć domyślne
 settings.rebind = Zmień przyciski
@@ -300,6 +307,7 @@ info.title = [accent]Informacje
 error.title = [crimson]Wystąpił błąd
 error.crashtitle = Wystąpił błąd
 blocks.outputspeed = Drill Speed: {0}/s
+blocks.efficiency = Efficiency: {0}%
 blocks.unknown = [LIGHT_GRAY]???
 blocks.blockinfo = Informacje o bloku
 blocks.powerbalance = Power: {0}
@@ -307,6 +315,7 @@ blocks.poweroutput = Power Output: {0}
 blocks.powercapacity = Pojemność mocy
 blocks.powershot = moc/strzał
 blocks.targetsair = Może namierzać wrogów powietrznych
+blocks.items = Items: {0}
 blocks.itemsmoved = Move Speed
 blocks.shootrange = Zasięg
 blocks.size = Rozmiar
@@ -369,6 +378,7 @@ category.items = Przedmioty
 category.crafting = Przetwórstwo
 category.shooting = Strzelanie
 category.optional = Ulepszenia Nieobowiąskowe
+setting.animatedwater.name = Animated Water
 setting.indicators.name = Wskaźniki Przyjaciół
 setting.autotarget.name = Automatyczne Celowanie
 setting.fpscap.name = Maksymalny FPS
@@ -523,6 +533,15 @@ mech.ability = [LIGHT_GRAY]Umiejętność: {0}
 liquid.heatcapacity = [LIGHT_GRAY]Wytrzymałość na przegrzewanie: {0}
 liquid.viscosity = [LIGHT_GRAY]Lepkość: {0}
 liquid.temperature = [LIGHT_GRAY]Temperatura: {0}
+block.grass.name = Grass
+block.salt.name = Salt
+block.sandrocks.name = Sand Rocks
+block.spore-pine.name = Spore Pine
+block.shale.name = Shale
+block.shale-boulder.name = Shale Boulder
+block.moss.name = Moss
+block.spore-moss.name = Spore Moss
+block.shalerocks.name = Shale Rocks
 block.scrap-wall.name = Scrap Wall
 block.scrap-wall-large.name = Large Scrap Wall
 block.scrap-wall-huge.name = Huge Scrap Wall
@@ -557,13 +576,6 @@ block.pine.name = Pine
 block.white-tree-dead.name = White Tree Dead
 block.white-tree.name = White Tree
 block.spore-cluster.name = Spore Cluster
-block.stained-rocks.name = Stained Rocks
-block.stained-stone.name = Stained Stone
-block.stained-rocks-red.name = Stained Rocks Red
-block.stained-stone-red.name = Stained Stone Red
-block.stained-rocks-yellow.name = Stained Rocks Yellow
-block.stained-stone-yellow.name = Stained Stone Yellow
-block.stained-boulder.name = Stained Boulde
 block.metal-floor.name = Metal Floor
 block.metal-floor-2.name = Metal Floor 2
 block.metal-floor-3.name = Metal Floor 3
@@ -650,6 +662,7 @@ block.phantom-factory.name = Fabryka Dronów Widmo
 block.wraith-factory.name = Fabryka Wojowników Zjawa
 block.ghoul-factory.name = Fabryka Bombowców Upiór
 block.dagger-factory.name = Fabryka Mechów Nóż
+block.crawler-factory.name = Crawler Mech Factory
 block.titan-factory.name = Fabryka Mechów Tytan
 block.fortress-factory.name = Fabryka Mechów Fortreca
 block.revenant-factory.name = Fabryka Wojowników Potwór

core/assets/bundles/bundle_pt_BR.properties

@@ -192,11 +192,23 @@ editor.oregen.info = Geração de minério:
 editor.mapinfo = Informação do mapa
 editor.author = Autor:
 editor.description = Descrição:
+editor.waves = Waves:
+waves.title = Waves
+waves.remove = Remove
+waves.never = <never>
+waves.every = every
+waves.waves = wave(s)
+waves.perspawn = per spawn
+waves.to = to
+waves.boss = Boss
+editor.default = [LIGHT_GRAY]<Default>
+edit = Edit...
 editor.name = Nome:
 editor.teams = Time
 editor.elevation = Elevação
-editor.errorimageload = Erro ao carregar arquivo de imagem:\n[accent]{0}
+editor.errorload = Error loading file:\n[accent]{0}
-editor.errorimagesave = Erro ao salvar arquivo de imagem:\n[accent]{0}
+editor.errorsave = Error saving file:\n[accent]{0}
+editor.errorname = Map has no name defined.
 editor.generate = Gerar
 editor.resize = Redimen\n sionar
 editor.loadmap = Carregar\n      Mapa
@@ -273,14 +285,9 @@ zone.groundZero.name = Ground Zero
 zone.craters.name = The Craters
 zone.frozenForest.name = Frozen Forest
 zone.ruinousShores.name = Ruinous Shores
-zone.crags.name = Crags
 zone.stainedMountains.name = Stained Mountains
-zone.impact0079.name = Impact 0079
 zone.desolateRift.name = Desolate Rift
-zone.arcticDesert.name = Arctic Desert
-zone.dryWastes.name = Dry Wastes
 zone.nuclearComplex.name = Nuclear Production Complex
-zone.moltenFault.name = Molten Fault
 settings.language = Linguagem
 settings.reset = Restaurar Padrões
 settings.rebind = Religar
@@ -300,6 +307,7 @@ info.title = [accent]Informação
 error.title = [crimson]Ocorreu um Erro.
 error.crashtitle = Ocorreu um Erro
 blocks.outputspeed = Drill Speed: {0}/s
+blocks.efficiency = Efficiency: {0}%
 blocks.unknown = [LIGHT_GRAY]???
 blocks.blockinfo = Informação do Bloco
 blocks.powerbalance = Power: {0}
@@ -307,6 +315,7 @@ blocks.poweroutput = Power Output: {0}
 blocks.powercapacity = Capacidade de Energia
 blocks.powershot = Energia/tiro
 blocks.targetsair = Mirar no ar
+blocks.items = Items: {0}
 blocks.itemsmoved = Move Speed
 blocks.shootrange = Alcance
 blocks.size = Tamanho
@@ -369,6 +378,7 @@ category.items = Itens
 category.crafting = Construindo
 category.shooting = Atirando
 category.optional = Melhoras opcionais
+setting.animatedwater.name = Animated Water
 setting.indicators.name = Ally Indicators
 setting.autotarget.name = Alvo automatico
 setting.fpscap.name = FPS Maximo
@@ -523,6 +533,15 @@ mech.ability = [LIGHT_GRAY]Habilidade: {0}
 liquid.heatcapacity = [LIGHT_GRAY]Capacidade de aquecimento: {0}
 liquid.viscosity = [LIGHT_GRAY]Viscosidade: {0}
 liquid.temperature = [LIGHT_GRAY]Temperatura: {0}
+block.grass.name = Grass
+block.salt.name = Salt
+block.sandrocks.name = Sand Rocks
+block.spore-pine.name = Spore Pine
+block.shale.name = Shale
+block.shale-boulder.name = Shale Boulder
+block.moss.name = Moss
+block.spore-moss.name = Spore Moss
+block.shalerocks.name = Shale Rocks
 block.scrap-wall.name = Scrap Wall
 block.scrap-wall-large.name = Large Scrap Wall
 block.scrap-wall-huge.name = Huge Scrap Wall
@@ -557,13 +576,6 @@ block.pine.name = Pine
 block.white-tree-dead.name = White Tree Dead
 block.white-tree.name = White Tree
 block.spore-cluster.name = Spore Cluster
-block.stained-rocks.name = Stained Rocks
-block.stained-stone.name = Stained Stone
-block.stained-rocks-red.name = Stained Rocks Red
-block.stained-stone-red.name = Stained Stone Red
-block.stained-rocks-yellow.name = Stained Rocks Yellow
-block.stained-stone-yellow.name = Stained Stone Yellow
-block.stained-boulder.name = Stained Boulde
 block.metal-floor.name = Metal Floor
 block.metal-floor-2.name = Metal Floor 2
 block.metal-floor-3.name = Metal Floor 3
@@ -650,6 +662,7 @@ block.phantom-factory.name = Fabrica de Drone Phantom
 block.wraith-factory.name = Fabrica de Drone Wraith
 block.ghoul-factory.name = Fabrica de Bombardeiro Ghoul
 block.dagger-factory.name = Fabrica de mech Dagger
+block.crawler-factory.name = Crawler Mech Factory
 block.titan-factory.name = Fabrica de mech titan
 block.fortress-factory.name = Fabrica de mech Fortress
 block.revenant-factory.name = Fabrica de lutadores Revenant

core/assets/bundles/bundle_ru.properties

@@ -192,11 +192,23 @@ editor.oregen.info = Генерация Руд:
 editor.mapinfo = Информация о карте
 editor.author = Автор:
 editor.description = Описание:
+editor.waves = Waves:
+waves.title = Waves
+waves.remove = Remove
+waves.never = <never>
+waves.every = every
+waves.waves = wave(s)
+waves.perspawn = per spawn
+waves.to = to
+waves.boss = Boss
+editor.default = [LIGHT_GRAY]<Default>
+edit = Edit...
 editor.name = Название:
 editor.teams = Команды
 editor.elevation = Возвышенность
-editor.errorimageload = Ошибка загрузки изображения: [accent] {0}
+editor.errorload = Error loading file:\n[accent]{0}
-editor.errorimagesave = Ошибка сохранения изображения: [accent] {0}
+editor.errorsave = Error saving file:\n[accent]{0}
+editor.errorname = Map has no name defined.
 editor.generate = Создать
 editor.resize = Изменить \nразмер
 editor.loadmap = Загрузить\nкарту
@@ -273,14 +285,9 @@ zone.groundZero.name = Нулевая земля
 zone.craters.name = Кратеры
 zone.frozenForest.name = Ледяной Лес
 zone.ruinousShores.name = Разрушенные Берега
-zone.crags.name = Утёсы
 zone.stainedMountains.name = Окрашенные горы
-zone.impact0079.name = Удар 0079
 zone.desolateRift.name = Пустынный Разлом
-zone.arcticDesert.name = Арктическия Пустыня
-zone.dryWastes.name = Грязные Отходы
 zone.nuclearComplex.name = Ядерный Производственный Комплекс
-zone.moltenFault.name = Расплавленый Разлом
 settings.language = Язык
 settings.reset = Сбросить по умолчанию
 settings.rebind = Смена
@@ -300,6 +307,7 @@ info.title = Информация
 error.title = [crimson]Произошла ошибка
 error.crashtitle = Произошла ошибка
 blocks.outputspeed = Drill Speed: {0}/s
+blocks.efficiency = Efficiency: {0}%
 blocks.unknown = [LIGHT_GRAY]???
 blocks.blockinfo = Информация о блоке
 blocks.powerbalance = Энергия: {0}
@@ -307,6 +315,7 @@ blocks.poweroutput = Выходная энергия: {0}
 blocks.powercapacity = Вместимость энергии
 blocks.powershot = Энергия/выстрел
 blocks.targetsair = Атакует воздуш. юнитов
+blocks.items = Items: {0}
 blocks.itemsmoved = Скорость перемещения
 blocks.shootrange = Радиус действия
 blocks.size = Размер
@@ -369,6 +378,7 @@ category.items = Предметы
 category.crafting = Создание
 category.shooting = Cтрельба
 category.optional = Дополнительные улучшения
+setting.animatedwater.name = Animated Water
 setting.indicators.name = Показывать в сторону союзников 
 setting.autotarget.name = Авто-цель
 setting.fpscap.name = Макс. FPS
@@ -523,6 +533,15 @@ mech.ability = [LIGHT_GRAY]Способность: {0}
 liquid.heatcapacity = [LIGHT_GRAY]Теплоёмкость: {0}
 liquid.viscosity = [LIGHT_GRAY]Вязкость: {0}
 liquid.temperature = [LIGHT_GRAY]Температура: {0}
+block.grass.name = Grass
+block.salt.name = Salt
+block.sandrocks.name = Sand Rocks
+block.spore-pine.name = Spore Pine
+block.shale.name = Shale
+block.shale-boulder.name = Shale Boulder
+block.moss.name = Moss
+block.spore-moss.name = Spore Moss
+block.shalerocks.name = Shale Rocks
 block.scrap-wall.name = Стена из металлолома
 block.scrap-wall-large.name = Великая стена из металлолома
 block.scrap-wall-huge.name = Огромная стена из металлолома
@@ -557,13 +576,6 @@ block.pine.name = Сосна
 block.white-tree-dead.name = Мёртвое Белое Дерево
 block.white-tree.name = Белое Дерево
 block.spore-cluster.name = Скопление спор
-block.stained-rocks.name = Пятнистые Камни
-block.stained-stone.name = Пятнистый Камень
-block.stained-rocks-red.name = Красные Пятнистые Камни
-block.stained-stone-red.name = Красный Пятнистый Камень
-block.stained-rocks-yellow.name = Жёлтые Пятнистые Камни
-block.stained-stone-yellow.name = Жёлтый Пятнистый Камень
-block.stained-boulder.name = Пятнистый Валун
 block.metal-floor.name = Металлический Пол
 block.metal-floor-2.name = Металлический Пол 2
 block.metal-floor-3.name = Металлический Пол 3
@@ -650,6 +662,7 @@ block.phantom-factory.name = Завод дронов "Фантом"
 block.wraith-factory.name = Завод призрачных истребителей
 block.ghoul-factory.name = Завод бомбардировщиков "Гуль"
 block.dagger-factory.name = Завод мехов "Кинджал"
+block.crawler-factory.name = Crawler Mech Factory
 block.titan-factory.name = Завод мехов "Титан"
 block.fortress-factory.name = Завод мехов "Крепость"
 block.revenant-factory.name = Завод бомбардировщиков "Потусторонний убийца"

core/assets/bundles/bundle_tk.properties

@@ -192,11 +192,23 @@ editor.oregen.info = Maden Yaratilmasi:
 editor.mapinfo = Harita bilgisi:
 editor.author = Yapimci:
 editor.description = Yorum:
+editor.waves = Waves:
+waves.title = Waves
+waves.remove = Remove
+waves.never = <never>
+waves.every = every
+waves.waves = wave(s)
+waves.perspawn = per spawn
+waves.to = to
+waves.boss = Boss
+editor.default = [LIGHT_GRAY]<Default>
+edit = Edit...
 editor.name = isim:
 editor.teams = Takimlar
 editor.elevation = Yukseklik
-editor.errorimageload = Dosya yuklenemedi:\n[accent]{0}
+editor.errorload = Error loading file:\n[accent]{0}
-editor.errorimagesave = Dosya kaydedilemedi.:\n[accent]{0}
+editor.errorsave = Error saving file:\n[accent]{0}
+editor.errorname = Map has no name defined.
 editor.generate = Yarat
 editor.resize = Boyutunu degistir
 editor.loadmap = Harita yukle
@@ -273,14 +285,9 @@ zone.groundZero.name = Ground Zero
 zone.craters.name = The Craters
 zone.frozenForest.name = Frozen Forest
 zone.ruinousShores.name = Ruinous Shores
-zone.crags.name = Crags
 zone.stainedMountains.name = Stained Mountains
-zone.impact0079.name = Impact 0079
 zone.desolateRift.name = Desolate Rift
-zone.arcticDesert.name = Arctic Desert
-zone.dryWastes.name = Dry Wastes
 zone.nuclearComplex.name = Nuclear Production Complex
-zone.moltenFault.name = Molten Fault
 settings.language = Dil
 settings.reset = ilk ayarlara geri al
 settings.rebind = Geri al
@@ -300,6 +307,7 @@ info.title = [accent]Bilgi
 error.title = [crimson]Bir hata olustu
 error.crashtitle = Bir hata olustu
 blocks.outputspeed = Drill Speed: {0}/s
+blocks.efficiency = Efficiency: {0}%
 blocks.unknown = [LIGHT_GRAY]???
 blocks.blockinfo = Yapi bilgisi
 blocks.powerbalance = Power: {0}
@@ -307,6 +315,7 @@ blocks.poweroutput = Power Output: {0}
 blocks.powercapacity = Guc kapasitesi
 blocks.powershot = Guc/Saldiri hizi
 blocks.targetsair = Havayi hedef alir mi?
+blocks.items = Items: {0}
 blocks.itemsmoved = Move Speed
 blocks.shootrange = Menzil
 blocks.size = Buyukluk
@@ -369,6 +378,7 @@ category.items = esyalar
 category.crafting = uretim
 category.shooting = sikma
 category.optional = Optional Enhancements
+setting.animatedwater.name = Animated Water
 setting.indicators.name = Ally Indicators
 setting.autotarget.name = Auto-Target
 setting.fpscap.name = Max FPS
@@ -523,6 +533,15 @@ mech.ability = [LIGHT_GRAY]yetenek gucu: {0}
 liquid.heatcapacity = [LIGHT_GRAY]isinma kapasitesi: {0}
 liquid.viscosity = [LIGHT_GRAY]Yari sivilik: {0}
 liquid.temperature = [LIGHT_GRAY]isi: {0}
+block.grass.name = Grass
+block.salt.name = Salt
+block.sandrocks.name = Sand Rocks
+block.spore-pine.name = Spore Pine
+block.shale.name = Shale
+block.shale-boulder.name = Shale Boulder
+block.moss.name = Moss
+block.spore-moss.name = Spore Moss
+block.shalerocks.name = Shale Rocks
 block.scrap-wall.name = Scrap Wall
 block.scrap-wall-large.name = Large Scrap Wall
 block.scrap-wall-huge.name = Huge Scrap Wall
@@ -557,13 +576,6 @@ block.pine.name = Pine
 block.white-tree-dead.name = White Tree Dead
 block.white-tree.name = White Tree
 block.spore-cluster.name = Spore Cluster
-block.stained-rocks.name = Stained Rocks
-block.stained-stone.name = Stained Stone
-block.stained-rocks-red.name = Stained Rocks Red
-block.stained-stone-red.name = Stained Stone Red
-block.stained-rocks-yellow.name = Stained Rocks Yellow
-block.stained-stone-yellow.name = Stained Stone Yellow
-block.stained-boulder.name = Stained Boulde
 block.metal-floor.name = Metal Floor
 block.metal-floor-2.name = Metal Floor 2
 block.metal-floor-3.name = Metal Floor 3
@@ -650,6 +662,7 @@ block.phantom-factory.name = Phantom Drone Factory
 block.wraith-factory.name = Wraith Fighter Factory
 block.ghoul-factory.name = Ghoul Bomber Factory
 block.dagger-factory.name = Dagger Mech Factory
+block.crawler-factory.name = Crawler Mech Factory
 block.titan-factory.name = Titan Mech Factory
 block.fortress-factory.name = Fortress Mech Factory
 block.revenant-factory.name = Revenant Fighter Factory

core/assets/bundles/bundle_tr.properties

@@ -192,11 +192,23 @@ editor.oregen.info = Ore Generation:
 editor.mapinfo = Map Info
 editor.author = Author:
 editor.description = Description:
+editor.waves = Waves:
+waves.title = Waves
+waves.remove = Remove
+waves.never = <never>
+waves.every = every
+waves.waves = wave(s)
+waves.perspawn = per spawn
+waves.to = to
+waves.boss = Boss
+editor.default = [LIGHT_GRAY]<Default>
+edit = Edit...
 editor.name = Name:
 editor.teams = Teams
 editor.elevation = Elevation
-editor.errorimageload = Resim dosyası yüklenirken hata oluştu: [accent] {0}
+editor.errorload = Error loading file:\n[accent]{0}
-editor.errorimagesave = Resim dosyası kaydedilirken hata oluştu: [accent] {0}
+editor.errorsave = Error saving file:\n[accent]{0}
+editor.errorname = Map has no name defined.
 editor.generate = Üretmek
 editor.resize = Yeniden Boyutlandırma
 editor.loadmap = Harita Yükle
@@ -273,14 +285,9 @@ zone.groundZero.name = Ground Zero
 zone.craters.name = The Craters
 zone.frozenForest.name = Frozen Forest
 zone.ruinousShores.name = Ruinous Shores
-zone.crags.name = Crags
 zone.stainedMountains.name = Stained Mountains
-zone.impact0079.name = Impact 0079
 zone.desolateRift.name = Desolate Rift
-zone.arcticDesert.name = Arctic Desert
-zone.dryWastes.name = Dry Wastes
 zone.nuclearComplex.name = Nuclear Production Complex
-zone.moltenFault.name = Molten Fault
 settings.language = Dil
 settings.reset = Varsayılanlara Dön
 settings.rebind = Rebind
@@ -300,6 +307,7 @@ info.title = [Vurgu] Bilgi
 error.title = [crimson] Bir hata oluştu
 error.crashtitle = Bir hata oluştu
 blocks.outputspeed = Drill Speed: {0}/s
+blocks.efficiency = Efficiency: {0}%
 blocks.unknown = [LIGHT_GRAY]???
 blocks.blockinfo = Blok Bilgisi
 blocks.powerbalance = Power: {0}
@@ -307,6 +315,7 @@ blocks.poweroutput = Power Output: {0}
 blocks.powercapacity = Güç kapasitesi
 blocks.powershot = Güç / atış
 blocks.targetsair = Targets Air
+blocks.items = Items: {0}
 blocks.itemsmoved = Move Speed
 blocks.shootrange = Range
 blocks.size = Boyut
@@ -369,6 +378,7 @@ category.items = Items
 category.crafting = Crafting
 category.shooting = Shooting
 category.optional = Optional Enhancements
+setting.animatedwater.name = Animated Water
 setting.indicators.name = Ally Indicators
 setting.autotarget.name = Auto-Target
 setting.fpscap.name = Max FPS
@@ -523,6 +533,15 @@ mech.ability = [LIGHT_GRAY]Ability: {0}
 liquid.heatcapacity = [LIGHT_GRAY]Heat Capacity: {0}
 liquid.viscosity = [LIGHT_GRAY]Viscosity: {0}
 liquid.temperature = [LIGHT_GRAY]Temperature: {0}
+block.grass.name = Grass
+block.salt.name = Salt
+block.sandrocks.name = Sand Rocks
+block.spore-pine.name = Spore Pine
+block.shale.name = Shale
+block.shale-boulder.name = Shale Boulder
+block.moss.name = Moss
+block.spore-moss.name = Spore Moss
+block.shalerocks.name = Shale Rocks
 block.scrap-wall.name = Scrap Wall
 block.scrap-wall-large.name = Large Scrap Wall
 block.scrap-wall-huge.name = Huge Scrap Wall
@@ -557,13 +576,6 @@ block.pine.name = Pine
 block.white-tree-dead.name = White Tree Dead
 block.white-tree.name = White Tree
 block.spore-cluster.name = Spore Cluster
-block.stained-rocks.name = Stained Rocks
-block.stained-stone.name = Stained Stone
-block.stained-rocks-red.name = Stained Rocks Red
-block.stained-stone-red.name = Stained Stone Red
-block.stained-rocks-yellow.name = Stained Rocks Yellow
-block.stained-stone-yellow.name = Stained Stone Yellow
-block.stained-boulder.name = Stained Boulde
 block.metal-floor.name = Metal Floor
 block.metal-floor-2.name = Metal Floor 2
 block.metal-floor-3.name = Metal Floor 3
@@ -650,6 +662,7 @@ block.phantom-factory.name = Phantom Drone Factory
 block.wraith-factory.name = Wraith Fighter Factory
 block.ghoul-factory.name = Ghoul Bomber Factory
 block.dagger-factory.name = Dagger Mech Factory
+block.crawler-factory.name = Crawler Mech Factory
 block.titan-factory.name = Titan Mech Factory
 block.fortress-factory.name = Fortress Mech Factory
 block.revenant-factory.name = Revenant Fighter Factory

core/assets/bundles/bundle_uk_UA.properties

@@ -192,11 +192,23 @@ editor.oregen.info = Генерація руд:
 editor.mapinfo = Інформація про мапу
 editor.author = Автор:
 editor.description = Опис:
+editor.waves = Waves:
+waves.title = Waves
+waves.remove = Remove
+waves.never = <never>
+waves.every = every
+waves.waves = wave(s)
+waves.perspawn = per spawn
+waves.to = to
+waves.boss = Boss
+editor.default = [LIGHT_GRAY]<Default>
+edit = Edit...
 editor.name = Назва:
 editor.teams = Команди
 editor.elevation = Висота
-editor.errorimageload = Помилка завантаження зображення:[accent] {0}
+editor.errorload = Error loading file:\n[accent]{0}
-editor.errorimagesave = Помилка збереження зображення:\n[accent]{0}
+editor.errorsave = Error saving file:\n[accent]{0}
+editor.errorname = Map has no name defined.
 editor.generate = Створити
 editor.resize = Змінити \nрозмір
 editor.loadmap = Завантажити мапу
@@ -273,14 +285,9 @@ zone.groundZero.name = Нульова земля
 zone.craters.name = Кратери
 zone.frozenForest.name = Крижаний Ліс
 zone.ruinousShores.name = Зруйновані Берега
-zone.crags.name = Кручі
 zone.stainedMountains.name = Пофарбовані гори
-zone.impact0079.name = Impact 0079
 zone.desolateRift.name = Пустельний Розлом
-zone.arcticDesert.name = Арктична Пустеля
-zone.dryWastes.name = Брудні Відходи
 zone.nuclearComplex.name = Ядерний Виробничий Комплекс
-zone.moltenFault.name = РозплавленийРозлом
 settings.language = Мова
 settings.reset = Скинути за замовчуванням
 settings.rebind = Зміна
@@ -300,6 +307,7 @@ info.title = Інформація
 error.title = [crimson]Виникла помилка
 error.crashtitle = Виникла помилка
 blocks.outputspeed = Drill Speed: {0}/s
+blocks.efficiency = Efficiency: {0}%
 blocks.unknown = [LIGHT_GRAY]???
 blocks.blockinfo = Інформація про блок
 blocks.powerbalance = Енергія: {0}
@@ -307,6 +315,7 @@ blocks.poweroutput = Вихідна енергія: {0}
 blocks.powercapacity = Місткість енергії
 blocks.powershot = Енергія/постріл
 blocks.targetsair = Атакуе повітряних ворогів
+blocks.items = Items: {0}
 blocks.itemsmoved = Швидкість переміщення
 blocks.shootrange = Діапазон дії
 blocks.size = Розмір
@@ -369,6 +378,7 @@ category.items = Предмети
 category.crafting = Створення
 category.shooting = Стрільба
 category.optional = Додаткові поліпшення
+setting.animatedwater.name = Animated Water
 setting.indicators.name = Показувати у сторону союзників
 setting.autotarget.name = Авто-ціль
 setting.fpscap.name = Макс. FPS
@@ -523,6 +533,15 @@ mech.ability = [LIGHT_GRAY]Здібність: {0}
 liquid.heatcapacity = [LIGHT_GRAY]Теплоємність: {0}
 liquid.viscosity = [LIGHT_GRAY]В'язкість: {0}
 liquid.temperature = [LIGHT_GRAY]Температура: {0}
+block.grass.name = Grass
+block.salt.name = Salt
+block.sandrocks.name = Sand Rocks
+block.spore-pine.name = Spore Pine
+block.shale.name = Shale
+block.shale-boulder.name = Shale Boulder
+block.moss.name = Moss
+block.spore-moss.name = Spore Moss
+block.shalerocks.name = Shale Rocks
 block.scrap-wall.name = Стіна з металобрухту
 block.scrap-wall-large.name = Велика стіна з металобрухту
 block.scrap-wall-huge.name = Величезна стіна з металобрухту
@@ -557,13 +576,6 @@ block.pine.name = Сосна
 block.white-tree-dead.name = Мертве Біле Дерево
 block.white-tree.name = Біле Дерево
 block.spore-cluster.name = Скупчення спор
-block.stained-rocks.name = Плямисті Камені
-block.stained-stone.name = Плямистий Камінь
-block.stained-rocks-red.name = Червоні Плямисті Камні
-block.stained-stone-red.name = Червоний Плямистий Камінь
-block.stained-rocks-yellow.name = Жовті Плямисті Камні
-block.stained-stone-yellow.name = Жовтий Плямистий Камінь
-block.stained-boulder.name = Плямистий Валун
 block.metal-floor.name = Металевий Пол
 block.metal-floor-2.name = Металевий Пол 2
 block.metal-floor-3.name = Металевий Пол 3
@@ -650,6 +662,7 @@ block.phantom-factory.name = Завод дронов "Фантом"
 block.wraith-factory.name = Завод винищувачів "Примара" 
 block.ghoul-factory.name = Завод бомбардувальників-винищувачів "Ґуль"
 block.dagger-factory.name = Завод мехів "Кинджал"
+block.crawler-factory.name = Crawler Mech Factory
 block.titan-factory.name = Завод мехів "Титан"
 block.fortress-factory.name = Завод мехів "Крепость"
 block.revenant-factory.name = Завод бомбардировщиков "Потусторонний убийца"

core/assets/bundles/bundle_zh_CN.properties

@@ -192,11 +192,23 @@ editor.oregen.info = 生成矿石：
 editor.mapinfo = 地图详情
 editor.author = 作者：
 editor.description = 描述：
+editor.waves = Waves:
+waves.title = Waves
+waves.remove = Remove
+waves.never = <never>
+waves.every = every
+waves.waves = wave(s)
+waves.perspawn = per spawn
+waves.to = to
+waves.boss = Boss
+editor.default = [LIGHT_GRAY]<Default>
+edit = Edit...
 editor.name = 名字：
 editor.teams = 团队
 editor.elevation = 高度
-editor.errorimageload = 载入文件时出错：\n[accent]{0}
+editor.errorload = Error loading file:\n[accent]{0}
-editor.errorimagesave = 保存文件时出错：\n[accent]{0}
+editor.errorsave = Error saving file:\n[accent]{0}
+editor.errorname = Map has no name defined.
 editor.generate = 生成
 editor.resize = 调整
 editor.loadmap = 载入地图
@@ -273,14 +285,9 @@ zone.groundZero.name = Ground Zero
 zone.craters.name = The Craters
 zone.frozenForest.name = Frozen Forest
 zone.ruinousShores.name = Ruinous Shores
-zone.crags.name = Crags
 zone.stainedMountains.name = Stained Mountains
-zone.impact0079.name = Impact 0079
 zone.desolateRift.name = Desolate Rift
-zone.arcticDesert.name = Arctic Desert
-zone.dryWastes.name = Dry Wastes
 zone.nuclearComplex.name = Nuclear Production Complex
-zone.moltenFault.name = Molten Fault
 settings.language = 语言
 settings.reset = 恢复默认
 settings.rebind = 重新绑定
@@ -300,6 +307,7 @@ info.title = [accent]详情
 error.title = [crimson]发生了一个错误
 error.crashtitle = 发生了一个错误
 blocks.outputspeed = Drill Speed: {0}/s
+blocks.efficiency = Efficiency: {0}%
 blocks.unknown = [LIGHT_GRAY]???
 blocks.blockinfo = 方块详情
 blocks.powerbalance = Power: {0}
@@ -307,6 +315,7 @@ blocks.poweroutput = Power Output: {0}
 blocks.powercapacity = 能量容量
 blocks.powershot = 能量/发射
 blocks.targetsair = 攻击空中单位
+blocks.items = Items: {0}
 blocks.itemsmoved = 移动速度
 blocks.shootrange = 范围
 blocks.size = 尺寸
@@ -369,6 +378,7 @@ category.items = 物品
 category.crafting = 制造
 category.shooting = 发射
 category.optional = 可选的增强物品
+setting.animatedwater.name = Animated Water
 setting.indicators.name = 队友指示器
 setting.autotarget.name = 自动发射
 setting.fpscap.name = 最高 FPS
@@ -523,6 +533,15 @@ mech.ability = [LIGHT_GRAY]能力：{0}
 liquid.heatcapacity = [LIGHT_GRAY]热容量：{0}
 liquid.viscosity = [LIGHT_GRAY]粘度：{0}
 liquid.temperature = [LIGHT_GRAY]温度：{0}
+block.grass.name = Grass
+block.salt.name = Salt
+block.sandrocks.name = Sand Rocks
+block.spore-pine.name = Spore Pine
+block.shale.name = Shale
+block.shale-boulder.name = Shale Boulder
+block.moss.name = Moss
+block.spore-moss.name = Spore Moss
+block.shalerocks.name = Shale Rocks
 block.scrap-wall.name = Scrap Wall
 block.scrap-wall-large.name = Large Scrap Wall
 block.scrap-wall-huge.name = Huge Scrap Wall
@@ -557,13 +576,6 @@ block.pine.name = Pine
 block.white-tree-dead.name = White Tree Dead
 block.white-tree.name = White Tree
 block.spore-cluster.name = Spore Cluster
-block.stained-rocks.name = Stained Rocks
-block.stained-stone.name = Stained Stone
-block.stained-rocks-red.name = Stained Rocks Red
-block.stained-stone-red.name = Stained Stone Red
-block.stained-rocks-yellow.name = Stained Rocks Yellow
-block.stained-stone-yellow.name = Stained Stone Yellow
-block.stained-boulder.name = Stained Boulde
 block.metal-floor.name = Metal Floor
 block.metal-floor-2.name = Metal Floor 2
 block.metal-floor-3.name = Metal Floor 3
@@ -650,6 +662,7 @@ block.phantom-factory.name = 鬼怪无人机工厂
 block.wraith-factory.name = 幻影战机工厂
 block.ghoul-factory.name = 食尸鬼轰炸机工厂
 block.dagger-factory.name = 尖刀机甲工厂
+block.crawler-factory.name = Crawler Mech Factory
 block.titan-factory.name = 泰坦机甲工厂
 block.fortress-factory.name = 堡垒机甲工厂
 block.revenant-factory.name = 亡魂战机工厂

core/assets/bundles/bundle_zh_TW.properties

@@ -192,11 +192,23 @@ editor.oregen.info = 礦石產生：
 editor.mapinfo = 地圖資訊
 editor.author = 作者：
 editor.description = 描述：
+editor.waves = Waves:
+waves.title = Waves
+waves.remove = Remove
+waves.never = <never>
+waves.every = every
+waves.waves = wave(s)
+waves.perspawn = per spawn
+waves.to = to
+waves.boss = Boss
+editor.default = [LIGHT_GRAY]<Default>
+edit = Edit...
 editor.name = 名稱：
 editor.teams = 隊伍
 editor.elevation = 高度
-editor.errorimageload = 載入圖像檔時發生錯誤：[accent]{0}
+editor.errorload = Error loading file:\n[accent]{0}
-editor.errorimagesave = 儲存圖像檔時發生錯誤：[橙色]{0}
+editor.errorsave = Error saving file:\n[accent]{0}
+editor.errorname = Map has no name defined.
 editor.generate = 產生
 editor.resize = 調整大小
 editor.loadmap = 載入地圖
@@ -273,14 +285,9 @@ zone.groundZero.name = Ground Zero
 zone.craters.name = The Craters
 zone.frozenForest.name = Frozen Forest
 zone.ruinousShores.name = Ruinous Shores
-zone.crags.name = Crags
 zone.stainedMountains.name = Stained Mountains
-zone.impact0079.name = Impact 0079
 zone.desolateRift.name = Desolate Rift
-zone.arcticDesert.name = Arctic Desert
-zone.dryWastes.name = Dry Wastes
 zone.nuclearComplex.name = Nuclear Production Complex
-zone.moltenFault.name = Molten Fault
 settings.language = 語言
 settings.reset = 重設為預設設定
 settings.rebind = 重新綁定
@@ -300,6 +307,7 @@ info.title = [accent]資訊
 error.title = [crimson]發生錯誤
 error.crashtitle = 發生錯誤
 blocks.outputspeed = Drill Speed: {0}/s
+blocks.efficiency = Efficiency: {0}%
 blocks.unknown = [LIGHT_GRAY]？？？
 blocks.blockinfo = 方塊資訊
 blocks.powerbalance = Power: {0}
@@ -307,6 +315,7 @@ blocks.poweroutput = Power Output: {0}
 blocks.powercapacity = 蓄電量
 blocks.powershot = 能量/射擊
 blocks.targetsair = 攻擊空中目標
+blocks.items = Items: {0}
 blocks.itemsmoved = Move Speed
 blocks.shootrange = 範圍
 blocks.size = 尺寸
@@ -369,6 +378,7 @@ category.items = 物品
 category.crafting = 合成
 category.shooting = 射擊
 category.optional = 可選的強化
+setting.animatedwater.name = Animated Water
 setting.indicators.name = 盟友指標
 setting.autotarget.name = 自動射擊
 setting.fpscap.name = 最大FPS
@@ -523,6 +533,15 @@ mech.ability = [LIGHT_GRAY]能力：{0}
 liquid.heatcapacity = [LIGHT_GRAY]熱容量：{0}
 liquid.viscosity = [LIGHT_GRAY]粘性：{0}
 liquid.temperature = [LIGHT_GRAY]温度：{0}
+block.grass.name = Grass
+block.salt.name = Salt
+block.sandrocks.name = Sand Rocks
+block.spore-pine.name = Spore Pine
+block.shale.name = Shale
+block.shale-boulder.name = Shale Boulder
+block.moss.name = Moss
+block.spore-moss.name = Spore Moss
+block.shalerocks.name = Shale Rocks
 block.scrap-wall.name = Scrap Wall
 block.scrap-wall-large.name = Large Scrap Wall
 block.scrap-wall-huge.name = Huge Scrap Wall
@@ -557,13 +576,6 @@ block.pine.name = Pine
 block.white-tree-dead.name = White Tree Dead
 block.white-tree.name = White Tree
 block.spore-cluster.name = Spore Cluster
-block.stained-rocks.name = Stained Rocks
-block.stained-stone.name = Stained Stone
-block.stained-rocks-red.name = Stained Rocks Red
-block.stained-stone-red.name = Stained Stone Red
-block.stained-rocks-yellow.name = Stained Rocks Yellow
-block.stained-stone-yellow.name = Stained Stone Yellow
-block.stained-boulder.name = Stained Boulde
 block.metal-floor.name = Metal Floor
 block.metal-floor-2.name = Metal Floor 2
 block.metal-floor-3.name = Metal Floor 3
@@ -650,6 +662,7 @@ block.phantom-factory.name = 幻影無人機工廠
 block.wraith-factory.name = 怨靈戰鬥機工廠
 block.ghoul-factory.name = 食屍鬼轟炸機工廠
 block.dagger-factory.name = 匕首機甲工廠
+block.crawler-factory.name = Crawler Mech Factory
 block.titan-factory.name = 泰坦機甲工廠
 block.fortress-factory.name = 堡壘機甲工廠
 block.revenant-factory.name = 亡魂戰鬥機工廠

core/src/io/anuke/mindustry/ai/WaveSpawner.java

@@ -24,7 +24,6 @@ import static io.anuke.mindustry.Vars.*;
 
 public class WaveSpawner{
     private static final float shockwaveBase = 380f, shockwaveRand = 0f, maxShockwaveDst = shockwaveBase + shockwaveRand;
-    private Array<SpawnGroup> groups;
     private Array<FlyerSpawn> flySpawns = new Array<>();
     private Array<GroundSpawn> groundSpawns = new Array<>();
     private IntArray loadedSpawns = new IntArray();
@@ -59,7 +58,7 @@ public class WaveSpawner{
 
     public void spawnEnemies(){
 
-        for(SpawnGroup group : groups){
+        for(SpawnGroup group : state.rules.spawns){
             int spawned = group.getUnitsSpawned(state.wave);
 
             float spawnX, spawnY;
@@ -105,7 +104,6 @@ public class WaveSpawner{
 
         flySpawns.clear();
         groundSpawns.clear();
-        groups = state.rules.spawns;
 
         for(int x = 0; x < world.width(); x++){
             for(int y = 0; y < world.height(); y++){

core/src/io/anuke/mindustry/core/ContentLoader.java

@@ -8,20 +8,17 @@ import io.anuke.arc.graphics.Color;
 import io.anuke.arc.graphics.Pixmap;
 import io.anuke.arc.util.Log;
 import io.anuke.mindustry.content.*;
-import io.anuke.mindustry.entities.type.Player;
 import io.anuke.mindustry.entities.bullet.Bullet;
 import io.anuke.mindustry.entities.bullet.BulletType;
 import io.anuke.mindustry.entities.effect.Fire;
 import io.anuke.mindustry.entities.effect.Lightning;
 import io.anuke.mindustry.entities.effect.Puddle;
 import io.anuke.mindustry.entities.traits.TypeTrait;
+import io.anuke.mindustry.entities.type.Player;
 import io.anuke.mindustry.game.Content;
 import io.anuke.mindustry.game.ContentList;
 import io.anuke.mindustry.game.MappableContent;
-import io.anuke.mindustry.type.ContentType;
+import io.anuke.mindustry.type.*;
-import io.anuke.mindustry.type.Item;
-import io.anuke.mindustry.type.Liquid;
-import io.anuke.mindustry.type.Zone;
 import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.LegacyColorMapper;
 
@@ -237,6 +234,10 @@ public class ContentLoader{
         return getBy(ContentType.zone);
     }
 
+    public Array<UnitType> units(){
+        return getBy(ContentType.unit);
+    }
+
     /**
      * Registers sync IDs for all types of sync entities.
      * Do not register units here!

core/src/io/anuke/mindustry/core/Logic.java

@@ -5,15 +5,18 @@ import io.anuke.annotations.Annotations.Remote;
 import io.anuke.arc.ApplicationListener;
 import io.anuke.arc.Events;
 import io.anuke.arc.collection.ObjectSet.ObjectSetIterator;
+import io.anuke.arc.util.Time;
+import io.anuke.mindustry.content.Fx;
+import io.anuke.mindustry.core.GameState.State;
 import io.anuke.mindustry.entities.Effects;
 import io.anuke.mindustry.entities.Entities;
 import io.anuke.mindustry.entities.EntityGroup;
 import io.anuke.mindustry.entities.EntityQuery;
-import io.anuke.arc.util.Time;
-import io.anuke.mindustry.content.Fx;
-import io.anuke.mindustry.core.GameState.State;
 import io.anuke.mindustry.entities.type.TileEntity;
-import io.anuke.mindustry.game.EventType.*;
+import io.anuke.mindustry.game.EventType.GameOverEvent;
+import io.anuke.mindustry.game.EventType.PlayEvent;
+import io.anuke.mindustry.game.EventType.ResetEvent;
+import io.anuke.mindustry.game.EventType.WaveEvent;
 import io.anuke.mindustry.game.*;
 import io.anuke.mindustry.net.Net;
 import io.anuke.mindustry.type.Item;
@@ -58,6 +61,7 @@ public class Logic implements ApplicationListener{
     public void play(){
         state.set(State.playing);
         state.wavetime = state.rules.waveSpacing * 2; //grace period of 2x wave time before game starts
+        state.rules.spawns = world.getMap().getWaves();
 
         Events.fire(new PlayEvent());
     }

core/src/io/anuke/mindustry/editor/EditorTool.java

@@ -12,6 +12,7 @@ import io.anuke.mindustry.world.Pos;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.blocks.BlockPart;
 import io.anuke.mindustry.world.blocks.Floor;
+import io.anuke.mindustry.world.blocks.OreBlock;
 
 public enum EditorTool{
     pick{
@@ -99,8 +100,8 @@ public enum EditorTool{
             Block block = tile.block();
             boolean synth = editor.drawBlock.synthetic();
 
-            dest = isfloor ? floor : block;
             Block draw = editor.drawBlock;
+            dest = draw instanceof OreBlock ? tile.oreBlock() : isfloor ? floor : block;
 
             if(dest == draw || block == Blocks.part || block.isMultiblock()){
                 return;
@@ -189,7 +190,7 @@ public enum EditorTool{
         boolean eq(int px, int py){
             Tile tile = data.tile(px, py);
 
-            return (isfloor ? tile.floor() : tile.block()) == dest;
+            return (data.drawBlock instanceof OreBlock ? tile.oreBlock() : isfloor ? tile.floor() : tile.block()) == dest && !(data.drawBlock instanceof OreBlock && tile.floor().isLiquid);
         }
     },
     zoom;

core/src/io/anuke/mindustry/editor/WaveInfoDialog.java

@@ -1,18 +1,234 @@
 package io.anuke.mindustry.editor;
 
+import io.anuke.arc.Core;
+import io.anuke.arc.collection.Array;
+import io.anuke.arc.graphics.Color;
+import io.anuke.arc.math.Mathf;
+import io.anuke.arc.scene.ui.TextField.TextFieldFilter;
+import io.anuke.arc.scene.ui.layout.Table;
+import io.anuke.arc.util.Align;
+import io.anuke.arc.util.Strings;
+import io.anuke.arc.util.Time;
+import io.anuke.mindustry.Vars;
+import io.anuke.mindustry.content.StatusEffects;
+import io.anuke.mindustry.content.UnitTypes;
+import io.anuke.mindustry.game.DefaultWaves;
+import io.anuke.mindustry.game.SpawnGroup;
+import io.anuke.mindustry.graphics.Pal;
+import io.anuke.mindustry.type.ContentType;
+import io.anuke.mindustry.type.UnitType;
 import io.anuke.mindustry.ui.dialogs.FloatingDialog;
 
+import static io.anuke.mindustry.Vars.*;
+import static io.anuke.mindustry.game.SpawnGroup.never;
+
 public class WaveInfoDialog extends FloatingDialog{
     private final MapEditor editor;
+    private final static int displayed = 20;
+    private Array<SpawnGroup> groups;
+
+    private Table table, preview;
+    private int start = 0;
+    private UnitType lastType = UnitTypes.dagger;
+    private float updateTimer, updatePeriod = 1f;
 
     public WaveInfoDialog(MapEditor editor){
-        super("$editor.waves");
+        super("$waves.title");
         this.editor = editor;
 
         shown(this::setup);
+        hidden(() -> editor.getTags().put("waves", world.maps.writeWaves(groups)));
+
+        addCloseButton();
+        buttons.addButton("$settings.reset", () -> ui.showConfirm("$confirm", "$settings.clear.confirm", () ->{
+            groups = null;
+            buildGroups();
+        })).size(270f, 64f);
     }
 
     void setup(){
+        groups = world.maps.readWaves(editor.getTags().get("waves"));
 
+        cont.clear();
+
+        cont.table("button-disabled", main -> {
+            main.pane(t -> table = t).growX().growY().get().setScrollingDisabled(true, false);
+            main.row();
+            main.addButton("$add", () -> {
+                if(groups == null) groups = new Array<>();
+                groups.add(new SpawnGroup(lastType));
+                buildGroups();
+            }).growX().height(80f);
+        }).width(390f).growY();
+        cont.table("button-disabled", m -> {
+            m.add("Preview").color(Color.LIGHT_GRAY).growX().center().get().setAlignment(Align.center, Align.center);
+            m.row();
+            m.addButton("-", () -> {}).update(t -> {
+                if(t.getClickListener().isPressed()){
+                    updateTimer += Time.delta();
+                    if(updateTimer >= updatePeriod){
+                        start = Math.max(start - 1, 0);
+                        updateTimer = 0f;
+                        updateWaves();
+                    }
+                }
+            }).growX().height(70f);
+            m.row();
+            m.pane(t -> preview = t).grow().get().setScrollingDisabled(true, false);
+            m.row();
+            m.addButton("+", () -> {}).update(t -> {
+                if(t.getClickListener().isPressed()){
+                    updateTimer += Time.delta();
+                    if(updateTimer >= updatePeriod){
+                        start ++;
+                        updateTimer = 0f;
+                        updateWaves();
+                    }
+                }
+            }).growX().height(70f);
+        }).growY().width(200f).growY();
+
+        buildGroups();
+    }
+
+    void buildGroups(){
+        table.clear();
+        table.top();
+        table.margin(10f);
+
+        if(groups != null){
+            for(SpawnGroup group : groups){
+                table.table("button-disabled", t -> {
+                    t.margin(6f).defaults().pad(2).padLeft(5f).growX().left();
+                    t.addButton(b -> {
+                        b.left();
+                        b.addImage(group.type.iconRegion).size(30f).padRight(3);
+                        b.add(group.type.localizedName).color(Pal.accent);
+                    }, () -> showUpdate(group)).pad(-6f).padBottom(0f);
+
+                    t.row();
+                    t.table(spawns -> {
+                        spawns.addField("" + group.begin, TextFieldFilter.digitsOnly, text -> {
+                             if(Strings.canParsePostiveInt(text)){
+                                 group.begin = Strings.parseInt(text);
+                                 updateWaves();
+                             }
+                        }).width(100f);
+                        spawns.add("$waves.to").padLeft(4).padRight(4);
+                        spawns.addField(group.end == never ? "" : group.end + "", TextFieldFilter.digitsOnly, text -> {
+                            if(Strings.canParsePostiveInt(text)){
+                                group.end = Strings.parseInt(text);
+                                updateWaves();
+                            }else if(text.isEmpty()){
+                                group.end = never;
+                                updateWaves();
+                            }
+                        }).width(100f).get().setMessageText(Core.bundle.get("waves.never"));
+                    });
+                    t.row();
+                    t.table(p -> {
+                        p.add("$waves.every").padRight(4);
+                        p.addField(group.spacing + "", TextFieldFilter.digitsOnly, text -> {
+                            if(Strings.canParsePostiveInt(text)){
+                                group.spacing = Strings.parseInt(text);
+                                updateWaves();
+                            }
+                        }).width(100f);
+                        p.add("$waves.waves").padLeft(4);
+                    });
+
+                    t.row();
+                    t.table(a -> {
+                        a.addField(group.unitAmount + "", TextFieldFilter.digitsOnly, text -> {
+                            if(Strings.canParsePostiveInt(text)){
+                                group.unitAmount = Strings.parseInt(text);
+                                updateWaves();
+                            }
+                        }).width(80f);
+
+                        a.add(" + ");
+                        a.addField(Math.max((int)(Mathf.isZero(group.unitScaling) ? 0 : 1f/group.unitScaling), 0) + "", TextFieldFilter.digitsOnly, text -> {
+                            if(Strings.canParsePostiveInt(text)){
+                                group.unitScaling = 1f / Strings.parseInt(text);
+                                updateWaves();
+                            }
+                        }).width(80f);
+                        a.add("$waves.perspawn").padLeft(4);
+                    });
+
+                    t.row();
+                    t.addCheck("$waves.boss", b -> group.effect = (b ? StatusEffects.boss : null)).padTop(4).update(b -> b.setChecked(group.effect == StatusEffects.boss));
+
+                    t.row();
+                    t.addButton("$waves.remove", () -> {
+                        groups.remove(group);
+                        table.getCell(t).pad(0f);
+                        t.remove();
+                        updateWaves();
+                    }).growX().pad(-6f).padTop(5);
+                }).width(340f).pad(3);
+                table.row();
+            }
+        }else{
+            table.add("$editor.default");
+        }
+
+        updateWaves();
+    }
+
+    void showUpdate(SpawnGroup group){
+        FloatingDialog dialog = new FloatingDialog("");
+        dialog.setFillParent(false);
+        int i = 0;
+        for(UnitType type : content.units()){
+            dialog.cont.addButton(t -> {
+                t.left();
+                t.addImage(type.iconRegion).size(40f).padRight(2f);
+                t.add(type.localizedName);
+            }, () -> {
+                lastType = type;
+                group.type = type;
+                dialog.hide();
+                buildGroups();
+            }).pad(2).margin(12f).fillX();
+            if(++i % 2 == 0)dialog.cont.row();
+        }
+        dialog.show();
+    }
+
+    void updateWaves(){
+        preview.clear();
+        preview.top();
+
+        Array<SpawnGroup> groups = (this.groups == null ? DefaultWaves.getDefaultSpawns() : this.groups);
+
+        for(int i = start; i < displayed + start; i ++){
+            int wave = i;
+            preview.table("button-disabled", table -> {
+                table.add(wave + "").color(Pal.accent).center().colspan(2).get().setAlignment(Align.center, Align.center);
+                table.row();
+
+                int[] spawned = new int[Vars.content.getBy(ContentType.unit).size];
+
+                for(SpawnGroup spawn : groups){
+                    spawned[spawn.type.id] += spawn.getUnitsSpawned(wave);
+                }
+
+                for(int j = 0; j < spawned.length; j++){
+                    if(spawned[j] > 0){
+                        UnitType type = content.getByID(ContentType.unit, j);
+                        table.addImage(type.iconRegion).size(30f).padRight(4);
+                        table.add(spawned[j] + "x").color(Color.LIGHT_GRAY).padRight(6);
+                        table.row();
+                    }
+                }
+
+                if(table.getChildren().size == 1){
+                    table.add("$none").color(Pal.remove);
+                }
+            }).width(130f).pad(2f);
+
+            preview.row();
+        }
     }
 }

core/src/io/anuke/mindustry/game/SpawnGroup.java

@@ -17,26 +17,26 @@ import static io.anuke.mindustry.Vars.content;
  * Each spawn group can have multiple sub-groups spawned in different areas of the map.
  */
 public class SpawnGroup implements Serializable{
-    protected static final int never = Integer.MAX_VALUE;
+    public static final int never = Integer.MAX_VALUE;
 
     /**The unit type spawned*/
     public UnitType type;
     /**When this spawn should end*/
-    protected int end = never;
+    public int end = never;
     /**When this spawn should start*/
-    protected int begin;
+    public int begin;
     /**The spacing, in waves, of spawns. For example, 2 = spawns every other wave*/
-    protected int spacing = 1;
+    public int spacing = 1;
     /**Maximum amount of units that spawn*/
-    protected int max = 40;
+    public int max = 40;
     /**How many waves need to pass before the amount of units spawned increases by 1*/
-    protected float unitScaling = 9999f;
+    public float unitScaling = never;
     /**Amount of enemies spawned initially, with no scaling*/
-    protected int unitAmount = 1;
+    public int unitAmount = 1;
     /**Status effect applied to the spawned unit. Null to disable.*/
-    protected StatusEffect effect;
+    public StatusEffect effect;
     /**Items this unit spawns with. Null to disable.*/
-    protected ItemStack items;
+    public ItemStack items;
 
     public SpawnGroup(UnitType type){
         this.type = type;
@@ -76,15 +76,14 @@ public class SpawnGroup implements Serializable{
 
     @Override
     public void write (Json json) {
-        json.writeObjectStart();
         json.writeValue("type", type.name);
-        json.writeValue("begin", begin);
+        if(begin != 0) json.writeValue("begin", begin);
-        json.writeValue("end", end);
+        if(end != never) json.writeValue("end", end);
-        json.writeValue("spacing", spacing);
+        if(spacing != 1) json.writeValue("spacing", spacing);
-        json.writeValue("max", max);
+        if(max != 40) json.writeValue("max", max);
-        json.writeValue("scaling", unitScaling);
+        if(unitScaling != never) json.writeValue("scaling", unitScaling);
-        json.writeValue("amount", unitAmount);
+        if(unitAmount != 1) json.writeValue("amount", unitAmount);
-        json.writeObjectEnd();
+        if(effect != null) json.writeValue("effect", effect.id);
     }
 
     @Override
@@ -96,6 +95,7 @@ public class SpawnGroup implements Serializable{
         max = data.getInt("spacing", 40);
         unitScaling = data.getFloat("scaling", never);
         unitAmount = data.getInt("amount", 1);
+        effect = content.getByID(ContentType.status, data.getInt("effect", -1));
     }
 
     @Override

core/src/io/anuke/mindustry/io/MapIO.java

@@ -8,9 +8,7 @@ import io.anuke.arc.graphics.Color;
 import io.anuke.arc.graphics.Pixmap;
 import io.anuke.arc.graphics.Pixmap.Format;
 import io.anuke.arc.math.Mathf;
-import io.anuke.arc.util.Pack;
+import io.anuke.arc.util.*;
-import io.anuke.arc.util.Strings;
-import io.anuke.arc.util.Structs;
 import io.anuke.mindustry.content.Blocks;
 import io.anuke.mindustry.game.MappableContent;
 import io.anuke.mindustry.game.Team;
@@ -70,6 +68,7 @@ public class MapIO{
     }
 
     public static Pixmap generatePreview(Map map) throws IOException{
+        Time.mark();
         Pixmap floor = new Pixmap(map.width, map.height, Format.RGBA8888);
         Pixmap wall = new Pixmap(map.width, map.height, Format.RGBA8888);
         int black = Color.rgba8888(Color.BLACK);

core/src/io/anuke/mindustry/io/versions/Save16.java

@@ -6,8 +6,6 @@ import io.anuke.mindustry.game.Version;
 import io.anuke.mindustry.gen.Serialization;
 import io.anuke.mindustry.io.SaveFileVersion;
 import io.anuke.mindustry.maps.Map;
-import io.anuke.mindustry.type.ContentType;
-import io.anuke.mindustry.type.Zone;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -29,14 +27,11 @@ public class Save16 extends SaveFileVersion{
 
         //general state
         state.rules = Serialization.readRules(stream);
-        //load zone spawn patterns if applicable
-        if(content.getByID(ContentType.zone, state.rules.zone) != null){
-            state.rules.spawns = content.<Zone>getByID(ContentType.zone, state.rules.zone).rules.get().spawns;
-        }
         String mapname = stream.readUTF();
         Map map = world.maps.all().find(m -> m.name().equals(mapname));
         if(map == null) map = new Map(customMapDirectory.child(mapname), 1, 1, new ObjectMap<>(), true);
         world.setMap(map);
+        state.rules.spawns = map.getWaves();
 
         int wave = stream.readInt();
         float wavetime = stream.readFloat();

core/src/io/anuke/mindustry/maps/Map.java

@@ -1,12 +1,18 @@
 package io.anuke.mindustry.maps;
 
 import io.anuke.arc.Core;
+import io.anuke.arc.collection.Array;
 import io.anuke.arc.collection.ObjectMap;
 import io.anuke.arc.files.FileHandle;
 import io.anuke.arc.graphics.Texture;
+import io.anuke.arc.util.Log;
 import io.anuke.mindustry.Vars;
+import io.anuke.mindustry.game.DefaultWaves;
+import io.anuke.mindustry.game.SpawnGroup;
 import io.anuke.mindustry.io.MapIO;
 
+import static io.anuke.mindustry.Vars.world;
+
 public class Map{
     /** Whether this is a custom map.*/
     public final boolean custom;
@@ -41,6 +47,20 @@ public class Map{
         this(file, width, height, tags, custom, MapIO.version);
     }
 
+    public Array<SpawnGroup> getWaves(){
+        if(tags.containsKey("waves")){
+            try{
+                return world.maps.readWaves(tags.get("waves"));
+            }catch(Exception e){
+                Log.err("Malformed waves: {0}", tags.get("waves"));
+                e.printStackTrace();
+                return DefaultWaves.getDefaultSpawns();
+            }
+        }else{
+            return DefaultWaves.getDefaultSpawns();
+        }
+    }
+
     public int getHightScore(){
         return Core.settings.getInt("hiscore" + file.nameWithoutExtension(), 0);
     }

core/src/io/anuke/mindustry/maps/Maps.java

@@ -9,22 +9,25 @@ import io.anuke.arc.util.Disposable;
 import io.anuke.arc.util.Log;
 import io.anuke.arc.util.Time;
 import io.anuke.arc.util.serialization.Json;
+import io.anuke.mindustry.game.SpawnGroup;
 import io.anuke.mindustry.io.MapIO;
 import io.anuke.mindustry.world.Tile;
 
 import java.io.IOException;
+import java.io.StringWriter;
 
 import static io.anuke.mindustry.Vars.*;
 
 public class Maps implements Disposable{
     /** List of all built-in maps. Filenames only.*/
-    private static final String[] defaultMapNames = {"Fortress"};
+    private static final String[] defaultMapNames = {"fortress"};
     /** All maps stored in an ordered array. */
     private Array<Map> maps = new Array<>();
     /** Serializer for meta.*/
     private Json json = new Json();
 
     public Maps(){
+
     }
 
     /** Returns a list of all maps, including custom ones. */
@@ -134,6 +137,28 @@ public class Maps implements Disposable{
         map.file.delete();
     }
 
+    public String writeWaves(Array<SpawnGroup> groups){
+        if(groups == null){
+            return "[]";
+        }
+
+        StringWriter buffer = new StringWriter();
+        json.setWriter(buffer);
+
+        json.writeArrayStart();
+        for(int i = 0; i < groups.size; i++){
+            json.writeObjectStart(SpawnGroup.class, SpawnGroup.class);
+            groups.get(i).write(json);
+            json.writeObjectEnd();
+        }
+        json.writeArrayEnd();
+        return buffer.toString();
+    }
+
+    public Array<SpawnGroup> readWaves(String str){
+        return str == null ? null : str.equals("[]") ? new Array<>() : Array.with(json.fromJson(SpawnGroup[].class, str));
+    }
+
     /** Find a new filename to put a map to.*/
     private FileHandle findFile(){
         //find a map name that isn't used.
@@ -173,6 +198,12 @@ public class Maps implements Disposable{
 
     @Override
     public void dispose(){
-
+        for(Map map : maps){
+            if(map.texture != null){
+                map.texture.dispose();
+                map.texture = null;
+            }
+        }
+        maps.clear();
     }
 }

core/src/io/anuke/mindustry/ui/fragments/HudFragment.java

@@ -124,7 +124,7 @@ public class HudFragment extends Fragment{
                 stuff.add(stack).width(dsize * 4 + 3f);
                 stuff.row();
                 stuff.table("button", t -> t.margin(10f).add(new Bar("boss.health", Pal.health, () -> state.boss() == null ? 0f : state.boss().healthf()).blink(Color.WHITE))
-                    .grow()).fillX().visible(() -> world.isZone() && state.boss() != null).height(60f).get();
+                    .grow()).fillX().visible(() -> state.rules.waves && state.boss() != null).height(60f).get();
                 stuff.row();
             }).visible(() -> shown);
         });

core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java

@@ -138,7 +138,7 @@ public class MenuFragment extends Fragment{
         FloatingDialog dialog = new FloatingDialog("$play");
         dialog.setFillParent(false);
         dialog.addCloseButton();
-        dialog.cont.defaults().size(230f, 64f);
+        dialog.cont.defaults().size(210f, 64f);
         dialog.cont.add(new MenuButton("icon-editor", "$newgame", () -> {
             dialog.hide();
             ui.custom.show();