Merge branch 'beta' of https://github.com/pagefaultgames/pokerogue into earlygyms

This commit is contained in:
AJ Fontaine 2024-12-20 15:56:03 -05:00
commit 1d2da0b4e5
4 changed files with 55 additions and 51 deletions

View File

@ -372,63 +372,67 @@ In addition to the lists below, please check [the PokéRogue wiki](https://wiki.
- Lily - Lily
- PigeonBar - PigeonBar
## Past Contributors ## Other Code Contributors
- Fontbane - Admiral-Billy
- sodaMelon - allen925
- schmidtc1 - arColm
- shayebeadling - Arxalc
- AsdarDevelops
- bennybroseph
- Brain Frog
- Corrade
- Dakurei
- DustinLin - DustinLin
- lucfd - ElizaAlex
- madibye
- EmberCM - EmberCM
- Mewtwo2387 - EmoUsedHM01
- EvasiveAce
- Fontbane
- francktrouillez
- FredeX
- geeilhan
- Greenlamp
- happinyz
- hayuna - hayuna
- sirzento - InfernoVulpix
- ReneGV
- mattrossdev
- zacharied
- NxKarim
- td76099
- Xiaphear
- j-diefenbach - j-diefenbach
- jaimefd - jaimefd
- EvasiveAce
- EmoUsedHM01
- francktrouillez
- JakubHanko - JakubHanko
- FredeX
- PigeonBar
- prime-dialga
- rnicar245
- rationality6
- Neverblade
- Corrade
- Admiral-Billy
- okimin
- Arxalc
- PrabbyDD
- JonStudders - JonStudders
- karl-police - karl-police
- prateau - lucfd
- meepen - Lugiadrien
- arColm - madibye
- allen925 - mattrossdev
- InfernoVulpix
- snoozbuster
- zaccie
- happinyz
- PyGaVS
- mcmontag - mcmontag
- ElizaAlex - meepen
- AsdarDevelops - Mewtwo2387
- Vassiat - muscode
- RedstonewolfX - Neverblade
- Sam/Flashfyre (initial developer, started PokéRogue) - NxKarim
- Greenlamp - okimin
- bennybroseph
- OrangeRed - OrangeRed
- Dakurei - PigeonBar
- Brain Frog - PrabbyDD
- prateau
- prime-dialga
- PyGaVS
- rationality6
- RedstonewolfX
- ReneGV
- rnicar245
- Sam aka Flashfyre (initial developer, started PokéRogue)
- schmidtc1
- shayebeadling
- sirzento
- snoozbuster
- sodaMelon
- td76099
- Vassiat
- Xiaphear
- zaccie
- zacharied
- Zé Ricardo
# 🌎 Translation # 🌎 Translation

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "pokemon-rogue-battle", "name": "pokemon-rogue-battle",
"version": "1.3.0", "version": "1.4.0",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "pokemon-rogue-battle", "name": "pokemon-rogue-battle",
"version": "1.3.0", "version": "1.4.0",
"hasInstallScript": true, "hasInstallScript": true,
"dependencies": { "dependencies": {
"@material/material-color-utilities": "^0.2.7", "@material/material-color-utilities": "^0.2.7",

View File

@ -1,7 +1,7 @@
{ {
"name": "pokemon-rogue-battle", "name": "pokemon-rogue-battle",
"private": true, "private": true,
"version": "1.3.0", "version": "1.4.0",
"type": "module", "type": "module",
"scripts": { "scripts": {
"start": "vite", "start": "vite",

@ -1 +1 @@
Subproject commit 1dc4d5dd238db8bbf64535c3274056abd199d404 Subproject commit 6c6f0af398ae11f8d96c6ac064f171d927812c85