Auto stash before merge of "develop" and "origin/develop"

2019-05-13 15:52:28 -04:00
parent 03f6ffb3e8
commit d3c0258e60
3 changed files with 65 additions and 1 deletions
@@ -228,4 +228,11 @@ MapVersion=Using mapgen v0.1
 MapWidth=Width
 MapHeight=Height

-
+[CommandTradeBeans]
+TradeBeansInfo=Gives another person some of your beans! Use is `tradebeans amount @person`!
+TradeBeansNoTargetError=You have to give *someone* your beans!
+TradeBeansIntParseError=That's not a real number! 
+TradeBeansNotEnoughError=You don't have enough beans! 
+TradeBeanseStealingBeans=Stealing is wrong! *Steals 10 beans from %s*
+TradeBeansSuccess=%s gave %s %s of their beans! 
+