1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 11:45:51 +00:00
Commit Graph

5799 Commits

Author SHA1 Message Date
wzpzw5
965e348695
Update BlockPlacer.java 2020-11-17 01:13:03 +00:00
wzpzw5
3db77a0081
Fixed a bug of Duplicate items with BlockPlacer
Fixed a bug of Duplicate items with BlockPlacer's delay
on BlockPlacer place an item, just take out the item when it place,then one in hand and 
another is placed
2020-11-17 00:01:04 +00:00
TheBusyBiscuit
0cdd21f6bb Added a config option to delete excess cargo network items 2020-11-15 16:29:45 +01:00
TheBusyBiscuit
adc36fe7bd
[CI skip] Merge pull request #2553 from Slimefun/renovate/com.github.seeseemelk-mockbukkit-v1.16-0.x
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.15.1
2020-11-15 14:10:43 +01:00
Renovate Bot
0fd952d9e5
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.15.1 2020-11-15 10:54:53 +00:00
TheBusyBiscuit
0b9ab8b6cc Fixes #2446 2020-11-14 18:44:07 +01:00
TheBusyBiscuit
503dbc8367 Fixes #2418 2020-11-14 18:32:53 +01:00
TheBusyBiscuit
8de60dbe1d
[CI skip] Merge pull request #2552 from Slimefun/renovate/com.github.thebusybiscuit-cs-corelib2-0.x
Update dependency com.github.TheBusyBiscuit:CS-CoreLib2 to v0.27
2020-11-14 18:12:10 +01:00
Renovate Bot
2cd1fa2019
Update dependency com.github.TheBusyBiscuit:CS-CoreLib2 to v0.27 2020-11-14 16:38:22 +00:00
CURVX
527dfb2b79 Been a while 2020-11-12 22:20:36 +05:30
CURVX
c4a08fe991 Changes req by TTB 2020-11-12 18:32:18 +05:30
CURVX
bd461a6f88
Merge pull request #5 from Slimefun/master
[CI skip] Update fork
2020-11-12 18:10:00 +05:30
TheBusyBiscuit
032ad956ad
[CI skip] Merge pull request #2551 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.157
2020-11-12 12:46:16 +01:00
Renovate Bot
9c70c91118
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.157 2020-11-12 01:45:59 +00:00
TheBusyBiscuit
48b548e432
[CI skip] Merge pull request #2549 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.156
2020-11-11 11:47:25 +01:00
Renovate Bot
a6c8f3cf6c
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.156 2020-11-10 23:40:26 +00:00
TheBusyBiscuit
a675fe74f3
[CI skip] Merge pull request #2547 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.155
2020-11-10 11:08:47 +01:00
Renovate Bot
c243dd6927
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.155 2020-11-10 01:55:24 +00:00
TheBusyBiscuit
f1d4b50b67 One more tweak 2020-11-10 01:09:50 +01:00
TheBusyBiscuit
97cbe72a91 Some tweaks to the experimental bee wings 2020-11-10 01:04:15 +01:00
TheBusyBiscuit
e5b2924bee Finished Bee Wings 2020-11-10 00:56:06 +01:00
TheBusyBiscuit
f3cf421f0e Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into bee-armor 2020-11-10 00:40:59 +01:00
TheBusyBiscuit
05e983917a Added CoolerFeedPlayerEvent 2020-11-10 00:36:38 +01:00
TheBusyBiscuit
1d36ca82ba
Merge pull request #2522 from Slimefun/code-quality/abstract-classes
Code quality: Getting rid of abstract energy classes
2020-11-10 00:11:50 +01:00
TheBusyBiscuit
f261ea1103
[CI skip] Merge pull request #2546 from Slimefun/renovate/com.konghq-unirest-java-3.x
Update dependency com.konghq:unirest-java to v3.11.05
2020-11-10 00:11:31 +01:00
Renovate Bot
ba8a663aad
Update dependency com.konghq:unirest-java to v3.11.05 2020-11-09 02:43:09 +00:00
TheBusyBiscuit
dee7ded9cd
Merge pull request #2537 from Slimefun/gitlocalize-14021
fix of messenge_zh-TW
2020-11-08 23:40:14 +01:00
TheBusyBiscuit
a5704aee3f
Merge pull request #2388 from svr333/MoreTalismans
More talismans
2020-11-08 23:35:40 +01:00
TheBusyBiscuit
c55ab4318e
[CI skip] Merge pull request #2544 from Slimefun/renovate/ibiqlik-action-yamllint-3.x
Update ibiqlik/action-yamllint action to v3
2020-11-08 23:30:43 +01:00
Renovate Bot
4570c8dfa5
Update ibiqlik/action-yamllint action to v3 2020-11-08 18:09:09 +00:00
TheBusyBiscuit
4af45607c7
[CI skip] Merge pull request #2543 from Slimefun/renovate/com.konghq-unirest-java-3.x
Update dependency com.konghq:unirest-java to v3.11.04
2020-11-08 11:42:59 +01:00
Renovate Bot
fdb603dad4
Update dependency com.konghq:unirest-java to v3.11.04 2020-11-07 14:52:52 +00:00
TheBusyBiscuit
19873de5a5
[CI skip] Merge pull request #2541 from Slimefun/renovate/com.github.seeseemelk-mockbukkit-v1.16-0.x
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.15.0
2020-11-07 10:00:38 +01:00
TheBusyBiscuit
94e48ceb38
[CI skip] Merge pull request #2542 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.154
2020-11-07 10:00:22 +01:00
Renovate Bot
41f49877e3
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.154 2020-11-07 00:17:01 +00:00
Renovate Bot
255730dcb8
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.15.0 2020-11-05 11:17:16 +00:00
TheBusyBiscuit
4d00ffc9af Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into code-quality/abstract-classes 2020-11-05 00:08:04 +01:00
TheBusyBiscuit
933bd9d9b9 Merge branch 'code-quality/abstract-classes' of https://github.com/Slimefun/Slimefun4.git into code-quality/abstract-classes 2020-11-05 00:07:50 +01:00
TheBusyBiscuit
f8306f0693 Small addition 2020-11-05 00:07:37 +01:00
TheBusyBiscuit
c54dd1e6e4
[CI skip] Merge pull request #2538 from Slimefun/renovate/com.github.seeseemelk-mockbukkit-v1.16-0.x
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.14.0
2020-11-04 22:18:31 +01:00
TheBusyBiscuit
92a3d5e83a
[CI skip] Merge pull request #2539 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.153
2020-11-04 22:17:56 +01:00
Renovate Bot
58d47da62f
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.153 2020-11-04 21:05:26 +00:00
Renovate Bot
1b79a3791e
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.14.0 2020-11-04 19:52:30 +00:00
TheBusyBiscuit
3170f143a2 Added a config option to disable network visualizations 2020-11-04 11:18:06 +01:00
TheBusyBiscuit
d02e1c91ad Translate messages_zh-TW.yml via GitLocalize 2020-11-04 10:08:42 +00:00
Wei-Liang Liou
b9f1e6d688 Translate messages_zh-TW.yml via GitLocalize 2020-11-04 10:08:41 +00:00
TheBusyBiscuit
57590b2ff3
[CI skip] Updated Spigot version 2020-11-03 18:32:14 +01:00
TheBusyBiscuit
1d8d1d3084
[CI skip] Merge pull request #2531 from Slimefun/renovate/com.sk89q.worldedit-worldedit-bukkit-7.x
Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.2.0
2020-11-03 18:31:50 +01:00
TheBusyBiscuit
ab472cbb1f
[CI skip] Merge pull request #2535 from Slimefun/gitlocalize-14016
Good to go
2020-11-03 18:29:08 +01:00
TheBusyBiscuit
b80d8cfeda
[CI skip] Updated translators 2020-11-03 18:28:08 +01:00