Skip to content

Actions: Slimefun/Slimefun4

Actions

Merge Conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

Loading
merge-conflicts.yml
128 workflow runs
128 workflow runs

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

[CI skip] Update WalshyDev/blob-builds digest to ea9ecd9 Merge Conflicts #1514: Commit a1a2abb pushed by TheBusyBot
January 12, 2025 11:03 35s master
master
January 12, 2025 11:03 35s
[CI skip] New locale updates from Crowdin Merge Conflicts #1513: Commit bf53c34 pushed by TheBusyBot
January 12, 2025 11:01 33s master
master
January 12, 2025 11:01 33s
[CI skip] Update dependency org.junit:junit-bom to v5.11.4 Merge Conflicts #1512: Commit 02b00af pushed by TheBusyBot
January 12, 2025 10:17 29s master
master
January 12, 2025 10:17 29s
[CI skip] Update dependency org.apache.maven.plugins:maven-surefire-p… Merge Conflicts #1511: Commit 6e9cd72 pushed by TheBusyBot
January 12, 2025 10:17 34s master
master
January 12, 2025 10:17 34s
[CI skip] Update dependency org.sonarsource.scanner.maven:sonar-maven… Merge Conflicts #1510: Commit 1ffcb46 pushed by TheBusyBot
January 12, 2025 10:17 37s master
master
January 12, 2025 10:17 37s
[CI skip] Update dependency org.apache.maven.plugins:maven-javadoc-pl… Merge Conflicts #1509: Commit 66c69b3 pushed by TheBusyBot
January 11, 2025 19:16 41s master
master
January 11, 2025 19:16 41s
Refactor ticker task to use a thread-safe Set implementation for tick… Merge Conflicts #1508: Commit 755a7eb pushed by TheBusyBiscuit
January 11, 2025 19:12 34s master
master
January 11, 2025 19:12 34s
[CI skip] Update pascalgn/automerge-action action to v0.16.4 Merge Conflicts #1507: Commit 11cea2d pushed by TheBusyBot
January 11, 2025 18:31 36s master
master
January 11, 2025 18:31 36s
[CI skip] Update dependency org.jacoco:jacoco-maven-plugin to v0.8.12 Merge Conflicts #1506: Commit d90e2dc pushed by TheBusyBot
January 11, 2025 18:30 31s master
master
January 11, 2025 18:30 31s
[CI skip] Update dependency org.apache.maven.plugins:maven-shade-plug… Merge Conflicts #1505: Commit 0dcc33e pushed by TheBusyBot
January 11, 2025 18:29 37s master
master
January 11, 2025 18:29 37s
[CI skip] Update actions/setup-java action to v4.6.0 Merge Conflicts #1504: Commit b027af3 pushed by TheBusyBot
January 11, 2025 18:28 27s master
master
January 11, 2025 18:28 27s
[CI skip] Update dependency com.sk89q.worldedit:worldedit-bukkit to v… Merge Conflicts #1503: Commit af260b2 pushed by TheBusyBot
January 11, 2025 18:28 40s master
master
January 11, 2025 18:28 40s
[CI skip] Update dependency com.sk89q.worldedit:worldedit-core to v7.3.9 Merge Conflicts #1502: Commit 4e00aad pushed by TheBusyBot
January 11, 2025 18:27 38s master
master
January 11, 2025 18:27 38s
[CI skip] Update dependency org.mockito:mockito-core to v5.15.2 Merge Conflicts #1501: Commit 7d0b12b pushed by TheBusyBot
January 11, 2025 18:27 38s master
master
January 11, 2025 18:27 38s
[CI skip] Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.2.029 Merge Conflicts #1500: Commit c145027 pushed by TheBusyBot
January 11, 2025 18:26 37s master
master
January 11, 2025 18:26 37s
[CI skip] Update dependency org.sonarsource.scanner.maven:sonar-maven… Merge Conflicts #1499: Commit 2317d1e pushed by TheBusyBot
January 11, 2025 18:26 27s master
master
January 11, 2025 18:26 27s
[CI skip] Update actions/checkout action to v4.2.2 Merge Conflicts #1498: Commit c85175d pushed by TheBusyBot
January 11, 2025 18:25 42s master
master
January 11, 2025 18:25 42s
[CI skip] Update dependency org.slf4j:slf4j-simple to v2.0.16 Merge Conflicts #1497: Commit bbf7830 pushed by TheBusyBot
January 11, 2025 18:25 26s master
master
January 11, 2025 18:25 26s
[CI skip] Update dependency me.clip:placeholderapi to v2.11.6 Merge Conflicts #1496: Commit ee349a5 pushed by TheBusyBot
January 11, 2025 18:25 37s master
master
January 11, 2025 18:25 37s
Fix message (#4263) Merge Conflicts #1495: Commit 1a4ddc5 pushed by TheBusyBiscuit
January 11, 2025 18:06 31s master
master
January 11, 2025 18:06 31s
[CI skip] Add simple BlockPosition based BlockStorage helpers. (#4244) Merge Conflicts #1494: Commit 9ce8955 pushed by TheBusyBiscuit
January 11, 2025 18:06 39s master
master
January 11, 2025 18:06 39s
api/Open up range field (#4231) Merge Conflicts #1493: Commit d12ae85 pushed by WalshyDev
November 9, 2024 19:28 40s master
master
November 9, 2024 19:28 40s
Log non-200 on metrics download (#4239) Merge Conflicts #1492: Commit 0a7fea8 pushed by WalshyDev
September 22, 2024 13:28 27s master
master
September 22, 2024 13:28 27s
chore: localization for options menu (#4189) Merge Conflicts #1491: Commit b560db1 pushed by WalshyDev
September 22, 2024 13:28 36s master
master
September 22, 2024 13:28 36s
Update to 1.20.5 (#4186) Merge Conflicts #1490: Commit 4e46546 pushed by WalshyDev
September 13, 2024 17:51 43s master
master
September 13, 2024 17:51 43s