Merge remote-tracking branch 'origin/dev/rewrite' into dev/rewrite

# Conflicts:
#	src/main/java/com/alttd/playershops/listener/TransactionListener.java
This commit is contained in:
2022-08-28 20:51:54 +02:00
4 changed files with 24 additions and 8 deletions
@@ -55,7 +55,7 @@ public class ShopTypeConfig {
public String playerInventoryFull = "<red>You do not have enough space in your inventory to buy from this shop.";
public String playerNoFunds = "<red>You do not have sufficient funds to trade with this shop.";
public String playerBought = "<white>You bought <amount> <item>(s) from <shopownername> for <price>.";
public String playerBought = "<white>You bought <amount> <item>(s) from <ownername> for <price>.";
public String shopSold = "<white><user> bought <amount> <item>(s) from you for <price>.";
public String shopInventoryFull = "<red>This shop does not have enough space in its inventory.";
public String shopNoStock = "<red>This shop is out of stock.";