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

oracle fix #646

Merged
merged 6 commits into from
Aug 9, 2024
Merged

oracle fix #646

merged 6 commits into from
Aug 9, 2024

Conversation

Rxup
Copy link
Owner

@Rxup Rxup commented Jun 12, 2024

No description provided.

@github-actions github-actions bot added the Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. label Jun 12, 2024
@Rxup Rxup requested a review from Kirillcas June 12, 2024 10:50
Kirillcas and others added 2 commits June 12, 2024 17:26
@Kirillcas
bloody_time
c8dd865
@KayzelW
TempleOfBloodMoon
9571267 
dungeon gen doesn't working
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jul 6, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot added the MERGE CONFLICT ПИЗДА! label Jul 6, 2024
@github-actions github-actions bot removed the MERGE CONFLICT ПИЗДА! label Aug 9, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Aug 9, 2024 •
edited
Loading

RSI Diff Bot; head commit 8386e16 merging into e8718c8
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Backmen/Structures/Decoration/statues.rsi

State Old New Status
oracle-o0bld Added

Edit: diff updated after 8386e16

@Rxup Rxup merged commit eac02ea into master Aug 9, 2024
11 checks passed
CrimeMoot referenced this pull request in fospas/Space-Cats-14 Aug 10, 2024
@CrimeMoot
Merge pull request #141 from fospas/syns
7ddfb60 
oracle fix (#646)
@KayzelW KayzelW deleted the OracleFix branch September 27, 2024 19:14
@KayzelW KayzelW restored the OracleFix branch September 27, 2024 19:14
@KayzelW KayzelW deleted the OracleFix branch September 27, 2024 19:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Kirillcas Kirillcas Awaiting requested review from Kirillcas

Assignees

@Kirillcas Kirillcas

Labels
Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Rxup @Kirillcas @KayzelW