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.

Sign up for GitHub

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

Jump to bottom

Merging upstream up to v2.3.3.0 #114

Merged
merged 8 commits into from
Jun 1, 2024
Merged

Merging upstream up to v2.3.3.0 #114

merged 8 commits into from
Jun 1, 2024

Commits on Mar 4, 2024

  1. removes 'Unmerged change' comments

    @pardeike
    pardeike authored Mar 4, 2024
    Configuration menu
    Copy the full SHA
    669729f View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2024

  1. Fix/get method from stackframe (#601) 

    * .gitignore update
* GetMethodFromStackframe fix
* Revert ".gitignore update"
This reverts commit 679d2d73c6ca3d94ce1ef791454a1b25ef011229.
* cleans up, refactors getting original methods [DebugFat breaking]
---------
Co-authored-by: kohanis <[email protected]>
    @pardeike
    pardeike authored Mar 25, 2024
    Configuration menu
    Copy the full SHA
    acbd6ee View commit details
    Browse the repository at this point in the history

  2. Update documentation [skip ci]

    @pardeike-bot
    pardeike-bot committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    fe81d78 View commit details
    Browse the repository at this point in the history

  3. v2.3.2

    @pardeike
    pardeike committed Mar 25, 2024
    Configuration menu
    Copy the full SHA
    f0a4f51 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2024

  1. adds UnpatchCategory, fixes HarmonyPriority bug with inherited values

    @pardeike
    pardeike committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    395749f View commit details
    Browse the repository at this point in the history

  2. Update documentation [skip ci]

    @pardeike-bot
    pardeike-bot committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    5054c98 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2024

  1. Merge remote-tracking tag 'harmony/v2.3.3.0' 

    Also migrating to ConditionalWeakTable in PatchManager using MonoMod.Backports
    @kohanis
    kohanis committed May 30, 2024
    Configuration menu
    Copy the full SHA
    dd8f185 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2024

  1. Removing merge remnants

    @kohanis
    kohanis committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    b36abc5 View commit details
    Browse the repository at this point in the history