Fuck over the history:tm: #131
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Proper names & genders * Uppercase proper names * Make Smile female
* lost friendship flavor * add rouny steak * rouny special meat * rouny meat textures --------- Co-authored-by: deltanedas <@deltanedas:kde.org>
* Explosive wet floor sign & janitorial suicide vest * fix attributions * Remove name & desc from explosive wet floor sign * Make wet floor sign chameleonable
Co-authored-by: metalgearsloth <[email protected]>
…pt and minPlayers field (#20564) * Improve active game rule querying, add generic try round start attempt method, move minPlayers to GameRuleComponent * Nukeops todo and cleanup * Remove Active field * Add EndedGameRuleComponent
* give me a drink bartender * guh * aARG
* fix * add * Revert "add" This reverts commit a054a3204a8f185a94ceb80b1bd3bc9f30423711.
* Space cat breathes space Made Space Cat lungs ROBUST * Made Space Cat's lungs ROBUST 2.0
* Add files via upload * Add files via upload * Add files via upload * Add files via upload * add textures * fix encoding * fix 2
* Fixed Telescopic Shield Lighting Bug fix #20199 * no need for these at all --------- Co-authored-by: Nemanja <[email protected]>
…v-rebase into Try-to-fix-the-mess-Colin-made
DebugOk
force-pushed
the
Try-to-fix-the-mess-Colin-made
branch
from
93e54d2 to
6fda3e1
Compare
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
|
Silence, robot. I'm trying |
Signed-off-by: Debug <[email protected]>
github-actions
bot
added
Changes: YML
|
Whats the worst that can happen |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
With any luck github will just let me force this into the current branch without having to touch the existing hashes :blunt:
TODO: Kill Colin