Merge remote-tracking branch 'origin/master'

core/assets/bundles/bundle_fi.properties

@@ -829,11 +829,11 @@ liquid.oil.name = Öljy
 liquid.cryofluid.name = Kryoneste
 item.corestorable = [lightgray]Säilöttävissä ytimeen: {0}
 item.explosiveness = [lightgray]Räjädysmäisyys: {0}%
-item.flammability = [lightgray]Flammability: {0}%
+item.flammability = [lightgray]Syttyvyys: {0}%
-item.radioactivity = [lightgray]Radioactivity: {0}%
+item.radioactivity = [lightgray]Radioaktiivisuus: {0}%
 unit.health = [lightgray]Elämäpisteet: {0}
 unit.speed = [lightgray]Nopeus: {0}
-unit.weapon = [lightgray]Weapon: {0}
+unit.weapon = [lightgray]Ammuksia: {0}
 unit.itemcapacity = [lightgray]Item Capacity: {0}
 unit.minespeed = [lightgray]Mining Speed: {0}%
 unit.minepower = [lightgray]Mining Power: {0}
@@ -843,26 +843,26 @@ liquid.heatcapacity = [lightgray]Lämpökapasiteetti: {0}
 liquid.viscosity = [lightgray]Tahmeus: {0}
 liquid.temperature = [lightgray]Lämpö: {0}
 
-block.cliff.name = Cliff
+block.cliff.name = Vuoren
-block.sand-boulder.name = Sand Boulder
+block.sand-boulder.name = Hiekkalohkare
-block.grass.name = Grass
+block.grass.name = Ruoho
-block.slag.name = Slag
+block.slag.name = Kuono
-block.salt.name = Salt
+block.salt.name = Suolapitoisuus
-block.saltrocks.name = Salt Rocks
+block.saltrocks.name = Suolakivi
-block.pebbles.name = Pebbles
+block.pebbles.name = Pikkukivi
 block.tendrils.name = Tendrils
-block.sandrocks.name = Sand Rocks
+block.sandrocks.name = Hiekkakivet
 block.spore-pine.name = Spore Pine
 block.sporerocks.name = Spore Rocks
-block.rock.name = Rock
+block.rock.name = Mukulakivi
-block.snowrock.name = Snow Rock
+block.snowrock.name = Lumi kivi
-block.snow-pine.name = Snow Pine
+block.snow-pine.name = Lumimänny
-block.shale.name = Shale
+block.shale.name = Liuske
 block.shale-boulder.name = Shale Boulder
-block.moss.name = Moss
+block.moss.name = Sammal
-block.shrubs.name = Shrubs
+block.shrubs.name = Pensaikko
-block.spore-moss.name = Spore Moss
+block.spore-moss.name = Itiösammal
-block.shalerocks.name = Shale Rocks
+block.shalerocks.name = Liuskekivet
 block.scrap-wall.name = Romuseinä
 block.scrap-wall-large.name = Suuri romuseinä
 block.scrap-wall-huge.name = Valtava romuseinä
@@ -893,29 +893,29 @@ block.char.name = Char
 block.holostone.name = Holo stone
 block.ice-snow.name = Ice Snow
 block.rocks.name = Rocks
-block.icerocks.name = Ice rocks
+block.icerocks.name = Jääkivet
 block.snowrocks.name = Snow Rocks
 block.dunerocks.name = Dune Rocks
-block.pine.name = Pine
+block.pine.name = Mänty
-block.white-tree-dead.name = White Tree Dead
+block.white-tree-dead.name = Valkoinen kuollut puu
-block.white-tree.name = White Tree
+block.white-tree.name = Valkoinen puu
 block.spore-cluster.name = Spore Cluster
-block.metal-floor.name = Metal Floor 1
+block.metal-floor.name = Metallilattia 1
-block.metal-floor-2.name = Metal Floor 2
+block.metal-floor-2.name = Metallilattia 2
-block.metal-floor-3.name = Metal Floor 3
+block.metal-floor-3.name = Metallilattia 3
-block.metal-floor-5.name = Metal Floor 4
+block.metal-floor-5.name = Metallilattia 4
-block.metal-floor-damaged.name = Metal Floor Damaged
+block.metal-floor-damaged.name = Vaurioitunut metallilattia
-block.dark-panel-1.name = Dark Panel 1
+block.dark-panel-1.name = Tumma paneeli 1
-block.dark-panel-2.name = Dark Panel 2
+block.dark-panel-2.name = Tumma paneeli 2
-block.dark-panel-3.name = Dark Panel 3
+block.dark-panel-3.name = Tumma paneeli 3
-block.dark-panel-4.name = Dark Panel 4
+block.dark-panel-4.name = Tumma paneeli 4
-block.dark-panel-5.name = Dark Panel 5
+block.dark-panel-5.name = Tumma paneeli 5
-block.dark-panel-6.name = Dark Panel 6
+block.dark-panel-6.name = Tumma paneeli 6
-block.dark-metal.name = Dark Metal
+block.dark-metal.name = Tumma metalli
 block.ignarock.name = Igna Rock
 block.hotrock.name = Hot Rock
 block.magmarock.name = Magma Rock
-block.cliffs.name = Cliffs
+block.cliffs.name = Kallio
 block.copper-wall.name = Kupariseinä
 block.copper-wall-large.name = Suuri kupariseinä
 block.titanium-wall.name = Titaaniseinä
@@ -1018,18 +1018,18 @@ block.thorium-reactor.name = Thorium Reactor
 block.mass-driver.name = Massalinko
 block.blast-drill.name = Airblast Drill
 block.thermal-pump.name = Thermal Pump
-block.thermal-generator.name = Thermal Generator
+block.thermal-generator.name = Lämpögeneraattori
 block.alloy-smelter.name = Alloy Smelter
 block.mender.name = Mender
 block.mend-projector.name = Mend Projector
 block.surge-wall.name = Surge Wall
 block.surge-wall-large.name = Large Surge Wall
-block.cyclone.name = Cyclone
+block.cyclone.name = Sykloni
 block.fuse.name = Fuse
 block.shock-mine.name = Shock Mine
 block.overdrive-projector.name = Overdrive Projector
 block.force-projector.name = Force Projector
-block.arc.name = Arc
+block.arc.name = Kaari
 block.rtg-generator.name = RTG Generator
 block.spectre.name = Haamu
 block.meltdown.name = Sulamispiste
@@ -1047,11 +1047,11 @@ unit.spirit.name = Henki-korjausdrooni
 unit.draug.name = Kummitus-louhintadrooni
 unit.phantom.name = Aave-rakennusdrooni
 unit.dagger.name = Tikari
-unit.crawler.name = Crawler
+unit.crawler.name = Indeksointirobotti
 unit.titan.name = Titan
-unit.ghoul.name = Ghoul Bomber
+unit.ghoul.name = Ghoul-pommittaja
-unit.wraith.name = Wraith Fighter
+unit.wraith.name = Haamu-taistelija
-unit.fortress.name = Fortress
+unit.fortress.name = Linnoitus
 unit.revenant.name = Revenant
 unit.eruptor.name = Eruptor
 unit.chaos-array.name = Chaos Array

core/src/mindustry/editor/MapView.java

@@ -72,10 +72,15 @@ public class MapView extends Element implements GestureListener{
                     return false;
                 }
 
-                if(!mobile && button != KeyCode.mouseLeft && button != KeyCode.mouseMiddle){
+                if(!mobile && button != KeyCode.mouseLeft && button != KeyCode.mouseMiddle && button != KeyCode.mouseRight){
                     return true;
                 }
                 
+                if(button == KeyCode.mouseRight){
+                    lastTool = tool;
+                    tool = EditorTool.eraser;
+                }
+
                 if(button == KeyCode.mouseMiddle){
                     lastTool = tool;
                     tool = EditorTool.zoom;
@@ -102,7 +107,7 @@ public class MapView extends Element implements GestureListener{
 
             @Override
             public void touchUp(InputEvent event, float x, float y, int pointer, KeyCode button){
-                if(!mobile && button != KeyCode.mouseLeft && button != KeyCode.mouseMiddle){
+                if(!mobile && button != KeyCode.mouseLeft && button != KeyCode.mouseMiddle && button != KeyCode.mouseRight){
                     return;
                 }
 
@@ -117,7 +122,7 @@ public class MapView extends Element implements GestureListener{
 
                 editor.flushOp();
 
-                if(button == KeyCode.mouseMiddle && lastTool != null){
+                if((button == KeyCode.mouseMiddle || button == KeyCode.mouseRight) && lastTool != null){
                     tool = lastTool;
                     lastTool = null;
                 }