sigonasr2 c3e762d89e Merge branch 'masterdev' into dev ...

Conflicts:
	BankEconomyMod/src/me/kaZep/Base/Main.java

2013-11-26 03:21:19 -07:00

..

ArrowShooter.java

First Commit

2013-11-01 23:28:39 -07:00

BrewingStandData.java

Pushing dev to master.

2013-11-16 21:08:52 -07:00

DamageAPI.java

First Commit

2013-11-01 23:28:39 -07:00

EnchantLevelDatabase.java

Quickfixes.

2013-11-18 03:54:29 -07:00

EntityHitData.java

Pushing dev to master.

2013-11-16 21:08:52 -07:00

EntityInteractData.java

Pushing dev to master.

2013-11-16 21:08:52 -07:00

ExplorerData.java

First Commit

2013-11-01 23:28:39 -07:00

FurnaceData.java

Pushing dev to master.

2013-11-16 21:08:52 -07:00

InvisibilityData.java

First Commit

2013-11-01 23:28:39 -07:00

JukeboxData.java

Pushing dev to master.

2013-11-16 21:08:52 -07:00

Main.java

Merge branch 'masterdev' into dev

2013-11-26 03:21:19 -07:00

Metrics.java

First Commit

2013-11-01 23:28:39 -07:00

PersistentExplorerList.java

Pushing dev to master.

2013-11-16 21:08:52 -07:00

PlayerBuffData.java

Fixed all references of string names for account configs to have

2013-11-21 01:28:39 -07:00

PlayerData.java

Builder Job Buffs complete.

2013-11-23 14:32:06 -07:00

PlayerListener.java

Merge branch 'masterdev' into dev

2013-11-26 03:21:19 -07:00

RecyclingCenterNode.java

Revert "Fire modifications. Move of tick code."

2013-11-25 03:49:12 -07:00

ReviveInventory.java

Pushing dev to master.

2013-11-16 21:08:52 -07:00

StoreValues.java

First Commit

2013-11-01 23:28:39 -07:00

SupportEntity.java

Pushing dev to master.

2013-11-16 21:08:52 -07:00

SupportPlayer.java

First Commit

2013-11-01 23:28:39 -07:00

TempWeb.java

First Commit

2013-11-01 23:28:39 -07:00