| Component | Translated | Unfinished | Unfinished words | Unfinished characters | Untranslated | Checks | Suggestions | Comments | |
|---|---|---|---|---|---|---|---|---|---|
| XCore Plugin MIT | 33% | 2,766 | 24,347 | 156,867 | 2,670 | 202 | 131 | 0 | |
| Glossary XCore MIT | 88% | 1 | 1 | 5 | 1 | 0 | 0 | 0 | |
Summary
| Project website | github.com/XCore-mindustry | |
|---|---|---|
03/13/2026
String statistics
| Strings percent | Hosted strings | Words percent | Hosted words | Characters percent | Hosted characters | |
|---|---|---|---|---|---|---|
| Total | 4,185 | 36,288 | 233,217 | |||
| Source | 465 | 4,032 | 25,913 | |||
| Translated | 33% | 1,418 | 32% | 11,940 | 32% | 76,345 |
| Needs editing | 2% | 96 | 2% | 973 | 2% | 6,531 |
| Read-only | 1% | 8 | 1% | 8 | 1% | 40 |
| Failing checks | 4% | 202 | 5% | 1,860 | 5% | 12,301 |
| Strings with suggestions | 3% | 131 | 2% | 1,064 | 2% | 6,505 |
| Untranslated strings | 63% | 2,671 | 64% | 23,375 | 64% | 150,341 |
Quick numbers
36,288
Hosted words
4,185
Hosted strings
33%
Translated
2
Components
9
Languages
18
Translations
0
Screenshots
and previous 30 days
Trends of last 30 days
+77%
Hosted words
+100%
+77%
Hosted strings
+100%
−49%
Translated
+83%
+50%
Contributors
+100%
| Language | Translated | Unfinished | Unfinished words | Unfinished characters | Untranslated | Checks | Suggestions | Comments | |
|---|---|---|---|---|---|---|---|---|---|
| English | 100% | 0 | 0 | 0 | 0 | 65 | 0 | 0 | |
| Belarusian | 18% | 378 | 3,366 | 21,563 | 348 | 34 | 39 | 0 | |
| Czech | 1% | 464 | 4,031 | 25,908 | 464 | 0 | 0 | 0 | |
| French | 1% | 464 | 4,031 | 25,908 | 464 | 0 | 0 | 0 | |
| German | 1% | 464 | 4,031 | 25,908 | 464 | 0 | 0 | 0 | |
| Polish | 1% | 464 | 4,031 | 25,908 | 464 | 0 | 0 | 0 | |
| Russian | 86% | 64 | 607 | 4,089 | 3 | 95 | 92 | 0 | |
| Spanish | 1% | 464 | 4,031 | 25,908 | 464 | 0 | 0 | 0 | |
| Ukrainian | 98% | 5 | 220 | 1,680 | 0 | 8 | 0 | 0 | |
 webhook:github
Repository rebase failed |
03/18/2026
|
|
webhook:github
Repository notification received |
GitHub: https://api.github.com/repos/XCore-mindustry/XCore-plugin, main
03/18/2026
|
 None
Alert triggered |
Repository has changes.
03/15/2026
|
|
None
Alert triggered |
Repository outdated.
03/15/2026
|
|
webhook:github
Repository rebase failed |
warning: skipped previously applied commit d091f9c warning: skipped previously applied commit 80b21b1 warning: skipped previously applied commit ae6089b warning: skipped previously applied commit 26b141c warning: skipped previously applied commit 4ba4166 warning: skipped previously applied commit 69d7431 warning: skipped previously applied commit 7ea4040 warning: skipped previously applied commit d1252fc warning: skipped previously applied commit f309cb1 warning: skipped previously applied commit c1d4ad9 warning: skipped previously applied commit b180e34 warning: skipped previously applied commit 4d6b361 warning: skipped previously applied commit c662585 warning: skipped previously applied commit 0995d9b warning: skipped previously applied commit d297fb7 warning: skipped previously applied commit 6d64d3a warning: skipped previously applied commit 17fd886 warning: skipped previously applied commit 61f51e5 warning: skipped previously applied commit a39f321 warning: skipped previously applied commit 6574ec0 warning: skipped previously applied commit b1a03db warning: skipped previously applied commit 06ff4c3 warning: skipped previously applied commit d49a816 warning: skipped previously applied commit 43d14a6 warning: skipped previously applied commit 6c1b0f2 warning: skipped previously applied commit aa57498 warning: skipped previously applied commit abc8896 warning: skipped previously applied commit bdc759f warning: skipped previously applied commit 1f6937d warning: skipped previously applied commit b5b4e87 warning: skipped previously applied commit c0be651 warning: skipped previously applied commit f06c1d1 warning: skipped previously applied commit 537b090 warning: skipped previously applied commit 71896f0 warning: skipped previously applied commit 82726ef warning: skipped previously applied commit 0aadee7 warning: skipped previously applied commit 5829150 warning: skipped previously applied commit 032947f warning: skipped previously applied commit edc03b5 warning: skipped previously applied commit ddd62bf warning: skipped previously applied commit a3ba244 warning: skipped previously applied commit 9265e6a warning: skipped previously applied commit 8c72d58 warning: skipped previously applied commit 83ac917 warning: skipped previously applied commit 8a5a9e6 warning: skipped previously applied commit 71d1863 warning: skipped previously applied commit aa8db73 warning: skipped previously applied commit 4cf1cbb warning: skipped previously applied commit 81c17b1 warning: skipped previously applied commit 397ffb7 warning: skipped previously applied commit b522d6d warning: skipped previously applied commit 70df3d4 warning: skipped previously applied commit c113779 warning: skipped previously applied commit 06dd455 warning: skipped previously applied commit 8f37e43 warning: skipped previously applied commit a4adcc1 warning: skipped previously applied commit 4a295fc warning: skipped previously applied commit 324b6ad warning: skipped previously applied commit 1280382 warning: skipped previously applied commit 543fde4 warning: skipped previously applied commit 0048666 warning: skipped previously applied commit 1767fdb warning: skipped previously applied commit 7547149 warning: skipped previously applied commit a535b67 warning: skipped previously applied commit 4fa714e warning: skipped previously applied commit 5e325c5 warning: skipped previously applied commit 2ef155e warning: skipped previously applied commit 21e632c warning: skipped previously applied commit 0371900 warning: skipped previously applied commit 538379b warning: skipped previously applied commit 5d44f84 warning: skipped previously applied commit e5ab201 warning: skipped previously applied commit 52229f6 warning: skipped previously applied commit bf43d75 warning: skipped previously applied commit 9263995 warning: skipped previously applied commit 1c13d91 warning: skipped previously applied commit 7775e6c warning: skipped previously applied commit dc06802 warning: skipped previously applied commit 51ac6d3 warning: skipped previously applied commit 2142af7 warning: skipped previously applied commit 7fea0d6 warning: skipped previously applied commit 8a17245 warning: skipped previously applied commit 9a6b45e warning: skipped previously applied commit 2329d0e warning: skipped previously applied commit 26fa24f warning: skipped previously applied commit 5a16b74 warning: skipped previously applied commit 3f94990 warning: skipped previously applied commit 92c311e warning: skipped previously applied commit 1d14dc8 warning: skipped previously applied commit 77bf402 warning: skipped previously applied commit f1b8017 warning: skipped previously applied commit 8eeddd7 warning: skipped previously applied commit 3e86b4b warning: skipped previously applied commit 44d26b5 warning: skipped previously applied commit a6be04e warning: skipped previously applied commit 43324c6 warning: skipped previously applied commit 70e5a1a warning: skipped previously applied commit 95a6982 warning: skipped previously applied commit b2e6b63 warning: skipped previously applied commit b2627bf warning: skipped previously applied commit 1263c12 warning: skipped previously applied commit c74202b warning: skipped previously applied commit 7d048e3 warning: skipped previously applied commit b572727 warning: skipped previously applied commit 689a42b warning: skipped previously applied commit 32ea041 warning: skipped previously applied commit 7191b7f warning: skipped previously applied commit f7cf460 warning: skipped previously applied commit 2eff1a7 warning: skipped previously applied commit 0b7e5e3 warning: skipped previously applied commit ea89ef1 warning: skipped previously applied commit 1647349 warning: skipped previously applied commit cb3c1e7 warning: skipped previously applied commit f2dd64d warning: skipped previously applied commit 656b25e warning: skipped previously applied commit c85ccdd warning: skipped previously applied commit abac5c0 warning: skipped previously applied commit 1e87b69 warning: skipped previously applied commit 28aa6ed warning: skipped previously applied commit 67cce58 warning: skipped previously applied commit c95ce3b warning: skipped previously applied commit 446a520 warning: skipped previously applied commit 0a9a00e warning: skipped previously applied commit 512645b warning: skipped previously applied commit a781be9 warning: skipped previously applied commit cdc7971 warning: skipped previously applied commit 769bffc warning: skipped previously applied commit 406adca warning: skipped previously applied commit f9ee5f9 warning: skipped previously applied commit b79680c warning: skipped previously applied commit 747ff8f warning: skipped previously applied commit 1598044 warning: skipped previously applied commit afb2169 warning: skipped previously applied commit b1aef44 warning: skipped previously applied commit 7d0a63a warning: skipped previously applied commit dab1821 warning: skipped previously applied commit f8da4c5 warning: skipped previously applied commit 4d22077 warning: skipped previously applied commit 30e26f3 warning: skipped previously applied commit 2b3163d warning: skipped previously applied commit adcd753 warning: skipped previously applied commit 5c1b278 warning: skipped previously applied commit e1a682e warning: skipped previously applied commit 6d1a7b1 warning: skipped previously applied commit 798ae4c warning: skipped previously applied commit 24cda32 warning: skipped previously applied commit 04e5b4b warning: skipped previously applied commit a62af45 warning: skipped previously applied commit e88210d warning: skipped previously applied commit e090ca0 warning: skipped previously applied commit ddbeb92 warning: skipped previously applied commit bdbf838 warning: skipped previously applied commit 4154307 warning: skipped previously applied commit 27d2278 warning: skipped previously applied commit 3efaf1e warning: skipped previously applied commit 4c13841 warning: skipped previously applied commit 65fefc5 warning: skipped previously applied commit cbfa3cf warning: skipped previously applied commit 0fb1f3a warning: skipped previously applied commit b359fec warning: skipped previously applied commit 398d39d warning: skipped previously applied commit 04db9df warning: skipped previously applied commit 1f51d20 warning: skipped previously applied commit c0e26d9 warning: skipped previously applied commit a447804 warning: skipped previously applied commit 4816244 warning: skipped previously applied commit 8b10465 warning: skipped previously applied commit b904260 warning: skipped previously applied commit 41037bd warning: skipped previously applied commit abd21ec warning: skipped previously applied commit 226ae99 warning: skipped previously applied commit 7fbadde warning: skipped previously applied commit a0071e0 warning: skipped previously applied commit 7a38a15 warning: skipped previously applied commit 6c04761 warning: skipped previously applied commit 18687ec warning: skipped previously applied commit a035946 warning: skipped previously applied commit 1f9377f warning: skipped previously applied commit ff0c32c warning: skipped previously applied commit 73360e3 warning: skipped previously applied commit 0abd292 warning: skipped previously applied commit b2eb756 warning: skipped previously applied commit 1266dac warning: skipped previously applied commit 0579d5e warning: skipped previously applied commit 99051b7 warning: skipped previously applied commit 35542b2 warning: skipped previously applied commit 4fb8110 warning: skipped previously applied commit 38431ea warning: skipped previously applied commit beaf4eb warning: skipped previously applied commit 8c060af warning: skipped previously applied commit 0767911 warning: skipped previously applied commit caed430 warning: skipped previously applied commit ba3f891 warning: skipped previously applied commit 09e93e2 warning: skipped previously applied commit 893c781 warning: skipped previously applied commit f44cf5d warning: skipped previously applied commit ac92ef3 warning: skipped previously applied commit 5437ed2 warning: skipped previously applied commit fa312bc warning: skipped previously applied commit 711115f warning: skipped previously applied commit bd75040 warning: skipped previously applied commit 2ccf6de warning: skipped previously applied commit 27661f2 warning: skipped previously applied commit dde9710 warning: skipped previously applied commit 218ec0f warning: skipped previously applied commit 829a8bf warning: skipped previously applied commit 9de4b20 warning: skipped previously applied commit 2c439a6 warning: skipped previously applied commit be1eb43 warning: skipped previously applied commit 230cfd6 warning: skipped previously applied commit fd5eefa warning: skipped previously applied commit 4f1ef16 warning: skipped previously applied commit dc87d2e warning: skipped previously applied commit 600987d warning: skipped previously applied commit a61d823 warning: skipped previously applied commit 33018db warning: skipped previously applied commit 1b3a92f warning: skipped previously applied commit 15c603d warning: skipped previously applied commit 40114e2 warning: skipped previously applied commit 70b4e5d warning: skipped previously applied commit d0f2141 warning: skipped previously applied commit 509997c warning: skipped previously applied commit e2b115f warning: skipped previously applied commit 1556bd0 warning: skipped previously applied commit b4ad222 warning: skipped previously applied commit 59a7d08 warning: skipped previously applied commit 0002a8a warning: skipped previously applied commit af5129f warning: skipped previously applied commit 228a3f1 warning: skipped previously applied commit 430314a warning: skipped previously applied commit 3ae9966 warning: skipped previously applied commit 9e03a54 warning: skipped previously applied commit 51aede4 warning: skipped previously applied commit fe4bde0 warning: skipped previously applied commit 743c936 warning: skipped previously applied commit 67105a6 warning: skipped previously applied commit 9e81fd5 warning: skipped previously applied commit b531f5d warning: skipped previously applied commit a55700a warning: skipped previously applied commit b7a81ca warning: skipped previously applied commit da410d1 warning: skipped previously applied commit 88be6d3 warning: skipped previously applied commit f951ec2 warning: skipped previously applied commit 5b6a68b warning: skipped previously applied commit 9301fd4 warning: skipped previously applied commit 154c63e warning: skipped previously applied commit c5c5947 warning: skipped previously applied commit 2508491 warning: skipped previously applied commit 7ec6300 warning: skipped previously applied commit 5c7a0be warning: skipped previously applied commit cb2ad26 warning: skipped previously applied commit 10738ca warning: skipped previously applied commit 4ffb7e4 warning: skipped previously applied commit dddcb74 warning: skipped previously applied commit eab9979 warning: skipped previously applied commit eb245ca warning: skipped previously applied commit 41ff74f warning: skipped previously applied commit 05d96bb warning: skipped previously applied commit f9fa3bb warning: skipped previously applied commit ab6c7bf warning: skipped previously applied commit dd4376c warning: skipped previously applied commit cb97215 warning: skipped previously applied commit b7fcdef warning: skipped previously applied commit e2755be warning: skipped previously applied commit 25382aa warning: skipped previously applied commit f8d72ad warning: skipped previously applied commit 0823743 warning: skipped previously applied commit b6206cf warning: skipped previously applied commit b26c910 warning: skipped previously applied commit b2a3089 warning: skipped previously applied commit 7da4a46 warning: skipped previously applied commit 06a69d4 warning: skipped previously applied commit 5f2e3bb warning: skipped previously applied commit 970a6a5 warning: skipped previously applied commit 24273c5 warning: skipped previously applied commit 408384d warning: skipped previously applied commit b665d9e warning: skipped previously applied commit 450bddf warning: skipped previously applied commit 4f8f58c warning: skipped previously applied commit 23ec9e0 warning: skipped previously applied commit 46291d4 warning: skipped previously applied commit 8104817 warning: skipped previously applied commit d787e35 warning: skipped previously applied commit 2c481f7 warning: skipped previously applied commit 22545be warning: skipped previously applied commit 734cb6a warning: skipped previously applied commit a6707aa warning: skipped previously applied commit 8599cb9 warning: skipped previously applied commit 58b9273 warning: skipped previously applied commit 4c50b5b warning: skipped previously applied commit 8f5aa47 warning: skipped previously applied commit b149947 warning: skipped previously applied commit a964c38 warning: skipped previously applied commit b17ae62 warning: skipped previously applied commit 8baba3f warning: skipped previously applied commit 9863e7e warning: skipped previously applied commit 90738fa warning: skipped previously applied commit ba0b0d0 warning: skipped previously applied commit 2a5105e warning: skipped previously applied commit 180aa7f warning: skipped previously applied commit 5b1601d warning: skipped previously applied commit ce613f6 warning: skipped previously applied commit 589b172 warning: skipped previously applied commit 0fb5a2f warning: skipped previously applied commit 9c596e8 warning: skipped previously applied commit 10aba6c warning: skipped previously applied commit 9ab559e warning: skipped previously applied commit c3dba89 warning: skipped previously applied commit f924f7d warning: skipped previously applied commit b6fd4f1 warning: skipped previously applied commit 689c64e warning: skipped previously applied commit 222d151 warning: skipped previously applied commit fcf00c1 warning: skipped previously applied commit 887b6e9 warning: skipped previously applied commit 3c3cb16 warning: skipped previously applied commit 34e2fb9 warning: skipped previously applied commit 8ec9d3a warning: skipped previously applied commit e12bbb0 warning: skipped previously applied commit 8f4eb33 warning: skipped previously applied commit e21fb80 warning: skipped previously applied commit 4729df5 warning: skipped previously applied commit 489056c warning: skipped previously applied commit 9fbb83a warning: skipped previously applied commit 679b634 warning: skipped previously applied commit f6d9395 warning: skipped previously applied commit d3863c9 warning: skipped previously applied commit 3a39107 warning: skipped previously applied commit 86fe2fe warning: skipped previously applied commit 336d486 warning: skipped previously applied commit cff1654 warning: skipped previously applied commit 78f8752 warning: skipped previously applied commit 32ee83f warning: skipped previously applied commit 6e3d10b warning: skipped previously applied commit 9392ebe warning: skipped previously applied commit 5762fb2 warning: skipped previously applied commit c6668b6 warning: skipped previously applied commit ebc1ad6 warning: skipped previously applied commit d624714 warning: skipped previously applied commit f17cc17 warning: skipped previously applied commit a6c91d4 warning: skipped previously applied commit 87943c7 warning: skipped previously applied commit 9439f07 warning: skipped previously applied commit 1fbda14 warning: skipped previously applied commit d8faa8b warning: skipped previously applied commit 18aa2f5 warning: skipped previously applied commit 95f23ac warning: skipped previously applied commit 49a8d88 warning: skipped previously applied commit ce3e93a warning: skipped previously applied commit e2906e7 warning: skipped previously applied commit 9ed6900 warning: skipped previously applied commit 1d5bd3a warning: skipped previously applied commit f9e74df warning: skipped previously applied commit 7dd385e warning: skipped previously applied commit b47bb81 warning: skipped previously applied commit 6c6131c warning: skipped previously applied commit 6b460f4 warning: skipped previously applied commit 38282c7 warning: skipped previously applied commit 81471b7 warning: skipped previously applied commit de860f7 warning: skipped previously applied commit 53008c6 warning: skipped previously applied commit 13b6cdb warning: skipped previously applied commit a9425a0 warning: skipped previously applied commit cc79b25 warning: skipped previously applied commit 4a300f8 warning: skipped previously applied commit 5ec875f warning: skipped previously applied commit e40b651 warning: skipped previously applied commit 9286e4a warning: skipped previously applied commit 9392510 warning: skipped previously applied commit 396b3a1 warning: skipped previously applied commit e0df1b9 warning: skipped previously applied commit f2dae13 warning: skipped previously applied commit 556741c warning: skipped previously applied commit b0e54ab warning: skipped previously applied commit e1eab39 warning: skipped previously applied commit e9c9c8f warning: skipped previously applied commit 5fc0b23 warning: skipped previously applied commit 93d5b9b warning: skipped previously applied commit 7c559cf warning: skipped previously applied commit 66218e2 warning: skipped previously applied commit 515e554 warning: skipped previously applied commit dc8b173 warning: skipped previously applied commit 335c068 warning: skipped previously applied commit 3076f28 warning: skipped previously applied commit fb19875 warning: skipped previously applied commit faefdc5 warning: skipped previously applied commit 66c12b1 warning: skipped previously applied commit 832ac74 warning: skipped previously applied commit a69f21d warning: skipped previously applied commit 25f1b5b warning: skipped previously applied commit 2d59b06 warning: skipped previously applied commit 57164d5 warning: skipped previously applied commit 25cae31 warning: skipped previously applied commit 0fed177 warning: skipped previously applied commit 4f56a44 warning: skipped previously applied commit 0694eca warning: skipped previously applied commit f8c0d36 warning: skipped previously applied commit 688ad0c warning: skipped previously applied commit d24f043 warning: skipped previously applied commit b3bfb48 warning: skipped previously applied commit bd483c4 warning: skipped previously applied commit 0bf00e6 warning: skipped previously applied commit dc43993 warning: skipped previously applied commit 9122fcf warning: skipped previously applied commit e2ce1e0 warning: skipped previously applied commit e9411a4 warning: skipped previously applied commit 71e5678 warning: skipped previously applied commit 9c8f15e warning: skipped previously applied commit 140c3ca warning: skipped previously applied commit 664d592 warning: skipped previously applied commit 64c92d4 warning: skipped previously applied commit 8848bc3 warning: skipped previously applied commit 13a5f3d warning: skipped previously applied commit 14632d4 warning: skipped previously applied commit e1c7443 warning: skipped previously applied commit 8dd7f30 warning: skipped previously applied commit bd38945 warning: skipped previously applied commit b18021f warning: skipped previously applied commit 2ca4c8b warning: skipped previously applied commit af7a7f5 warning: skipped previously applied commit ef3ca8a warning: skipped previously applied commit dab5cf9 warning: skipped previously applied commit a0e92ad warning: skipped previously applied commit 36b4666 warning: skipped previously applied commit bd637ab warning: skipped previously applied commit c79304d warning: skipped previously applied commit 1a25c69 warning: skipped previously applied commit 7c725e4 warning: skipped previously applied commit 5a60f5c warning: skipped previously applied commit d17e528 warning: skipped previously applied commit 06f98fe warning: skipped previously applied commit 61062ec warning: skipped previously applied commit fbec2de warning: skipped previously applied commit 03aa1d0 warning: skipped previously applied commit fd8bf74 warning: skipped previously applied commit a2daf2b warning: skipped previously applied commit fe217ba warning: skipped previously applied commit 1482e1c warning: skipped previously applied commit 0738100 warning: skipped previously applied commit 9e9de01 warning: skipped previously applied commit b05fff4 warning: skipped previously applied commit 1234e03 warning: skipped previously applied commit 95ac6f0 warning: skipped previously applied commit 7e412a8 warning: skipped previously applied commit ed4be5e warning: skipped previously applied commit 71ee71d warning: skipped previously applied commit 1399a13 warning: skipped previously applied commit a7f1340 warning: skipped previously applied commit 183a35e warning: skipped previously applied commit df7bac9 warning: skipped previously applied commit 67d5667 warning: skipped previously applied commit 39e1a94 warning: skipped previously applied commit 7a7f206 warning: skipped previously applied commit 7c0aa05 warning: skipped previously applied commit 67b639e warning: skipped previously applied commit 7592426 warning: skipped previously applied commit dd4f5da warning: skipped previously applied commit 08e4050 warning: skipped previously applied commit d46f45a warning: skipped previously applied commit 693a395 warning: skipped previously applied commit 943785c warning: skipped previously applied commit 35f73f5 warning: skipped previously applied commit c8a9766 warning: skipped previously applied commit 95b327e warning: skipped previously applied commit 4bb602d warning: skipped previously applied commit a72d83e warning: skipped previously applied commit df2e9fa warning: skipped previously applied commit fc8be4b warning: skipped previously applied commit 9ccec1c warning: skipped previously applied commit afa2108 warning: skipped previously applied commit 38fe4cf warning: skipped previously applied commit b4d9c98 warning: skipped previously applied commit 29dc7dd warning: skipped previously applied commit 7c53312 warning: skipped previously applied commit 607dc88 warning: skipped previously applied commit 804bb8b warning: skipped previously applied commit b16b311 warning: skipped previously applied commit b908cd0 warning: skipped previously applied commit 15bfcca warning: skipped previously applied commit 5755159 warning: skipped previously applied commit 6b925af warning: skipped previously applied commit d5821ed warning: skipped previously applied commit 8944145 warning: skipped previously applied commit daec420 warning: skipped previously applied commit da2f7fd warning: skipped previously applied commit 59e2916 warning: skipped previously applied commit 0585d13 warning: skipped previously applied commit 22faeb2 warning: skipped previously applied commit 6c34724 warning: skipped previously applied commit 272b6bf warning: skipped previously applied commit 9884fc8 warning: skipped previously applied commit 224c1e7 warning: skipped previously applied commit 102c0f8 warning: skipped previously applied commit 06abced warning: skipped previously applied commit 06d1606 warning: skipped previously applied commit 796b835 warning: skipped previously applied commit 0555e77 warning: skipped previously applied commit f276151 warning: skipped previously applied commit 7dc2c80 warning: skipped previously applied commit c2fd2cc warning: skipped previously applied commit 3a378c3 warning: skipped previously applied commit 74b5b31 warning: skipped previously applied commit 5107497 warning: skipped previously applied commit 22b6d22 warning: skipped previously applied commit ad3d66c warning: skipped previously applied commit 35cb242 warning: skipped previously applied commit 0f27ae6 warning: skipped previously applied commit fb24b8b warning: skipped previously applied commit 063c964 warning: skipped previously applied commit 9fc0fe8 warning: skipped previously applied commit e5ece6c warning: skipped previously applied commit f5b9149 warning: skipped previously applied commit 0d4bf1a warning: skipped previously applied commit f345e1e warning: skipped previously applied commit 86413c5 warning: skipped previously applied commit 99d0d22 warning: skipped previously applied commit f649031 warning: skipped previously applied commit 85d2590 warning: skipped previously applied commit 88eb827 warning: skipped previously applied commit c1969cf warning: skipped previously applied commit c798d55 warning: skipped previously applied commit 9084e58 warning: skipped previously applied commit 6b60905 warning: skipped previously applied commit 4e3f039 warning: skipped previously applied commit 8590bd8 warning: skipped previously applied commit c1eccdc warning: skipped previously applied commit 363592b warning: skipped previously applied commit 59cc57f warning: skipped previously applied commit a25e858 warning: skipped previously applied commit 44ef43b warning: skipped previously applied commit a1255d3 warning: skipped previously applied commit 0044b2f warning: skipped previously applied commit 5cfbdf3 warning: skipped previously applied commit cb6e875 warning: skipped previously applied commit f8bfc37 warning: skipped previously applied commit 5768736 warning: skipped previously applied commit eec3b1d warning: skipped previously applied commit 2033b54 warning: skipped previously applied commit 1dbab52 warning: skipped previously applied commit b560db1 warning: skipped previously applied commit 112877a warning: skipped previously applied commit f0cf85d warning: skipped previously applied commit 31f0902 warning: skipped previously applied commit 691faca warning: skipped previously applied commit 56571a4 warning: skipped previously applied commit f5463cf warning: skipped previously applied commit 0216184 warning: skipped previously applied commit 5a090a7 warning: skipped previously applied commit e2d89f8 warning: skipped previously applied commit bdce5ea warning: skipped previously applied commit 92c0fe3 warning: skipped previously applied commit d53517f warning: skipped previously applied commit 7dda1bc warning: skipped previously applied commit 51f106e warning: skipped previously applied commit 0f03135 warning: skipped previously applied commit 16fff34 warning: skipped previously applied commit ee778e6 warning: skipped previously applied commit 06ed7c8 warning: skipped previously applied commit 4446b91 warning: skipped previously applied commit bbcf9da warning: skipped previously applied commit 90feead warning: skipped previously applied commit 737020f warning: skipped previously applied commit fae5ee7 warning: skipped previously applied commit 067f850 warning: skipped previously applied commit fca8e0d warning: skipped previously applied commit cab1eb1 warning: skipped previously applied commit 8a6036f warning: skipped previously applied commit 0fe2843 warning: skipped previously applied commit 65deb2e warning: skipped previously applied commit 76ddd82 warning: skipped previously applied commit 0bc1753 warning: skipped previously applied commit 1e8dc2c warning: skipped previously applied commit 8a790fc warning: skipped previously applied commit c65d05e warning: skipped previously applied commit 0bfdab4 warning: skipped previously applied commit 6525fbc warning: skipped previously applied commit 92b51d6 warning: skipped previously applied commit f348089 warning: skipped previously applied commit a7aef32 warning: skipped previously applied commit 8252443 warning: skipped previously applied commit df9a971 warning: skipped previously applied commit daf4cdb warning: skipped previously applied commit ed98213 warning: skipped previously applied commit 09166b6 warning: skipped previously applied commit bc7ab5e hint: use --reapply-cherry-picks to include skipped commits hint: Disable this message with "git config set advice.skippedCherryPicks false" Rebasing (1/2) Auto-merging .github/workflows/build.yml CONFLICT (add/add): Merge conflict in .github/workflows/build.yml Auto-merging .gitignore CONFLICT (add/add): Merge conflict in .gitignore Auto-merging README.md CONFLICT (add/add): Merge conflict in README.md Auto-merging build.gradle.kts CONFLICT (add/add): Merge conflict in build.gradle.kts Failed to merge submodule flubundle (not checked out) CONFLICT (submodule): Merge conflict in flubundle Auto-merging gradle/wrapper/gradle-wrapper.properties CONFLICT (add/add): Merge conflict in gradle/wrapper/gradle-wrapper.properties Auto-merging src/main/java/org/xcore/plugin/XcorePlugin.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/XcorePlugin.java Auto-merging src/main/java/org/xcore/plugin/command/controller/client/AuthController.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/command/controller/client/AuthController.java Auto-merging src/main/java/org/xcore/plugin/command/controller/client/EventController.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/command/controller/client/EventController.java Auto-merging src/main/java/org/xcore/plugin/command/controller/client/HexedController.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/command/controller/client/HexedController.java Auto-merging src/main/java/org/xcore/plugin/command/controller/client/InformationController.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/command/controller/client/InformationController.java Auto-merging src/main/java/org/xcore/plugin/command/controller/client/MapController.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/command/controller/client/MapController.java Auto-merging src/main/java/org/xcore/plugin/command/controller/client/ModerationController.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/command/controller/client/ModerationController.java Auto-merging src/main/java/org/xcore/plugin/command/controller/client/SocialController.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/command/controller/client/SocialController.java Auto-merging src/main/java/org/xcore/plugin/command/controller/client/VoteController.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/command/controller/client/VoteController.java Auto-merging src/main/java/org/xcore/plugin/command/controller/server/DataController.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/command/controller/server/DataController.java Auto-merging src/main/java/org/xcore/plugin/command/controller/server/MaintainController.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/command/controller/server/MaintainController.java Auto-merging src/main/java/org/xcore/plugin/command/controller/server/ServerInformationController.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/command/controller/server/ServerInformationController.java Auto-merging src/main/java/org/xcore/plugin/command/controller/server/ServerModerationController.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/command/controller/server/ServerModerationController.java Auto-merging src/main/java/org/xcore/plugin/config/Config.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/config/Config.java Auto-merging src/main/java/org/xcore/plugin/config/ConfigFactory.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/config/ConfigFactory.java Auto-merging src/main/java/org/xcore/plugin/config/GlobalConfig.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/config/GlobalConfig.java Auto-merging src/main/java/org/xcore/plugin/config/SerializationFactory.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/config/SerializationFactory.java Auto-merging src/main/java/org/xcore/plugin/database/MongoFactory.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/database/MongoFactory.java Auto-merging src/main/java/org/xcore/plugin/database/repository/AdminDataRepository.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/database/repository/AdminDataRepository.java Auto-merging src/main/java/org/xcore/plugin/database/repository/BanDataRepository.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/database/repository/BanDataRepository.java Auto-merging src/main/java/org/xcore/plugin/database/repository/EventDataRepository.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/database/repository/EventDataRepository.java Auto-merging src/main/java/org/xcore/plugin/database/repository/MapDataRepository.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/database/repository/MapDataRepository.java Auto-merging src/main/java/org/xcore/plugin/database/repository/MuteDataRepository.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/database/repository/MuteDataRepository.java Auto-merging src/main/java/org/xcore/plugin/database/repository/PlayerDataRepository.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/database/repository/PlayerDataRepository.java Auto-merging src/main/java/org/xcore/plugin/event/NetEventService.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/event/NetEventService.java Auto-merging src/main/java/org/xcore/plugin/event/PluginEventService.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/event/PluginEventService.java Auto-merging src/main/java/org/xcore/plugin/event/SocketEvents.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/event/SocketEvents.java Auto-merging src/main/java/org/xcore/plugin/event/SocketService.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/event/SocketService.java Auto-merging src/main/java/org/xcore/plugin/event/handler/ConnectionHandler.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/event/handler/ConnectionHandler.java Auto-merging src/main/java/org/xcore/plugin/event/handler/GameLifecycleHandler.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/event/handler/GameLifecycleHandler.java Auto-merging src/main/java/org/xcore/plugin/event/handler/MapVoteHandler.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/event/handler/MapVoteHandler.java Auto-merging src/main/java/org/xcore/plugin/event/socket/ChatSocketHandler.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/event/socket/ChatSocketHandler.java Auto-merging src/main/java/org/xcore/plugin/event/socket/MapSocketHandler.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/event/socket/MapSocketHandler.java Auto-merging src/main/java/org/xcore/plugin/event/socket/ModerationSocketHandler.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/event/socket/ModerationSocketHandler.java Auto-merging src/main/java/org/xcore/plugin/gamemode/hexed/HexedRanks.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/gamemode/hexed/HexedRanks.java Auto-merging src/main/java/org/xcore/plugin/gamemode/hexed/MiniHexedService.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/gamemode/hexed/MiniHexedService.java Auto-merging src/main/java/org/xcore/plugin/gamemode/pvp/MiniPvP.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/gamemode/pvp/MiniPvP.java Auto-merging src/main/java/org/xcore/plugin/integration/AdminModIntegration.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/integration/AdminModIntegration.java Auto-merging src/main/java/org/xcore/plugin/integration/Console.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/integration/Console.java Auto-merging src/main/java/org/xcore/plugin/map/SmartMapSelector.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/map/SmartMapSelector.java Auto-merging src/main/java/org/xcore/plugin/model/BanData.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/model/BanData.java Auto-merging src/main/java/org/xcore/plugin/model/EventData.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/model/EventData.java Auto-merging src/main/java/org/xcore/plugin/model/MapData.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/model/MapData.java Auto-merging src/main/java/org/xcore/plugin/model/MuteData.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/model/MuteData.java Auto-merging src/main/java/org/xcore/plugin/model/PlayerData.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/model/PlayerData.java Auto-merging src/main/java/org/xcore/plugin/model/Punishment.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/model/Punishment.java Auto-merging src/main/java/org/xcore/plugin/security/ingress/IngressService.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/security/ingress/IngressService.java Auto-merging src/main/java/org/xcore/plugin/security/ingress/checks/BanCheck.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/security/ingress/checks/BanCheck.java Auto-merging src/main/java/org/xcore/plugin/security/ingress/checks/KickTimeoutCheck.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/security/ingress/checks/KickTimeoutCheck.java Auto-merging src/main/java/org/xcore/plugin/security/ingress/checks/NameValidationCheck.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/security/ingress/checks/NameValidationCheck.java Auto-merging src/main/java/org/xcore/plugin/service/AntiCheatService.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/service/AntiCheatService.java Auto-merging src/main/java/org/xcore/plugin/service/FindService.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/service/FindService.java Auto-merging src/main/java/org/xcore/plugin/service/GameStateService.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/service/GameStateService.java Auto-merging src/main/java/org/xcore/plugin/service/LeaderboardService.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/service/LeaderboardService.java Auto-merging src/main/java/org/xcore/plugin/service/MapService.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/service/MapService.java Auto-merging src/main/java/org/xcore/plugin/service/NetworkService.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/service/NetworkService.java Auto-merging src/main/java/org/xcore/plugin/service/PlayerActivityService.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/service/PlayerActivityService.java Auto-merging src/main/java/org/xcore/plugin/service/SecurityService.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/service/SecurityService.java Auto-merging src/main/java/org/xcore/plugin/service/TimeService.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/service/TimeService.java Auto-merging src/main/java/org/xcore/plugin/service/TranslatorService.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/service/TranslatorService.java Auto-merging src/main/java/org/xcore/plugin/service/moderation/ModerationService.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/service/moderation/ModerationService.java Auto-merging src/main/java/org/xcore/plugin/vote/VoteChoice.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/vote/VoteChoice.java Auto-merging src/main/java/org/xcore/plugin/vote/VoteEvent.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/vote/VoteEvent.java Auto-merging src/main/java/org/xcore/plugin/vote/VoteKick.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/vote/VoteKick.java Auto-merging src/main/java/org/xcore/plugin/vote/VoteRtv.java CONFLICT hint: Recursive merging with submodules currently only supports trivial cases. hint: Please manually handle the merging of each conflicted submodule. hint: This can be accomplished with the following steps: hint: - come back to superproject and run: hint: hint: git add flubundle hint: hint: to record the above merge or update hint: - resolve any other conflicts in the superproject hint: - commit the resulting index in the superproject hint: hint: Disable this message with "git config set advice.submoduleMergeConflict false" (add/add): Merge conflict in src/main/java/org/xcore/plugin/vote/VoteRtv.java Auto-merging src/main/java/org/xcore/plugin/vote/VoteService.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/vote/VoteService.java Auto-merging src/main/resources/bundles/bundle_en.ftl CONFLICT (add/add): Merge conflict in src/main/resources/bundles/bundle_en.ftl Auto-merging src/main/resources/bundles/bundle_ru.ftl CONFLICT (add/add): Merge conflict in src/main/resources/bundles/bundle_ru.ftl Auto-merging src/main/resources/bundles/bundle_uk_UA.ftl CONFLICT (add/add): Merge conflict in src/main/resources/bundles/bundle_uk_UA.ftl Auto-merging weblate.yaml CONFLICT (add/add): Merge conflict in weblate.yaml error: could not apply 37a26e5... feat: Add weblate.yaml hint: Resolve all conflicts manually, mark them as resolved with hint: "git add/rm <conflicted_files>", then run "git rebase --continue". hint: You can instead skip this commit: run "git rebase --skip". hint: To abort and get back to the state before "git rebase", run "git rebase --abort". hint: Disable this message with "git config set advice.mergeConflict false" Could not apply 37a26e5... # feat: Add weblate.yaml (1)03/14/2026 |
|
webhook:github
Repository notification received |
GitHub: https://api.github.com/repos/XCore-mindustry/XCore-plugin, main
03/14/2026
|
|
webhook:github
Repository rebase failed |
warning: skipped previously applied commit d091f9c warning: skipped previously applied commit 80b21b1 warning: skipped previously applied commit ae6089b warning: skipped previously applied commit 26b141c warning: skipped previously applied commit 4ba4166 warning: skipped previously applied commit 69d7431 warning: skipped previously applied commit 7ea4040 warning: skipped previously applied commit d1252fc warning: skipped previously applied commit f309cb1 warning: skipped previously applied commit c1d4ad9 warning: skipped previously applied commit b180e34 warning: skipped previously applied commit 4d6b361 warning: skipped previously applied commit c662585 warning: skipped previously applied commit 0995d9b warning: skipped previously applied commit d297fb7 warning: skipped previously applied commit 6d64d3a warning: skipped previously applied commit 17fd886 warning: skipped previously applied commit 61f51e5 warning: skipped previously applied commit a39f321 warning: skipped previously applied commit 6574ec0 warning: skipped previously applied commit b1a03db warning: skipped previously applied commit 06ff4c3 warning: skipped previously applied commit d49a816 warning: skipped previously applied commit 43d14a6 warning: skipped previously applied commit 6c1b0f2 warning: skipped previously applied commit aa57498 warning: skipped previously applied commit abc8896 warning: skipped previously applied commit bdc759f warning: skipped previously applied commit 1f6937d warning: skipped previously applied commit b5b4e87 warning: skipped previously applied commit c0be651 warning: skipped previously applied commit f06c1d1 warning: skipped previously applied commit 537b090 warning: skipped previously applied commit 71896f0 warning: skipped previously applied commit 82726ef warning: skipped previously applied commit 0aadee7 warning: skipped previously applied commit 5829150 warning: skipped previously applied commit 032947f warning: skipped previously applied commit edc03b5 warning: skipped previously applied commit ddd62bf warning: skipped previously applied commit a3ba244 warning: skipped previously applied commit 9265e6a warning: skipped previously applied commit 8c72d58 warning: skipped previously applied commit 83ac917 warning: skipped previously applied commit 8a5a9e6 warning: skipped previously applied commit 71d1863 warning: skipped previously applied commit aa8db73 warning: skipped previously applied commit 4cf1cbb warning: skipped previously applied commit 81c17b1 warning: skipped previously applied commit 397ffb7 warning: skipped previously applied commit b522d6d warning: skipped previously applied commit 70df3d4 warning: skipped previously applied commit c113779 warning: skipped previously applied commit 06dd455 warning: skipped previously applied commit 8f37e43 warning: skipped previously applied commit a4adcc1 warning: skipped previously applied commit 4a295fc warning: skipped previously applied commit 324b6ad warning: skipped previously applied commit 1280382 warning: skipped previously applied commit 543fde4 warning: skipped previously applied commit 0048666 warning: skipped previously applied commit 1767fdb warning: skipped previously applied commit 7547149 warning: skipped previously applied commit a535b67 warning: skipped previously applied commit 4fa714e warning: skipped previously applied commit 5e325c5 warning: skipped previously applied commit 2ef155e warning: skipped previously applied commit 21e632c warning: skipped previously applied commit 0371900 warning: skipped previously applied commit 538379b warning: skipped previously applied commit 5d44f84 warning: skipped previously applied commit e5ab201 warning: skipped previously applied commit 52229f6 warning: skipped previously applied commit bf43d75 warning: skipped previously applied commit 9263995 warning: skipped previously applied commit 1c13d91 warning: skipped previously applied commit 7775e6c warning: skipped previously applied commit dc06802 warning: skipped previously applied commit 51ac6d3 warning: skipped previously applied commit 2142af7 warning: skipped previously applied commit 7fea0d6 warning: skipped previously applied commit 8a17245 warning: skipped previously applied commit 9a6b45e warning: skipped previously applied commit 2329d0e warning: skipped previously applied commit 26fa24f warning: skipped previously applied commit 5a16b74 warning: skipped previously applied commit 3f94990 warning: skipped previously applied commit 92c311e warning: skipped previously applied commit 1d14dc8 warning: skipped previously applied commit 77bf402 warning: skipped previously applied commit f1b8017 warning: skipped previously applied commit 8eeddd7 warning: skipped previously applied commit 3e86b4b warning: skipped previously applied commit 44d26b5 warning: skipped previously applied commit a6be04e warning: skipped previously applied commit 43324c6 warning: skipped previously applied commit 70e5a1a warning: skipped previously applied commit 95a6982 warning: skipped previously applied commit b2e6b63 warning: skipped previously applied commit b2627bf warning: skipped previously applied commit 1263c12 warning: skipped previously applied commit c74202b warning: skipped previously applied commit 7d048e3 warning: skipped previously applied commit b572727 warning: skipped previously applied commit 689a42b warning: skipped previously applied commit 32ea041 warning: skipped previously applied commit 7191b7f warning: skipped previously applied commit f7cf460 warning: skipped previously applied commit 2eff1a7 warning: skipped previously applied commit 0b7e5e3 warning: skipped previously applied commit ea89ef1 warning: skipped previously applied commit 1647349 warning: skipped previously applied commit cb3c1e7 warning: skipped previously applied commit f2dd64d warning: skipped previously applied commit 656b25e warning: skipped previously applied commit c85ccdd warning: skipped previously applied commit abac5c0 warning: skipped previously applied commit 1e87b69 warning: skipped previously applied commit 28aa6ed warning: skipped previously applied commit 67cce58 warning: skipped previously applied commit c95ce3b warning: skipped previously applied commit 446a520 warning: skipped previously applied commit 0a9a00e warning: skipped previously applied commit 512645b warning: skipped previously applied commit a781be9 warning: skipped previously applied commit cdc7971 warning: skipped previously applied commit 769bffc warning: skipped previously applied commit 406adca warning: skipped previously applied commit f9ee5f9 warning: skipped previously applied commit b79680c warning: skipped previously applied commit 747ff8f warning: skipped previously applied commit 1598044 warning: skipped previously applied commit afb2169 warning: skipped previously applied commit b1aef44 warning: skipped previously applied commit 7d0a63a warning: skipped previously applied commit dab1821 warning: skipped previously applied commit f8da4c5 warning: skipped previously applied commit 4d22077 warning: skipped previously applied commit 30e26f3 warning: skipped previously applied commit 2b3163d warning: skipped previously applied commit adcd753 warning: skipped previously applied commit 5c1b278 warning: skipped previously applied commit e1a682e warning: skipped previously applied commit 6d1a7b1 warning: skipped previously applied commit 798ae4c warning: skipped previously applied commit 24cda32 warning: skipped previously applied commit 04e5b4b warning: skipped previously applied commit a62af45 warning: skipped previously applied commit e88210d warning: skipped previously applied commit e090ca0 warning: skipped previously applied commit ddbeb92 warning: skipped previously applied commit bdbf838 warning: skipped previously applied commit 4154307 warning: skipped previously applied commit 27d2278 warning: skipped previously applied commit 3efaf1e warning: skipped previously applied commit 4c13841 warning: skipped previously applied commit 65fefc5 warning: skipped previously applied commit cbfa3cf warning: skipped previously applied commit 0fb1f3a warning: skipped previously applied commit b359fec warning: skipped previously applied commit 398d39d warning: skipped previously applied commit 04db9df warning: skipped previously applied commit 1f51d20 warning: skipped previously applied commit c0e26d9 warning: skipped previously applied commit a447804 warning: skipped previously applied commit 4816244 warning: skipped previously applied commit 8b10465 warning: skipped previously applied commit b904260 warning: skipped previously applied commit 41037bd warning: skipped previously applied commit abd21ec warning: skipped previously applied commit 226ae99 warning: skipped previously applied commit 7fbadde warning: skipped previously applied commit a0071e0 warning: skipped previously applied commit 7a38a15 warning: skipped previously applied commit 6c04761 warning: skipped previously applied commit 18687ec warning: skipped previously applied commit a035946 warning: skipped previously applied commit 1f9377f warning: skipped previously applied commit ff0c32c warning: skipped previously applied commit 73360e3 warning: skipped previously applied commit 0abd292 warning: skipped previously applied commit b2eb756 warning: skipped previously applied commit 1266dac warning: skipped previously applied commit 0579d5e warning: skipped previously applied commit 99051b7 warning: skipped previously applied commit 35542b2 warning: skipped previously applied commit 4fb8110 warning: skipped previously applied commit 38431ea warning: skipped previously applied commit beaf4eb warning: skipped previously applied commit 8c060af warning: skipped previously applied commit 0767911 warning: skipped previously applied commit caed430 warning: skipped previously applied commit ba3f891 warning: skipped previously applied commit 09e93e2 warning: skipped previously applied commit 893c781 warning: skipped previously applied commit f44cf5d warning: skipped previously applied commit ac92ef3 warning: skipped previously applied commit 5437ed2 warning: skipped previously applied commit fa312bc warning: skipped previously applied commit 711115f warning: skipped previously applied commit bd75040 warning: skipped previously applied commit 2ccf6de warning: skipped previously applied commit 27661f2 warning: skipped previously applied commit dde9710 warning: skipped previously applied commit 218ec0f warning: skipped previously applied commit 829a8bf warning: skipped previously applied commit 9de4b20 warning: skipped previously applied commit 2c439a6 warning: skipped previously applied commit be1eb43 warning: skipped previously applied commit 230cfd6 warning: skipped previously applied commit fd5eefa warning: skipped previously applied commit 4f1ef16 warning: skipped previously applied commit dc87d2e warning: skipped previously applied commit 600987d warning: skipped previously applied commit a61d823 warning: skipped previously applied commit 33018db warning: skipped previously applied commit 1b3a92f warning: skipped previously applied commit 15c603d warning: skipped previously applied commit 40114e2 warning: skipped previously applied commit 70b4e5d warning: skipped previously applied commit d0f2141 warning: skipped previously applied commit 509997c warning: skipped previously applied commit e2b115f warning: skipped previously applied commit 1556bd0 warning: skipped previously applied commit b4ad222 warning: skipped previously applied commit 59a7d08 warning: skipped previously applied commit 0002a8a warning: skipped previously applied commit af5129f warning: skipped previously applied commit 228a3f1 warning: skipped previously applied commit 430314a warning: skipped previously applied commit 3ae9966 warning: skipped previously applied commit 9e03a54 warning: skipped previously applied commit 51aede4 warning: skipped previously applied commit fe4bde0 warning: skipped previously applied commit 743c936 warning: skipped previously applied commit 67105a6 warning: skipped previously applied commit 9e81fd5 warning: skipped previously applied commit b531f5d warning: skipped previously applied commit a55700a warning: skipped previously applied commit b7a81ca warning: skipped previously applied commit da410d1 warning: skipped previously applied commit 88be6d3 warning: skipped previously applied commit f951ec2 warning: skipped previously applied commit 5b6a68b warning: skipped previously applied commit 9301fd4 warning: skipped previously applied commit 154c63e warning: skipped previously applied commit c5c5947 warning: skipped previously applied commit 2508491 warning: skipped previously applied commit 7ec6300 warning: skipped previously applied commit 5c7a0be warning: skipped previously applied commit cb2ad26 warning: skipped previously applied commit 10738ca warning: skipped previously applied commit 4ffb7e4 warning: skipped previously applied commit dddcb74 warning: skipped previously applied commit eab9979 warning: skipped previously applied commit eb245ca warning: skipped previously applied commit 41ff74f warning: skipped previously applied commit 05d96bb warning: skipped previously applied commit f9fa3bb warning: skipped previously applied commit ab6c7bf warning: skipped previously applied commit dd4376c warning: skipped previously applied commit cb97215 warning: skipped previously applied commit b7fcdef warning: skipped previously applied commit e2755be warning: skipped previously applied commit 25382aa warning: skipped previously applied commit f8d72ad warning: skipped previously applied commit 0823743 warning: skipped previously applied commit b6206cf warning: skipped previously applied commit b26c910 warning: skipped previously applied commit b2a3089 warning: skipped previously applied commit 7da4a46 warning: skipped previously applied commit 06a69d4 warning: skipped previously applied commit 5f2e3bb warning: skipped previously applied commit 970a6a5 warning: skipped previously applied commit 24273c5 warning: skipped previously applied commit 408384d warning: skipped previously applied commit b665d9e warning: skipped previously applied commit 450bddf warning: skipped previously applied commit 4f8f58c warning: skipped previously applied commit 23ec9e0 warning: skipped previously applied commit 46291d4 warning: skipped previously applied commit 8104817 warning: skipped previously applied commit d787e35 warning: skipped previously applied commit 2c481f7 warning: skipped previously applied commit 22545be warning: skipped previously applied commit 734cb6a warning: skipped previously applied commit a6707aa warning: skipped previously applied commit 8599cb9 warning: skipped previously applied commit 58b9273 warning: skipped previously applied commit 4c50b5b warning: skipped previously applied commit 8f5aa47 warning: skipped previously applied commit b149947 warning: skipped previously applied commit a964c38 warning: skipped previously applied commit b17ae62 warning: skipped previously applied commit 8baba3f warning: skipped previously applied commit 9863e7e warning: skipped previously applied commit 90738fa warning: skipped previously applied commit ba0b0d0 warning: skipped previously applied commit 2a5105e warning: skipped previously applied commit 180aa7f warning: skipped previously applied commit 5b1601d warning: skipped previously applied commit ce613f6 warning: skipped previously applied commit 589b172 warning: skipped previously applied commit 0fb5a2f warning: skipped previously applied commit 9c596e8 warning: skipped previously applied commit 10aba6c warning: skipped previously applied commit 9ab559e warning: skipped previously applied commit c3dba89 warning: skipped previously applied commit f924f7d warning: skipped previously applied commit b6fd4f1 warning: skipped previously applied commit 689c64e warning: skipped previously applied commit 222d151 warning: skipped previously applied commit fcf00c1 warning: skipped previously applied commit 887b6e9 warning: skipped previously applied commit 3c3cb16 warning: skipped previously applied commit 34e2fb9 warning: skipped previously applied commit 8ec9d3a warning: skipped previously applied commit e12bbb0 warning: skipped previously applied commit 8f4eb33 warning: skipped previously applied commit e21fb80 warning: skipped previously applied commit 4729df5 warning: skipped previously applied commit 489056c warning: skipped previously applied commit 9fbb83a warning: skipped previously applied commit 679b634 warning: skipped previously applied commit f6d9395 warning: skipped previously applied commit d3863c9 warning: skipped previously applied commit 3a39107 warning: skipped previously applied commit 86fe2fe warning: skipped previously applied commit 336d486 warning: skipped previously applied commit cff1654 warning: skipped previously applied commit 78f8752 warning: skipped previously applied commit 32ee83f warning: skipped previously applied commit 6e3d10b warning: skipped previously applied commit 9392ebe warning: skipped previously applied commit 5762fb2 warning: skipped previously applied commit c6668b6 warning: skipped previously applied commit ebc1ad6 warning: skipped previously applied commit d624714 warning: skipped previously applied commit f17cc17 warning: skipped previously applied commit a6c91d4 warning: skipped previously applied commit 87943c7 warning: skipped previously applied commit 9439f07 warning: skipped previously applied commit 1fbda14 warning: skipped previously applied commit d8faa8b warning: skipped previously applied commit 18aa2f5 warning: skipped previously applied commit 95f23ac warning: skipped previously applied commit 49a8d88 warning: skipped previously applied commit ce3e93a warning: skipped previously applied commit e2906e7 warning: skipped previously applied commit 9ed6900 warning: skipped previously applied commit 1d5bd3a warning: skipped previously applied commit f9e74df warning: skipped previously applied commit 7dd385e warning: skipped previously applied commit b47bb81 warning: skipped previously applied commit 6c6131c warning: skipped previously applied commit 6b460f4 warning: skipped previously applied commit 38282c7 warning: skipped previously applied commit 81471b7 warning: skipped previously applied commit de860f7 warning: skipped previously applied commit 53008c6 warning: skipped previously applied commit 13b6cdb warning: skipped previously applied commit a9425a0 warning: skipped previously applied commit cc79b25 warning: skipped previously applied commit 4a300f8 warning: skipped previously applied commit 5ec875f warning: skipped previously applied commit e40b651 warning: skipped previously applied commit 9286e4a warning: skipped previously applied commit 9392510 warning: skipped previously applied commit 396b3a1 warning: skipped previously applied commit e0df1b9 warning: skipped previously applied commit f2dae13 warning: skipped previously applied commit 556741c warning: skipped previously applied commit b0e54ab warning: skipped previously applied commit e1eab39 warning: skipped previously applied commit e9c9c8f warning: skipped previously applied commit 5fc0b23 warning: skipped previously applied commit 93d5b9b warning: skipped previously applied commit 7c559cf warning: skipped previously applied commit 66218e2 warning: skipped previously applied commit 515e554 warning: skipped previously applied commit dc8b173 warning: skipped previously applied commit 335c068 warning: skipped previously applied commit 3076f28 warning: skipped previously applied commit fb19875 warning: skipped previously applied commit faefdc5 warning: skipped previously applied commit 66c12b1 warning: skipped previously applied commit 832ac74 warning: skipped previously applied commit a69f21d warning: skipped previously applied commit 25f1b5b warning: skipped previously applied commit 2d59b06 warning: skipped previously applied commit 57164d5 warning: skipped previously applied commit 25cae31 warning: skipped previously applied commit 0fed177 warning: skipped previously applied commit 4f56a44 warning: skipped previously applied commit 0694eca warning: skipped previously applied commit f8c0d36 warning: skipped previously applied commit 688ad0c warning: skipped previously applied commit d24f043 warning: skipped previously applied commit b3bfb48 warning: skipped previously applied commit bd483c4 warning: skipped previously applied commit 0bf00e6 warning: skipped previously applied commit dc43993 warning: skipped previously applied commit 9122fcf warning: skipped previously applied commit e2ce1e0 warning: skipped previously applied commit e9411a4 warning: skipped previously applied commit 71e5678 warning: skipped previously applied commit 9c8f15e warning: skipped previously applied commit 140c3ca warning: skipped previously applied commit 664d592 warning: skipped previously applied commit 64c92d4 warning: skipped previously applied commit 8848bc3 warning: skipped previously applied commit 13a5f3d warning: skipped previously applied commit 14632d4 warning: skipped previously applied commit e1c7443 warning: skipped previously applied commit 8dd7f30 warning: skipped previously applied commit bd38945 warning: skipped previously applied commit b18021f warning: skipped previously applied commit 2ca4c8b warning: skipped previously applied commit af7a7f5 warning: skipped previously applied commit ef3ca8a warning: skipped previously applied commit dab5cf9 warning: skipped previously applied commit a0e92ad warning: skipped previously applied commit 36b4666 warning: skipped previously applied commit bd637ab warning: skipped previously applied commit c79304d warning: skipped previously applied commit 1a25c69 warning: skipped previously applied commit 7c725e4 warning: skipped previously applied commit 5a60f5c warning: skipped previously applied commit d17e528 warning: skipped previously applied commit 06f98fe warning: skipped previously applied commit 61062ec warning: skipped previously applied commit fbec2de warning: skipped previously applied commit 03aa1d0 warning: skipped previously applied commit fd8bf74 warning: skipped previously applied commit a2daf2b warning: skipped previously applied commit fe217ba warning: skipped previously applied commit 1482e1c warning: skipped previously applied commit 0738100 warning: skipped previously applied commit 9e9de01 warning: skipped previously applied commit b05fff4 warning: skipped previously applied commit 1234e03 warning: skipped previously applied commit 95ac6f0 warning: skipped previously applied commit 7e412a8 warning: skipped previously applied commit ed4be5e warning: skipped previously applied commit 71ee71d warning: skipped previously applied commit 1399a13 warning: skipped previously applied commit a7f1340 warning: skipped previously applied commit 183a35e warning: skipped previously applied commit df7bac9 warning: skipped previously applied commit 67d5667 warning: skipped previously applied commit 39e1a94 warning: skipped previously applied commit 7a7f206 warning: skipped previously applied commit 7c0aa05 warning: skipped previously applied commit 67b639e warning: skipped previously applied commit 7592426 warning: skipped previously applied commit dd4f5da warning: skipped previously applied commit 08e4050 warning: skipped previously applied commit d46f45a warning: skipped previously applied commit 693a395 warning: skipped previously applied commit 943785c warning: skipped previously applied commit 35f73f5 warning: skipped previously applied commit c8a9766 warning: skipped previously applied commit 95b327e warning: skipped previously applied commit 4bb602d warning: skipped previously applied commit a72d83e warning: skipped previously applied commit df2e9fa warning: skipped previously applied commit fc8be4b warning: skipped previously applied commit 9ccec1c warning: skipped previously applied commit afa2108 warning: skipped previously applied commit 38fe4cf warning: skipped previously applied commit b4d9c98 warning: skipped previously applied commit 29dc7dd warning: skipped previously applied commit 7c53312 warning: skipped previously applied commit 607dc88 warning: skipped previously applied commit 804bb8b warning: skipped previously applied commit b16b311 warning: skipped previously applied commit b908cd0 warning: skipped previously applied commit 15bfcca warning: skipped previously applied commit 5755159 warning: skipped previously applied commit 6b925af warning: skipped previously applied commit d5821ed warning: skipped previously applied commit 8944145 warning: skipped previously applied commit daec420 warning: skipped previously applied commit da2f7fd warning: skipped previously applied commit 59e2916 warning: skipped previously applied commit 0585d13 warning: skipped previously applied commit 22faeb2 warning: skipped previously applied commit 6c34724 warning: skipped previously applied commit 272b6bf warning: skipped previously applied commit 9884fc8 warning: skipped previously applied commit 224c1e7 warning: skipped previously applied commit 102c0f8 warning: skipped previously applied commit 06abced warning: skipped previously applied commit 06d1606 warning: skipped previously applied commit 796b835 warning: skipped previously applied commit 0555e77 warning: skipped previously applied commit f276151 warning: skipped previously applied commit 7dc2c80 warning: skipped previously applied commit c2fd2cc warning: skipped previously applied commit 3a378c3 warning: skipped previously applied commit 74b5b31 warning: skipped previously applied commit 5107497 warning: skipped previously applied commit 22b6d22 warning: skipped previously applied commit ad3d66c warning: skipped previously applied commit 35cb242 warning: skipped previously applied commit 0f27ae6 warning: skipped previously applied commit fb24b8b warning: skipped previously applied commit 063c964 warning: skipped previously applied commit 9fc0fe8 warning: skipped previously applied commit e5ece6c warning: skipped previously applied commit f5b9149 warning: skipped previously applied commit 0d4bf1a warning: skipped previously applied commit f345e1e warning: skipped previously applied commit 86413c5 warning: skipped previously applied commit 99d0d22 warning: skipped previously applied commit f649031 warning: skipped previously applied commit 85d2590 warning: skipped previously applied commit 88eb827 warning: skipped previously applied commit c1969cf warning: skipped previously applied commit c798d55 warning: skipped previously applied commit 9084e58 warning: skipped previously applied commit 6b60905 warning: skipped previously applied commit 4e3f039 warning: skipped previously applied commit 8590bd8 warning: skipped previously applied commit c1eccdc warning: skipped previously applied commit 363592b warning: skipped previously applied commit 59cc57f warning: skipped previously applied commit a25e858 warning: skipped previously applied commit 44ef43b warning: skipped previously applied commit a1255d3 warning: skipped previously applied commit 0044b2f warning: skipped previously applied commit 5cfbdf3 warning: skipped previously applied commit cb6e875 warning: skipped previously applied commit f8bfc37 warning: skipped previously applied commit 5768736 warning: skipped previously applied commit eec3b1d warning: skipped previously applied commit 2033b54 warning: skipped previously applied commit 1dbab52 warning: skipped previously applied commit b560db1 warning: skipped previously applied commit 112877a warning: skipped previously applied commit f0cf85d warning: skipped previously applied commit 31f0902 warning: skipped previously applied commit 691faca warning: skipped previously applied commit 56571a4 warning: skipped previously applied commit f5463cf warning: skipped previously applied commit 0216184 warning: skipped previously applied commit 5a090a7 warning: skipped previously applied commit e2d89f8 warning: skipped previously applied commit bdce5ea warning: skipped previously applied commit 92c0fe3 warning: skipped previously applied commit d53517f warning: skipped previously applied commit 7dda1bc warning: skipped previously applied commit 51f106e warning: skipped previously applied commit 0f03135 warning: skipped previously applied commit 16fff34 warning: skipped previously applied commit ee778e6 warning: skipped previously applied commit 06ed7c8 warning: skipped previously applied commit 4446b91 warning: skipped previously applied commit bbcf9da warning: skipped previously applied commit 90feead warning: skipped previously applied commit 737020f warning: skipped previously applied commit fae5ee7 warning: skipped previously applied commit 067f850 warning: skipped previously applied commit fca8e0d warning: skipped previously applied commit cab1eb1 warning: skipped previously applied commit 8a6036f warning: skipped previously applied commit 0fe2843 warning: skipped previously applied commit 65deb2e warning: skipped previously applied commit 76ddd82 warning: skipped previously applied commit 0bc1753 warning: skipped previously applied commit 1e8dc2c warning: skipped previously applied commit 8a790fc warning: skipped previously applied commit c65d05e warning: skipped previously applied commit 0bfdab4 warning: skipped previously applied commit 6525fbc warning: skipped previously applied commit 92b51d6 warning: skipped previously applied commit f348089 warning: skipped previously applied commit a7aef32 warning: skipped previously applied commit 8252443 warning: skipped previously applied commit df9a971 warning: skipped previously applied commit daf4cdb warning: skipped previously applied commit ed98213 warning: skipped previously applied commit 09166b6 warning: skipped previously applied commit bc7ab5e hint: use --reapply-cherry-picks to include skipped commits hint: Disable this message with "git config set advice.skippedCherryPicks false" Rebasing (1/2) Auto-merging .github/workflows/build.yml CONFLICT (add/add): Merge conflict in .github/workflows/build.yml Auto-merging .gitignore CONFLICT (add/add): Merge conflict in .gitignore Auto-merging README.md CONFLICT (add/add): Merge conflict in README.md Auto-merging build.gradle.kts CONFLICT (add/add): Merge conflict in build.gradle.kts Failed to merge submodule flubundle (not checked out) CONFLICT (submodule): Merge conflict in flubundle Auto-merging gradle/wrapper/gradle-wrapper.properties CONFLICT (add/add): Merge conflict in gradle/wrapper/gradle-wrapper.properties Auto-merging src/main/java/org/xcore/plugin/XcorePlugin.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/XcorePlugin.java Auto-merging src/main/java/org/xcore/plugin/command/controller/client/AuthController.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/command/controller/client/AuthController.java Auto-merging src/main/java/org/xcore/plugin/command/controller/client/EventController.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/command/controller/client/EventController.java Auto-merging src/main/java/org/xcore/plugin/command/controller/client/HexedController.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/command/controller/client/HexedController.java Auto-merging src/main/java/org/xcore/plugin/command/controller/client/InformationController.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/command/controller/client/InformationController.java Auto-merging src/main/java/org/xcore/plugin/command/controller/client/MapController.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/command/controller/client/MapController.java Auto-merging src/main/java/org/xcore/plugin/command/controller/client/ModerationController.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/command/controller/client/ModerationController.java Auto-merging src/main/java/org/xcore/plugin/command/controller/client/SocialController.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/command/controller/client/SocialController.java Auto-merging src/main/java/org/xcore/plugin/command/controller/client/VoteController.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/command/controller/client/VoteController.java Auto-merging src/main/java/org/xcore/plugin/command/controller/server/DataController.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/command/controller/server/DataController.java Auto-merging src/main/java/org/xcore/plugin/command/controller/server/MaintainController.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/command/controller/server/MaintainController.java Auto-merging src/main/java/org/xcore/plugin/command/controller/server/ServerInformationController.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/command/controller/server/ServerInformationController.java Auto-merging src/main/java/org/xcore/plugin/command/controller/server/ServerModerationController.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/command/controller/server/ServerModerationController.java Auto-merging src/main/java/org/xcore/plugin/config/Config.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/config/Config.java Auto-merging src/main/java/org/xcore/plugin/config/ConfigFactory.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/config/ConfigFactory.java Auto-merging src/main/java/org/xcore/plugin/config/GlobalConfig.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/config/GlobalConfig.java Auto-merging src/main/java/org/xcore/plugin/config/SerializationFactory.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/config/SerializationFactory.java Auto-merging src/main/java/org/xcore/plugin/database/MongoFactory.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/database/MongoFactory.java Auto-merging src/main/java/org/xcore/plugin/database/repository/AdminDataRepository.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/database/repository/AdminDataRepository.java Auto-merging src/main/java/org/xcore/plugin/database/repository/BanDataRepository.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/database/repository/BanDataRepository.java Auto-merging src/main/java/org/xcore/plugin/database/repository/EventDataRepository.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/database/repository/EventDataRepository.java Auto-merging src/main/java/org/xcore/plugin/database/repository/MapDataRepository.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/database/repository/MapDataRepository.java Auto-merging src/main/java/org/xcore/plugin/database/repository/MuteDataRepository.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/database/repository/MuteDataRepository.java Auto-merging src/main/java/org/xcore/plugin/database/repository/PlayerDataRepository.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/database/repository/PlayerDataRepository.java Auto-merging src/main/java/org/xcore/plugin/event/NetEventService.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/event/NetEventService.java Auto-merging src/main/java/org/xcore/plugin/event/PluginEventService.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/event/PluginEventService.java Auto-merging src/main/java/org/xcore/plugin/event/SocketEvents.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/event/SocketEvents.java Auto-merging src/main/java/org/xcore/plugin/event/SocketService.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/event/SocketService.java Auto-merging src/main/java/org/xcore/plugin/event/handler/ConnectionHandler.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/event/handler/ConnectionHandler.java Auto-merging src/main/java/org/xcore/plugin/event/handler/GameLifecycleHandler.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/event/handler/GameLifecycleHandler.java Auto-merging src/main/java/org/xcore/plugin/event/handler/MapVoteHandler.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/event/handler/MapVoteHandler.java Auto-merging src/main/java/org/xcore/plugin/event/socket/ChatSocketHandler.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/event/socket/ChatSocketHandler.java Auto-merging src/main/java/org/xcore/plugin/event/socket/MapSocketHandler.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/event/socket/MapSocketHandler.java Auto-merging src/main/java/org/xcore/plugin/event/socket/ModerationSocketHandler.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/event/socket/ModerationSocketHandler.java Auto-merging src/main/java/org/xcore/plugin/gamemode/hexed/HexedRanks.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/gamemode/hexed/HexedRanks.java Auto-merging src/main/java/org/xcore/plugin/gamemode/hexed/MiniHexedService.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/gamemode/hexed/MiniHexedService.java Auto-merging src/main/java/org/xcore/plugin/gamemode/pvp/MiniPvP.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/gamemode/pvp/MiniPvP.java Auto-merging src/main/java/org/xcore/plugin/integration/AdminModIntegration.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/integration/AdminModIntegration.java Auto-merging src/main/java/org/xcore/plugin/integration/Console.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/integration/Console.java Auto-merging src/main/java/org/xcore/plugin/map/SmartMapSelector.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/map/SmartMapSelector.java Auto-merging src/main/java/org/xcore/plugin/model/BanData.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/model/BanData.java Auto-merging src/main/java/org/xcore/plugin/model/EventData.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/model/EventData.java Auto-merging src/main/java/org/xcore/plugin/model/MapData.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/model/MapData.java Auto-merging src/main/java/org/xcore/plugin/model/MuteData.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/model/MuteData.java Auto-merging src/main/java/org/xcore/plugin/model/PlayerData.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/model/PlayerData.java Auto-merging src/main/java/org/xcore/plugin/model/Punishment.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/model/Punishment.java Auto-merging src/main/java/org/xcore/plugin/security/ingress/IngressService.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/security/ingress/IngressService.java Auto-merging src/main/java/org/xcore/plugin/security/ingress/checks/BanCheck.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/security/ingress/checks/BanCheck.java Auto-merging src/main/java/org/xcore/plugin/security/ingress/checks/KickTimeoutCheck.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/security/ingress/checks/KickTimeoutCheck.java Auto-merging src/main/java/org/xcore/plugin/security/ingress/checks/NameValidationCheck.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/security/ingress/checks/NameValidationCheck.java Auto-merging src/main/java/org/xcore/plugin/service/AntiCheatService.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/service/AntiCheatService.java Auto-merging src/main/java/org/xcore/plugin/service/FindService.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/service/FindService.java Auto-merging src/main/java/org/xcore/plugin/service/GameStateService.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/service/GameStateService.java Auto-merging src/main/java/org/xcore/plugin/service/LeaderboardService.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/service/LeaderboardService.java Auto-merging src/main/java/org/xcore/plugin/service/MapService.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/service/MapService.java Auto-merging src/main/java/org/xcore/plugin/service/NetworkService.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/service/NetworkService.java Auto-merging src/main/java/org/xcore/plugin/service/PlayerActivityService.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/service/PlayerActivityService.java Auto-merging src/main/java/org/xcore/plugin/service/SecurityService.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/service/SecurityService.java Auto-merging src/main/java/org/xcore/plugin/service/TimeService.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/service/TimeService.java Auto-merging src/main/java/org/xcore/plugin/service/TranslatorService.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/service/TranslatorService.java Auto-merging src/main/java/org/xcore/plugin/service/moderation/ModerationService.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/service/moderation/ModerationService.java Auto-merging src/main/java/org/xcore/plugin/vote/VoteChoice.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/vote/VoteChoice.java Auto-merging src/main/java/org/xcore/plugin/vote/VoteEvent.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/vote/VoteEvent.java Auto-merging src/main/java/org/xcore/plugin/vote/VoteKick.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/vote/VoteKick.java Auto-merging src/main/java/org/xcore/plugin/vote/VoteRtv.java CONFLICT hint: Recursive merging with submodules currently only supports trivial cases. hint: Please manually handle the merging of each conflicted submodule. hint: This can be accomplished with the following steps: hint: - come back to superproject and run: hint: hint: git add flubundle hint: hint: to record the above merge or update hint: - resolve any other conflicts in the superproject hint: - commit the resulting index in the superproject hint: hint: Disable this message with "git config set advice.submoduleMergeConflict false" (add/add): Merge conflict in src/main/java/org/xcore/plugin/vote/VoteRtv.java Auto-merging src/main/java/org/xcore/plugin/vote/VoteService.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/vote/VoteService.java Auto-merging src/main/resources/bundles/bundle_en.ftl CONFLICT (add/add): Merge conflict in src/main/resources/bundles/bundle_en.ftl Auto-merging src/main/resources/bundles/bundle_ru.ftl CONFLICT (add/add): Merge conflict in src/main/resources/bundles/bundle_ru.ftl Auto-merging src/main/resources/bundles/bundle_uk_UA.ftl CONFLICT (add/add): Merge conflict in src/main/resources/bundles/bundle_uk_UA.ftl Auto-merging weblate.yaml CONFLICT (add/add): Merge conflict in weblate.yaml error: could not apply 37a26e5... feat: Add weblate.yaml hint: Resolve all conflicts manually, mark them as resolved with hint: "git add/rm <conflicted_files>", then run "git rebase --continue". hint: You can instead skip this commit: run "git rebase --skip". hint: To abort and get back to the state before "git rebase", run "git rebase --abort". hint: Disable this message with "git config set advice.mergeConflict false" Could not apply 37a26e5... # feat: Add weblate.yaml (1)03/14/2026 |
|
webhook:github
Repository notification received |
GitHub: https://api.github.com/repos/XCore-mindustry/XCore-plugin, main
03/14/2026
|
|
webhook:github
Repository rebase failed |
warning: skipped previously applied commit d091f9c warning: skipped previously applied commit 80b21b1 warning: skipped previously applied commit ae6089b warning: skipped previously applied commit 26b141c warning: skipped previously applied commit 4ba4166 warning: skipped previously applied commit 69d7431 warning: skipped previously applied commit 7ea4040 warning: skipped previously applied commit d1252fc warning: skipped previously applied commit f309cb1 warning: skipped previously applied commit c1d4ad9 warning: skipped previously applied commit b180e34 warning: skipped previously applied commit 4d6b361 warning: skipped previously applied commit c662585 warning: skipped previously applied commit 0995d9b warning: skipped previously applied commit d297fb7 warning: skipped previously applied commit 6d64d3a warning: skipped previously applied commit 17fd886 warning: skipped previously applied commit 61f51e5 warning: skipped previously applied commit a39f321 warning: skipped previously applied commit 6574ec0 warning: skipped previously applied commit b1a03db warning: skipped previously applied commit 06ff4c3 warning: skipped previously applied commit d49a816 warning: skipped previously applied commit 43d14a6 warning: skipped previously applied commit 6c1b0f2 warning: skipped previously applied commit aa57498 warning: skipped previously applied commit abc8896 warning: skipped previously applied commit bdc759f warning: skipped previously applied commit 1f6937d warning: skipped previously applied commit b5b4e87 warning: skipped previously applied commit c0be651 warning: skipped previously applied commit f06c1d1 warning: skipped previously applied commit 537b090 warning: skipped previously applied commit 71896f0 warning: skipped previously applied commit 82726ef warning: skipped previously applied commit 0aadee7 warning: skipped previously applied commit 5829150 warning: skipped previously applied commit 032947f warning: skipped previously applied commit edc03b5 warning: skipped previously applied commit ddd62bf warning: skipped previously applied commit a3ba244 warning: skipped previously applied commit 9265e6a warning: skipped previously applied commit 8c72d58 warning: skipped previously applied commit 83ac917 warning: skipped previously applied commit 8a5a9e6 warning: skipped previously applied commit 71d1863 warning: skipped previously applied commit aa8db73 warning: skipped previously applied commit 4cf1cbb warning: skipped previously applied commit 81c17b1 warning: skipped previously applied commit 397ffb7 warning: skipped previously applied commit b522d6d warning: skipped previously applied commit 70df3d4 warning: skipped previously applied commit c113779 warning: skipped previously applied commit 06dd455 warning: skipped previously applied commit 8f37e43 warning: skipped previously applied commit a4adcc1 warning: skipped previously applied commit 4a295fc warning: skipped previously applied commit 324b6ad warning: skipped previously applied commit 1280382 warning: skipped previously applied commit 543fde4 warning: skipped previously applied commit 0048666 warning: skipped previously applied commit 1767fdb warning: skipped previously applied commit 7547149 warning: skipped previously applied commit a535b67 warning: skipped previously applied commit 4fa714e warning: skipped previously applied commit 5e325c5 warning: skipped previously applied commit 2ef155e warning: skipped previously applied commit 21e632c warning: skipped previously applied commit 0371900 warning: skipped previously applied commit 538379b warning: skipped previously applied commit 5d44f84 warning: skipped previously applied commit e5ab201 warning: skipped previously applied commit 52229f6 warning: skipped previously applied commit bf43d75 warning: skipped previously applied commit 9263995 warning: skipped previously applied commit 1c13d91 warning: skipped previously applied commit 7775e6c warning: skipped previously applied commit dc06802 warning: skipped previously applied commit 51ac6d3 warning: skipped previously applied commit 2142af7 warning: skipped previously applied commit 7fea0d6 warning: skipped previously applied commit 8a17245 warning: skipped previously applied commit 9a6b45e warning: skipped previously applied commit 2329d0e warning: skipped previously applied commit 26fa24f warning: skipped previously applied commit 5a16b74 warning: skipped previously applied commit 3f94990 warning: skipped previously applied commit 92c311e warning: skipped previously applied commit 1d14dc8 warning: skipped previously applied commit 77bf402 warning: skipped previously applied commit f1b8017 warning: skipped previously applied commit 8eeddd7 warning: skipped previously applied commit 3e86b4b warning: skipped previously applied commit 44d26b5 warning: skipped previously applied commit a6be04e warning: skipped previously applied commit 43324c6 warning: skipped previously applied commit 70e5a1a warning: skipped previously applied commit 95a6982 warning: skipped previously applied commit b2e6b63 warning: skipped previously applied commit b2627bf warning: skipped previously applied commit 1263c12 warning: skipped previously applied commit c74202b warning: skipped previously applied commit 7d048e3 warning: skipped previously applied commit b572727 warning: skipped previously applied commit 689a42b warning: skipped previously applied commit 32ea041 warning: skipped previously applied commit 7191b7f warning: skipped previously applied commit f7cf460 warning: skipped previously applied commit 2eff1a7 warning: skipped previously applied commit 0b7e5e3 warning: skipped previously applied commit ea89ef1 warning: skipped previously applied commit 1647349 warning: skipped previously applied commit cb3c1e7 warning: skipped previously applied commit f2dd64d warning: skipped previously applied commit 656b25e warning: skipped previously applied commit c85ccdd warning: skipped previously applied commit abac5c0 warning: skipped previously applied commit 1e87b69 warning: skipped previously applied commit 28aa6ed warning: skipped previously applied commit 67cce58 warning: skipped previously applied commit c95ce3b warning: skipped previously applied commit 446a520 warning: skipped previously applied commit 0a9a00e warning: skipped previously applied commit 512645b warning: skipped previously applied commit a781be9 warning: skipped previously applied commit cdc7971 warning: skipped previously applied commit 769bffc warning: skipped previously applied commit 406adca warning: skipped previously applied commit f9ee5f9 warning: skipped previously applied commit b79680c warning: skipped previously applied commit 747ff8f warning: skipped previously applied commit 1598044 warning: skipped previously applied commit afb2169 warning: skipped previously applied commit b1aef44 warning: skipped previously applied commit 7d0a63a warning: skipped previously applied commit dab1821 warning: skipped previously applied commit f8da4c5 warning: skipped previously applied commit 4d22077 warning: skipped previously applied commit 30e26f3 warning: skipped previously applied commit 2b3163d warning: skipped previously applied commit adcd753 warning: skipped previously applied commit 5c1b278 warning: skipped previously applied commit e1a682e warning: skipped previously applied commit 6d1a7b1 warning: skipped previously applied commit 798ae4c warning: skipped previously applied commit 24cda32 warning: skipped previously applied commit 04e5b4b warning: skipped previously applied commit a62af45 warning: skipped previously applied commit e88210d warning: skipped previously applied commit e090ca0 warning: skipped previously applied commit ddbeb92 warning: skipped previously applied commit bdbf838 warning: skipped previously applied commit 4154307 warning: skipped previously applied commit 27d2278 warning: skipped previously applied commit 3efaf1e warning: skipped previously applied commit 4c13841 warning: skipped previously applied commit 65fefc5 warning: skipped previously applied commit cbfa3cf warning: skipped previously applied commit 0fb1f3a warning: skipped previously applied commit b359fec warning: skipped previously applied commit 398d39d warning: skipped previously applied commit 04db9df warning: skipped previously applied commit 1f51d20 warning: skipped previously applied commit c0e26d9 warning: skipped previously applied commit a447804 warning: skipped previously applied commit 4816244 warning: skipped previously applied commit 8b10465 warning: skipped previously applied commit b904260 warning: skipped previously applied commit 41037bd warning: skipped previously applied commit abd21ec warning: skipped previously applied commit 226ae99 warning: skipped previously applied commit 7fbadde warning: skipped previously applied commit a0071e0 warning: skipped previously applied commit 7a38a15 warning: skipped previously applied commit 6c04761 warning: skipped previously applied commit 18687ec warning: skipped previously applied commit a035946 warning: skipped previously applied commit 1f9377f warning: skipped previously applied commit ff0c32c warning: skipped previously applied commit 73360e3 warning: skipped previously applied commit 0abd292 warning: skipped previously applied commit b2eb756 warning: skipped previously applied commit 1266dac warning: skipped previously applied commit 0579d5e warning: skipped previously applied commit 99051b7 warning: skipped previously applied commit 35542b2 warning: skipped previously applied commit 4fb8110 warning: skipped previously applied commit 38431ea warning: skipped previously applied commit beaf4eb warning: skipped previously applied commit 8c060af warning: skipped previously applied commit 0767911 warning: skipped previously applied commit caed430 warning: skipped previously applied commit ba3f891 warning: skipped previously applied commit 09e93e2 warning: skipped previously applied commit 893c781 warning: skipped previously applied commit f44cf5d warning: skipped previously applied commit ac92ef3 warning: skipped previously applied commit 5437ed2 warning: skipped previously applied commit fa312bc warning: skipped previously applied commit 711115f warning: skipped previously applied commit bd75040 warning: skipped previously applied commit 2ccf6de warning: skipped previously applied commit 27661f2 warning: skipped previously applied commit dde9710 warning: skipped previously applied commit 218ec0f warning: skipped previously applied commit 829a8bf warning: skipped previously applied commit 9de4b20 warning: skipped previously applied commit 2c439a6 warning: skipped previously applied commit be1eb43 warning: skipped previously applied commit 230cfd6 warning: skipped previously applied commit fd5eefa warning: skipped previously applied commit 4f1ef16 warning: skipped previously applied commit dc87d2e warning: skipped previously applied commit 600987d warning: skipped previously applied commit a61d823 warning: skipped previously applied commit 33018db warning: skipped previously applied commit 1b3a92f warning: skipped previously applied commit 15c603d warning: skipped previously applied commit 40114e2 warning: skipped previously applied commit 70b4e5d warning: skipped previously applied commit d0f2141 warning: skipped previously applied commit 509997c warning: skipped previously applied commit e2b115f warning: skipped previously applied commit 1556bd0 warning: skipped previously applied commit b4ad222 warning: skipped previously applied commit 59a7d08 warning: skipped previously applied commit 0002a8a warning: skipped previously applied commit af5129f warning: skipped previously applied commit 228a3f1 warning: skipped previously applied commit 430314a warning: skipped previously applied commit 3ae9966 warning: skipped previously applied commit 9e03a54 warning: skipped previously applied commit 51aede4 warning: skipped previously applied commit fe4bde0 warning: skipped previously applied commit 743c936 warning: skipped previously applied commit 67105a6 warning: skipped previously applied commit 9e81fd5 warning: skipped previously applied commit b531f5d warning: skipped previously applied commit a55700a warning: skipped previously applied commit b7a81ca warning: skipped previously applied commit da410d1 warning: skipped previously applied commit 88be6d3 warning: skipped previously applied commit f951ec2 warning: skipped previously applied commit 5b6a68b warning: skipped previously applied commit 9301fd4 warning: skipped previously applied commit 154c63e warning: skipped previously applied commit c5c5947 warning: skipped previously applied commit 2508491 warning: skipped previously applied commit 7ec6300 warning: skipped previously applied commit 5c7a0be warning: skipped previously applied commit cb2ad26 warning: skipped previously applied commit 10738ca warning: skipped previously applied commit 4ffb7e4 warning: skipped previously applied commit dddcb74 warning: skipped previously applied commit eab9979 warning: skipped previously applied commit eb245ca warning: skipped previously applied commit 41ff74f warning: skipped previously applied commit 05d96bb warning: skipped previously applied commit f9fa3bb warning: skipped previously applied commit ab6c7bf warning: skipped previously applied commit dd4376c warning: skipped previously applied commit cb97215 warning: skipped previously applied commit b7fcdef warning: skipped previously applied commit e2755be warning: skipped previously applied commit 25382aa warning: skipped previously applied commit f8d72ad warning: skipped previously applied commit 0823743 warning: skipped previously applied commit b6206cf warning: skipped previously applied commit b26c910 warning: skipped previously applied commit b2a3089 warning: skipped previously applied commit 7da4a46 warning: skipped previously applied commit 06a69d4 warning: skipped previously applied commit 5f2e3bb warning: skipped previously applied commit 970a6a5 warning: skipped previously applied commit 24273c5 warning: skipped previously applied commit 408384d warning: skipped previously applied commit b665d9e warning: skipped previously applied commit 450bddf warning: skipped previously applied commit 4f8f58c warning: skipped previously applied commit 23ec9e0 warning: skipped previously applied commit 46291d4 warning: skipped previously applied commit 8104817 warning: skipped previously applied commit d787e35 warning: skipped previously applied commit 2c481f7 warning: skipped previously applied commit 22545be warning: skipped previously applied commit 734cb6a warning: skipped previously applied commit a6707aa warning: skipped previously applied commit 8599cb9 warning: skipped previously applied commit 58b9273 warning: skipped previously applied commit 4c50b5b warning: skipped previously applied commit 8f5aa47 warning: skipped previously applied commit b149947 warning: skipped previously applied commit a964c38 warning: skipped previously applied commit b17ae62 warning: skipped previously applied commit 8baba3f warning: skipped previously applied commit 9863e7e warning: skipped previously applied commit 90738fa warning: skipped previously applied commit ba0b0d0 warning: skipped previously applied commit 2a5105e warning: skipped previously applied commit 180aa7f warning: skipped previously applied commit 5b1601d warning: skipped previously applied commit ce613f6 warning: skipped previously applied commit 589b172 warning: skipped previously applied commit 0fb5a2f warning: skipped previously applied commit 9c596e8 warning: skipped previously applied commit 10aba6c warning: skipped previously applied commit 9ab559e warning: skipped previously applied commit c3dba89 warning: skipped previously applied commit f924f7d warning: skipped previously applied commit b6fd4f1 warning: skipped previously applied commit 689c64e warning: skipped previously applied commit 222d151 warning: skipped previously applied commit fcf00c1 warning: skipped previously applied commit 887b6e9 warning: skipped previously applied commit 3c3cb16 warning: skipped previously applied commit 34e2fb9 warning: skipped previously applied commit 8ec9d3a warning: skipped previously applied commit e12bbb0 warning: skipped previously applied commit 8f4eb33 warning: skipped previously applied commit e21fb80 warning: skipped previously applied commit 4729df5 warning: skipped previously applied commit 489056c warning: skipped previously applied commit 9fbb83a warning: skipped previously applied commit 679b634 warning: skipped previously applied commit f6d9395 warning: skipped previously applied commit d3863c9 warning: skipped previously applied commit 3a39107 warning: skipped previously applied commit 86fe2fe warning: skipped previously applied commit 336d486 warning: skipped previously applied commit cff1654 warning: skipped previously applied commit 78f8752 warning: skipped previously applied commit 32ee83f warning: skipped previously applied commit 6e3d10b warning: skipped previously applied commit 9392ebe warning: skipped previously applied commit 5762fb2 warning: skipped previously applied commit c6668b6 warning: skipped previously applied commit ebc1ad6 warning: skipped previously applied commit d624714 warning: skipped previously applied commit f17cc17 warning: skipped previously applied commit a6c91d4 warning: skipped previously applied commit 87943c7 warning: skipped previously applied commit 9439f07 warning: skipped previously applied commit 1fbda14 warning: skipped previously applied commit d8faa8b warning: skipped previously applied commit 18aa2f5 warning: skipped previously applied commit 95f23ac warning: skipped previously applied commit 49a8d88 warning: skipped previously applied commit ce3e93a warning: skipped previously applied commit e2906e7 warning: skipped previously applied commit 9ed6900 warning: skipped previously applied commit 1d5bd3a warning: skipped previously applied commit f9e74df warning: skipped previously applied commit 7dd385e warning: skipped previously applied commit b47bb81 warning: skipped previously applied commit 6c6131c warning: skipped previously applied commit 6b460f4 warning: skipped previously applied commit 38282c7 warning: skipped previously applied commit 81471b7 warning: skipped previously applied commit de860f7 warning: skipped previously applied commit 53008c6 warning: skipped previously applied commit 13b6cdb warning: skipped previously applied commit a9425a0 warning: skipped previously applied commit cc79b25 warning: skipped previously applied commit 4a300f8 warning: skipped previously applied commit 5ec875f warning: skipped previously applied commit e40b651 warning: skipped previously applied commit 9286e4a warning: skipped previously applied commit 9392510 warning: skipped previously applied commit 396b3a1 warning: skipped previously applied commit e0df1b9 warning: skipped previously applied commit f2dae13 warning: skipped previously applied commit 556741c warning: skipped previously applied commit b0e54ab warning: skipped previously applied commit e1eab39 warning: skipped previously applied commit e9c9c8f warning: skipped previously applied commit 5fc0b23 warning: skipped previously applied commit 93d5b9b warning: skipped previously applied commit 7c559cf warning: skipped previously applied commit 66218e2 warning: skipped previously applied commit 515e554 warning: skipped previously applied commit dc8b173 warning: skipped previously applied commit 335c068 warning: skipped previously applied commit 3076f28 warning: skipped previously applied commit fb19875 warning: skipped previously applied commit faefdc5 warning: skipped previously applied commit 66c12b1 warning: skipped previously applied commit 832ac74 warning: skipped previously applied commit a69f21d warning: skipped previously applied commit 25f1b5b warning: skipped previously applied commit 2d59b06 warning: skipped previously applied commit 57164d5 warning: skipped previously applied commit 25cae31 warning: skipped previously applied commit 0fed177 warning: skipped previously applied commit 4f56a44 warning: skipped previously applied commit 0694eca warning: skipped previously applied commit f8c0d36 warning: skipped previously applied commit 688ad0c warning: skipped previously applied commit d24f043 warning: skipped previously applied commit b3bfb48 warning: skipped previously applied commit bd483c4 warning: skipped previously applied commit 0bf00e6 warning: skipped previously applied commit dc43993 warning: skipped previously applied commit 9122fcf warning: skipped previously applied commit e2ce1e0 warning: skipped previously applied commit e9411a4 warning: skipped previously applied commit 71e5678 warning: skipped previously applied commit 9c8f15e warning: skipped previously applied commit 140c3ca warning: skipped previously applied commit 664d592 warning: skipped previously applied commit 64c92d4 warning: skipped previously applied commit 8848bc3 warning: skipped previously applied commit 13a5f3d warning: skipped previously applied commit 14632d4 warning: skipped previously applied commit e1c7443 warning: skipped previously applied commit 8dd7f30 warning: skipped previously applied commit bd38945 warning: skipped previously applied commit b18021f warning: skipped previously applied commit 2ca4c8b warning: skipped previously applied commit af7a7f5 warning: skipped previously applied commit ef3ca8a warning: skipped previously applied commit dab5cf9 warning: skipped previously applied commit a0e92ad warning: skipped previously applied commit 36b4666 warning: skipped previously applied commit bd637ab warning: skipped previously applied commit c79304d warning: skipped previously applied commit 1a25c69 warning: skipped previously applied commit 7c725e4 warning: skipped previously applied commit 5a60f5c warning: skipped previously applied commit d17e528 warning: skipped previously applied commit 06f98fe warning: skipped previously applied commit 61062ec warning: skipped previously applied commit fbec2de warning: skipped previously applied commit 03aa1d0 warning: skipped previously applied commit fd8bf74 warning: skipped previously applied commit a2daf2b warning: skipped previously applied commit fe217ba warning: skipped previously applied commit 1482e1c warning: skipped previously applied commit 0738100 warning: skipped previously applied commit 9e9de01 warning: skipped previously applied commit b05fff4 warning: skipped previously applied commit 1234e03 warning: skipped previously applied commit 95ac6f0 warning: skipped previously applied commit 7e412a8 warning: skipped previously applied commit ed4be5e warning: skipped previously applied commit 71ee71d warning: skipped previously applied commit 1399a13 warning: skipped previously applied commit a7f1340 warning: skipped previously applied commit 183a35e warning: skipped previously applied commit df7bac9 warning: skipped previously applied commit 67d5667 warning: skipped previously applied commit 39e1a94 warning: skipped previously applied commit 7a7f206 warning: skipped previously applied commit 7c0aa05 warning: skipped previously applied commit 67b639e warning: skipped previously applied commit 7592426 warning: skipped previously applied commit dd4f5da warning: skipped previously applied commit 08e4050 warning: skipped previously applied commit d46f45a warning: skipped previously applied commit 693a395 warning: skipped previously applied commit 943785c warning: skipped previously applied commit 35f73f5 warning: skipped previously applied commit c8a9766 warning: skipped previously applied commit 95b327e warning: skipped previously applied commit 4bb602d warning: skipped previously applied commit a72d83e warning: skipped previously applied commit df2e9fa warning: skipped previously applied commit fc8be4b warning: skipped previously applied commit 9ccec1c warning: skipped previously applied commit afa2108 warning: skipped previously applied commit 38fe4cf warning: skipped previously applied commit b4d9c98 warning: skipped previously applied commit 29dc7dd warning: skipped previously applied commit 7c53312 warning: skipped previously applied commit 607dc88 warning: skipped previously applied commit 804bb8b warning: skipped previously applied commit b16b311 warning: skipped previously applied commit b908cd0 warning: skipped previously applied commit 15bfcca warning: skipped previously applied commit 5755159 warning: skipped previously applied commit 6b925af warning: skipped previously applied commit d5821ed warning: skipped previously applied commit 8944145 warning: skipped previously applied commit daec420 warning: skipped previously applied commit da2f7fd warning: skipped previously applied commit 59e2916 warning: skipped previously applied commit 0585d13 warning: skipped previously applied commit 22faeb2 warning: skipped previously applied commit 6c34724 warning: skipped previously applied commit 272b6bf warning: skipped previously applied commit 9884fc8 warning: skipped previously applied commit 224c1e7 warning: skipped previously applied commit 102c0f8 warning: skipped previously applied commit 06abced warning: skipped previously applied commit 06d1606 warning: skipped previously applied commit 796b835 warning: skipped previously applied commit 0555e77 warning: skipped previously applied commit f276151 warning: skipped previously applied commit 7dc2c80 warning: skipped previously applied commit c2fd2cc warning: skipped previously applied commit 3a378c3 warning: skipped previously applied commit 74b5b31 warning: skipped previously applied commit 5107497 warning: skipped previously applied commit 22b6d22 warning: skipped previously applied commit ad3d66c warning: skipped previously applied commit 35cb242 warning: skipped previously applied commit 0f27ae6 warning: skipped previously applied commit fb24b8b warning: skipped previously applied commit 063c964 warning: skipped previously applied commit 9fc0fe8 warning: skipped previously applied commit e5ece6c warning: skipped previously applied commit f5b9149 warning: skipped previously applied commit 0d4bf1a warning: skipped previously applied commit f345e1e warning: skipped previously applied commit 86413c5 warning: skipped previously applied commit 99d0d22 warning: skipped previously applied commit f649031 warning: skipped previously applied commit 85d2590 warning: skipped previously applied commit 88eb827 warning: skipped previously applied commit c1969cf warning: skipped previously applied commit c798d55 warning: skipped previously applied commit 9084e58 warning: skipped previously applied commit 6b60905 warning: skipped previously applied commit 4e3f039 warning: skipped previously applied commit 8590bd8 warning: skipped previously applied commit c1eccdc warning: skipped previously applied commit 363592b warning: skipped previously applied commit 59cc57f warning: skipped previously applied commit a25e858 warning: skipped previously applied commit 44ef43b warning: skipped previously applied commit a1255d3 warning: skipped previously applied commit 0044b2f warning: skipped previously applied commit 5cfbdf3 warning: skipped previously applied commit cb6e875 warning: skipped previously applied commit f8bfc37 warning: skipped previously applied commit 5768736 warning: skipped previously applied commit eec3b1d warning: skipped previously applied commit 2033b54 warning: skipped previously applied commit 1dbab52 warning: skipped previously applied commit b560db1 warning: skipped previously applied commit 112877a warning: skipped previously applied commit f0cf85d warning: skipped previously applied commit 31f0902 warning: skipped previously applied commit 691faca warning: skipped previously applied commit 56571a4 warning: skipped previously applied commit f5463cf warning: skipped previously applied commit 0216184 warning: skipped previously applied commit 5a090a7 warning: skipped previously applied commit e2d89f8 warning: skipped previously applied commit bdce5ea warning: skipped previously applied commit 92c0fe3 warning: skipped previously applied commit d53517f warning: skipped previously applied commit 7dda1bc warning: skipped previously applied commit 51f106e warning: skipped previously applied commit 0f03135 warning: skipped previously applied commit 16fff34 warning: skipped previously applied commit ee778e6 warning: skipped previously applied commit 06ed7c8 warning: skipped previously applied commit 4446b91 warning: skipped previously applied commit bbcf9da warning: skipped previously applied commit 90feead warning: skipped previously applied commit 737020f warning: skipped previously applied commit fae5ee7 warning: skipped previously applied commit 067f850 warning: skipped previously applied commit fca8e0d warning: skipped previously applied commit cab1eb1 warning: skipped previously applied commit 8a6036f warning: skipped previously applied commit 0fe2843 warning: skipped previously applied commit 65deb2e warning: skipped previously applied commit 76ddd82 warning: skipped previously applied commit 0bc1753 warning: skipped previously applied commit 1e8dc2c warning: skipped previously applied commit 8a790fc warning: skipped previously applied commit c65d05e warning: skipped previously applied commit 0bfdab4 warning: skipped previously applied commit 6525fbc warning: skipped previously applied commit 92b51d6 warning: skipped previously applied commit f348089 warning: skipped previously applied commit a7aef32 warning: skipped previously applied commit 8252443 warning: skipped previously applied commit df9a971 warning: skipped previously applied commit daf4cdb warning: skipped previously applied commit ed98213 warning: skipped previously applied commit 09166b6 warning: skipped previously applied commit bc7ab5e hint: use --reapply-cherry-picks to include skipped commits hint: Disable this message with "git config set advice.skippedCherryPicks false" Rebasing (1/2) Auto-merging .github/workflows/build.yml CONFLICT (add/add): Merge conflict in .github/workflows/build.yml Auto-merging .gitignore CONFLICT (add/add): Merge conflict in .gitignore Auto-merging README.md CONFLICT (add/add): Merge conflict in README.md Auto-merging build.gradle.kts CONFLICT (add/add): Merge conflict in build.gradle.kts Failed to merge submodule flubundle (not checked out) CONFLICT (submodule): Merge conflict in flubundle Auto-merging gradle/wrapper/gradle-wrapper.properties CONFLICT (add/add): Merge conflict in gradle/wrapper/gradle-wrapper.properties Auto-merging src/main/java/org/xcore/plugin/XcorePlugin.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/XcorePlugin.java Auto-merging src/main/java/org/xcore/plugin/command/controller/client/AuthController.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/command/controller/client/AuthController.java Auto-merging src/main/java/org/xcore/plugin/command/controller/client/EventController.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/command/controller/client/EventController.java Auto-merging src/main/java/org/xcore/plugin/command/controller/client/HexedController.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/command/controller/client/HexedController.java Auto-merging src/main/java/org/xcore/plugin/command/controller/client/InformationController.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/command/controller/client/InformationController.java Auto-merging src/main/java/org/xcore/plugin/command/controller/client/MapController.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/command/controller/client/MapController.java Auto-merging src/main/java/org/xcore/plugin/command/controller/client/ModerationController.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/command/controller/client/ModerationController.java Auto-merging src/main/java/org/xcore/plugin/command/controller/client/SocialController.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/command/controller/client/SocialController.java Auto-merging src/main/java/org/xcore/plugin/command/controller/client/VoteController.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/command/controller/client/VoteController.java Auto-merging src/main/java/org/xcore/plugin/command/controller/server/DataController.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/command/controller/server/DataController.java Auto-merging src/main/java/org/xcore/plugin/command/controller/server/MaintainController.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/command/controller/server/MaintainController.java Auto-merging src/main/java/org/xcore/plugin/command/controller/server/ServerInformationController.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/command/controller/server/ServerInformationController.java Auto-merging src/main/java/org/xcore/plugin/command/controller/server/ServerModerationController.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/command/controller/server/ServerModerationController.java Auto-merging src/main/java/org/xcore/plugin/config/Config.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/config/Config.java Auto-merging src/main/java/org/xcore/plugin/config/ConfigFactory.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/config/ConfigFactory.java Auto-merging src/main/java/org/xcore/plugin/config/GlobalConfig.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/config/GlobalConfig.java Auto-merging src/main/java/org/xcore/plugin/config/SerializationFactory.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/config/SerializationFactory.java Auto-merging src/main/java/org/xcore/plugin/database/MongoFactory.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/database/MongoFactory.java Auto-merging src/main/java/org/xcore/plugin/database/repository/AdminDataRepository.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/database/repository/AdminDataRepository.java Auto-merging src/main/java/org/xcore/plugin/database/repository/BanDataRepository.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/database/repository/BanDataRepository.java Auto-merging src/main/java/org/xcore/plugin/database/repository/EventDataRepository.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/database/repository/EventDataRepository.java Auto-merging src/main/java/org/xcore/plugin/database/repository/MapDataRepository.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/database/repository/MapDataRepository.java Auto-merging src/main/java/org/xcore/plugin/database/repository/MuteDataRepository.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/database/repository/MuteDataRepository.java Auto-merging src/main/java/org/xcore/plugin/database/repository/PlayerDataRepository.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/database/repository/PlayerDataRepository.java Auto-merging src/main/java/org/xcore/plugin/event/NetEventService.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/event/NetEventService.java Auto-merging src/main/java/org/xcore/plugin/event/PluginEventService.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/event/PluginEventService.java Auto-merging src/main/java/org/xcore/plugin/event/SocketEvents.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/event/SocketEvents.java Auto-merging src/main/java/org/xcore/plugin/event/SocketService.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/event/SocketService.java Auto-merging src/main/java/org/xcore/plugin/event/handler/ConnectionHandler.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/event/handler/ConnectionHandler.java Auto-merging src/main/java/org/xcore/plugin/event/handler/GameLifecycleHandler.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/event/handler/GameLifecycleHandler.java Auto-merging src/main/java/org/xcore/plugin/event/handler/MapVoteHandler.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/event/handler/MapVoteHandler.java Auto-merging src/main/java/org/xcore/plugin/event/socket/ChatSocketHandler.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/event/socket/ChatSocketHandler.java Auto-merging src/main/java/org/xcore/plugin/event/socket/MapSocketHandler.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/event/socket/MapSocketHandler.java Auto-merging src/main/java/org/xcore/plugin/event/socket/ModerationSocketHandler.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/event/socket/ModerationSocketHandler.java Auto-merging src/main/java/org/xcore/plugin/gamemode/hexed/HexedRanks.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/gamemode/hexed/HexedRanks.java Auto-merging src/main/java/org/xcore/plugin/gamemode/hexed/MiniHexedService.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/gamemode/hexed/MiniHexedService.java Auto-merging src/main/java/org/xcore/plugin/gamemode/pvp/MiniPvP.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/gamemode/pvp/MiniPvP.java Auto-merging src/main/java/org/xcore/plugin/integration/AdminModIntegration.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/integration/AdminModIntegration.java Auto-merging src/main/java/org/xcore/plugin/integration/Console.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/integration/Console.java Auto-merging src/main/java/org/xcore/plugin/map/SmartMapSelector.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/map/SmartMapSelector.java Auto-merging src/main/java/org/xcore/plugin/model/BanData.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/model/BanData.java Auto-merging src/main/java/org/xcore/plugin/model/EventData.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/model/EventData.java Auto-merging src/main/java/org/xcore/plugin/model/MapData.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/model/MapData.java Auto-merging src/main/java/org/xcore/plugin/model/MuteData.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/model/MuteData.java Auto-merging src/main/java/org/xcore/plugin/model/PlayerData.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/model/PlayerData.java Auto-merging src/main/java/org/xcore/plugin/model/Punishment.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/model/Punishment.java Auto-merging src/main/java/org/xcore/plugin/security/ingress/IngressService.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/security/ingress/IngressService.java Auto-merging src/main/java/org/xcore/plugin/security/ingress/checks/BanCheck.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/security/ingress/checks/BanCheck.java Auto-merging src/main/java/org/xcore/plugin/security/ingress/checks/KickTimeoutCheck.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/security/ingress/checks/KickTimeoutCheck.java Auto-merging src/main/java/org/xcore/plugin/security/ingress/checks/NameValidationCheck.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/security/ingress/checks/NameValidationCheck.java Auto-merging src/main/java/org/xcore/plugin/service/AntiCheatService.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/service/AntiCheatService.java Auto-merging src/main/java/org/xcore/plugin/service/FindService.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/service/FindService.java Auto-merging src/main/java/org/xcore/plugin/service/GameStateService.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/service/GameStateService.java Auto-merging src/main/java/org/xcore/plugin/service/LeaderboardService.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/service/LeaderboardService.java Auto-merging src/main/java/org/xcore/plugin/service/MapService.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/service/MapService.java Auto-merging src/main/java/org/xcore/plugin/service/NetworkService.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/service/NetworkService.java Auto-merging src/main/java/org/xcore/plugin/service/PlayerActivityService.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/service/PlayerActivityService.java Auto-merging src/main/java/org/xcore/plugin/service/SecurityService.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/service/SecurityService.java Auto-merging src/main/java/org/xcore/plugin/service/TimeService.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/service/TimeService.java Auto-merging src/main/java/org/xcore/plugin/service/TranslatorService.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/service/TranslatorService.java Auto-merging src/main/java/org/xcore/plugin/service/moderation/ModerationService.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/service/moderation/ModerationService.java Auto-merging src/main/java/org/xcore/plugin/vote/VoteChoice.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/vote/VoteChoice.java Auto-merging src/main/java/org/xcore/plugin/vote/VoteEvent.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/vote/VoteEvent.java Auto-merging src/main/java/org/xcore/plugin/vote/VoteKick.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/vote/VoteKick.java Auto-merging src/main/java/org/xcore/plugin/vote/VoteRtv.java CONFLICT hint: Recursive merging with submodules currently only supports trivial cases. hint: Please manually handle the merging of each conflicted submodule. hint: This can be accomplished with the following steps: hint: - come back to superproject and run: hint: hint: git add flubundle hint: hint: to record the above merge or update hint: - resolve any other conflicts in the superproject hint: - commit the resulting index in the superproject hint: hint: Disable this message with "git config set advice.submoduleMergeConflict false" (add/add): Merge conflict in src/main/java/org/xcore/plugin/vote/VoteRtv.java Auto-merging src/main/java/org/xcore/plugin/vote/VoteService.java CONFLICT (add/add): Merge conflict in src/main/java/org/xcore/plugin/vote/VoteService.java Auto-merging src/main/resources/bundles/bundle_en.ftl CONFLICT (add/add): Merge conflict in src/main/resources/bundles/bundle_en.ftl Auto-merging src/main/resources/bundles/bundle_ru.ftl CONFLICT (add/add): Merge conflict in src/main/resources/bundles/bundle_ru.ftl Auto-merging src/main/resources/bundles/bundle_uk_UA.ftl CONFLICT (add/add): Merge conflict in src/main/resources/bundles/bundle_uk_UA.ftl Auto-merging weblate.yaml CONFLICT (add/add): Merge conflict in weblate.yaml error: could not apply 37a26e5... feat: Add weblate.yaml hint: Resolve all conflicts manually, mark them as resolved with hint: "git add/rm <conflicted_files>", then run "git rebase --continue". hint: You can instead skip this commit: run "git rebase --skip". hint: To abort and get back to the state before "git rebase", run "git rebase --abort". hint: Disable this message with "git config set advice.mergeConflict false" Could not apply 37a26e5... # feat: Add weblate.yaml (1)03/14/2026 |
|
webhook:github
Repository notification received |
GitHub: https://api.github.com/repos/XCore-mindustry/XCore-plugin, main
03/14/2026
|