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:debug-guards
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:mixbane
MagicBane:postwipe-1.5.2
MagicBane:postwipe-guilds
MagicBane:postwipe-hostile
MagicBane:postwipe-mines
MagicBane:postwipe-teleporting
MagicBane:weekend-fixings
FatBoy:bugfix-slot-update-2
FatBoy:convex-data
FatBoy:feature-region-set
FatBoy:feature-workorder
FatBoy:hull4
FatBoy:hull7
FatBoy:magicbox-1.5.2
FatBoy:master
FatBoy:mesh-colliders
FatBoy:mobile-class-refactor
FatBoy:server-collision
FatBoy:terrain-tweak2
pull from: FatBoy:master
FatBoy:bugfix-slot-update-2
FatBoy:convex-data
FatBoy:feature-region-set
FatBoy:feature-workorder
FatBoy:hull4
FatBoy:hull7
FatBoy:magicbox-1.5.2
FatBoy:master
FatBoy:mesh-colliders
FatBoy:mobile-class-refactor
FatBoy:server-collision
FatBoy:terrain-tweak2
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:debug-guards
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:mixbane
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.