Merge remote-tracking branch 'origin/master'

# Conflicts:
#	core/assets/bundles/bundle_cs.properties
#	core/assets/bundles/bundle_fr.properties
#	core/assets/bundles/bundle_it.properties
#	core/assets/bundles/bundle_nl.properties
#	core/assets/bundles/bundle_pt.properties
#	core/assets/bundles/bundle_ru.properties
#	core/assets/bundles/bundle_zh_TW.properties

core/assets/bundles/bundle_de.properties

@@ -1,8 +1,8 @@
 credits.text = Entwickelt von [ROYAL]Anuken[] - [SKY]anukendev@gmail.com[]\n\n[GRAY]
 credits = Danksagungen
 contributors = Übersetzer und Mitwirkende
-discord = Trete dem Mindustry Discord bei!
-link.discord.description = Der offizielle Mindustry Discord-Chatroom
+discord = Tritt dem Mindustry Discord bei!
+link.discord.description = Der offizielle Mindustry Discord-Server
 link.reddit.description = Der Mindustry Subreddit
 link.github.description = Quellcode des Spiels
 link.changelog.description = Liste der Änderungen
@@ -487,7 +487,7 @@ zone.stainedMountains.name = Gefleckte Berge
 zone.desolateRift.name = Trostloser Riss
 zone.nuclearComplex.name = Kernkraftwerk
 zone.overgrowth.name = Überwucherung
-zone.tarFields.name = Teerfelder
+zone.tarFields.name = Ölfelder
 zone.saltFlats.name = Salztiefen
 zone.impact0078.name = Auswirkung 0078
 zone.crags.name = Felsen
@@ -800,7 +800,7 @@ item.pyratite.name = Pyratit
 item.metaglass.name = Metaglass
 item.scrap.name = Schrott
 liquid.water.name = Wasser
-liquid.slag.name = Asche
+liquid.slag.name = Schlacke
 liquid.oil.name = Öl
 liquid.cryofluid.name = Kryoflüssigkeit
 mech.alpha-mech.name = Alpha
@@ -876,7 +876,7 @@ block.deepwater.name = Tiefes Wasser
 block.water.name = Wasser
 block.tainted-water.name = Unreines Wasser
 block.darksand-tainted-water.name = Dunkler Sand in unreinem Wasser
-block.tar.name = Teer
+block.tar.name = Öl
 block.stone.name = Stein
 block.sand.name = Sand
 block.darksand.name = Dunkler Sand