Skip to content

Actions: Slimefun/Slimefun4

Actions

Merge Conflicts

Actions

Loading...
Loading

Show workflow options

Create status badge

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

Filter by Event

Filter by Status

Filter by Branch

Filter by Actor

[CI skip] Update dependency org.mockito:mockito-core to v5.10.0 Merge Conflicts #1464: Commit 4dcd73b pushed by TheBusyBot
February 22, 2024 22:12 36s master
master
February 22, 2024 22:12 36s
[CI skip] Update dependency org.apache.maven.plugins:maven-surefire-p… Merge Conflicts #1463: Commit 29bafa5 pushed by TheBusyBot
February 22, 2024 22:11 28s master
master
February 22, 2024 22:11 28s
[CI skip] Update dependency org.apache.maven.plugins:maven-compiler-p… Merge Conflicts #1462: Commit 629a6f6 pushed by TheBusyBot
February 22, 2024 22:11 35s master
master
February 22, 2024 22:11 35s
[CI skip] Update pascalgn/automerge-action action to v0.16.2 Merge Conflicts #1461: Commit a94ab18 pushed by TheBusyBot
February 22, 2024 22:11 43s master
master
February 22, 2024 22:11 43s
fix dupe glitch with backpacks (#4134) Merge Conflicts #1460: Commit 3301a77 pushed by Sfiguz7
February 17, 2024 18:32 37s master
master
February 17, 2024 18:32 37s
Add new analytics service (#4067) Merge Conflicts #1459: Commit bf40206 pushed by WalshyDev
February 17, 2024 16:23 35s master
master
February 17, 2024 16:23 35s
Fixes guide search when using colored chat (#4125) Merge Conflicts #1458: Commit 8666bbc pushed by WalshyDev
February 16, 2024 21:52 37s master
master
February 16, 2024 21:52 37s
Fixes exhaustion when loading large profiles (#4127) Merge Conflicts #1457: Commit 5be4718 pushed by Sfiguz7
February 14, 2024 14:56 41s master
master
February 14, 2024 14:56 41s
Fixes #4123 - Coal Generator will no longer be locked after researchi… Merge Conflicts #1456: Commit 98bc59e pushed by WalshyDev
February 10, 2024 10:43 37s master
master
February 10, 2024 10:43 37s
Add update warning to /sf versions (#4096) Merge Conflicts #1455: Commit 86fa6f8 pushed by WalshyDev
February 10, 2024 02:09 38s master
master
February 10, 2024 02:09 38s
Move PlayerProfile saving off the main thread (#4119) Merge Conflicts #1454: Commit da9c2ac pushed by WalshyDev
February 7, 2024 09:26 37s master
master
February 7, 2024 09:26 37s
fix: fix spawn in ArmorStandUtils (#4109) Merge Conflicts #1453: Commit cd3672c pushed by WalshyDev
January 21, 2024 14:49 38s master
master
January 21, 2024 14:49 38s
Make SlimefunItem#getOptionalByItem static like intended (#4098) Merge Conflicts #1452: Commit 31c7c4e pushed by WalshyDev
January 20, 2024 21:10 36s master
master
January 20, 2024 21:10 36s
fix slimefun blocks turning into vanilla blocks for 1.20.1 and lower … Merge Conflicts #1451: Commit c95bcc9 pushed by WalshyDev
January 19, 2024 19:57 37s master
master
January 19, 2024 19:57 37s
✨ feat(api): Introduce SlimefunItemRegistryFinalizedEvent (#… Merge Conflicts #1450: Commit 7c917c3 pushed by WalshyDev
January 18, 2024 14:07 30s master
master
January 18, 2024 14:07 30s
[CI skip] Update actions/cache action to v4 Merge Conflicts #1449: Commit bcdde8c pushed by TheBusyBot
January 18, 2024 14:06 1m 0s master
master
January 18, 2024 14:06 1m 0s
fix slimefun block turning into a vanilla block if there are viewers … Merge Conflicts #1448: Commit bcfbd3a pushed by WalshyDev
January 17, 2024 16:26 36s master
master
January 17, 2024 16:26 36s
[CI skip] Update dependency org.mockito:mockito-core to v5.9.0 Merge Conflicts #1447: Commit 9fba3f6 pushed by TheBusyBot
January 17, 2024 16:16 38s master
master
January 17, 2024 16:16 38s
Update dough to fix item stacking issue (#4100) Merge Conflicts #1446: Commit f7b42a1 pushed by Sfiguz7
January 17, 2024 10:27 41s master
master
January 17, 2024 10:27 41s
fix items not being able to be placed on ancient altar (#4094) Merge Conflicts #1445: Commit 6bc1b1f pushed by WalshyDev
January 16, 2024 12:08 40s master
master
January 16, 2024 12:08 40s
Update MockBukkit to 1.20.4 along with existing tests (#4086) Merge Conflicts #1444: Commit eb4d23e pushed by WalshyDev
January 15, 2024 13:40 40s master
master
January 15, 2024 13:40 40s
Fix another bug with interaction fix and add more interaction tests (… Merge Conflicts #1443: Commit 1fb27b9 pushed by WalshyDev
January 14, 2024 11:02 35s master
master
January 14, 2024 11:02 35s
Fixes NPE when interacting with air (#4089) Merge Conflicts #1442: Commit 86533a8 pushed by Sfiguz7
January 13, 2024 16:38 38s master
master
January 13, 2024 16:38 38s
Fixes #4087 Merge Conflicts #1441: Commit a78cba0 pushed by WalshyDev
January 13, 2024 13:53 39s master
master
January 13, 2024 13:53 39s
Fix backpack IDs not incrementing (#4081) Merge Conflicts #1440: Commit 158c6ee pushed by WalshyDev
January 7, 2024 09:19 40s master
master
January 7, 2024 09:19 40s