Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PAB: FCOIS support (part 1) #163

Merged
merged 21 commits into from Jul 12, 2019

Conversation

@klingo
Copy link
Owner

commented Jul 12, 2019

No description provided.

klingo added 21 commits Jul 3, 2019
PA: some text resource restructuring
PA: new (empty) tab for FCOIS rules and corresponding settings
PAI: improved EN texts, improved disabled-state logic
PAI: added preventAutoSell setting (not yet functional)
PAJ: fixed an issue with missing event registration in some cases
PAJ: improved logic to trigger event registration for PAI + FCOIS
PAI: added DE translations (and prepare FR text keys)
PAI: added new description if no supported addons are installed
Merge branch 'master-v2' into PAB-fcois-support
# Conflicts:
#	PersonalAssistant/PersonalAssistantJunk/Menu/PAJunkMenuFunctions.lua
#	PersonalAssistant/PersonalAssistantJunk/PAJunk/PAJunk.lua
#	PersonalAssistant/PersonalAssistantJunk/localization/de.lua
#	PersonalAssistant/PersonalAssistantJunk/localization/en.lua
#	PersonalAssistant/PersonalAssistantJunk/localization/fr.lua
#	PersonalAssistant/Utilities/SavedVarsPatcher.lua

@klingo klingo added the enhancement label Jul 12, 2019

@klingo klingo added this to the 2.4.2 milestone Jul 12, 2019

@klingo klingo merged commit 2bcd0bc into master-v2 Jul 12, 2019

@klingo klingo referenced this pull request Jul 12, 2019
2 of 7 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
1 participant
You can’t perform that action at this time.