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

Muffins #29318

Open
wants to merge 44 commits into
base: master
Choose a base branch
from
Open

Muffins #29318

wants to merge 44 commits into from
+197 −9

Commits on Jun 9, 2024

  1. Update meta.json

    @RumiTiger
    RumiTiger authored Jun 9, 2024
    Configuration menu
    Copy the full SHA
    2a93a40 View commit details
    Browse the repository at this point in the history

  2. Add files via upload

    @RumiTiger
    RumiTiger authored Jun 9, 2024
    Configuration menu
    Copy the full SHA
    3f0c4d2 View commit details
    Browse the repository at this point in the history

  3. Update misc.yml

    @RumiTiger
    RumiTiger authored Jun 9, 2024
    Configuration menu
    Copy the full SHA
    a99ff79 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2024

  1. Update meal_recipes.yml

    @RumiTiger
    RumiTiger authored Jun 10, 2024
    Configuration menu
    Copy the full SHA
    f86ab2f View commit details
    Browse the repository at this point in the history

  2. Update meta.json

    @RumiTiger
    RumiTiger authored Jun 10, 2024
    Configuration menu
    Copy the full SHA
    39562e3 View commit details
    Browse the repository at this point in the history

  3. Add files via upload

    @RumiTiger
    RumiTiger authored Jun 10, 2024
    Configuration menu
    Copy the full SHA
    15fd178 View commit details
    Browse the repository at this point in the history

  4. Update plate.yml

    @RumiTiger
    RumiTiger authored Jun 10, 2024
    Configuration menu
    Copy the full SHA
    14fd032 View commit details
    Browse the repository at this point in the history

  5. Update food_baked_single.yml

    @RumiTiger
    RumiTiger authored Jun 10, 2024
    Configuration menu
    Copy the full SHA
    7a258be View commit details
    Browse the repository at this point in the history

  6. Update dinnerware.yml

    @RumiTiger
    RumiTiger authored Jun 10, 2024
    Configuration menu
    Copy the full SHA
    54f747f View commit details
    Browse the repository at this point in the history

  7. Update cooking.yml

    @RumiTiger
    RumiTiger authored Jun 10, 2024
    Configuration menu
    Copy the full SHA
    43f3ef3 View commit details
    Browse the repository at this point in the history

  8. Update misc.yml

    @RumiTiger
    RumiTiger authored Jun 10, 2024
    Configuration menu
    Copy the full SHA
    382c901 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2024

  1. Merge branch 'space-wizards:master' into Muffins

    @RumiTiger
    RumiTiger authored Jun 21, 2024
    Configuration menu
    Copy the full SHA
    48a84b2 View commit details
    Browse the repository at this point in the history

  2. Add files via upload

    @RumiTiger
    RumiTiger authored Jun 21, 2024
    Configuration menu
    Copy the full SHA
    b046e2f View commit details
    Browse the repository at this point in the history

  3. Delete Resources/Textures/Objects/Consumable/Food/Baked/misc.rsi/muff… 

    …in-cherry.png
    @RumiTiger
    RumiTiger authored Jun 21, 2024
    Configuration menu
    Copy the full SHA
    d3c9d7d View commit details
    Browse the repository at this point in the history

  4. Add files via upload

    @RumiTiger
    RumiTiger authored Jun 21, 2024
    Configuration menu
    Copy the full SHA
    d891aae View commit details
    Browse the repository at this point in the history

  5. Update meta.json

    @RumiTiger
    RumiTiger authored Jun 21, 2024
    Configuration menu
    Copy the full SHA
    657e8e7 View commit details
    Browse the repository at this point in the history

  6. Update misc.yml

    @RumiTiger
    RumiTiger authored Jun 21, 2024
    Configuration menu
    Copy the full SHA
    41d7938 View commit details
    Browse the repository at this point in the history

  7. Update meal_recipes.yml

    @RumiTiger
    RumiTiger authored Jun 21, 2024
    Configuration menu
    Copy the full SHA
    c8a9a62 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2024

  1. Merge branch 'master' into Muffins

    @RumiTiger
    RumiTiger authored Aug 23, 2024
    Configuration menu
    Copy the full SHA
    5e38eb3 View commit details
    Browse the repository at this point in the history

  2. Update meta.json

    @RumiTiger
    RumiTiger authored Aug 23, 2024
    Configuration menu
    Copy the full SHA
    9f140a6 View commit details
    Browse the repository at this point in the history

  3. Fix meta.json

    @RumiTiger
    RumiTiger authored Aug 23, 2024
    Configuration menu
    Copy the full SHA
    09b03f4 View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2024

  1. Fix meta.json again

    @RumiTiger
    RumiTiger authored Aug 25, 2024
    Configuration menu
    Copy the full SHA
    39af36e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'space-wizards:master' into Muffins

    @RumiTiger
    RumiTiger authored Aug 25, 2024
    Configuration menu
    Copy the full SHA
    1399051 View commit details
    Browse the repository at this point in the history

  3. Update misc.yml

    @RumiTiger
    RumiTiger authored Aug 25, 2024
    Configuration menu
    Copy the full SHA
    4d47013 View commit details
    Browse the repository at this point in the history

  4. Update misc.yml

    @RumiTiger
    RumiTiger authored Aug 25, 2024
    Configuration menu
    Copy the full SHA
    6f796b5 View commit details
    Browse the repository at this point in the history

  5. Update misc.yml

    @RumiTiger
    RumiTiger authored Aug 25, 2024
    Configuration menu
    Copy the full SHA
    74e768f View commit details
    Browse the repository at this point in the history

  6. Update misc.yml

    @RumiTiger
    RumiTiger authored Aug 25, 2024
    Configuration menu
    Copy the full SHA
    c94c3b2 View commit details
    Browse the repository at this point in the history

  7. Update meta.json

    @RumiTiger
    RumiTiger authored Aug 25, 2024
    Configuration menu
    Copy the full SHA
    d33eb78 View commit details
    Browse the repository at this point in the history

  8. Update meta.json

    @RumiTiger
    RumiTiger authored Aug 25, 2024
    Configuration menu
    Copy the full SHA
    eb9f510 View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2024

  1. Merge branch 'space-wizards:master' into Muffins

    @RumiTiger
    RumiTiger authored Aug 27, 2024
    Configuration menu
    Copy the full SHA
    876e12b View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2024

  1. Update misc.yml

    @RumiTiger
    RumiTiger authored Aug 29, 2024
    Configuration menu
    Copy the full SHA
    e7a235f View commit details
    Browse the repository at this point in the history

  2. Update meal_recipes.yml

    @RumiTiger
    RumiTiger authored Aug 29, 2024
    Configuration menu
    Copy the full SHA
    367b24b View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2024

  1. Update Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/mi… 

    …sc.yml

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
    @RumiTiger @slarticodefast
    RumiTiger and slarticodefast authored Sep 2, 2024
    Configuration menu
    Copy the full SHA
    aa70961 View commit details
    Browse the repository at this point in the history

  2. Update dinnerware.yml

    @RumiTiger
    RumiTiger authored Sep 2, 2024
    Configuration menu
    Copy the full SHA
    5ac9489 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2024

  1. Merge branch 'space-wizards:master' into Muffins

    @RumiTiger
    RumiTiger authored Sep 16, 2024
    Configuration menu
    Copy the full SHA
    394b4e4 View commit details
    Browse the repository at this point in the history

  2. Delete cherry

    @RumiTiger
    RumiTiger authored Sep 16, 2024
    Configuration menu
    Copy the full SHA
    70fb7ea View commit details
    Browse the repository at this point in the history

  3. Add files via upload

    @RumiTiger
    RumiTiger authored Sep 16, 2024
    Configuration menu
    Copy the full SHA
    eaadbad View commit details
    Browse the repository at this point in the history

  4. Delete banana

    @RumiTiger
    RumiTiger authored Sep 16, 2024
    Configuration menu
    Copy the full SHA
    0ed7178 View commit details
    Browse the repository at this point in the history

  5. Add banana

    @RumiTiger
    RumiTiger authored Sep 16, 2024
    Configuration menu
    Copy the full SHA
    d2b71f2 View commit details
    Browse the repository at this point in the history

  6. Delete chocolate

    @RumiTiger
    RumiTiger authored Sep 16, 2024
    Configuration menu
    Copy the full SHA
    33b5f4e View commit details
    Browse the repository at this point in the history

  7. Add chocolate

    @RumiTiger
    RumiTiger authored Sep 16, 2024
    Configuration menu
    Copy the full SHA
    a387c15 View commit details
    Browse the repository at this point in the history

Commits on Sep 17, 2024

  1. Merge branch 'space-wizards:master' into Muffins

    @RumiTiger
    RumiTiger authored Sep 17, 2024
    Configuration menu
    Copy the full SHA
    e6db5ba View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2024

  1. Merge branch 'space-wizards:master' into Muffins

    @RumiTiger
    RumiTiger authored Oct 17, 2024
    Configuration menu
    Copy the full SHA
    012478c View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2024

  1. Merge branch 'space-wizards:master' into Muffins

    @RumiTiger
    RumiTiger authored Oct 24, 2024
    Configuration menu
    Copy the full SHA
    3eb0fc6 View commit details
    Browse the repository at this point in the history