From 612b54ec8a3539e3c6bd593e72e84b13a7b3f023 Mon Sep 17 00:00:00 2001 From: Paktosan Date: Mon, 23 Mar 2015 14:49:26 +0100 Subject: [PATCH 1/3] Removed .idea directory and added it to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 4bb3e46b2..4bde66f5a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ /build /out /idea +/.idea /*.iml /*.ipr /*.iws \ No newline at end of file From d0e21c296ec801d24bc2d2ef88b5d3d7765fd77a Mon Sep 17 00:00:00 2001 From: Paktosan Date: Mon, 23 Mar 2015 15:37:59 +0100 Subject: [PATCH 2/3] Done a serious german translation now ;) --- .../assets/actuallyadditions/lang/de_DE.lang | 59 ++++++++++--------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/src/main/resources/assets/actuallyadditions/lang/de_DE.lang b/src/main/resources/assets/actuallyadditions/lang/de_DE.lang index 0672d5d7b..51119a580 100644 --- a/src/main/resources/assets/actuallyadditions/lang/de_DE.lang +++ b/src/main/resources/assets/actuallyadditions/lang/de_DE.lang @@ -87,7 +87,7 @@ tooltip.actuallyadditions.blockGrinderDouble.desc.1=Macht Staub aus Erzen! tooltip.actuallyadditions.blockGrinderDouble.desc.2=Aus 1 mach 2 und BONI!! tooltip.actuallyadditions.blockGrinderDouble.desc.3=Kann zwei Sachen gleichzeitig verarbeiten! +tooltip.actuallyadditions.blockInputter.desc.1=Ich bin eine Biene! -+tooltip.actuallyadditions.blockInputter.desc.2=Ich bin klüger als Hopper. ++tooltip.actuallyadditions.blockInputter.desc.2=%s%sIch bin klüger als ein Hopper. +tooltip.actuallyadditions.blockInputter.desc.3=Stell mich ein: +tooltip.actuallyadditions.blockInputter.desc.4=-Ein-/Ausgabeseite und +tooltip.actuallyadditions.blockInputter.desc.5=-Slots, die verwendet werden sollen. @@ -171,33 +171,34 @@ achievement.actuallyadditions.craftKnifeBlade.desc=Schärfe eine Messerklinge. achievement.actuallyadditions.craftKnife=Noch schärfer? Definitiv Phillips! achievement.actuallyadditions.craftKnife.desc=Baue ein Messer. -+tile.actuallyadditions.blockInputter.add.0.name=Ellpeck's Interessantes System -+tile.actuallyadditions.blockInputter.add.1.name=Egal Irgendwie Sowieso -+tile.actuallyadditions.blockInputter.add.2.name=Eiszeit in Sicht -+tile.actuallyadditions.blockInputter.add.3.name=Experimentieren ist scheisse -+tile.actuallyadditions.blockInputter.add.4.name=Experten interessieren sich -+tile.actuallyadditions.blockInputter.add.5.name=Hier könnte ihre Werbung stehen -+tile.actuallyadditions.blockInputter.add.6.name=Emil ist sexy -+tile.actuallyadditions.blockInputter.add.7.name=Edgar isst Sahne -+tile.actuallyadditions.blockInputter.add.8.name=Eim in Sahmwhere -+tile.actuallyadditions.blockInputter.add.9.name=Erotik ist sexy -+tile.actuallyadditions.blockInputter.add.10.name=Everybody is shitting -+tile.actuallyadditions.blockInputter.add.11.name=Erik ist sardistisch -+tile.actuallyadditions.blockInputter.add.12.name=Evelin isst Spermer +tile.actuallyadditions.blockInputter.name=ESS +tile.actuallyadditions.blockInputter.add.0.name=Ellpeck's Super Sortierer +tile.actuallyadditions.blockInputter.add.1.name=Ein schneller Sortierer +tile.actuallyadditions.blockInputter.add.2.name=Ein schöner Sortierer +tile.actuallyadditions.blockInputter.add.3.name=Elendes Sortier System +tile.actuallyadditions.blockInputter.add.4.name=Extrem spezieller Sortierer +tile.actuallyadditions.blockInputter.add.5.name=Entspanntes Sortier System +tile.actuallyadditions.blockInputter.add.6.name=Erosions Steuer System +tile.actuallyadditions.blockInputter.add.7.name=Enderman Such Service +tile.actuallyadditions.blockInputter.add.8.name=Elite System Sortierer +tile.actuallyadditions.blockInputter.add.9.name=Elektronische Slot Steuerung +tile.actuallyadditions.blockInputter.add.10.name=Elektronischer Sachschwund Service +tile.actuallyadditions.blockInputter.add.11.name=Effizienter Slot Schubser +tile.actuallyadditions.blockInputter.add.12.name=Elektronischer Slot Schieber -+info.actuallyadditions.gui.animals=Tiere -+info.actuallyadditions.gui.enoughToBreed=Genug zur Fortpflanzung! -+info.actuallyadditions.gui.tooMany=Too many to breed! -+info.actuallyadditions.gui.notEnough=Not enough to breed! -+info.actuallyadditions.gui.disabled=Disabled -+info.actuallyadditions.gui.up=Up -+info.actuallyadditions.gui.down=Down -+info.actuallyadditions.gui.north=North -+info.actuallyadditions.gui.east=East -+info.actuallyadditions.gui.south=South -+info.actuallyadditions.gui.west=West -+info.actuallyadditions.gui.all=All -+info.actuallyadditions.gui.slot=Slot -+info.actuallyadditions.gui.put=Put -+info.actuallyadditions.gui.pull=Pull \ No newline at end of file +info.actuallyadditions.gui.animals=Tiere +info.actuallyadditions.gui.enoughToBreed=Genug zur Fortpflanzung! +info.actuallyadditions.gui.tooMany=Zu viel zur Fortpflanzung! +info.actuallyadditions.gui.notEnough=Nicht genug zur Fortpflanzung! +info.actuallyadditions.gui.disabled=Deaktiviert +info.actuallyadditions.gui.up=Oben +info.actuallyadditions.gui.down=unten +info.actuallyadditions.gui.north=Norden +info.actuallyadditions.gui.east=Osten +info.actuallyadditions.gui.south=Süden +info.actuallyadditions.gui.west=Westen +info.actuallyadditions.gui.all=Alle +info.actuallyadditions.gui.slot=Slot +info.actuallyadditions.gui.put=Hinlegen +info.actuallyadditions.gui.pull=Rausnehmen \ No newline at end of file From 8cacfe01be95684532288fbfdeb05bad6d71fe2e Mon Sep 17 00:00:00 2001 From: Paktosan Date: Mon, 23 Mar 2015 15:42:22 +0100 Subject: [PATCH 3/3] Removed some derpy "+" --- .../resources/assets/actuallyadditions/lang/de_DE.lang | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/resources/assets/actuallyadditions/lang/de_DE.lang b/src/main/resources/assets/actuallyadditions/lang/de_DE.lang index 51119a580..b5f3d6dba 100644 --- a/src/main/resources/assets/actuallyadditions/lang/de_DE.lang +++ b/src/main/resources/assets/actuallyadditions/lang/de_DE.lang @@ -86,11 +86,11 @@ tooltip.actuallyadditions.blockGrinder.desc.4=gleichzeitig verarbeiten! tooltip.actuallyadditions.blockGrinderDouble.desc.1=Macht Staub aus Erzen! tooltip.actuallyadditions.blockGrinderDouble.desc.2=Aus 1 mach 2 und BONI!! tooltip.actuallyadditions.blockGrinderDouble.desc.3=Kann zwei Sachen gleichzeitig verarbeiten! -+tooltip.actuallyadditions.blockInputter.desc.1=Ich bin eine Biene! -+tooltip.actuallyadditions.blockInputter.desc.2=%s%sIch bin klüger als ein Hopper. -+tooltip.actuallyadditions.blockInputter.desc.3=Stell mich ein: -+tooltip.actuallyadditions.blockInputter.desc.4=-Ein-/Ausgabeseite und -+tooltip.actuallyadditions.blockInputter.desc.5=-Slots, die verwendet werden sollen. +tooltip.actuallyadditions.blockInputter.desc.1=Ich bin eine Biene! +tooltip.actuallyadditions.blockInputter.desc.2=%s%sIch bin klüger als ein Hopper. +tooltip.actuallyadditions.blockInputter.desc.3=Stell mich ein: +tooltip.actuallyadditions.blockInputter.desc.4=-Ein-/Ausgabeseite und +tooltip.actuallyadditions.blockInputter.desc.5=-Slots, die verwendet werden sollen. tooltip.actuallyadditions.itemMiscMashedFood.desc=Zur Herstellung von Dünger benötigt. tooltip.actuallyadditions.itemFertilizer.desc=Om nom nom. Don't eat it. Made in a Compost.