Merge remote-tracking branch 'origin/main' · Porting-Dead-Mods/Researchd@fa98966 · GitHub

Commit

Merge remote-tracking branch 'origin/main'

Browse files

# Conflicts:
#	src/main/java/com/portingdeadmods/researchd/client/screens/queue/QueueEntryWidget.java
#	src/main/java/com/portingdeadmods/researchd/client/screens/queue/ResearchQueueWidget.java

Loading branch information

Thepigcat76 committed Jan 23, 2025

2 parents 186cf93 + 3b33673 commit fa98966