I get knocked down, but I get up again (pret merge 2023/04/13) #2907
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
Treat map data as const
Fix scanner item flag name
Document the trendy sayings word group
Replace NUM_TEXT_PRINTERS with WINDOWS_MAX
Use tilemap file for cable car pylons
ShaeTsuPog
added a commit
to ShaeTsuPog/em-vstar
that referenced
this pull request
Apr 14, 2023
commit 48fba7a Merge: 0397a1d 958bc34 Author: Martin Griffin <[email protected]> Date: Fri Apr 14 14:56:46 2023 +0100 Fixed AI not considering Hidden Abilities in its team during switching logic (rh-hideout#2908) commit 958bc34 Author: Eduardo Quezada <[email protected]> Date: Fri Apr 14 09:42:48 2023 -0400 Fixed AI not considering Hidden Abilities in its team during switching logic commit 0397a1d Merge: 513ebcb 7c29a24 Author: Eduardo Quezada D'Ottone <[email protected]> Date: Thu Apr 13 17:19:39 2023 -0400 pret merge 2023/04/13 (rh-hideout#2907) commit 7c29a24 Merge: 513ebcb 73a6a58 Author: Eduardo Quezada <[email protected]> Date: Thu Apr 13 17:05:48 2023 -0400 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretsync20230413 commit 513ebcb Merge: 86242c1 eaddeab Author: Martin Griffin <[email protected]> Date: Thu Apr 13 19:02:20 2023 +0100 Improved PR Template (rh-hideout#2905) commit eaddeab Author: Eduardo Quezada <[email protected]> Date: Thu Apr 13 13:17:25 2023 -0400 Improve PR Template commit 73a6a58 Merge: d4e2431 4b859ff Author: GriffinR <[email protected]> Date: Sun Apr 9 13:19:43 2023 -0400 Merge pull request rh-hideout#1879 from GriffinRichards/cable-car-tilemap Use tilemap file for cable car pylons commit d4e2431 Merge: 6be9a79 5739602 Author: GriffinR <[email protected]> Date: Sat Apr 8 08:41:04 2023 -0400 Merge pull request rh-hideout#1878 from GriffinRichards/num-text-printers Replace NUM_TEXT_PRINTERS with WINDOWS_MAX commit 5739602 Author: GriffinR <[email protected]> Date: Fri Mar 31 14:57:51 2023 -0400 Replace NUM_TEXT_PRINTERS with WINDOWS_MAX commit 4b859ff Author: GriffinR <[email protected]> Date: Fri Mar 31 00:44:22 2023 -0400 Use tilemap file for cable car pylons commit 6be9a79 Merge: 590eda3 0c38086 Author: GriffinR <[email protected]> Date: Fri Mar 24 08:05:51 2023 -0400 Merge pull request rh-hideout#1871 from GriffinRichards/doc-trendy-sayings Document the trendy sayings word group commit 590eda3 Merge: 8d67beb 492422b Author: GriffinR <[email protected]> Date: Fri Mar 24 01:04:04 2023 -0400 Merge pull request rh-hideout#1875 from Zunawe/fix-scanner-flag-name Fix scanner item flag name commit 492422b Author: Zunawe <[email protected]> Date: Thu Mar 23 21:47:26 2023 -0700 Fix scanner item flag name commit 8d67beb Merge: 00e211a dbf757b Author: GriffinR <[email protected]> Date: Wed Mar 22 13:00:06 2023 -0400 Merge pull request rh-hideout#1869 from GriffinRichards/const-map Treat map data as const commit 0c38086 Author: GriffinR <[email protected]> Date: Mon Mar 13 15:37:46 2023 -0400 Document the trendy saying word group commit dbf757b Author: GriffinR <[email protected]> Date: Wed Mar 8 11:07:44 2023 -0500 Treat map data as const
Merged
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.
Description
Clean merge! No conflicts or hash changes!
SHA1: 9e3017e584e7b69303336ed074d18c2c0f88b4b0
Discord contact info
AsparagusEduardo#6051