1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 19:55:48 +00:00
Commit Graph

5619 Commits

Author SHA1 Message Date
Seggan
31a1d7b3b2 Localization + removed redundant 1st check 2021-01-18 09:41:38 -05:00
Seggan
e1810f60ff Oops 2021-01-16 12:01:27 -05:00
Seggan
2e7291c3a5 Script validation 2021-01-16 11:38:19 -05:00
TheBusyBiscuit
0feace9c06
Merge pull request #2729 from Slimefun/fix/infused-hopper-picking-up-incorrect-items
Fix the infused hopper picking up items with pickup delay Short.MAX_VALUE
2021-01-16 15:51:17 +01:00
TheBusyBiscuit
7758fabcec
Merge pull request #2732 from Slimefun/gitlocalize-14785
Translated to Bulgarian
2021-01-16 15:50:38 +01:00
TheBusyBiscuit
a6acf53b3d
[CI skip] Merge pull request #2730 from Slimefun/renovate/com.github.seeseemelk-mockbukkit-v1.16-0.x
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.21.0
2021-01-16 15:50:25 +01:00
TheBusyBiscuit
91ccd10ce2
[CI skip] Merge pull request #2731 from Slimefun/renovate/org.mockito-mockito-core-3.x
Update dependency org.mockito:mockito-core to v3.7.7
2021-01-16 15:50:08 +01:00
TheBusyBiscuit
03b4c10bad [CI skip] Updated changelog 2021-01-16 14:46:00 +01:00
Nikolay
defad8af32 Translate messages_bg.yml via GitLocalize 2021-01-16 13:13:35 +00:00
DNBGlol
61a30ec8b3 Translate messages_bg.yml via GitLocalize 2021-01-16 13:13:33 +00:00
Renovate Bot
6e55731f9c
Update dependency org.mockito:mockito-core to v3.7.7 2021-01-16 11:32:16 +00:00
Renovate Bot
05493d1da6
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.21.0 2021-01-16 11:32:09 +00:00
Daniel Walsh
485fc1aa69
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/InfusedHopper.java
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2021-01-16 10:39:05 +00:00
Daniel Walsh
ff368bdf56
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/InfusedHopper.java
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2021-01-16 10:35:03 +00:00
Daniel Walsh
55d2f82dcd
Merge branch 'master' into fix/infused-hopper-picking-up-incorrect-items 2021-01-16 10:33:16 +00:00
TheBusyBiscuit
7c929a2f22 Fixes #2728 2021-01-16 11:30:39 +01:00
Daniel Walsh
5c2a2faa79
Add to changelog 2021-01-16 10:30:31 +00:00
TheBusyBiscuit
e523d7849e Fixes #2662 2021-01-16 11:28:38 +01:00
Daniel Walsh
da2419d414
Fix the infused hopper picking up items with pickup delay Short.MAX_VALUE 2021-01-16 10:26:22 +00:00
TheBusyBiscuit
24f1359ecf
[CI skip] Merge pull request #2727 from Slimefun/renovate/com.github.thebusybiscuit-cs-corelib2-0.x
Update dependency com.github.TheBusyBiscuit:CS-CoreLib2 to v0.29.3
2021-01-16 11:24:04 +01:00
Renovate Bot
773e7e984e
Update dependency com.github.TheBusyBiscuit:CS-CoreLib2 to v0.29.3 2021-01-16 05:12:20 +00:00
TheBusyBiscuit
a810458345 [CI skip] Small changes 2021-01-15 11:46:40 +01:00
TheBusyBiscuit
dfcca27dd4
[CI skip] Merge pull request #2723 from Slimefun/renovate/org.sonarsource.scanner.maven-sonar-maven-plugin-3.x
Update dependency org.sonarsource.scanner.maven:sonar-maven-plugin to v3.8.0.2131
2021-01-14 17:57:06 +01:00
Renovate Bot
1510a49032
Update dependency org.sonarsource.scanner.maven:sonar-maven-plugin to v3.8.0.2131 2021-01-14 16:53:50 +00:00
TheBusyBiscuit
ac590fdde3 Fixes #2721 2021-01-14 14:41:09 +01:00
TheBusyBiscuit
a3715d3b88
[CI skip] Merge pull request #2720 from Slimefun/renovate/com.github.thebusybiscuit-cs-corelib2-0.x
Update dependency com.github.TheBusyBiscuit:CS-CoreLib2 to v0.29.2
2021-01-14 14:32:46 +01:00
Renovate Bot
05548723f7
Update dependency com.github.TheBusyBiscuit:CS-CoreLib2 to v0.29.2 2021-01-14 13:21:24 +00:00
TheBusyBiscuit
5d28261626
[CI skip] Fix discord webhook 2021-01-14 12:32:21 +01:00
TheBusyBiscuit
7826b2359a Finished fix for #2636 and fixed a threading issue with BlockStates 2021-01-14 11:58:52 +01:00
TheBusyBiscuit
42631a1165
[CI skip] Removed URL checker 2021-01-14 11:08:56 +01:00
TheBusyBiscuit
552abb31d6
[CI skip] Merge pull request #2718 from Slimefun/renovate/superkogito-urls-checker-0.x
Update SuperKogito/URLs-checker action to v0.2.2
2021-01-14 11:03:31 +01:00
Renovate Bot
3fe60b91c7
Update SuperKogito/URLs-checker action to v0.2.2 2021-01-13 22:07:20 +00:00
TheBusyBiscuit
d8004510e5
Updated changelog (fixed two bugs) 2021-01-13 19:48:30 +01:00
Daniel Walsh
2f08066449
Merge pull request #2487 from CURVX/fix/sf-machine-hopper 2021-01-13 18:46:13 +00:00
TheBusyBiscuit
0ae418250b
[CI skip] Merge pull request #2716 from Slimefun/renovate/com.github.lonedev6-itemsadder-api-2.x
Update dependency com.github.LoneDev6:itemsadder-api to v2
2021-01-13 17:38:40 +01:00
Renovate Bot
c53d87d064
Update dependency com.github.LoneDev6:itemsadder-api to v2 2021-01-13 16:31:00 +00:00
TheBusyBiscuit
4494a32826 [CI skip] Updated diagram 2021-01-13 15:55:12 +01:00
TheBusyBiscuit
f9a138b79c [CI skip] Added Triage workflow 2021-01-13 15:33:29 +01:00
TheBusyBiscuit
6e27ea0ca1 [CI skip] Fixed javadocs 2021-01-13 13:48:56 +01:00
TheBusyBiscuit
faa3219add Added an additional item warning for illegal stack sizes 2021-01-13 13:15:05 +01:00
TheBusyBiscuit
11a368f97e Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git 2021-01-13 12:46:35 +01:00
TheBusyBiscuit
b0f5768443 [CI skip] Removed a deprecated method 2021-01-13 12:46:16 +01:00
TheBusyBiscuit
89f6b69e80
[CI skip] Merge pull request #2713 from Slimefun/gitlocalize-14728
Updated and improve zh-CN Translation
2021-01-13 12:19:25 +01:00
Nameless
a69226dd76 Translate messages_zh-CN.yml via GitLocalize 2021-01-13 05:23:28 +00:00
CURVX
889ffe4872 Few minor changes 2021-01-13 10:31:45 +05:30
TheBusyBiscuit
7339a6ed4b [CI skip] Refactoring 2021-01-13 02:20:32 +01:00
TheBusyBiscuit
ec8eed58f9 [CI skip] Refactoring 2021-01-12 19:28:12 +01:00
CURVX
a0ab148a65 Cleaned imports pt.2 2021-01-12 23:42:19 +05:30
CURVX
f0e891134b Cleaned imports 2021-01-12 23:17:23 +05:30
CURVX
19e2f37ac6 Resolve merge conflicts 2021-01-12 21:51:31 +05:30