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

Make UnionPath behave as paths from ZipFileSystem do. #26

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Make UnionPath behave as paths from ZipFileSystem do. #26

wants to merge 8 commits into from

Commits on Mar 15, 2022

  1. Make tests work with jar paths

    @noeppi-noeppi
    noeppi-noeppi committed Mar 15, 2022
    Configuration menu
    Copy the full SHA
    82862aa View commit details
    Browse the repository at this point in the history

  2. Move tests for relativize to TestUnionPath and fix path and fs so the… 

    …y behave as jar paths do
    @noeppi-noeppi
    noeppi-noeppi committed Mar 15, 2022
    Configuration menu
    Copy the full SHA
    3494f50 View commit details
    Browse the repository at this point in the history

  3. Some jar fixes

    @noeppi-noeppi
    noeppi-noeppi committed Mar 15, 2022
    Configuration menu
    Copy the full SHA
    e89c092 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2022

  1. Merge branch 'main' of https://github.com/McModLauncher/securejarhandler 

     into pathfix

� Conflicts:
�	src/main/java/cpw/mods/niofs/union/UnionFileSystem.java
�	src/main/java/cpw/mods/niofs/union/UnionPath.java
�	src/test/java/cpw/mods/niofs/union/TestUnionFS.java
    @noeppi-noeppi
    noeppi-noeppi committed Jul 8, 2022
    Configuration menu
    Copy the full SHA
    e14f126 View commit details
    Browse the repository at this point in the history

  2. Fix UnionPath

    @noeppi-noeppi
    noeppi-noeppi committed Jul 8, 2022
    Configuration menu
    Copy the full SHA
    4d8cf80 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2023

  1. Merge branch 'main' of https://github.com/McModlauncher/securejarhandler 

     into pathfix
    @noeppi-noeppi
    noeppi-noeppi committed Jun 14, 2023
    Configuration menu
    Copy the full SHA
    0cd3f12 View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2024

  1. Merge remote-tracking branch 'upstream-neo/main' into pathfix 

    # Conflicts:
#	src/main/java/cpw/mods/jarhandling/impl/Jar.java
#	src/main/java/cpw/mods/niofs/union/UnionFileSystem.java
    @noeppi-noeppi
    noeppi-noeppi committed Jan 20, 2024
    Configuration menu
    Copy the full SHA
    3cc182d View commit details
    Browse the repository at this point in the history

  2. Reapply the changes that were lost dropped the merge commit to JarCon… 

    …tentsImpl.java
    @noeppi-noeppi
    noeppi-noeppi committed Jan 20, 2024
    Configuration menu
    Copy the full SHA
    2dedd83 View commit details
    Browse the repository at this point in the history