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

3815 Commits

Author SHA1 Message Date
StarWishsama
17d7521115
chore: revert order change 2021-07-14 11:10:25 +08:00
StarWishsama
22155edd71
refactor: optimize check method 2021-07-14 11:08:59 +08:00
StarWishsama
a0e6628acc
fix(talisman): use correct slot number 2021-07-13 11:10:06 +08:00
StarWishsama
0d4502e739
fix(talisman): add validate for offhand to avoid fix wrong item 2021-07-13 10:57:39 +08:00
Martin Brom
11ba156bb3 Change the default value for canMineDeepslateOres to true 2021-07-10 09:07:53 +02:00
Martin Brom
8e13b41a34 Reorder conditions to prevent a possible version error 2021-07-10 00:18:03 +02:00
Martin Brom
7285277707 Add the option to prevent IndustrialMiner from mining deepslate ores 2021-07-09 23:59:27 +02:00
TheBusyBiscuit
e58a6219ff
Merge pull request #3151 from Apeiros-46B/master
Add Amethyst Block -> 4 Amethyst Shard recipe to grindstone
2021-07-09 12:13:38 +02:00
Lil_BC
5fe8dff05e
Added My Minecraft Name 2021-07-08 11:54:04 -04:00
TheBusyBiscuit
5a1442f13a Added SlimefunItemSpawnEvent and ItemSpawnReason
This allows other plugins to provide compatibility in some places
2021-07-08 11:17:56 +02:00
TheBusyBiscuit
e19f291904
Merge pull request #3145 from martinbrom/fix/mining-task-world-height
Allow IndustrialMiner to mine when minWorldHeight is lower than 0
2021-07-08 10:42:28 +02:00
The Busy Bot
2c55eacbe3
[CI skip] New locale updates from Crowdin 2021-07-07 09:58:43 +02:00
Apeiros-46B
214dc533a5 Add Amethyst Block -> 4 Amethyst Shard recipe to grindstone 2021-07-06 02:49:22 -07:00
The Busy Bot
0fdd6edb00
[CI skip] New locale updates from Crowdin 2021-07-06 10:42:21 +02:00
LilBC
5ca97bcd09
Update src/main/resources/languages/en/messages.yml
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2021-07-05 08:52:24 -04:00
LilBC
55f777eb17
Merge branch 'Slimefun:master' into master 2021-07-04 21:40:23 -04:00
LilBC
564a1a0905
Update src/main/resources/languages/en/messages.yml
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
2021-07-04 01:27:35 -04:00
LilBC
74fba2e1f5
Corrected Inverted Unlocked Recipe Check
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2021-07-04 00:35:19 -04:00
Martin Brom
c93dea06ed Allow IndustrialMiner to mine when minWorldHeight is lower than 0 2021-07-03 12:06:59 +02:00
LilBC
ebfb7904b7
Reordered Codes 2021-07-02 09:24:10 -04:00
LilBC
7a40027937
Made Error Message More Informative 2021-07-02 09:14:59 -04:00
LilBC
36894894be
Changed Naming
Changed recipe-unavailable to recipe-unavailable.
2021-07-02 09:02:19 -04:00
LilBC
680511ee11
Fix hasUnlockedRecipe and Bad Imports 2021-07-02 08:58:53 -04:00
The Busy Bot
101139bb2f
[CI skip] New locale updates from Crowdin 2021-07-02 14:09:11 +02:00
LilBC
0b2c3dba83
Add files via upload 2021-07-01 18:46:59 -04:00
LilBC
a922e2e8cc
Add files via upload 2021-07-01 18:16:13 -04:00
LilBC
28eec7b101
Add files via upload 2021-07-01 18:15:42 -04:00
LilBC
5a7a151a17
Add files via upload 2021-07-01 16:12:22 -04:00
LilBC
2f74d01312
Add files via upload 2021-07-01 15:10:19 -04:00
LilBC
013907900d
Add files via upload 2021-07-01 15:09:40 -04:00
LilBC
65070dc42e
Add files via upload 2021-07-01 14:34:27 -04:00
LilBC
b01b90d0d0
Add files via upload 2021-07-01 12:45:54 -04:00
LilBC
cbae3b9d73
Add files via upload 2021-07-01 12:44:23 -04:00
The Busy Bot
c31962565d
[CI skip] New locale updates from Crowdin 2021-07-01 12:55:05 +02:00
TheBusyBiscuit
51bfbbd653
Merge pull request #3119 from svr333/AddTridentCrafting
Add Trident recipe
2021-06-30 23:35:12 +02:00
TheBusyBiscuit
25dea3daf6 Fixed #2966
This fix was salvaged from PR #2968
2021-06-26 00:21:01 +02:00
TheBusyBiscuit
b9f64bdebc Deepslate ores can now be doubled using an Ore Crusher 2021-06-26 00:05:43 +02:00
TheBusyBiscuit
65142d1204 [CI skip] Some code cleanup 2021-06-26 00:02:43 +02:00
TheBusyBiscuit
f5b5fc2f4e
Merge pull request #3118 from svr333/AddDiamondGrinding
Add diamond -> coal conversion
2021-06-25 19:16:13 +02:00
TheBusyBiscuit
10764555d3
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/GrindStone.java 2021-06-25 19:12:23 +02:00
svr333
037747983c
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/GrindStone.java
Co-authored-by: Semisol <git@smileycreations15.com>
2021-06-23 10:26:29 +02:00
Senne
7ed4441849
Add subconversion 2021-06-21 20:03:45 +02:00
Senne
60b803c64c
Make trident recipe expensive 2021-06-21 19:54:05 +02:00
TheBusyBiscuit
57f7553f74
Merge pull request #3126 from Slimefun/chore/recommend-java-16
Encourage Java 16 on older versions
2021-06-21 14:30:10 +02:00
EpicPlayerA10
fe9cdb3a77
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/weapons/IcyBow.java
Co-authored-by: Daniel Walsh <walshydev@gmail.com>
2021-06-18 17:24:17 +02:00
EpicPlayerA10
e14c63ce76 Add a freeze effect on the icy bow 2021-06-18 17:14:36 +02:00
EpicPlayerA10
31d0589733 Add a freeze effect on the icy bow 2021-06-18 17:14:21 +02:00
EpicPlayerA10
55d8d9fdcd Add a freeze effect on the icy bow 2021-06-18 17:13:21 +02:00
BuildTools
1c4d2db8ec Add a freeze effect on the icy bow 2021-06-18 16:59:51 +02:00
TheBusyBiscuit
96574bed6f Fixes #3116 2021-06-18 15:09:03 +02:00