Merge remote-tracking branch 'origin/master'
# Conflicts: # core/assets/bundles/bundle_es.properties
This commit is contained in:
@@ -1374,7 +1374,7 @@ block.deep-tainted-water.name = Deep Tainted Water
|
||||
block.darksand-tainted-water.name = Donker Zand Vervuild Water
|
||||
block.tar.name = Olie
|
||||
block.stone.name = Steen
|
||||
block.sand-floor.name = Donker Zand
|
||||
block.sand-floor.name = Zand
|
||||
block.darksand.name = Donker Zand
|
||||
block.ice.name = Ijs
|
||||
block.snow.name = Sneeuw
|
||||
|
||||
@@ -1527,7 +1527,7 @@ block.rotary-pump.name = Wirowa Pompa
|
||||
block.thorium-reactor.name = Reaktor Torowy
|
||||
block.mass-driver.name = Katapulta Masy
|
||||
block.blast-drill.name = Wybuchowe Wiertło
|
||||
block.impulse-pump.name = Impulsywna Pompa
|
||||
block.impulse-pump.name = Impulsowa Pompa
|
||||
block.thermal-generator.name = Generator Termalny
|
||||
block.surge-smelter.name = Piec Mieszający
|
||||
block.mender.name = Naprawiacz
|
||||
|
||||
Reference in New Issue
Block a user