Skip to content

Actions: MrMelbert/MapleStationCode

Actions

Check for merge conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
conflicts.yml
202 workflow runs
202 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

Speech sounds for carbon mobs work on tongue rather than species. (#652) Check for merge conflicts #555: Commit 841ab1f pushed by MrMelbert
February 2, 2025 23:13 7m 2s master
master
February 2, 2025 23:13 7m 2s
Adds a bespoke pre-game lobby chat (#657) Check for merge conflicts #554: Commit 9bfc575 pushed by MrMelbert
February 2, 2025 23:11 8m 12s master
master
February 2, 2025 23:11 8m 12s
Moves init time display out of chat (and make it hideable since most … Check for merge conflicts #553: Commit c3e9e05 pushed by MrMelbert
February 2, 2025 23:11 41s master
master
February 2, 2025 23:11 41s
Emotes are affeceted by voice pitch / frequency (#654) Check for merge conflicts #552: Commit 3bd7e43 pushed by MrMelbert
February 2, 2025 23:09 46s master
master
February 2, 2025 23:09 46s
Heath System Rework (#579) Check for merge conflicts #551: Commit 0067ac0 pushed by MrMelbert
January 27, 2025 05:25 41s master
master
January 27, 2025 05:25 41s
Adds 2 new posters to the game (#653) Check for merge conflicts #550: Commit c238fe5 pushed by MrMelbert
January 26, 2025 23:31 42s master
master
January 26, 2025 23:31 42s
Adds more of my own character content, plus two bits of generic conte… Check for merge conflicts #549: Commit 21fcfee pushed by MrMelbert
January 26, 2025 22:08 40s master
master
January 26, 2025 22:08 40s
Fix Master (#651) Check for merge conflicts #548: Commit 4e8bc38 pushed by MrMelbert
January 25, 2025 22:02 42s master
master
January 25, 2025 22:02 42s
Adds in the colorblind quirk. (#632) Check for merge conflicts #547: Commit 34090ec pushed by MrMelbert
January 25, 2025 19:36 1m 11s master
master
January 25, 2025 19:36 1m 11s
Support for holiday loadout items (and also custom lipstick colors I … Check for merge conflicts #546: Commit d816694 pushed by MrMelbert
January 25, 2025 19:35 44s master
master
January 25, 2025 19:35 44s
Readds language radio keys to cargo + framework for arbitrary mutual … Check for merge conflicts #545: Commit cb3846a pushed by MrMelbert
January 25, 2025 19:35 55s master
master
January 25, 2025 19:35 55s
[IDB Ignore] Some fresh Cherry Picks (#649) Check for merge conflicts #544: Commit 98a57ce pushed by MrMelbert
January 25, 2025 08:32 41s master
master
January 25, 2025 08:32 41s
Label action test Check for merge conflicts #543: Commit 406d933 pushed by MrMelbert
January 21, 2025 03:20 38s master
master
January 21, 2025 03:20 38s
Fix Silverscale statue on Multi z maps (#646) Check for merge conflicts #542: Commit d21a5b8 pushed by MrMelbert
January 14, 2025 20:12 39s master
master
January 14, 2025 20:12 39s
Adds chaplain's revolver to Nullrod selection (#641) Check for merge conflicts #541: Commit 4564278 pushed by MrMelbert
January 13, 2025 04:24 30s master
master
January 13, 2025 04:24 30s
Adds Minorly Mutation quirk (#639) Check for merge conflicts #540: Commit 3617f1e pushed by MrMelbert
January 13, 2025 04:23 43s master
master
January 13, 2025 04:23 43s
Ports the Primidine Starfruit from NovaSector as the Murian Starfruit… Check for merge conflicts #539: Commit ace4b76 pushed by MrMelbert
January 12, 2025 23:23 37s master
master
January 12, 2025 23:23 37s
Cherry-picks two server security fixes. (#629) Check for merge conflicts #538: Commit 4c3683a pushed by MrMelbert
January 5, 2025 19:33 9m 10s master
master
January 5, 2025 19:33 9m 10s
Fixes Go-Juice's Reaction. (#638) Check for merge conflicts #537: Commit 061997e pushed by MrMelbert
January 5, 2025 19:32 57s master
master
January 5, 2025 19:32 57s
Language Menu (like the one in the preferences) Rework (#631) Check for merge conflicts #536: Commit 92af125 pushed by MrMelbert
December 22, 2024 18:31 7m 13s master
master
December 22, 2024 18:31 7m 13s
Adds partial language understanding (#630) Check for merge conflicts #535: Commit 43fe884 pushed by MrMelbert
December 22, 2024 18:28 44s master
master
December 22, 2024 18:28 44s
localnode has been repaired (#634) Check for merge conflicts #534: Commit 06ad29c pushed by MrMelbert
December 22, 2024 18:27 39s master
master
December 22, 2024 18:27 39s
Silverscale blood runtime fixes and tweaks (#628) Check for merge conflicts #533: Commit 371e079 pushed by MrMelbert
December 12, 2024 01:52 45s master
master
December 12, 2024 01:52 45s
Blood drying optimization (#626) Check for merge conflicts #532: Commit 37ad2c9 pushed by MrMelbert
December 2, 2024 08:46 37s master
master
December 2, 2024 08:46 37s
Part one of the Magic Rework (#501) Check for merge conflicts #531: Commit 72eb9b3 pushed by MrMelbert
December 2, 2024 03:04 37s master
master
December 2, 2024 03:04 37s