Jeppa
7b55d41445
Merge remote-tracking branch 'upstream/master'
Conflicts:
config.yml
src/me/Travja/HungerArena/BlockStorage.java
src/me/Travja/HungerArena/ChatListener.java
src/me/Travja/HungerArena/Chests.java
src/me/Travja/HungerArena/CommandBlock.java
src/me/Travja/HungerArena/DeathListener.java
src/me/Travja/HungerArena/DmgListener.java
src/me/Travja/HungerArena/FreezeListener.java
src/me/Travja/HungerArena/HaCommands.java
src/me/Travja/HungerArena/JoinAndQuitListener.java
src/me/Travja/HungerArena/Main.java
src/me/Travja/HungerArena/PlayerWinGamesEvent.java
src/me/Travja/HungerArena/PvP.java
src/me/Travja/HungerArena/Signs.java
src/me/Travja/HungerArena/SpawnsCommand.java
src/me/Travja/HungerArena/SpectatorListener.java
src/me/Travja/HungerArena/SponsorCommands.java
src/me/Travja/HungerArena/TeleportListener.java
src/me/Travja/HungerArena/WinGamesListener.java
src/me/travja/HungerArena/BlockStorage.java
src/me/travja/HungerArena/Blocks.java
src/me/travja/HungerArena/ChatListener.java
src/me/travja/HungerArena/Chests.java
src/me/travja/HungerArena/CommandBlock.java
src/me/travja/HungerArena/DeathListener.java
src/me/travja/HungerArena/DmgListener.java
src/me/travja/HungerArena/FreezeListener.java
src/me/travja/HungerArena/HaCommands.java
src/me/travja/HungerArena/JoinAndQuitListener.java
src/me/travja/HungerArena/Main.java
src/me/travja/HungerArena/PlayerWinGamesEvent.java
src/me/travja/HungerArena/PvP.java
src/me/travja/HungerArena/Signs.java
src/me/travja/HungerArena/SpawnsCommand.java
src/me/travja/HungerArena/SpectatorListener.java
src/me/travja/HungerArena/SponsorCommands.java
src/me/travja/HungerArena/TeleportListener.java
src/me/travja/HungerArena/WinGamesListener.java
src/me/travja/hungerarena/DmgListener.java
src/me/travja/hungerarena/PlayerWinGamesEvent.java
src/me/travja/hungerarena/TeleportListener.java
src/me/travja/hungerarena/WinGamesListener.java
