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

Misc Marine Changes and Fixes #209

Merged
merged 18 commits into from
Jun 11, 2024
Merged

Misc Marine Changes and Fixes #209

merged 18 commits into from
Jun 11, 2024

Commits on Mar 28, 2024

  1. Wood Palette Changes

    AmoryBlaine authored and AmoryBlaine committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    ec45cf1 View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2024

  1. Revert "Wood Palette Changes" 

    This reverts commit ec45cf1.
    AmoryBlaine authored and AmoryBlaine committed Mar 30, 2024
    Configuration menu
    Copy the full SHA
    f9e2944 View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2024

  1. Merge remote-tracking branch 'upstream/master'

    @AmoryBlaine
    AmoryBlaine committed Mar 31, 2024
    Configuration menu
    Copy the full SHA
    8ff1f48 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2024

  1. Misc Marine Changes and Fixes 

    Updates the security belt, updates updates the MARSOC armor, fixes rolled state of USCM jungle boilersuit. Updates some Updates existing tie and webbing overlays.
    @AmoryBlaine
    AmoryBlaine committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    0f38ef3 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2024

  1. Update belts.dmi

    @AmoryBlaine
    AmoryBlaine committed Apr 4, 2024
    Configuration menu
    Copy the full SHA
    8ab30be View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into misc-marine-changes

    @AmoryBlaine
    AmoryBlaine authored Apr 4, 2024
    Configuration menu
    Copy the full SHA
    e9d05fe View commit details
    Browse the repository at this point in the history

  3. fixes the duplicate

    @AmoryBlaine
    AmoryBlaine committed Apr 4, 2024
    Configuration menu
    Copy the full SHA
    489fb68 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'misc-marine-changes' of https://github.com/AmoryBlaine/… 

    …PvE-CMSS13 into misc-marine-changes
    @AmoryBlaine
    AmoryBlaine committed Apr 4, 2024
    Configuration menu
    Copy the full SHA
    ef29d7f View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2024

  1. Merge branch 'master' into misc-marine-changes

    @AmoryBlaine
    AmoryBlaine committed Apr 6, 2024
    Configuration menu
    Copy the full SHA
    641dfcc View commit details
    Browse the repository at this point in the history

  2. Merge branch 'PvE-CMSS13:master' into master

    @AmoryBlaine
    AmoryBlaine authored Apr 6, 2024
    Configuration menu
    Copy the full SHA
    298847c View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into misc-marine-changes

    @AmoryBlaine
    AmoryBlaine committed Apr 6, 2024
    Configuration menu
    Copy the full SHA
    aabd82c View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2024

  1. Merge branch 'PvE-CMSS13:master' into master

    @AmoryBlaine
    AmoryBlaine authored Apr 8, 2024
    Configuration menu
    Copy the full SHA
    5c27cc6 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2024

  1. Merge branch 'master' into misc-marine-changes

    @AmoryBlaine
    AmoryBlaine committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    29eb86a View commit details
    Browse the repository at this point in the history

  2. updates belt 

    Adds Andro's machetes cause idk how to do it automatically
    @AmoryBlaine
    AmoryBlaine committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    b292818 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2024

  1. m37 holster updated palette

    @AmoryBlaine
    AmoryBlaine committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    52f1b89 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2024

  1. Merge branch 'master' into pr/209

    @AmoryBlaine
    AmoryBlaine committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    fcdca77 View commit details
    Browse the repository at this point in the history

  2. Fixes merge issues for real

    @AmoryBlaine
    AmoryBlaine committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    c9e3a3c View commit details
    Browse the repository at this point in the history

  3. REAL fix

    @AmoryBlaine
    AmoryBlaine committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    efcc262 View commit details
    Browse the repository at this point in the history