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

Upstream sync #663

Merged
merged 17 commits into from
Jul 17, 2024
Merged

Upstream sync #663

merged 17 commits into from
Jul 17, 2024

Commits on Jul 3, 2024

  1. Added toggle for gen AI textures on resource pack, includes enabling … 

    …or disabling of all reliant themes and prefabs.
    @GTD-Carthage
    GTD-Carthage committed Jul 3, 2024
    Configuration menu
    Copy the full SHA
    1010f63 View commit details
    Browse the repository at this point in the history

  2. Minute addition to quit messages 

    Video game ones.
    @Armaetus
    Armaetus authored Jul 3, 2024
    Configuration menu
    Copy the full SHA
    5737b6a View commit details
    Browse the repository at this point in the history

  3. Merge pull request #173 from obsidian-level-maker/v21 

    V21
    @GTD-Carthage
    GTD-Carthage authored Jul 3, 2024
    Configuration menu
    Copy the full SHA
    21f7a64 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #172 from Armaetus/obsidian 

    Minute addition to quit messages
    @GTD-Carthage
    GTD-Carthage authored Jul 3, 2024
    Configuration menu
    Copy the full SHA
    ffc9281 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2024

  1. - Missing table index on generative resources table.

    @GTD-Carthage
    GTD-Carthage committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    9e9ec2c View commit details
    Browse the repository at this point in the history

  2. Added wall groups reliant on generative textures to genAI resources t… 

    …able instead
    @GTD-Carthage
    GTD-Carthage committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    7a6643f View commit details
    Browse the repository at this point in the history

  3. Evil demonic satanic special character typo

    @GTD-Carthage
    GTD-Carthage committed Jul 4, 2024
    Configuration menu
    Copy the full SHA
    99b71f5 View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2024

  1. - Added more wood lab theme gen AI textures, replaced old ones with m… 

    …ore concise looking ones, also added brightmaps.
    @GTD-Carthage
    GTD-Carthage committed Jul 6, 2024
    Configuration menu
    Copy the full SHA
    245863d View commit details
    Browse the repository at this point in the history

  2. Added extra brightmap to a wall piece in resource pack computer catac… 

    …ombs theme gen AI set.
    @GTD-Carthage
    GTD-Carthage committed Jul 6, 2024
    Configuration menu
    Copy the full SHA
    6c0af0d View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2024

  1. - Replaced gen AI server rack textures and added custom brightmaps.

    @GTD-Carthage
    GTD-Carthage committed Jul 7, 2024
    Configuration menu
    Copy the full SHA
    82b4feb View commit details
    Browse the repository at this point in the history

  2. - Added jump_crouch filter to pond secret.

    @GTD-Carthage
    GTD-Carthage committed Jul 7, 2024
    Configuration menu
    Copy the full SHA
    889d663 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2024

  1. Replaced old genAI resource pack goth-tech flats with cleaner version… 

    …s, some brightmaps replaced
    @GTD-Carthage
    GTD-Carthage committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    3cbcafd View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2024

  1. - Added new large funnel-type shape rules.

    @GTD-Carthage
    GTD-Carthage committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    bd5fd45 View commit details
    Browse the repository at this point in the history

  2. New metal bunker room theme for tech and urban for resource pack, rep… 

    …laced some prior flats on other themes with nicer ones and included new brightmaps.
    @GTD-Carthage
    GTD-Carthage committed Jul 11, 2024
    Configuration menu
    Copy the full SHA
    959084b View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2024

  1. Corrected wrong flat assignments in resource pack room theme

    @GTD-Carthage
    GTD-Carthage committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    219bc98 View commit details
    Browse the repository at this point in the history

  2. Re-added missing brightmap for a particular resource pack texture.

    @GTD-Carthage
    GTD-Carthage committed Jul 12, 2024
    Configuration menu
    Copy the full SHA
    ac1dbed View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2024

  1. Added brightmaps for metal grate flat replacements in resource pack.

    @GTD-Carthage
    GTD-Carthage committed Jul 14, 2024
    Configuration menu
    Copy the full SHA
    1eaa91e View commit details
    Browse the repository at this point in the history