Permalink
Commits on Aug 18, 2012
  1. Merge branch 'master' of https://github.com/ttk2/Combat-Tag

    Conflicts:
    	.classpath
    	CombatTag/com/trc202/CombatTag/CombatTag.java
    	CombatTag/com/trc202/CombatTag/SettingsLoader.java
    	CombatTag/com/trc202/CombatTagListeners/NoPvpEntityListener.java
    	CombatTag/com/trc202/CombatTagListeners/NoPvpPlayerListener.java
    	CombatTag/com/trc202/Containers/Settings.java
    	Readme
    	plugin.yml
    committed Aug 18, 2012
Commits on Aug 7, 2012
Commits on Jul 12, 2012
  1. Added config for not spawning in WG, Possibly fixed duplication bug,

    Fixed command blocking, Different tag messages for damager and damaged
    Outfenneced committed Jul 12, 2012
Commits on Jun 25, 2012
Commits on Jun 20, 2012
Commits on Jun 12, 2012
Commits on Jun 10, 2012
  1. Tabbing for ease of reading

    Earlier commit: Merge pull request #3 from SnoFox/master
    Outfenneced committed Jun 10, 2012
Commits on Jun 8, 2012
Commits on May 15, 2012
  1. No more removePlayerData or createPlayerData if it is unnecessary. Pe…

    …rsist data instead.
    Rudd-O committed May 15, 2012
Commits on May 6, 2012
  1. Changed debug messages

    Outfenneced committed May 6, 2012
Commits on Apr 29, 2012
Commits on Apr 28, 2012
  1. PvP arena compatibility, changed command prevention system, added

    customizable messages
    Outfenneced committed Apr 28, 2012
Commits on Apr 27, 2012
Commits on Apr 25, 2012
  1. Merge branch 'tempban'

    Rudd-O committed Apr 25, 2012
  2. Whoops, flipped a sign there

    committed Apr 25, 2012
  3. Documented our work a bit better.

    Rudd-O committed Apr 25, 2012
  4. Repeated combat-logging now doubles temporary ban duration.

    Ban duration is reset to the default after player has not combat-logged for 24 hours.
    committed Apr 25, 2012
  5. Merge branch 'tempban' of github.com:shiinee/Combat-Tag into tempban

    Conflicts:
    	CombatTag/com/trc202/CombatTagListeners/NoPvpPlayerListener.java
    committed Apr 25, 2012
  6. Allow entrance to the server if the temp ban has expired, along with …

    …pardoning the user (which it turns out, was not enough to allow him in during the connection and join attempt).
    Rudd-O committed Apr 25, 2012
  7. Updated documentation

    committed Apr 25, 2012
Commits on Apr 24, 2012
  1. Added jar creation file

    Rudd-O committed Apr 24, 2012
  2. Added reasonable git ignore files

    Rudd-O committed Apr 24, 2012