Merge branch 'master' into release

Chais · Jul 16, 2017 · dfa3ef5 · dfa3ef5
2 parents 5947dbc + 957268e
commit dfa3ef5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/Defs/ThingDefs/Buildings_Production.xml b/Defs/ThingDefs/Buildings_Production.xml
@@ -3,7 +3,7 @@
 	<ThingDef ParentName="BenchBase">
 		<defName>Autarky_MechanitesWorkstation</defName>
 		<label>mechanites workstation</label>
-		<description>A hight-tech workstation controlled by a powerful AI, used to construct mechanites.</description>
+		<description>A hight-tech workstation controlled by a powerful AI, used to construct and process mechanites.</description>
 		<thingClass>Building_WorkTable</thingClass>
 		<altitudeLayer>Building</altitudeLayer>
 		<passability>PassThroughOnly</passability>

diff --git a/Languages/German/DefInjected/ThingDef/Items_Buildings.xml b/Languages/German/DefInjected/ThingDef/Items_Buildings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Defs>
+	<Autarky_MechanitesWorkstation.label>Mechaniten Arbeitsplatz</Autarky_MechanitesWorkstation.label>
+	<Autarky_MechanitesWorkstation.description>Ein hochtechnisierter Arbeitsplatz, kontrolliert von einer hochentwickelten KI, der verwendet wird um Mechaniten herzustellen und zu verarbeiten.</Autarky_MechanitesWorkstation.description>
+</Defs>