Merge pull request #1 from ACGaming/patch-1

German translation

src/main/resources/assets/controlling/lang/de_DE.lang

@@ -0,0 +1,2 @@
+options.search=Suchen
+options.showConflicts=Konflikte anzeigen