rl upstream #470
Merged
rl upstream #470
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
Withdrawing an item with objvars, like ring of shadows, when you have multiple of them, would result in both a regular ring of shadows and a placeholder ring of shadows existing in the bank at once. The regular item would be layouted like normal, but the placeholder was considered to be an item in the tab not in the layout, and so was added to the layout. Fix by removing the placeholder id too when layouting the normal id. Also fix drawing multiple placeholders in a layout as they will have qty>1. Instead, assume anything with a placeholder template id is a placeholder. (cherry picked from commit fc1d030ea104b9f945a15c41c7c30c1af28fa066)
(cherry picked from commit 6b0645e427a11a51612de7038706239785cb90f4)
(cherry picked from commit f40e8e64595cc279d5c647904dc86231530e2ff7)
(cherry picked from commit 7697dec5b9c3afc9277f75661144db4063eddf43)
(cherry picked from commit 8452edd954d13e5f15002f3056e2c5c8aba4be68)
(cherry picked from commit 38c15d16e94dcef3865b9ac66633eae43f26e6c4)
Signed-off-by: sam <[email protected]> (cherry picked from commit da43c185bc001a6ebe3b37fe5dc3e78609f95d21)
(cherry picked from commit 9ccf2a4d2f0455066a37573230bd016aeba466ab)
(cherry picked from commit 7c72a32da0e9cee38ff45bd6f3c70683af9366a0)
(cherry picked from commit eacd833e2f1af9cb90ff56357498ac37af160cd7)
(cherry picked from commit 652aeff3991ca5b47d7c8a1e419b65d3471a13f4)
(cherry picked from commit b3b18a58edf8f52396f57a18182b8dc4bdbf6a7b)
(cherry picked from commit 1f456f2dead9692b64ff4c528282b9a86f980bb8)
(cherry picked from commit 3ada7d927c7252780eedc047321343a7f64efc91)
(cherry picked from commit 1bd7cc48edd11d82397030ad67bb697d5df86646)
(cherry picked from commit c014d9f29cb29be48da516401ea9b36249894720)
(cherry picked from commit a12fec482e34693926006473d80846389b3ca51e)
(cherry picked from commit d6001c3f6f8a10b505622ca1e4b6ed6294e3e607)
(cherry picked from commit e791d0854b3d36371ed371830b4a60488fc2f083)
(cherry picked from commit 965175865dcad771570f2cf0ac7958576a401360)
Add the jars and mixes for sunlight and moonlight moths (cherry picked from commit bfe21caa2f6592b1ecc75977dc5ffddc0b3f82f3)
(cherry picked from commit 0500906f8de9cd20875c168a7a59e5e066ed5058)
(cherry picked from commit 2e38dc40d92f8346f5ea795c7abe9c2397f0929c)
(cherry picked from commit 04dbf5e47636c9aceac17d1ca0f60364096fbf1c)
(cherry picked from commit ba393f015f94415dc73a6fe9523d973ed6747184)
(cherry picked from commit 95003f650cba8876b6bfc4e5aba382520d9edf15)
(cherry picked from commit 473dabc59285a55ad7f2a6a174228299d111cfda)
(cherry picked from commit 194a0679bbe1474feccf5e7f90d4c4bd78de5238)
(cherry picked from commit 3ec3febec66e37f8b2e41d3d20080858a4a0b580)
(cherry picked from commit 327e3c576ad2bc52cf6e31c5128fd384753e6275)
(cherry picked from commit 72052ef5cb95a0d1766ed385fcefcf8c420fba82)
(cherry picked from commit 5a919328e29450e5f39e23399335be65199e8b27)
(cherry picked from commit f8dd6f5fefbdf1360f534f08451e7c50c16a8401)
(cherry picked from commit e84c940e48092768b578c2f42e278a8242a0bba4)
(cherry picked from commit 4f4387443b1defbf0eafea9f4d45d945e96390d9)
(cherry picked from commit c02ae1b467e96ddd87b5d05e119b60e9c0daf029)
jbx5
approved these changes
Oct 10, 2024
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.
No description provided.