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
MagicBane:lakebane-ai
MagicBane:lakebane-ai2
MagicBane:lakebane-dex-penalty
MagicBane:lakebane-dungeon
MagicBane:lakebane-easy
MagicBane:lakebane-jobs
MagicBane:lakebane-master
MagicBane:lakebane-mobAI
MagicBane:lakebane-mobai2
MagicBane:lakebane-new-effects
MagicBane:lakebane-optimize
MagicBane:lakebane-questing
MagicBane:lakebane-recovery
MagicBane:lakebane-reset
MagicBane:lakebane2
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
BadBird:BattleBane
BadBird:NovaTest
BadBird:bane-update2
BadBird:bane-updates
BadBird:birdbane
BadBird:bugfix-destbane
BadBird:bugfix-patches
BadBird:bugfix-sources
BadBird:combat-2
BadBird:combat-3
BadBird:combat-4
BadBird:feature-config-parsing
BadBird:feature-config-parsing2
BadBird:feature-config-usage
BadBird:lakebane
BadBird:lakebane-ai
BadBird:lakebane-ai2
BadBird:lakebane-dex-penalty
BadBird:lakebane-dungeon
BadBird:lakebane-easy
BadBird:lakebane-jobs
BadBird:lakebane-master
BadBird:lakebane-mobAI
BadBird:lakebane-mobai2
BadBird:lakebane-new-effects
BadBird:lakebane-optimize
BadBird:lakebane-questing
BadBird:lakebane-recovery
BadBird:lakebane-reset
BadBird:lakebane2
BadBird:magicbox-1.5.2.1
BadBird:master
BadBird:postwipe-1.5.2
BadBird:postwipe-guilds
BadBird:postwipe-hostile
BadBird:postwipe-mines
BadBird:postwipe-teleporting
BadBird:weekend-fixings
pull from: BadBird:master
BadBird:BattleBane
BadBird:NovaTest
BadBird:bane-update2
BadBird:bane-updates
BadBird:birdbane
BadBird:bugfix-destbane
BadBird:bugfix-patches
BadBird:bugfix-sources
BadBird:combat-2
BadBird:combat-3
BadBird:combat-4
BadBird:feature-config-parsing
BadBird:feature-config-parsing2
BadBird:feature-config-usage
BadBird:lakebane
BadBird:lakebane-ai
BadBird:lakebane-ai2
BadBird:lakebane-dex-penalty
BadBird:lakebane-dungeon
BadBird:lakebane-easy
BadBird:lakebane-jobs
BadBird:lakebane-master
BadBird:lakebane-mobAI
BadBird:lakebane-mobai2
BadBird:lakebane-new-effects
BadBird:lakebane-optimize
BadBird:lakebane-questing
BadBird:lakebane-recovery
BadBird:lakebane-reset
BadBird:lakebane2
BadBird:magicbox-1.5.2.1
BadBird:master
BadBird:postwipe-1.5.2
BadBird:postwipe-guilds
BadBird:postwipe-hostile
BadBird:postwipe-mines
BadBird:postwipe-teleporting
BadBird: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
MagicBane:lakebane-ai
MagicBane:lakebane-ai2
MagicBane:lakebane-dex-penalty
MagicBane:lakebane-dungeon
MagicBane:lakebane-easy
MagicBane:lakebane-jobs
MagicBane:lakebane-master
MagicBane:lakebane-mobAI
MagicBane:lakebane-mobai2
MagicBane:lakebane-new-effects
MagicBane:lakebane-optimize
MagicBane:lakebane-questing
MagicBane:lakebane-recovery
MagicBane:lakebane-reset
MagicBane:lakebane2
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.