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

Supermatter Engine (Port From White Dream) #341

Merged
merged 47 commits into from
Aug 3, 2024
Merged

Supermatter Engine (Port From White Dream) #341

merged 47 commits into from
Aug 3, 2024

Commits on Apr 25, 2024

  1. Initial Port

    @VMSolidus
    VMSolidus committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    4043f1b View commit details
    Browse the repository at this point in the history

  2. Should fix test fail

    @VMSolidus
    VMSolidus committed Apr 25, 2024
    Configuration menu
    Copy the full SHA
    158b8d9 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2024

  1. Edge with Experimental Supermatter Engine

    @VMSolidus
    VMSolidus committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    7527bdd View commit details
    Browse the repository at this point in the history

  2. Update edge.yml

    @VMSolidus
    VMSolidus committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    4089288 View commit details
    Browse the repository at this point in the history

  3. New edge by Colintel

    @VMSolidus
    VMSolidus committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    a9d8b6b View commit details
    Browse the repository at this point in the history

  4. Update edge.yml

    @VMSolidus
    VMSolidus committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    bf337fe View commit details
    Browse the repository at this point in the history

  5. Update edge.yml

    @VMSolidus
    VMSolidus committed Apr 26, 2024
    Configuration menu
    Copy the full SHA
    07d94cb View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2024

  1. better sound looping

    @VMSolidus
    VMSolidus committed Apr 30, 2024
    Configuration menu
    Copy the full SHA
    0b428dc View commit details
    Browse the repository at this point in the history

Commits on May 4, 2024

  1. Update edge.yml

    @VMSolidus
    VMSolidus committed May 4, 2024
    Configuration menu
    Copy the full SHA
    185a63b View commit details
    Browse the repository at this point in the history

Commits on May 10, 2024

  1. Update supermatter

    @VMSolidus
    VMSolidus committed May 10, 2024
    Configuration menu
    Copy the full SHA
    79e9664 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2024

  1. Merge branch 'master' into Port-Of-Supermatter

    @VMSolidus
    VMSolidus committed May 30, 2024
    Configuration menu
    Copy the full SHA
    259f714 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2024

  1. Updating server Supermatter System

    @VMSolidus
    VMSolidus committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    c241559 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2024

  1. Update supermatter.yml

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

  2. Update supermatter.ftl

    @VMSolidus
    VMSolidus committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    d6d5707 View commit details
    Browse the repository at this point in the history

  3. Delete edge.yml

    @VMSolidus
    VMSolidus committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    d94c07d View commit details
    Browse the repository at this point in the history

  4. Create edge.yml

    @VMSolidus
    VMSolidus committed Jun 21, 2024
    Configuration menu
    Copy the full SHA
    d3ab5a2 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2024

  1. what

    whateverusername0 committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    4199493 View commit details
    Browse the repository at this point in the history

  2. port from Goob-Station/Goob-Station#344

    whateverusername0 committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    2d1b16f View commit details
    Browse the repository at this point in the history

  3. fix doafter

    whateverusername0 committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    ba27eee View commit details
    Browse the repository at this point in the history

  4. ok

    whateverusername0 committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    b60949f View commit details
    Browse the repository at this point in the history

  5. grab som more

    whateverusername0 committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    13e6532 View commit details
    Browse the repository at this point in the history

  6. please god

    whateverusername0 committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    96dbb7b View commit details
    Browse the repository at this point in the history

  7. Merge branch 'Port-Of-Supermatter' of https://github.com/VMSolidus/Ei… 

    …nstein-Engines into Port-Of-Supermatter
    whateverusername0 committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    24be76e View commit details
    Browse the repository at this point in the history

  8. no more 0% integrity announcements

    whateverusername0 committed Jun 22, 2024
    Configuration menu
    Copy the full SHA
    7699ed5 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2024

  1. more tweaks

    whateverusername0 committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    f287722 View commit details
    Browse the repository at this point in the history

  2. moar oopdates

    whateverusername0 committed Jun 26, 2024
    Configuration menu
    Copy the full SHA
    4570415 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2024

  1. Merge branch 'master' into Port-Of-Supermatter

    @VMSolidus
    VMSolidus committed Jun 29, 2024
    Configuration menu
    Copy the full SHA
    e5de134 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2024

  1. womp

    whateverusername0 committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    de91dbd View commit details
    Browse the repository at this point in the history

  2. Merge branch 'Port-Of-Supermatter' of https://github.com/VMSolidus/Ei… 

    …nstein-Engines into Port-Of-Supermatter
    whateverusername0 committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    b238628 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2024

  1. Merge branch 'master' into Port-Of-Supermatter

    @whateverusername0
    whateverusername0 committed Jul 2, 2024
    Configuration menu
    Copy the full SHA
    b44cc4f View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2024

  1. Merge branch 'master' into Port-Of-Supermatter

    @DangerRevolution
    DangerRevolution committed Jul 8, 2024
    Configuration menu
    Copy the full SHA
    f1675dc View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2024

  1. Merge branch 'master' into Port-Of-Supermatter

    @VMSolidus
    VMSolidus committed Jul 21, 2024
    Configuration menu
    Copy the full SHA
    7a502c1 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2024

  1. Update SupermatterSystem.cs

    @VMSolidus
    VMSolidus committed Jul 22, 2024
    Configuration menu
    Copy the full SHA
    772997c View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2024

  1. Cleanup Deprecated VV Options

    @VMSolidus
    VMSolidus committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    d67f005 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into Port-Of-Supermatter

    @VMSolidus
    VMSolidus committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    7d93298 View commit details
    Browse the repository at this point in the history

  3. Update SupermatterSystem.cs

    @VMSolidus
    VMSolidus committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    89e7d27 View commit details
    Browse the repository at this point in the history

  4. Update SupermatterFoodComponent.cs

    @VMSolidus
    VMSolidus committed Jul 30, 2024
    Configuration menu
    Copy the full SHA
    af52d71 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2024

  1. Update SupermatterComponent.cs

    @VMSolidus
    VMSolidus committed Jul 31, 2024
    Configuration menu
    Copy the full SHA
    c1a5c57 View commit details
    Browse the repository at this point in the history

  2. Add job whitelist system (#28085) 

    * Add job whitelist system

* Address reviews

* Fix name

* Apply suggestions from code review

Co-authored-by: Pieter-Jan Briers <[email protected]>

* cancinium

---------

Co-authored-by: Pieter-Jan Briers <[email protected]>
    @VMSolidus @PJB3005
    VMSolidus and PJB3005 committed Jul 31, 2024
    Configuration menu
    Copy the full SHA
    db97eda View commit details
    Browse the repository at this point in the history

  3. this is INTERESTING to learn

    @VMSolidus
    VMSolidus committed Jul 31, 2024
    Configuration menu
    Copy the full SHA
    c54c778 View commit details
    Browse the repository at this point in the history

  4. Update SupermatterSystem.cs

    @VMSolidus
    VMSolidus committed Jul 31, 2024
    Configuration menu
    Copy the full SHA
    7ede349 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2024

  1. Apply suggestions from code review 

    Co-authored-by: DEATHB4DEFEAT <[email protected]>
Signed-off-by: VMSolidus <[email protected]>
    @VMSolidus @DEATHB4DEFEAT
    VMSolidus and DEATHB4DEFEAT committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    f4f0d35 View commit details
    Browse the repository at this point in the history

  2. Apply suggestions from code review 

    Co-authored-by: DEATHB4DEFEAT <[email protected]>
Signed-off-by: VMSolidus <[email protected]>
    @VMSolidus @DEATHB4DEFEAT
    VMSolidus and DEATHB4DEFEAT committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    d999564 View commit details
    Browse the repository at this point in the history

  3. Apply suggestions from code review 

    Co-authored-by: DEATHB4DEFEAT <[email protected]>
Signed-off-by: VMSolidus <[email protected]>
    @VMSolidus @DEATHB4DEFEAT
    VMSolidus and DEATHB4DEFEAT committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    50ed86b View commit details
    Browse the repository at this point in the history

  4. Apply suggestions from code review 

    Co-authored-by: DEATHB4DEFEAT <[email protected]>
Signed-off-by: VMSolidus <[email protected]>
    @VMSolidus @DEATHB4DEFEAT
    VMSolidus and DEATHB4DEFEAT committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    7f63471 View commit details
    Browse the repository at this point in the history

  5. Final Update

    @VMSolidus
    VMSolidus committed Aug 2, 2024
    Configuration menu
    Copy the full SHA
    1c76a1f View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2024

  1. Update supermatter.yml

    @VMSolidus
    VMSolidus committed Aug 3, 2024
    Configuration menu
    Copy the full SHA
    10989f4 View commit details
    Browse the repository at this point in the history