From d3b7dd973f14b1cdd7d273902dea74246a680124 Mon Sep 17 00:00:00 2001 From: Aldas <45396524+TheAldas@users.noreply.github.com> Date: Mon, 2 Mar 2020 17:02:56 +0200 Subject: [PATCH 1/4] Grammar corrections (#1656) Grammar and logic corrections --- core/assets/bundles/bundle_lt.properties | 28 ++++++++++++------------ 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/core/assets/bundles/bundle_lt.properties b/core/assets/bundles/bundle_lt.properties index e0fe6a9825..c1b01cf15f 100644 --- a/core/assets/bundles/bundle_lt.properties +++ b/core/assets/bundles/bundle_lt.properties @@ -561,7 +561,7 @@ blocks.productiontime = Gamybos Laikas blocks.repairtime = Pilnas bloko sutaisymo laikas blocks.speedincrease = Greičio Padidėjimas blocks.range = Atstumas -blocks.drilltier = Gręžiamieji +blocks.drilltier = Gręžiama blocks.drillspeed = Bazinis Grąžto Greitis blocks.boosteffect = Pastiprinimo Efektas blocks.maxunits = Maks. Aktyvių Vienetų Kiekis @@ -573,11 +573,11 @@ blocks.shots = Šūviai blocks.reload = Šūviai per sekundę blocks.ammo = Šoviniai -bar.drilltierreq = Privolomas Geresnis Grąžtas +bar.drilltierreq = Privalomas Geresnis Grąžtas bar.drillspeed = Grąžto Greitis: {0}/s bar.pumpspeed = Pompos Greitis: {0}/s bar.efficiency = Efektyvumas: {0}% -bar.powerbalance = Power: {0}/s +bar.powerbalance = Energija: {0}/s bar.powerstored = Sukaupta: {0}/{1} bar.poweramount = Energija: {0} bar.poweroutput = Energijos Išeiga: {0} @@ -594,7 +594,7 @@ bar.output = Išeiga bullet.damage = [stat]{0}[lightgray] žalos bullet.splashdamage = [stat]{0}[lightgray] zonos žalos ~[stat] {1}[lightgray] blokai bullet.incendiary = [stat]uždegantis -bullet.homing = [stat]nukreipiamasis +bullet.homing = [stat]sekimas bullet.shock = [stat]šokas bullet.frag = [stat]skilantis bullet.knockback = [stat]{0}[lightgray] numušimas @@ -689,7 +689,7 @@ keybinds.mobile = [scarlet]Dauguma valdymo mygtukų neveikia telefone. Tik papar category.general.name = Bendra category.view.name = Vaizdas category.multiplayer.name = Žaidimas Tinkle -command.attack = Puolti +command.attack = Pulti command.rally = Susitelkti command.retreat = Atsitraukti placement.blockselectkeys = \n[lightgray]Key: [{0}, @@ -870,7 +870,7 @@ block.shale-boulder.name = Skalūno Riedulys block.moss.name = Samanos block.shrubs.name = Krūmai block.spore-moss.name = Sporų Samanos -block.shalerocks.name = Skalūnos Uolienos +block.shalerocks.name = Skalūno Uolienos block.scrap-wall.name = Laužo Siena block.scrap-wall-large.name = Didelė Laužo Siena block.scrap-wall-huge.name = Didžiulė Laužo Siena @@ -930,8 +930,8 @@ block.titanium-wall.name = Titano Siena block.titanium-wall-large.name = Didelė Titano Siena block.plastanium-wall.name = Plastaniumo Siena block.plastanium-wall-large.name = Didelė Plastaniumo Siena -block.phase-wall.name = Fazės Siena -block.phase-wall-large.name = Didelė Fazės Siena +block.phase-wall.name = Fazinė Siena +block.phase-wall-large.name = Didelė Fazinė Siena block.thorium-wall.name = Torio Siena block.thorium-wall-large.name = Didelė Torio Siena block.door.name = Durys @@ -956,7 +956,7 @@ block.illuminator.description = Mažas, kompaktiškas, konfigūruojamas šviesos block.overflow-gate.name = Perpildymo Užtvara block.underflow-gate.name = Neperpildymo Užtvara block.silicon-smelter.name = Silicio Lydykla -block.phase-weaver.name = Fazės Audėjas +block.phase-weaver.name = Fazinė Audykla block.pulverizer.name = Pulverizatorius block.cryofluidmixer.name = Krio Skysčio Maišytojas block.melter.name = Lydytuvas @@ -972,8 +972,8 @@ block.battery.name = Baterija block.battery-large.name = Didelė Baterija block.combustion-generator.name = Vidaus Degimo Generatorius block.turbine-generator.name = Garų Generatorius -block.differential-generator.name = Differential Generator -block.impact-reactor.name = Smūgio Reaktorius +block.differential-generator.name = Diferencialinis Generatorius +block.impact-reactor.name = Smūginis Reaktorius block.mechanical-drill.name = Mechaninis Grąžtas block.pneumatic-drill.name = Pneumatinis Grąžtas block.laser-drill.name = Lazerinis Grąžtas @@ -1029,11 +1029,11 @@ block.liquid-junction.name = Skysčių Sandūra block.bridge-conduit.name = Tiltinis Vamzdis block.rotary-pump.name = Rotacinis Siurblys block.thorium-reactor.name = Torio Reaktorius -block.mass-driver.name = Elektromagnetė Katapulta +block.mass-driver.name = Elektromagnetinė Katapulta block.blast-drill.name = Oro Srovės Grąžtas block.thermal-pump.name = Terminė Pompa block.thermal-generator.name = Terminis Generatorius -block.alloy-smelter.name = Alloy Smelter +block.alloy-smelter.name = Lydinio Lydykla block.mender.name = Taisytojas block.mend-projector.name = Taisymo Projektorius block.surge-wall.name = Viršįtampio Siena @@ -1136,7 +1136,7 @@ unit.revenant.description = Sunkus, skraidantis raketų masyvas. block.message.description = Laiko žinutę. Naudojama komunikacijai tarp sąjungininkų. block.graphite-press.description = Sukompresuoja anglies gabalus į grynas grafito plokštes. block.multi-press.description = Patobulinta grafito preso versija. Pasitelkia vandenį ir energiją greitam ir efektyviam anglies apdirbimui. -block.silicon-smelter.description = Rekuoja smėlį su gryna anglimi. Gamina silicį. +block.silicon-smelter.description = Redukuoja smėlį su gryna anglimi. Gamina silicį. block.kiln.description = Sulydo smėlį ir stiklą į junginį žinomą kaip meta stiklas. Veikimui reikalinga nedaug energijos. block.plastanium-compressor.description = Gamina plastaniumą iš naftos ir titano. block.phase-weaver.description = Susintetina fazinį audinį iš radioaktyvaus torio ir smėlio. Veikimui reikalingas didžiulis kiekis energijos. From b512169d443d65e641397c45b28d1d0043086b52 Mon Sep 17 00:00:00 2001 From: Recessive <61154659+Recessive@users.noreply.github.com> Date: Tue, 3 Mar 2020 02:40:50 +1100 Subject: [PATCH 2/4] Added AA ffa to server list (#1605) * Added AA ffa to server list * Changed ip to use custom domain --- servers.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/servers.json b/servers.json index 2c0ab994b1..56c8a52456 100644 --- a/servers.json +++ b/servers.json @@ -34,5 +34,8 @@ }, { "address": "mindustry.io:3000" + }, + { + "address": "aamindustry.play.ai" } ] From 8e9dabb350626700fb40172b083da852a3966785 Mon Sep 17 00:00:00 2001 From: fuzzbuck <54221024+fuzzbuck@users.noreply.github.com> Date: Mon, 2 Mar 2020 19:37:04 +0100 Subject: [PATCH 3/4] Add "pardon" command for votekicks (#1570) * Add "pardon" command Allows players who have been incorrectly votekicked to join again * isn't hasn't * getInfoOptional & space * pardon me no pun intended * Update ServerControl.java --- server/src/mindustry/server/ServerControl.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/server/src/mindustry/server/ServerControl.java b/server/src/mindustry/server/ServerControl.java index a92cbdebec..6ecc42fb05 100644 --- a/server/src/mindustry/server/ServerControl.java +++ b/server/src/mindustry/server/ServerControl.java @@ -659,6 +659,17 @@ public class ServerControl implements ApplicationListener{ err("That IP/ID is not banned!"); } }); + + handler.register("pardon", "", "Pardons a votekicked player by ID and allows them to join again.", arg -> { + PlayerInfo info = netServer.admins.getInfoOptional(arg[0]); + + if(info != null){ + info.lastKicked = 0; + info("Pardoned player: {0}", info.lastName); + }else{ + err("That ID can't be found."); + } + }); handler.register("admin", " ", "Make an online user admin", arg -> { if(!state.is(State.playing)){ From cdb8682d433e84d55d36dd6046183dcd95586e63 Mon Sep 17 00:00:00 2001 From: Aldas <45396524+TheAldas@users.noreply.github.com> Date: Tue, 3 Mar 2020 17:36:34 +0200 Subject: [PATCH 4/4] Updated data.import.confirm lane (#1658) Updated data.import.confirm lane --- core/assets/bundles/bundle_lt.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/assets/bundles/bundle_lt.properties b/core/assets/bundles/bundle_lt.properties index c1b01cf15f..662753e99e 100644 --- a/core/assets/bundles/bundle_lt.properties +++ b/core/assets/bundles/bundle_lt.properties @@ -259,7 +259,7 @@ data.import = Importuoti Duomenis data.openfolder = Atidaryti Duomenų Aplanką data.exported = Duomenys Eksportuoti. data.invalid = Tai nėra veikiantys žaidimo duomenys. -data.import.confirm = Importuojant išorinius duomenis bus ištrinti[scarlet] visi[] +data.import.confirm = Importuojant išorinius duomenis bus ištrinti[scarlet] visi esami duomenys[] ų esami žaidimo duomenys.\n[accent]Tai negali būti atkurta![]\n\nŽaidimas bus išjungtas iš karto po duomenų importavimo. classic.export = Eksportuoti Klasikinius Duomenis classic.export.text = [accent]Mindustry[] has just had a major update.\nClassic (v3.5 build 40) save or map data has been detected. Would you like to export these saves to your phone's home folder, for use in the Mindustry Classic app?