Merge branch 'master' of github.com:SlimeKnights/TinkersConstruct int…

…o 16x
SlimeKnights · Feb 1, 2014 · 1a5e6e9 · 1a5e6e9
2 parents cbfb5f2 + f76c6d9
commit 1a5e6e9
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/capes.txt b/capes.txt
@@ -1,4 +1,3 @@
-mDiyo:https://dl.dropboxusercontent.com/u/42769935/mCape.png
 fuj1n:https://dl.dropboxusercontent.com/s/i6gra1pc6gxawwz/capeTCLogo.png
 progwml6:https://dl.dropboxusercontent.com/s/i6gra1pc6gxawwz/capeTCLogo.png
 _Sunstrike:http://talon.sunstrike.io/files/sun_cape.png

diff --git a/resources/assets/tinker/lang/de_DE.lang b/resources/assets/tinker/lang/de_DE.lang
@@ -3,6 +3,7 @@ itemGroup.TConstructMaterials=TConstruct Materialien
 itemGroup.TConstructBlocks=TConstruct Blöcke
 
 crafters.ToolStation=Werkzeugstation
+crafters.CraftingStation=Handwerksstation
 crafters.ToolForge=Werkzeugesse
 crafters.PartBuilder=Werkzeugteilbauer
 crafters.PatternShaper=Schablonenstanzer