mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 03:35:51 +00:00
Code Releases Activity
6,442 Commits 1 Branch 0 Tags 64 MiB
a846d4ea1b
Commit Graph

6442 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
BuildTools
a846d4ea1b Re-added check null and empty. 2021-04-23 19:29:36 +08:00
Rothes
07167442f9
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AbstractEnchantmentMachine.java 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2021-04-22 17:33:27 +08:00
Rothes
16a5a2ce06 Update 2021-04-22 11:58:52 +08:00
BuildTools
76f5848e08 Use ItemName in default value instead of Identifier 2021-04-21 22:34:17 +08:00
BuildTools
d28a97f729 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AbstractEnchantmentMachine.java
#	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 18:03:34 +08:00
Rothes
ecb23fa5e5 Update 2021-04-21 18:02:14 +08:00
Rothes
1777965964
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/electric/machines/enchanting/AbstractEnchantmentMachine.java 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2021-04-21 17:56:39 +08:00
TheBusyBiscuit
371a8b5f52 Restored pom.xml 2021-04-21 11:50:37 +02:00
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