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

5476 Commits

Author SHA1 Message Date
Nameless
3a5bfd75cb Translate researches_zh-CN.yml via GitLocalize 2020-11-28 10:37:27 +00:00
TheBusyBiscuit
81e0297b2a
[CI skip] Merge pull request #2579 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.159
2020-11-28 11:18:44 +01:00
Renovate Bot
975a078d2d
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.159 2020-11-28 01:51:39 +00:00
TheBusyBiscuit
9722161dc5
[CI skip] Deleted a workflow 2020-11-27 12:18:31 +01:00
TheBusyBiscuit
a905546d8e
[CI skip] Deleted Hacktoberfest issue template 2020-11-27 04:12:07 +01:00
TheBusyBiscuit
77f4373bcc Added a few more unit tests 2020-11-26 18:44:39 +01:00
TheBusyBiscuit
3e645a148f Refactoring 2020-11-26 18:21:10 +01:00
TheBusyBiscuit
fd7c769c27 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git 2020-11-25 14:27:52 +01:00
TheBusyBiscuit
d0e7e21877 Performance and memory improvements 2020-11-25 14:27:46 +01:00
TheBusyBiscuit
0a04835916
[CI skip] Merge pull request #2571 from Slimefun/renovate/org.mockito-mockito-core-3.x
Update dependency org.mockito:mockito-core to v3.6.28
2020-11-25 13:50:34 +01:00
Renovate Bot
fc960afdf8
Update dependency org.mockito:mockito-core to v3.6.28 2020-11-25 05:11:12 +00:00
TheBusyBiscuit
d77fd498f8
[CI skip] Merge pull request #2569 from Slimefun/renovate/com.github.thebusybiscuit-cs-corelib2-0.x
Update dependency com.github.TheBusyBiscuit:CS-CoreLib2 to v0.27.3
2020-11-24 23:56:15 +01:00
Renovate Bot
6756313012
Update dependency com.github.TheBusyBiscuit:CS-CoreLib2 to v0.27.3 2020-11-24 21:00:26 +00:00
TheBusyBiscuit
7c85ab2251
[CI skip] Merge pull request #2568 from Slimefun/renovate/com.github.seeseemelk-mockbukkit-v1.16-0.x
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.16.0
2020-11-24 16:56:43 +01:00
Renovate Bot
a0e5cec59c
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.16.0 2020-11-24 14:36:39 +00:00
TheBusyBiscuit
925cb9d0d1 [Ci skip] A small code improvement 2020-11-23 18:37:20 +01:00
TheBusyBiscuit
354dd30e52 Removed EmeraldEnchants integration 2020-11-23 16:58:08 +01:00
TheBusyBiscuit
876fbda585
[CI skip] Merge pull request #2564 from Slimefun/gitlocalize-14181
Update pt-BR translations
2020-11-23 16:35:47 +01:00
TheBusyBiscuit
1ec4e67df4
[CI skip] Merge pull request #2565 from Slimefun/gitlocalize-14182
Updated pt translations
2020-11-23 16:35:21 +01:00
TheBusyBiscuit
4a6418cd7d
[CI skip] Updated translators list 2020-11-23 16:34:47 +01:00
Gustavo de Souza
bf06e2be83 Translate categories_pt.yml via GitLocalize 2020-11-23 12:36:03 +00:00
Gustavo de Souza
dbad4a4f0f Translate researches_pt-BR.yml via GitLocalize 2020-11-23 12:35:11 +00:00
FaolanMalcadh
2edebeb5a0 Translate researches_pt-BR.yml via GitLocalize 2020-11-23 12:35:10 +00:00
Mauricio Roberto
ac1788a98c Translate researches_pt-BR.yml via GitLocalize 2020-11-23 12:35:09 +00:00
TheBusyBiscuit
497359568e [Ci skip] Refactoring and documentation 2020-11-22 14:06:06 +01:00
TheBusyBiscuit
f689c2fc4f Added an item setting to the Infused Hopper to toggle it with redstone 2020-11-21 15:34:09 +01:00
TheBusyBiscuit
3bd595a930 Fixes #2421 2020-11-21 14:18:54 +01:00
TheBusyBiscuit
55188bfd0a Fixes #2518 (+ refactoring and documentation) 2020-11-21 14:06:38 +01:00
TheBusyBiscuit
5bf3e38bae Fixed Armor Stands getting damaged/pushed by Explosive Bow 2020-11-20 13:39:25 +01:00
TheBusyBiscuit
1f32b160a5
Update src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/AbstractItemNetwork.java
Co-authored-by: Senne Van Rompaey <vanrompaey.senne@protonmail.com>
2020-11-20 03:00:23 +01:00
TheBusyBiscuit
c5f6b53412 Updated unit tests for new elapsed time method 2020-11-20 00:34:29 +01:00
TheBusyBiscuit
d8563eb5dc Fixed some docs 2020-11-19 22:22:42 +01:00
TheBusyBiscuit
f2a6d97f29 Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git 2020-11-19 22:21:01 +01:00
TheBusyBiscuit
15f281504f More performance and memory improvements 2020-11-19 22:20:43 +01:00
TheBusyBiscuit
bb764b7584 Fixed Guide Settings showing "last activity" as a negative number 2020-11-19 21:00:28 +01:00
TheBusyBiscuit
eea3254d11
Merge pull request #2555 from wzpzw5/patch-10
Fixed a bug of Duplicate items with BlockPlacer
2020-11-19 18:08:02 +01:00
TheBusyBiscuit
9f1b8790aa [Ci skip] Updated changelog 2020-11-19 18:07:16 +01:00
TheBusyBiscuit
8f3cad0419 [CI skip] Fixed two color codes related to the Elevator Plate 2020-11-19 18:06:17 +01:00
TheBusyBiscuit
8fab8268d4 [CI skip] Small change 2020-11-19 17:47:50 +01:00
TheBusyBiscuit
7e657c9810 A ton of performance improvements 2020-11-19 17:42:10 +01:00
TheBusyBiscuit
94752a9027 Fixes #2558 2020-11-19 15:01:47 +01:00
TheBusyBiscuit
c8d60ddc7b
Merge pull request #2494 from CURVX/fix/hopper-on-brew fixes #2447
Fixes brewing potion from Slimefun dusts using hopper
2020-11-19 14:46:39 +01:00
TheBusyBiscuit
177d1d81e0
[CI skip] Updated changelog 2020-11-19 14:45:55 +01:00
TheBusyBiscuit
86715cd3d0 Fixed CoreProtect not recognizing Slimefun blocks getting broken 2020-11-19 13:11:30 +01:00
TheBusyBiscuit
64fd5a54c3 Added an item setting to configure the Wind Staff velocity 2020-11-19 12:49:42 +01:00
TheBusyBiscuit
a18317295a [CI skip] Refactoring 2020-11-19 12:45:35 +01:00
wzpzw5
024dbf4fc5
Update BlockPlacer.java 2020-11-18 01:37:54 +00:00
wzpzw5
d76f77cd84
Update BlockPlacer.java 2020-11-18 01:21:59 +00:00
TheBusyBiscuit
e4624c4474
[CI skip] Merge pull request #2556 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.158
2020-11-17 12:10:58 +01:00
Renovate Bot
05c7a656b2
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.158 2020-11-17 01:38:30 +00:00