ShuriZma
ShuriZma synced commits to refs/pull/2190/merge at ShuriZma/xemu from mirror 2025-08-22 21:41:00 +00:00
cf15ed0d1a Merge 887da834b619a92b4cb46edb030ad8d60c304652 into b8cd8ba8cdcf6d9c0a62f889aa40a1e98529e621
b8cd8ba8cd ci: bump astral-sh/setup-uv from 6.4.3 to 6.5.0
9e2d90665c ci: bump actions/checkout from 4.2.2 to 5.0.0
Compare 3 commits »
ShuriZma synced commits to refs/pull/2211/merge at ShuriZma/xemu from mirror 2025-08-22 21:41:00 +00:00
6e03124b30 Merge 3226bfb7ab039a5d368bd9c88e3d92d52e6c967b into b8cd8ba8cdcf6d9c0a62f889aa40a1e98529e621
b8cd8ba8cd ci: bump astral-sh/setup-uv from 6.4.3 to 6.5.0
9e2d90665c ci: bump actions/checkout from 4.2.2 to 5.0.0
Compare 3 commits »
ShuriZma synced commits to refs/pull/6297/head at ShuriZma/pokerogue from mirror 2025-08-22 21:40:55 +00:00
1f086bd8ab fixed relative path bug
ShuriZma synced commits to refs/pull/6292/head at ShuriZma/pokerogue from mirror 2025-08-22 21:40:55 +00:00
caa1ba9a91 Merge branch 'release' into doTheAchievementShuffle
39b2d9865a [Beta][Bug][UI/UX] Fix broken candy upgrades (#6322)
01cd11e731 [Bug] [Beta] Fix trick room message (#6327)
6992a91819 [Challenge] No hardcore breeder (#6334)
b9a46a6a26 Restricted party options for fainted mons in hardcore (#6336)
Compare 9 commits »
ShuriZma synced commits to refs/pull/6292/merge at ShuriZma/pokerogue from mirror 2025-08-22 21:40:55 +00:00
3c9ea20d24 Merge caa1ba9a9123afe9bb93f7589afc6735170c8a15 into 5ee547a39ae04be89c4848e9c9ced64b4f8dcdd2
5ee547a39a [Balance] [ME] Trash to Treasure Option 1 Adjustment (#6341)
72b09eb7d5 Update locales
c3cce668fc [Misc] Moved `scrapeTrainerNames` to a script; removed `selfStatLowerMoves` (#6258)
edeb116ead [Bug] Ensure MEs disabled in a challenge mode only do so while challenge is active (#6337)
Compare 16 commits »
ShuriZma synced commits to refs/pull/6297/merge at ShuriZma/pokerogue from mirror 2025-08-22 21:40:55 +00:00
001926e33e Merge 1f086bd8ab2e2847335752af258704b8b6e04b83 into f2ca7783185f66942f409868a6f0f05653a3762d
1f086bd8ab fixed relative path bug
Compare 2 commits »
ShuriZma synced commits to refs/pull/6299/head at ShuriZma/pokerogue from mirror 2025-08-22 21:40:55 +00:00
c90b9b4a85 fix test checking last hit twice in row lul
23d1ebbfd0 Fixed laser focus test to not whiff instruct
Compare 2 commits »
ShuriZma synced commits to refs/pull/6299/merge at ShuriZma/pokerogue from mirror 2025-08-22 21:40:55 +00:00
3ed9d920a2 Merge c90b9b4a85763d8dbaa8747414c954b525b52e56 into f2ca7783185f66942f409868a6f0f05653a3762d
c90b9b4a85 fix test checking last hit twice in row lul
23d1ebbfd0 Fixed laser focus test to not whiff instruct
Compare 3 commits »
ShuriZma synced commits to refs/pull/6320/head at ShuriZma/pokerogue from mirror 2025-08-22 21:40:55 +00:00
5ee547a39a [Balance] [ME] Trash to Treasure Option 1 Adjustment (#6341)
72b09eb7d5 Update locales
c3cce668fc [Misc] Moved `scrapeTrainerNames` to a script; removed `selfStatLowerMoves` (#6258)
edeb116ead [Bug] Ensure MEs disabled in a challenge mode only do so while challenge is active (#6337)
af0b0b775f [Bug][Sprite] Remove fake Deerling variants (#6330)
Compare 12 commits »
ShuriZma synced commits to refs/pull/6320/merge at ShuriZma/pokerogue from mirror 2025-08-22 21:40:55 +00:00
f7935bf832 Merge 5ee547a39ae04be89c4848e9c9ced64b4f8dcdd2 into 965f92ba0f7626b117b1ed74f3c1f9c6e814fa17
5ee547a39a [Balance] [ME] Trash to Treasure Option 1 Adjustment (#6341)
72b09eb7d5 Update locales
c3cce668fc [Misc] Moved `scrapeTrainerNames` to a script; removed `selfStatLowerMoves` (#6258)
edeb116ead [Bug] Ensure MEs disabled in a challenge mode only do so while challenge is active (#6337)
Compare 13 commits »
ShuriZma synced commits to refs/pull/6321/head at ShuriZma/pokerogue from mirror 2025-08-22 21:40:55 +00:00
5ee547a39a [Balance] [ME] Trash to Treasure Option 1 Adjustment (#6341)
72b09eb7d5 Update locales
c3cce668fc [Misc] Moved `scrapeTrainerNames` to a script; removed `selfStatLowerMoves` (#6258)
edeb116ead [Bug] Ensure MEs disabled in a challenge mode only do so while challenge is active (#6337)
af0b0b775f [Bug][Sprite] Remove fake Deerling variants (#6330)
Compare 12 commits »
ShuriZma synced commits to refs/pull/6321/merge at ShuriZma/pokerogue from mirror 2025-08-22 21:40:55 +00:00
cf1953f02a Merge 5ee547a39ae04be89c4848e9c9ced64b4f8dcdd2 into f2ca7783185f66942f409868a6f0f05653a3762d
5ee547a39a [Balance] [ME] Trash to Treasure Option 1 Adjustment (#6341)
72b09eb7d5 Update locales
c3cce668fc [Misc] Moved `scrapeTrainerNames` to a script; removed `selfStatLowerMoves` (#6258)
edeb116ead [Bug] Ensure MEs disabled in a challenge mode only do so while challenge is active (#6337)
Compare 13 commits »
ShuriZma synced commits to refs/pull/6322/head at ShuriZma/pokerogue from mirror 2025-08-22 21:40:55 +00:00
178d7212e2 Merge branch 'release' into fix-broken-candy-upgrades
6992a91819 [Challenge] No hardcore breeder (#6334)
b9a46a6a26 Restricted party options for fainted mons in hardcore (#6336)
978f06427c [Bug] Sheer Force no longer boosts Fickle Beam; Focus Energy gives +2 crit instead of +1 (#6331)
9c498003aa [UI/UX] Always show starter's natures and ivs in evolution's dex entry (#6335)
Compare 5 commits »
ShuriZma synced commits to refs/pull/6327/head at ShuriZma/pokerogue from mirror 2025-08-22 21:40:55 +00:00
63bf445ad3 Merge branch 'release' into fix-trick-room-message
6992a91819 [Challenge] No hardcore breeder (#6334)
b9a46a6a26 Restricted party options for fainted mons in hardcore (#6336)
978f06427c [Bug] Sheer Force no longer boosts Fickle Beam; Focus Energy gives +2 crit instead of +1 (#6331)
9c498003aa [UI/UX] Always show starter's natures and ivs in evolution's dex entry (#6335)
Compare 10 commits »
ShuriZma synced commits to refs/pull/6330/head at ShuriZma/pokerogue from mirror 2025-08-22 21:40:55 +00:00
ee8c9c921b Remove unused json
7a5703160f Merge branch 'release' of https://github.com/pagefaultgames/pokerogue into byedeer
fae6620bae [Beta] [Balance] Even More 1.10 Balance Changes (Egg Moves + Passive Changes) (#6339)
39b2d9865a [Beta][Bug][UI/UX] Fix broken candy upgrades (#6322)
01cd11e731 [Bug] [Beta] Fix trick room message (#6327)
Compare 14 commits »
ShuriZma synced commits to refs/pull/6334/head at ShuriZma/pokerogue from mirror 2025-08-22 21:40:55 +00:00
6ec0f71097 Merge branch 'release' into no-hardcore-breeder
b9a46a6a26 Restricted party options for fainted mons in hardcore (#6336)
978f06427c [Bug] Sheer Force no longer boosts Fickle Beam; Focus Energy gives +2 crit instead of +1 (#6331)
9c498003aa [UI/UX] Always show starter's natures and ivs in evolution's dex entry (#6335)
Compare 4 commits »
ShuriZma synced and deleted reference refs/tags/misc/change-framerate-for-statuses at ShuriZma/pokerogue from mirror 2025-08-22 21:40:54 +00:00
ShuriZma synced and deleted reference refs/tags/no-evo-ivs-in-pokedex at ShuriZma/pokerogue from mirror 2025-08-22 21:40:54 +00:00
ShuriZma synced and deleted reference refs/tags/no-hardcore-breeder at ShuriZma/pokerogue from mirror 2025-08-22 21:40:54 +00:00
ShuriZma synced and deleted reference refs/tags/revert-6307-jsoncut at ShuriZma/pokerogue from mirror 2025-08-22 21:40:54 +00:00