fixing beta repo
fixing beta repo
marker backend
BlacklistManager, attempt at fixing chain fates, lots of other big changes
Merge branch 'master' into beta

Conflicts:
	minionlib/languages.lua
language fixes
added blacklisting grind mobs
Merge branch 'beta' of https://github.com/MMOMinion/FFXIVMinion
added autostartbot for the launcher and a gather lua error for markers
moved add blacklist entry to manager
Merge branch 'beta' of github.com:MMOMinion/FFXIVMinion into beta
more fixes
Fixed resting and added autoload a default mesh
fixed messed up crafting buff issue
Merge branch 'beta' of https://github.com/MMOMinion/FFXIVMinion into beta
gather buff fix
german conditions crafting added
JP strings for crafting cond
language fixes for blacklist names
Merge branch 'beta' of github.com:MMOMinion/FFXIVMinion into beta