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

3.16 - Pre-release merge, patch version 2. #48

Merged
merged 6 commits into from
Nov 9, 2021
Merged

3.16 - Pre-release merge, patch version 2. #48

merged 6 commits into from
Nov 9, 2021

Conversation

pm5k
Copy link
Collaborator

@pm5k pm5k commented Nov 9, 2021

Abstract

Merged outstanding PR's from @angelic-knight and resolved some merge conflicts

Action Taken

Merged #37 (into dev) and #38 #39 and #47 into patches.

Caveats

Some merge conflicts. I resolved them by taking Angelic's 3.16 branch as the golden source of truth.

FAO

@angelic-knight @Journeytojah

pm5k and others added 5 commits November 1, 2021 16:03
Generic fixes including printing more info about what rows are being processed, allowing passives without icon paths, and fixing crafting bench parameter.
Additionally reverted double quote sanitation since it was redundant.
Generic Fixes Implemented During 3.16 Updates
@pm5k pm5k self-assigned this Nov 9, 2021
@pm5k pm5k merged commit 789aab3 into patches Nov 9, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants