Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anuken 2021-06-04 20:19:15 -04:00
commit 7243ae4e95
2 changed files with 17 additions and 0 deletions

View File

@ -626,6 +626,7 @@ status.wet.name = Basah
status.muddy.name = Berlumpur
status.melting.name = Meleleh
status.sapped.name = Melemahkan
status.electrified.name = Dialiri listrik
status.spore-slowed.name = Spora Melambat
status.tarred.name = Berminyak
status.overclock.name = Melebihi Batas
@ -1060,6 +1061,11 @@ unit.minke.name = Minke
unit.bryde.name = Bryde
unit.sei.name = Sei
unit.omura.name = Omura
unit.retusa.name = Retusa
unit.oxynoe.name = Oxynoe
unit.cyerce.name = Cyerce
unit.aegires.name = Aegires
unit.navanax.name = Navanax
unit.alpha.name = Alpha
unit.beta.name = Beta
unit.gamma.name = Gamma
@ -1120,6 +1126,7 @@ block.sand-water.name = Air Pasir
block.darksand-water.name = Air Pasir Hitam
block.char.name = Bara
block.dacite.name = Dasit
block.rhyolite.name = Riolit
block.dacite-wall.name = Dinding Dasit
block.dacite-boulder.name = Batu Besar Dasit
block.ice-snow.name = Salju Es
@ -1227,6 +1234,7 @@ block.solar-panel.name = Panel Surya
block.solar-panel-large.name = Panel Surya Besar
block.oil-extractor.name = Pengekstrak Minyak
block.repair-point.name = Tempat Perbaikan
block.repair-turret.name = Menara Pembaikan
block.pulse-conduit.name = Selang Denyut
block.plated-conduit.name = Pipa Terlapis
block.phase-conduit.name = Selang Phase
@ -1269,6 +1277,12 @@ block.exponential-reconstructor.name = Rekonstruktor Eksponensial
block.tetrative-reconstructor.name = Rekonstruktor Tetratif
block.payload-conveyor.name = Pengantar Massa
block.payload-router.name = Pengarah Massa
block.duct.name = Saluran
block.duct-router.name = Pengarah Saluran
block.duct-bridge.name = Jembatan Saluran
block.payload-propulsion-tower.name = Menara Penggerak Muatan
block.payload-void.name = Penghilang Muatan
block.payload-source.name = Sumber Muatan
block.disassembler.name = Pembongkar
block.silicon-crucible.name = Pelebur Raksasa
block.overdrive-dome.name = Kubah Projektor Pemercepat

View File

@ -13,5 +13,8 @@
},
{
"address": "46.17.104.254:9999"
},
{
"address": "mindustrypvp.ml:6000"
}
]