Update current members, move Salvador to past members

src/book/01-team/01-introduction/03-current-team.mdx

@@ -10,81 +10,82 @@ authors:
   - Lachlan Court (@LachlanCourt)
 ---
 
-![The NUbots team for RoboCup 2025 Salvador](./images/robocup-team-2025.png 'The NUbots team for RoboCup 2025')
+![The rUNSWift + NUbots team for the 2025 World Humanoid Robot Games in Beijing](./images/beijing-2025.jpg 'The rUNSWift + NUbots team for the 2025 World Humanoid Robot Games')
 
-Left to right: Ysobel Sims, Liam Craft, Trent Houliston, Clayton Carlon (back), Johanne Montano, Liam Patey-Dennis (front), Thomas O'Brien, Angelique Herfel (front), Dexter Konijn
+Left to right: Hengning "Henry" Xu, Angelique Herfel (front), Claude Sammut (UNSW), Clayton Carlon, Mithun Sivanesan, William Burgin, Thomas O'Brien, (UNSW), Johanne Montano, UNSW, UNSW, UNSW, Lucinda Fien (not in picture)
 
 ## Academic Supervisors
 
-- **Professor Stephan Chalup**: Professor in the School of School of Information and Physical Sciences. Head of the Newcastle Robotics Laboratory and NUbots. Specialises in Machine Learning and Anthropocentric Biocybernetic Computing.
+- **Professor Stephan Chalup**: Professor in the School of Computer and Information Sciences. Head of the Newcastle Robotics Laboratory and NUbots. Specialises in Machine Learning and Anthropocentric Biocybernetic Computing.
 
-- **Dr. Alexandre Mendes**: Senior Lecturer in the School of Information and Physical Sciences. Deputy Head of NUbots. Specialises in Machine Learning and Optimisation.
+- **Dr. Alexandre Mendes**: Senior Lecturer in the School of Computer and Information Sciences. Deputy Head of NUbots. Specialises in Machine Learning and Optimisation.
 
 - **Dr. Alejandro Donaire**: Senior Lecturer in the School of Engineering. Specialises in control systems. Supervises NUbots Mechatronics final year projects in a range of areas.
 
-- **Dr. Khaled Saleh**: Lecturer in the School of Information and Physical Sciences. Specialises in Machine Learning and Autonomous Systems. Supervises NUbots Software Engineering final year projects in a range of areas.
+- **Dr. Khaled Saleh**: Lecturer in the School of Computer and Information Sciences. Specialises in Machine Learning and Autonomous Systems. Supervises NUbots Software Engineering final year projects in a range of areas.
+
+- **Dr. Roxy Jackson**: Lecturer in the School of Engineering. Supervises NUbots Mechatronics final year projects.
 
 ## Student Members
 
 - **Joe Bailey**: B Comp Sci. Studying Computing Honours. Vision data generation and benchmarking.
 
-- **Ethan Bird**: Undergraduate studying B Soft Eng. Localisation.
+- **Sebastian Brooker**: Undergraduate studying B Mechatronics Eng. Localisation.
 
 - **William Burgin**: Undergraduate studying B Mechatronics Eng. Localisation.
 
 - **Clayton Carlon**: B Comp Sys Eng (Hons), B Elec Eng (Hons). PhD student in Elec Eng. Team Leader. Electronics and audio signal processing.
 
-- **Lucinda Fien**: Undergraduate studying B Mechatronics Eng. Motion.
+- **Tristan Dyson**: Undergraduate studying B Computer Science and Data Science. Computer vision.
 
-- **Angelique Herfel**: Undergraduate studying B Soft Eng. Vision and behaviour.
+- **Lucinda Fien**: Undergraduate studying B Mechatronics Eng. Motion.
 
 - **Kim Khang Hoang**: Undergraduate studying B Comp Sci. NUsight development.
 
 - **Johanne Montano**: Undergraduate studying combined B Comp Sys Eng and B Math. Electronics and vision.
 
-- **Minh Thai "Jimmy" Nguyen**: Undergraduate studying B Comp Sci. Behaviour and path planning.
-
-- **Thomas O'Brien**: B Mechatronics Eng. PhD student in Mechatronics Eng. Motions, behaviour and localisation.
-
 - **Corah Oliver**: Undergraduate studying B Comp Sci. Outreach Manager. Darwin-OP assembly and hardware design.
 
-- **Liam Patey-Dennis**: Undergraduate studying B Elec Eng. Outreach and Social Media Manager. Electronics.
+- **Miles Punch**: Undergraduate studying B Mechatronics Eng. Embedded systems and localisation.
 
 - **Ali Riyaz**: Undergraduate studying B Soft Eng. Reinforcement learning behaviour.
 
 - **Mithun Sivanesan**: Undergraduate studying B Soft Eng. Localisation and vision.
 
 - **Vincent Tumminello**: Undergraduate studying B Mechatronics Eng. Motion.
 
-- **David Wieland**: B IT. Postgraduate studying M Data Science. Specialises in community outreach, sponsorships and marketing.
-
 - **Hengning "Henry" Xu**: PhD student in Elec Eng. Control and reinforcement learning.
 
 ## Junior Members
 
-- **Samuel Flood**, studying a Bachelor of Mechatronics Eng.
-- **Jo Lynch**, studying a Bachelor of Comp Sci.
-- **Sean Cyril Yu**, studying a Master of Mech Eng
+- Austin Bagnall, Software Eng
+- Thomas Harvey, Electrical Eng
+- Benjamin Hallett, Computer Science
+- Edward Jomon, Mechatronics Eng
+- Jason McCoy, Computing Honours
+- Nikita Mingazov, Computer Science
 
 ## Supporting Members
 
 Past members of the team that are still involved with projects, mentoring, and support.
 
 - **Brendan Annable**: B Soft Eng. Ex-Team Leader. Lead Developer of NUsight.
 
-- **Dr. Alex Biddulph**: PhD Comp Sys Eng, B Comp Sci, B Comp Sys Eng (Hons). Ex-Team Leader. Currently at 4AI Systems. Specialises in the Build System, Machine Learning and Computer Vision.
+- **Dr. Alex Biddulph**: PhD Comp Sys Eng, B Comp Sci, B Comp Sys Eng (Hons). Ex-Team Leader. Currently at 4AI Systems. Build system, machine learning and computer vision.
+
+- **Liam Craft**: B Comp Sci (Hons). Currently at 4Tel. Hardware design and machine learning.
 
-- **Kip Hamiltons**: B Math and Comp Sci. Ex-Lead of DevOps. Currently at Macquarie Group.
+- **Angelique Herfel**: B Soft Eng. Currently at 4Tel. Computer vision and behaviour.
 
-- **Dr. Trent Houliston**: PhD Soft Eng. Ex-Team Leader. Currently at 4AI Systems. Specialises in Software Architecture, Machine Learning and Computer Vision.
+- **Dr. Trent Houliston**: PhD Soft Eng. Ex-Team Leader. Currently at 4AI Systems. Software architecture, machine learning and computer vision.
 
-- **Cameron Murtagh**: B Math. Currently at AMD. DevOps and software.
+- **Thomas O'Brien**: B Mechatronics Eng. PhD submitted in Mechanical Eng. Ex-Team Leader. Control and localisation.
 
-- **Liam Craft**: B Comp Sci (Hons). Currently at 4Tel. Hardware design and Machine Learning.
+- **Josephus Paye II**: B Comp Sci. Ex-Team Leader. Web dev.
 
-- **Josephus Paye II**: B Comp Sci. Ex-Team Leader. Works on NUsight, our web-based debugging environment, and NUbook, the team handbook.
+- **Ysobel Sims**: B Math and Comp Sci. PhD submitted in Comp Sci. Ex-Team Leader. Currently at Macquarie University. Machine learning.
 
-- **Ysobel Sims**: B Math and Comp Sci. PhD submitted in Comp Sci. Currently at Macquarie University. Vision, behaviour, DevOps.
+- **David Wieland**: B IT. Specialises in community outreach, sponsorships and marketing.
 
 - **Taylor Young**: B Elec Eng (Hons). PhD candidate in Elec Eng. Hardware and electronics.
 

src/book/01-team/04-history/02-past-members.mdx

@@ -9,6 +9,12 @@ authors:
   - Josephus Paye II (@JosephusPaye)
 ---
 
+## RoboCup Salvador 2025
+
+![The NUbots team for RoboCup 2025 Salvador](./images/robocup-team-2025.png 'The NUbots team for RoboCup 2025')
+
+Left to right: Ysobel Sims, Liam Craft, Trent Houliston, Clayton Carlon (back), Johanne Montano, Liam Patey-Dennis (front), Thomas O'Brien, Angelique Herfel (front), Dexter Konijn
+
 ## RoboCup Eindhoven 2024
 
 ![The NUbots team for RoboCup 2024 Eindhoven](./images/robocup-team-2024.jpg 'The NUbots team for RoboCup 2024')
@@ -25,6 +31,6 @@ Front (left to right): Jesse Perrin, Jason Disher, Joe Bailey, Ysobel Sims
 
 ## RoboCup Bangkok 2022
 
-![The NUbots team for RoboCup 2022 Bangkok](./images/team-photo-robocup-2022.jpeg 'The NUbots team for RoboCup 2022')
+![The NUbots team for RoboCup 2022 Bangkok](./images/robocup-team-2022.jpeg 'The NUbots team for RoboCup 2022')
 
 Left to right: Abigail Hall, Liam Craft, Ysobel Sims, Thomas O'Brien, Lachlan Court, Bryce Tuppurainen, Alana Noonan, Mikyla Peters