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

7818 Commits

Author SHA1 Message Date
renovate[bot]
67be314df1
[CI skip] Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.211 2022-03-20 00:36:29 +01:00
Jeffrey Kosse
8043261da7 added freezer 3 2022-03-19 17:44:58 +01:00
TheBusyBiscuit
f36c8217a7
[CI skip] Merge pull request #3497 from Slimefun/renovate/com.konghq-unirest-java-3.x
Update dependency com.konghq:unirest-java to v3.13.7
2022-03-16 16:40:30 +01:00
Renovate Bot
fa896a1f29
Update dependency com.konghq:unirest-java to v3.13.7 2022-03-16 15:00:32 +00:00
qwertyuioplkjhgfd
d2d4dd54d5
comments and fix a mistake 2022-03-15 22:47:29 -07:00
haiman
d31275c9ca
Update ColoredMaterial.java 2022-03-16 07:41:05 +08:00
renovate[bot]
6ac9d68070
[CI skip] Update dependency com.github.seeseemelk:MockBukkit-v1.18 to v1.24.1 2022-03-15 17:49:11 +01:00
haiman
51bcf3d8b9
Update ColoredMaterial.java 2022-03-15 21:50:44 +08:00
TheBusyBiscuit
114de62942 Fixed #3445 2022-03-14 18:44:48 +01:00
TheBusyBiscuit
91a184a400 [CI skip] New changelog entry 2022-03-14 18:21:54 +01:00
TheBusyBiscuit
495208a089 [CI skip] Updated changelog 2022-03-14 18:19:48 +01:00
TheBusyBiscuit
b037c96d81
[CI skip] Merge pull request #3491 from ybw0014/feature/rainbow-shulker-box
Add shulker box to ColoredMaterial
2022-03-14 17:42:27 +01:00
Jeffrey Kosse
a3cfb94217 Merge branch 'master' of https://github.com/J3fftw1/Slimefun4 2022-03-14 10:37:16 +01:00
J3fftw
c71263a75c
Merge branch 'Slimefun:master' into master 2022-03-14 10:36:04 +01:00
Jeffrey Kosse
5af856a686 Merge branch 'master' of https://github.com/J3fftw1/Slimefun4 2022-03-14 10:33:22 +01:00
Jeffrey Kosse
6534a934ac Merge branch 'master' of https://github.com/J3fftw1/Slimefun4 2022-03-14 10:27:36 +01:00
Jeffrey Kosse
615e15b06c added tinted glass 2022-03-14 09:24:39 +01:00
ybw0014
e818597b0b
Add shulker box to ColoredMaterial 2022-03-12 16:36:22 -05:00
renovate[bot]
54cb571e1b
[CI skip] Update dependency org.apache.maven.plugins:maven-compiler-plugin to v3.10.1 2022-03-11 20:05:24 +01:00
TheBusyBiscuit
357fee7fff
Merge pull request #3453 from FN-FAL113/fix/industrialminer-bug
Fixes #3336
2022-03-11 12:14:58 +01:00
TheBusyBiscuit
c5f4d55b27
[CI skip] Updated changelog 2022-03-11 12:14:04 +01:00
TheBusyBiscuit
cea7204994 Fixed #3487 2022-03-10 21:00:28 +01:00
TheBusyBiscuit
c88b43717c
[CI skip] Merge pull request #3479 from FN-FAL113/fix/pedestal-bug
Fix pedestal item disappearing (fixes #3476)
2022-03-10 20:51:57 +01:00
TheBusyBiscuit
3432941ba4
[CI skip] Merge pull request #3470 from J3fftw1/master
added rooted dirt to dirt variants (fixes #3469)
2022-03-10 20:48:47 +01:00
TheBusyBiscuit
f4ded6b09b
[CI skip] Properly name this workflow 2022-03-10 20:45:06 +01:00
renovate[bot]
32054f328d
[CI skip] Update dependency net.imprex:orebfuscator-api to v5.2.6 2022-03-10 20:44:05 +01:00
TheBusyBiscuit
9387f28446
[CI skip] Updated auto-squash workflow 2022-03-10 20:40:47 +01:00
TheBusyBiscuit
f8db96532f
Merge pull request #3485 from J3fftw1/fix/fixes-inventory
fixes #3483
2022-03-10 00:16:50 +01:00
TheBusyBiscuit
52aa81419f
[CI skip] Updated changelog 2022-03-10 00:16:41 +01:00
Jeffrey Kosse
280440857b fixes #3483 2022-03-09 21:22:08 +01:00
TheBusyBiscuit
dc35bda574
Merge pull request #3451 from FN-FAL113/master
Allow Fluid Pump to fill water bottles
2022-03-09 15:57:46 +01:00
TheBusyBiscuit
92979d4fb6
[CI skip] Updated changelog 2022-03-09 15:57:37 +01:00
TheBusyBiscuit
e9ab775630
Merge pull request #3448 from StarWishsama/chore/guide-search-improve
Improve guide search result
2022-03-09 15:55:18 +01:00
TheBusyBiscuit
7668a786ca
Merge pull request #3309 from svr333/AddMiddleClickSupport
Implement Middle Click support for Slimefun Items
2022-03-09 14:29:05 +01:00
TheBusyBiscuit
c5045c8393
[CI skip] Updated changelog 2022-03-09 14:28:54 +01:00
TheBusyBiscuit
fe2990991c
[CI skip] Merge pull request #3477 from TheSilentPro/additions
unlocalized name and some docs
2022-03-09 14:26:17 +01:00
TheBusyBiscuit
ef1b6ae9a9 Added support for Minecraft 1.18.2
Happy build DEV-1000 🎉
2022-03-09 14:14:05 +01:00
TheBusyBiscuit
bd3640c7a8 [CI skip] Improved color codes test 2022-03-09 14:13:03 +01:00
TheBusyBiscuit
96f145385d Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git 2022-03-09 14:12:40 +01:00
The Busy Bot
5adafcda64
[CI skip] New locale updates from Crowdin 2022-03-09 14:12:24 +01:00
TheBusyBiscuit
d78110b527 [CI skip] Added test to catch faulty color codes 2022-03-09 13:37:33 +01:00
The Busy Bot
1e40932dab
[CI skip] New locale updates from Crowdin 2022-03-09 13:12:32 +01:00
TheBusyBiscuit
cc672cbb25
[CI skip] Merge pull request #3481 from Slimefun/renovate/mockito-monorepo
Update dependency org.mockito:mockito-core to v4.4.0
2022-03-09 12:54:29 +01:00
FN-FAL113
3c0dadef33
Added missing map import 2022-03-09 08:21:20 +08:00
Renovate Bot
2acfa59026
Update dependency org.mockito:mockito-core to v4.4.0 2022-03-08 17:44:46 +00:00
FN-FAL113
de36da446f
assign return value to a variable and loop values 2022-03-08 21:05:52 +08:00
FN-FAL113
f657016aa8
Update fix comment 2022-03-08 10:12:05 +08:00
FN-FAL113
82941dd8e8
fix a little typo from a comment 2022-03-08 10:10:54 +08:00
FN-FAL113
a11ca349fa
Use the return value of addItem as basis for dropping left overs 2022-03-08 10:06:58 +08:00
TheBusyBiscuit
46cb868ca6
[CI skip] Merge pull request #3478 from Slimefun/renovate/com.github.seeseemelk-mockbukkit-v1.18-1.x
Update dependency com.github.seeseemelk:MockBukkit-v1.18 to v1.18.1
2022-03-07 16:31:44 +01:00