forked from MagicBane/Server
Compare commits
merge into: BadBird/BattleBane:feature-config-parsing
BadBird/BattleBane:master
BadBird/BattleBane:birdbane
BadBird/BattleBane:BattleBane
BadBird/BattleBane:lakebane-recovery
BadBird/BattleBane:lakebane
BadBird/BattleBane:lakebane-jobs
BadBird/BattleBane:lakebane-dungeon
BadBird/BattleBane:feature-config-usage
BadBird/BattleBane:lakebane-ai2
BadBird/BattleBane:lakebane-mobAI
BadBird/BattleBane:lakebane-new-effects
BadBird/BattleBane:lakebane-reset
BadBird/BattleBane:lakebane-ai
BadBird/BattleBane:lakebane-dex-penalty
BadBird/BattleBane:lakebane-questing
BadBird/BattleBane:lakebane-easy
BadBird/BattleBane:lakebane-mobai2
BadBird/BattleBane:lakebane-optimize
BadBird/BattleBane:lakebane2
BadBird/BattleBane:NovaTest
BadBird/BattleBane:feature-config-parsing2
BadBird/BattleBane:weekend-fixings
BadBird/BattleBane:bane-update2
BadBird/BattleBane:bane-updates
BadBird/BattleBane:bugfix-destbane
BadBird/BattleBane:feature-config-parsing
BadBird/BattleBane:bugfix-patches
BadBird/BattleBane:magicbox-1.5.2.1
BadBird/BattleBane:bugfix-sources
BadBird/BattleBane:postwipe-hostile
BadBird/BattleBane:postwipe-1.5.2
BadBird/BattleBane:postwipe-teleporting
BadBird/BattleBane:postwipe-guilds
BadBird/BattleBane:combat-4
BadBird/BattleBane:postwipe-mines
BadBird/BattleBane:lakebane-master
BadBird/BattleBane:combat-3
BadBird/BattleBane:combat-2
MagicBane/Server:guild-update
MagicBane/Server:magicbox-1.5.2.1
MagicBane/Server:mixbane
MagicBane/Server:Dev_Cmd_Fixes
MagicBane/Server:debug-guards
MagicBane/Server:lakebane-recovery
MagicBane/Server:lakebane
MagicBane/Server:lakebane-jobs
MagicBane/Server:lakebane-dungeon
MagicBane/Server:feature-config-usage
MagicBane/Server:lakebane-ai2
MagicBane/Server:lakebane-mobAI
MagicBane/Server:lakebane-new-effects
MagicBane/Server:lakebane-reset
MagicBane/Server:lakebane-ai
MagicBane/Server:lakebane-dex-penalty
MagicBane/Server:lakebane-questing
MagicBane/Server:lakebane-easy
MagicBane/Server:lakebane-mobai2
MagicBane/Server:lakebane-optimize
MagicBane/Server:lakebane2
MagicBane/Server:NovaTest
MagicBane/Server:feature-config-parsing2
MagicBane/Server:weekend-fixings
MagicBane/Server:bane-update2
MagicBane/Server:bane-updates
MagicBane/Server:bugfix-destbane
MagicBane/Server:feature-config-parsing
MagicBane/Server:bugfix-patches
MagicBane/Server:bugfix-sources
MagicBane/Server:birdbane
MagicBane/Server:postwipe-hostile
MagicBane/Server:postwipe-1.5.2
MagicBane/Server:postwipe-teleporting
MagicBane/Server:postwipe-guilds
MagicBane/Server:combat-4
MagicBane/Server:postwipe-mines
MagicBane/Server:lakebane-master
MagicBane/Server:combat-3
MagicBane/Server:combat-2
MagicBane/Server:master
...
pull from: BadBird/BattleBane:combat-2
BadBird/BattleBane:birdbane
BadBird/BattleBane:BattleBane
BadBird/BattleBane:lakebane-recovery
BadBird/BattleBane:lakebane
BadBird/BattleBane:lakebane-jobs
BadBird/BattleBane:lakebane-dungeon
BadBird/BattleBane:feature-config-usage
BadBird/BattleBane:lakebane-ai2
BadBird/BattleBane:lakebane-mobAI
BadBird/BattleBane:lakebane-new-effects
BadBird/BattleBane:lakebane-reset
BadBird/BattleBane:lakebane-ai
BadBird/BattleBane:lakebane-dex-penalty
BadBird/BattleBane:lakebane-questing
BadBird/BattleBane:lakebane-easy
BadBird/BattleBane:lakebane-mobai2
BadBird/BattleBane:lakebane-optimize
BadBird/BattleBane:lakebane2
BadBird/BattleBane:NovaTest
BadBird/BattleBane:feature-config-parsing2
BadBird/BattleBane:weekend-fixings
BadBird/BattleBane:bane-update2
BadBird/BattleBane:bane-updates
BadBird/BattleBane:bugfix-destbane
BadBird/BattleBane:feature-config-parsing
BadBird/BattleBane:bugfix-patches
BadBird/BattleBane:magicbox-1.5.2.1
BadBird/BattleBane:bugfix-sources
BadBird/BattleBane:postwipe-hostile
BadBird/BattleBane:postwipe-1.5.2
BadBird/BattleBane:postwipe-teleporting
BadBird/BattleBane:postwipe-guilds
BadBird/BattleBane:combat-4
BadBird/BattleBane:postwipe-mines
BadBird/BattleBane:lakebane-master
BadBird/BattleBane:combat-3
BadBird/BattleBane:combat-2
BadBird/BattleBane:master
MagicBane/Server:guild-update
MagicBane/Server:magicbox-1.5.2.1
MagicBane/Server:mixbane
MagicBane/Server:Dev_Cmd_Fixes
MagicBane/Server:debug-guards
MagicBane/Server:lakebane-recovery
MagicBane/Server:lakebane
MagicBane/Server:lakebane-jobs
MagicBane/Server:lakebane-dungeon
MagicBane/Server:feature-config-usage
MagicBane/Server:lakebane-ai2
MagicBane/Server:lakebane-mobAI
MagicBane/Server:lakebane-new-effects
MagicBane/Server:lakebane-reset
MagicBane/Server:lakebane-ai
MagicBane/Server:lakebane-dex-penalty
MagicBane/Server:lakebane-questing
MagicBane/Server:lakebane-easy
MagicBane/Server:lakebane-mobai2
MagicBane/Server:lakebane-optimize
MagicBane/Server:lakebane2
MagicBane/Server:NovaTest
MagicBane/Server:feature-config-parsing2
MagicBane/Server:weekend-fixings
MagicBane/Server:bane-update2
MagicBane/Server:bane-updates
MagicBane/Server:bugfix-destbane
MagicBane/Server:feature-config-parsing
MagicBane/Server:bugfix-patches
MagicBane/Server:bugfix-sources
MagicBane/Server:birdbane
MagicBane/Server:postwipe-hostile
MagicBane/Server:postwipe-1.5.2
MagicBane/Server:postwipe-teleporting
MagicBane/Server:postwipe-guilds
MagicBane/Server:combat-4
MagicBane/Server:postwipe-mines
MagicBane/Server:lakebane-master
MagicBane/Server:combat-3
MagicBane/Server:combat-2
MagicBane/Server:master
These branches are equal.