TheBusyBiscuit
|
6141bb9fd5
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4
|
2021-04-21 11:49:09 +02:00 |
|
Rothes
|
b729e14ec4
|
Update pom.xml
|
2021-04-21 17:46:13 +08:00 |
|
Rothes
|
f12b2a0ba7
|
Update pom.xml
|
2021-04-21 17:44:52 +08:00 |
|
Rothes
|
de927099e4
|
Update
|
2021-04-21 17:37:38 +08:00 |
|
TheBusyBiscuit
|
28137be764
|
[CI skip] Merge pull request #2975 from Slimefun/renovate/com.sk89q.worldedit-worldedit-bukkit-7.x
Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.2.5
|
2021-04-21 10:17:25 +02:00 |
|
TheBusyBiscuit
|
0e9f420371
|
[CI skip] Merge pull request #2976 from Slimefun/renovate/com.sk89q.worldedit-worldedit-core-7.x
Update dependency com.sk89q.worldedit:worldedit-core to v7.2.5
|
2021-04-21 10:17:05 +02:00 |
|
BuildTools
|
27bbca1502
|
Update
|
2021-04-21 13:06:16 +08:00 |
|
BuildTools
|
0a1345622e
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AutoDisenchanter.java
# src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AutoEnchanter.java
|
2021-04-21 13:03:34 +08:00 |
|
BuildTools
|
8eb196caaa
|
a
|
2021-04-21 12:58:30 +08:00 |
|
Rothes
|
807c442930
|
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AutoEnchanter.java
Co-authored-by: Riley <69326411+Mooy1@users.noreply.github.com>
|
2021-04-21 12:20:08 +08:00 |
|
Renovate Bot
|
f3565a6556
|
Update dependency com.sk89q.worldedit:worldedit-core to v7.2.5
|
2021-04-21 04:08:29 +00:00 |
|
Renovate Bot
|
aa314d4e41
|
Update dependency com.sk89q.worldedit:worldedit-bukkit to v7.2.5
|
2021-04-21 04:08:25 +00:00 |
|
TheBusyBiscuit
|
c0058a3994
|
[CI skip] Refactored and cleaned up Auto (Dis)enchanters
|
2021-04-20 17:35:51 +02:00 |
|
Rothes
|
837afab0db
|
Update AutoEnchanter.java
|
2021-04-20 22:43:37 +08:00 |
|
Rothes
|
2b3658a724
|
Update AutoDisenchanter.java
|
2021-04-20 22:43:05 +08:00 |
|
TheBusyBiscuit
|
8181f04b22
|
[CI skip] Merge pull request #2973 from Slimefun/renovate/com.github.seeseemelk-mockbukkit-v1.16-0.x
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.34.1
|
2021-04-20 09:59:35 +02:00 |
|
Renovate Bot
|
98fa7c180a
|
Update dependency com.github.seeseemelk:MockBukkit-v1.16 to v0.34.1
|
2021-04-20 07:55:46 +00:00 |
|
TheBusyBiscuit
|
f72abde66a
|
[CI skip] Merge pull request #2971 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.195
|
2021-04-20 09:54:50 +02:00 |
|
Rothes
|
df0d36f4f7
|
Merge branch 'master' into master
|
2021-04-20 12:51:03 +08:00 |
|
Rothes
|
37bb6005e8
|
Improved code
|
2021-04-20 12:48:17 +08:00 |
|
Rothes
|
68dc6d560d
|
Improved code
|
2021-04-20 12:47:48 +08:00 |
|
Renovate Bot
|
1a53db1e14
|
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.195
|
2021-04-19 20:41:07 +00:00 |
|
TheBusyBiscuit
|
57cb7e4cb3
|
[CI skip] Improved wording for PR checklist
|
2021-04-19 20:19:15 +02:00 |
|
TheBusyBiscuit
|
f0fae0c74a
|
[CI skip] That sounded a bit off.
|
2021-04-19 20:17:28 +02:00 |
|
TheBusyBiscuit
|
0fbb9b2d9b
|
[CI skip] 200+ contributors, we need a third page 👀
|
2021-04-19 20:15:56 +02:00 |
|
TheBusyBiscuit
|
dcc5648c8f
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git
|
2021-04-19 10:36:43 +02:00 |
|
TheBusyBiscuit
|
c1cb7d5213
|
[CI skip] Updated README and CHANGELOG
|
2021-04-19 10:36:25 +02:00 |
|
TheBusyBiscuit
|
61f128f828
|
[CI skip] Merge pull request #2969 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.194
|
2021-04-19 10:27:26 +02:00 |
|
Renovate Bot
|
da9d0467c5
|
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.194
|
2021-04-19 01:30:37 +00:00 |
|
Daniel Walsh
|
dc3b5bb7ff
|
Merge pull request #2965 from variananora/add-suggestion-#746
Add Quartz Block -> 4 Quartz to Grind Stone (Suggestion-746)
|
2021-04-18 14:45:35 +01:00 |
|
TheBusyBiscuit
|
e59a5926c4
|
Code cleanup
|
2021-04-18 10:35:39 +02:00 |
|
TheBusyBiscuit
|
b20353557f
|
Photovoltaic Cells can no longer be placed
|
2021-04-18 10:11:32 +02:00 |
|
Varian Anora
|
473c58d720
|
Update GrindStone.java
|
2021-04-18 12:12:30 +07:00 |
|
TheBusyBiscuit
|
f91481db1c
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git
Conflicts:
CHANGELOG.md
|
2021-04-17 09:51:24 +02:00 |
|
TheBusyBiscuit
|
f3765ba7c7
|
Merge pull request #2956 from Slimefun/fix/2942
Fixes #2942
|
2021-04-17 09:46:35 +02:00 |
|
TheBusyBiscuit
|
2adedd2c76
|
[CI skip] Ffs, what is wrong with my keyboard
|
2021-04-17 09:45:22 +02:00 |
|
TheBusyBiscuit
|
34c3593e86
|
[CI skip] forgot one
|
2021-04-17 09:44:52 +02:00 |
|
TheBusyBiscuit
|
c6ad928a24
|
[CI skip] +1
|
2021-04-17 09:44:29 +02:00 |
|
Daniel Walsh
|
bf22f40f99
|
Oops forgot one validate
|
2021-04-17 08:39:56 +01:00 |
|
TheBusyBiscuit
|
b0c82c2395
|
[CI skip] Merge pull request #2962 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.193
|
2021-04-17 09:37:17 +02:00 |
|
Renovate Bot
|
50bc7525e0
|
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.193
|
2021-04-16 17:43:23 +00:00 |
|
TheBusyBiscuit
|
d2e17af2a1
|
Removed SlimefunBlockHandler
|
2021-04-16 15:05:39 +02:00 |
|
TheBusyBiscuit
|
c3028058c0
|
[CI skip] Updated changelog
|
2021-04-16 14:56:08 +02:00 |
|
TheBusyBiscuit
|
aa85388480
|
Renamed Solar Panel to Photovoltaic Cell
|
2021-04-16 14:55:49 +02:00 |
|
TheBusyBiscuit
|
23fa713b44
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git
|
2021-04-16 14:50:21 +02:00 |
|
TheBusyBiscuit
|
cb3e9dfbeb
|
[CI skip] Refactoring
|
2021-04-16 14:50:06 +02:00 |
|
TheBusyBiscuit
|
deba144d6f
|
[CI skip] Merge pull request #2961 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.192
|
2021-04-16 14:14:59 +02:00 |
|
Renovate Bot
|
f547a7dad2
|
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.192
|
2021-04-15 22:03:54 +00:00 |
|
Daniel Walsh
|
448d6ca565
|
Fix nullability - not sure why this wasnt flagged...
|
2021-04-15 12:23:02 +01:00 |
|
TheBusyBiscuit
|
fc6de18088
|
[CI skip] Merge pull request #2960 from Slimefun/renovate/com.gmail.nossr50.mcmmo-mcmmo-2.x
Update dependency com.gmail.nossr50.mcMMO:mcMMO to v2.1.190
|
2021-04-15 10:45:12 +02:00 |
|