Compare commits
merge into: MagicBane:master
MagicBane:NovaTest
MagicBane:bane-update2
MagicBane:bane-updates
MagicBane:birdbane
MagicBane:bugfix-destbane
MagicBane:bugfix-patches
MagicBane:bugfix-sources
MagicBane:combat-2
MagicBane:combat-3
MagicBane:combat-4
MagicBane:feature-config-parsing
MagicBane:feature-config-parsing2
MagicBane:feature-config-usage
MagicBane:lakebane-master
MagicBane:lakebane-mine-tele
MagicBane:lakebane-new
MagicBane:lakebane-strongholds
MagicBane:magicbox-1.5.2.1
MagicBane:master
MagicBane:postwipe-1.5.2
MagicBane:postwipe-guilds
MagicBane:postwipe-hostile
MagicBane:postwipe-mines
MagicBane:postwipe-teleporting
MagicBane:weekend-fixings
Preston:NovaTest
Preston:bane-update2
Preston:bane-updates
Preston:birdbane
Preston:bugfix-destbane
Preston:bugfix-patches
Preston:bugfix-sources
Preston:combat-2
Preston:combat-3
Preston:combat-4
Preston:feature-config-parsing
Preston:feature-config-parsing2
Preston:feature-config-usage
Preston:lakebane-master
Preston:lakebane-mine-tele
Preston:lakebane-new
Preston:lakebane-strongholds
Preston:magicbox-1.5.2.1
Preston:master
Preston:playercollision-1
Preston:postwipe-1.5.2
Preston:postwipe-guilds
Preston:postwipe-hostile
Preston:postwipe-mines
Preston:postwipe-teleporting
Preston:weekend-fixings
pull from: Preston:master
Preston:NovaTest
Preston:bane-update2
Preston:bane-updates
Preston:birdbane
Preston:bugfix-destbane
Preston:bugfix-patches
Preston:bugfix-sources
Preston:combat-2
Preston:combat-3
Preston:combat-4
Preston:feature-config-parsing
Preston:feature-config-parsing2
Preston:feature-config-usage
Preston:lakebane-master
Preston:lakebane-mine-tele
Preston:lakebane-new
Preston:lakebane-strongholds
Preston:magicbox-1.5.2.1
Preston:master
Preston:playercollision-1
Preston:postwipe-1.5.2
Preston:postwipe-guilds
Preston:postwipe-hostile
Preston:postwipe-mines
Preston:postwipe-teleporting
Preston:weekend-fixings
MagicBane:NovaTest
MagicBane:bane-update2
MagicBane:bane-updates
MagicBane:birdbane
MagicBane:bugfix-destbane
MagicBane:bugfix-patches
MagicBane:bugfix-sources
MagicBane:combat-2
MagicBane:combat-3
MagicBane:combat-4
MagicBane:feature-config-parsing
MagicBane:feature-config-parsing2
MagicBane:feature-config-usage
MagicBane:lakebane-master
MagicBane:lakebane-mine-tele
MagicBane:lakebane-new
MagicBane:lakebane-strongholds
MagicBane:magicbox-1.5.2.1
MagicBane:master
MagicBane:postwipe-1.5.2
MagicBane:postwipe-guilds
MagicBane:postwipe-hostile
MagicBane:postwipe-mines
MagicBane:postwipe-teleporting
MagicBane:weekend-fixings
These branches are equal. There is no need to create a pull request.