Merge remote-tracking branch 'origin/master'

This commit is contained in:
Ellpeck 2016-01-11 22:18:03 +01:00
commit 8a5dd83e0b
3 changed files with 70 additions and 64 deletions

View file

@ -407,76 +407,74 @@ tooltip.actuallyadditions.laser.connected.desc=<Laser verbunden!>
tooltip.actuallyadditions.laser.cantConnect.desc=Kann nicht verbunden werden: Die Relais sind entweder nicht im selben Netzwerk, das gespeicherte Relais existiert nicht mehr oder es ist zu weit entfernt!
tooltip.actuallyadditions.itemBooklet.desc=Oder "Heft", wenn man möchte
#Bis hierhin wurde übersetzt. Bitte später ggf. entfernen/verschieben!
#Gui Information
info.actuallyadditions.gui.animals=Animals
info.actuallyadditions.gui.enoughToBreed=Enough to breed!
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.put=Put
info.actuallyadditions.gui.pull=Pull
info.actuallyadditions.gui.animals=Tiere
info.actuallyadditions.gui.enoughToBreed=Genügend um zu vermehren!
info.actuallyadditions.gui.tooMany=Zu viel, um vermehren zu können!
info.actuallyadditions.gui.notEnough=Nicht genügend, um zu vermehren!
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.put=Put #line couldn't be translatet for grammatical reasons
info.actuallyadditions.gui.pull=Pull #line couldn't be translatet for grammatical reasons
info.actuallyadditions.gui.whitelist=Whitelist
info.actuallyadditions.gui.blacklist=Blacklist
info.actuallyadditions.gui.coffee=Coffee
info.actuallyadditions.gui.coffee=Kaffee
info.actuallyadditions.gui.ok=Ok
info.actuallyadditions.gui.the=the
info.actuallyadditions.inputter.info.1=This is the first Slot in the connected Inventory to <p> at.
info.actuallyadditions.inputter.info.2=This is the slot after the last Slot in the connected Inventory to <p> at. What that means: If you, for example, write 2 in the field to the left and 5 in this one, it will <p> at Slot 2, 3, and 4.
info.actuallyadditions.inputter.whitelistInfo=This applies for this part of the white-/blacklist. The other side applies as well, so you can have some Items whitelisted and some blacklisted. Note that, if you have an empty blacklist or an item whitelisted on at least one side, it will always go through.
info.actuallyadditions.noLens=No Lens
info.actuallyadditions.gui.the=the #line couldn't be translatet for grammatical reasons
info.actuallyadditions.inputter.info.1=This is the first Slot in the connected Inventory to <p> at. #line couldn't be translatet for grammatical reasons
info.actuallyadditions.inputter.info.2=This is the slot after the last Slot in the connected Inventory to <p> at. What that means: If you, for example, write 2 in the field to the left and 5 in this one, it will <p> at Slot 2, 3, and 4. #line couldn't be translatet for grammatical reasons
info.actuallyadditions.inputter.whitelistInfo=This applies for this part of the white-/blacklist. The other side applies as well, so you can have some Items whitelisted and some blacklisted. Note that, if you have an empty blacklist or an item whitelisted on at least one side, it will always go through. #line couldn't be translatet for grammatical reasons
info.actuallyadditions.noLens=Keine Neigungen
info.actuallyadditions.booklet.manualName.1=Actually Additions
info.actuallyadditions.booklet.manualName.2=Manual
info.actuallyadditions.booklet.edition=Edition
info.actuallyadditions.booklet.manualName.2=Handbuch
info.actuallyadditions.booklet.edition=Auflage
#Container Names
container.actuallyadditions.inputter.name=ESD
container.actuallyadditions.inputterAdvanced.name=Advanced ESD
container.actuallyadditions.grinder.name=Crusher
container.actuallyadditions.grinderDouble.name=Double Crusher
container.actuallyadditions.furnaceDouble.name=Double Furnace
container.actuallyadditions.feeder.name=Feeder
container.actuallyadditions.giantChest.name=Storage Crate
container.actuallyadditions.repairer.name=Repairer
container.actuallyadditions.placer.name=Placer
container.actuallyadditions.breaker.name=Breaker
container.actuallyadditions.dropper.name=Precision Dropper
container.actuallyadditions.crafting.name=Crafting Table On A Stick
container.actuallyadditions.canolaPress.name=Canola Press
container.actuallyadditions.fermentingBarrel.name=Fermenting Barrel
container.actuallyadditions.coalGenerator.name=Coal Generator
container.actuallyadditions.oilGenerator.name=Oil Generator
container.actuallyadditions.phantomPlacer.name=Phantom Placer
container.actuallyadditions.phantomBreaker.name=Phantom Breaker
container.actuallyadditions.phantomface.name=Phantomface
container.actuallyadditions.liquiface.name=Liquiface
container.actuallyadditions.energyface.name=Energyface
container.actuallyadditions.fluidPlacer.name=Fluid Placer
container.actuallyadditions.fluidCollector.name=Fluid Collector
container.actuallyadditions.coffeeMachine.name=Coffee Machine
container.actuallyadditions.drill.name=Drill
container.actuallyadditions.energizer.name=Energizer
container.actuallyadditions.enervator.name=Enervator
container.actuallyadditions.xpSolidifier.name=Experience Solidifier
container.actuallyadditions.cloud.name=Smiley Cloud
container.actuallyadditions.directionalBreaker.name=Long-Range Breaker
container.actuallyadditions.rangedCollector.name=Ranged Collector
container.actuallyadditions.miner.name=Vertical Digger
#Container Names / Container-Namen
container.actuallyadditions.inputter.name=ESG
container.actuallyadditions.inputterAdvanced.name=Advanced ESG
container.actuallyadditions.grinder.name=Brecher
container.actuallyadditions.grinderDouble.name=Doppelter Brecher
container.actuallyadditions.furnaceDouble.name=Doppelter Ofen
container.actuallyadditions.feeder.name=Automatischer Füterer
container.actuallyadditions.giantChest.name=Lagerkiste
container.actuallyadditions.repairer.name=Reparierer
container.actuallyadditions.placer.name=Platzierer
container.actuallyadditions.breaker.name=Abbauer
container.actuallyadditions.dropper.name=Prezisionsspender
container.actuallyadditions.crafting.name=Mobile Werkbank
container.actuallyadditions.canolaPress.name=Rapspresse
container.actuallyadditions.fermentingBarrel.name=Fermentierungsfass
container.actuallyadditions.coalGenerator.name=Kohlegenerator
container.actuallyadditions.oilGenerator.name=Ölgenerator
container.actuallyadditions.phantomPlacer.name=Phantomplatzierer
container.actuallyadditions.phantomBreaker.name=Phantomabbauer
container.actuallyadditions.phantomface.name=Phantomoberfläche
container.actuallyadditions.liquiface.name=Liqui-Oberfläche
container.actuallyadditions.energyface.name=Energieoberfläche
container.actuallyadditions.fluidPlacer.name=Flüssigkeitenplatzierer
container.actuallyadditions.fluidCollector.name=Flüssigkeitenkollektor
container.actuallyadditions.coffeeMachine.name=Kaffeemaschine
container.actuallyadditions.drill.name=Bohrer
container.actuallyadditions.energizer.name=Energetisierer
container.actuallyadditions.enervator.name=Schwächer
container.actuallyadditions.xpSolidifier.name=Erfahrungsverdichter
container.actuallyadditions.cloud.name=Smiley-Wolke
container.actuallyadditions.directionalBreaker.name=Brecher (große Reichweite)
container.actuallyadditions.rangedCollector.name=Kollektor (große Reichweite)
container.actuallyadditions.miner.name=Senkrechter Diggah
#Update Information
info.actuallyadditions.update.generic=[{"text":"There is an Update for "},{"text":"Actually Additions ","color":"dark_green"},{"text":"available!","color":"none"}]
info.actuallyadditions.update.versionCompare=[{"text":"Current Version: "},{"text":"%s","color":"dark_red"},{"text":", newest Version: ","color":"none"},{"text":"%s","color":"dark_green"}]
info.actuallyadditions.update.buttons=[{"text":"["},{"text":"Click for Changelog","color":"green","clickEvent":{"action":"open_url","value":"%s"}},{"text":"] [","color":"none"},{"text":"Click for Download","color":"green","clickEvent":{"action":"open_url","value":"%s"}},{"text":"]","color":"none"}]
info.actuallyadditions.update.buttonOptions=Click: Changelog, Shift-Click: Download! (In Browser)
info.actuallyadditions.update.failed=[{"text":"The Update Check for "},{"text":"Actually Additions ","color":"dark_green"},{"text":"failed! Check Logs for more Info!","color":"none"}]
#Update Information / Update-Informationen
info.actuallyadditions.update.generic=[{"text":"Es ist ein "},{"text":"Actually Additions","color":"dark_green"},{"text":"-Update verfügbar!","color":"none"}]
info.actuallyadditions.update.versionCompare=[{"text":"Verwendete Version: "},{"text":"%s","color":"dark_red"},{"text":", neuste Version: ","color":"none"},{"text":"%s","color":"dark_green"}]
info.actuallyadditions.update.buttons=[{"text":"["},{"text":"Klicke hier für den Changelog","color":"green","clickEvent":{"action":"open_url","value":"%s"}},{"text":"] [","color":"none"},{"text":"Klicke hier für den Download","color":"green","clickEvent":{"action":"open_url","value":"%s"}},{"text":"]","color":"none"}]
info.actuallyadditions.update.buttonOptions=Klick: Changelog, [Umschalt]-Klick: Download! (Im Browser)
info.actuallyadditions.update.failed=[{"text":"Die Überprüfung nach "},{"text":"Actually Additions","color":"dark_green"},{"text":"-Updates ist fehlgeschlagen! In den Logs findest du weite Informationen!","color":"none"}]
#Achievements
achievement.actuallyadditions.openBooklet=Screams of Knowledge

View file

@ -1,3 +1,11 @@
# 1.8.9-r23
* Fixed a ginormous bug that screwed over crafting
#### DON'T EXPECT EVERYTHING TO WORK PERFECTLY. Seriously, I break lots of stuff probably.
# 1.8.9-r22
* 1.8.9 PORT!
#### DON'T EXPECT EVERYTHING TO WORK PERFECTLY. THIS IS A BETA. Also: If you look through the booklet, you will see a hover text on some chapters' buttons saying the item or block doesn't fully work. RESPECT THAT. Thanks.
# 1.7.10-r21
* Made looking up the double furnace in the booklet possible
* The magnet ring now only uses RF when actually sucking up items

View file

@ -1,2 +1,2 @@
1.7.10=21
1.8.9=22
1.8.9=23