Shaun Bennett 699b35995f Merge remote-tracking branch 'remotes/origin/develop' into feature/gems ... # Conflicts: # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java # Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java		2016-06-09 00:39:39 -05:00
..
commands	Update to Redis 2.8.1 and clean up repositories (#26)	2016-04-16 22:51:20 -05:00
data	Implement gamemode feature with modifiable variables and working on first moded games	2016-04-27 17:42:50 +02:00
database	Clans now load, added connection property to null zero date timestamps.	2016-04-04 16:31:37 -05:00
redis	Proper display of extra gem fountain rewards	2016-06-09 00:14:01 -05:00
serialization	Finish GoldToken integration for cashing in. Re-implement fixed hidden JSON lore encoding. Fix damage reduction attributes where entity types weren't being properly initialized. Prevent players from breaking blocks in temporary Spawn regions.	2015-06-02 20:01:42 -04:00
servers	Revert "Revert "Report system (version 1)""	2016-05-04 15:24:29 +01:00
Region.java	Add ClansRegions to handle the initialization of default server-side Clans representing special territories such as Spawn and Fields. Additionally, claim land with appropriate distribution according to the respective Clan. Fix bug with WeightSet generation not properly handling low amounts of uniformly likely elements. Fix bug with ClanInfo not properly handling creation of clans and initializing the date created field. Fix bug with Spawn region not properly protecting from claim and PvP settings.	2015-06-03 20:08:34 -04:00
Utility.java	Update to Redis 2.8.1 and clean up repositories (#26)	2016-04-16 22:51:20 -05:00