Preparing for release

Solving conflicts.
Set constants to GMS-like. Ready for release.
This commit is contained in:
ronancpl
2017-11-29 10:34:46 -02:00
parent 85a81b9bf9
commit b9b0015e00
16 changed files with 910 additions and 77 deletions

View File

@@ -53,9 +53,6 @@ import server.CashShop.SpecialCashItem;
import server.DueyPackages;
import server.MTSItemInfo;
import server.MapleItemInformationProvider;
import server.maps.MapleMiniGame;
import server.maps.MaplePlayerShop;
import server.maps.MaplePlayerShopItem;
import server.MapleShopItem;
import server.MapleTrade;
import server.events.gm.MapleSnowball;
@@ -69,6 +66,9 @@ import server.maps.MapleDragon;
import server.maps.MapleMap;
import server.maps.MapleMapItem;
import server.maps.MapleMist;
import server.maps.MapleMiniGame;
import server.maps.MaplePlayerShop;
import server.maps.MaplePlayerShopItem;
import server.maps.MapleReactor;
import server.maps.MapleSummon;
import server.maps.PlayerNPCs;