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

7051 Commits

Author SHA1 Message Date
ItchyDitchy
dee4bc97e8
Code format 2021-08-06 21:39:22 +08:00
ItchyDitchy
6d632d1ad6
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/WoodcutterAndroid.java
Code Style Fix

Co-authored-by: Martin Brom <16322387+martinbrom@users.noreply.github.com>
2021-08-06 21:34:40 +08:00
ItchyDitchy
8da16ce0a7
Update src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/androids/FarmerAndroid.java
Code Style Fix

Co-authored-by: Martin Brom <16322387+martinbrom@users.noreply.github.com>
2021-08-06 21:34:13 +08:00
ItchyDitchy
6ca3360db9 WorldBorder Support
Androids can go past and do stuff outside the world border.

This is a fix.
2021-08-06 14:26:04 +08:00
TheBusyBiscuit
0df4694a63
Merge pull request #3192 from guizhanss/feature/raw-metals-luck-multiplier
Add Enhanced furnaces' luck multiplier for raw ores in 1.17, resolves #3190
2021-08-05 10:05:13 +02:00
TheBusyBiscuit
850f9e2b74
[CI skip] Updated changelog 2021-08-05 10:04:30 +02:00
ybw0014
bb147e26ab rename the new tag 2021-08-04 20:46:30 +08:00
TheBusyBiscuit
077bbf774f
Merge pull request #3191 from guizhanss/chore/chest-menu-utils
Use chest menu preset in GUI
2021-08-03 21:12:07 +02:00
TheBusyBiscuit
0c2866186e
[CI skip] Merge pull request #3195 from Slimefun/renovate/com.github.lonedev6-itemsadder-api-2.x
Update dependency com.github.LoneDev6:itemsadder-api to v2.4.7
2021-08-03 17:36:34 +02:00
Renovate Bot
11fb4a47cc
Update dependency com.github.LoneDev6:itemsadder-api to v2.4.7 2021-08-03 15:31:25 +00:00
ybw0014
bced5ba4b1 add a new tag for luck multiplier 2021-08-03 18:26:34 +08:00
ybw0014
7021df8a54 remove unnecessary codes 2021-08-03 17:58:59 +08:00
ybw0014
dfd6d372cd use slimefun tag 2021-08-02 12:20:13 +08:00
ybw0014
33ce8ecff6 enhanced furnaces' luck multiplier for raw ores in 1.17 2021-08-02 03:13:32 +08:00
ybw0014
30cfcfa292 missed one 2021-08-02 02:44:26 +08:00
ybw0014
9574227783 use ChestMenuUtils to support CustomModelData and update docs in Reactor 2021-08-02 02:22:02 +08:00
TheBusyBiscuit
707b219e18 [CI skip] Reduced technical debt 2021-08-01 14:24:52 +02:00
TheBusyBiscuit
157890aebe
Merge pull request #3186 from Apeiros-46B/master
Added sneaking check to ExplosiveTool
2021-08-01 10:24:59 +02:00
TheBusyBiscuit
e184836cba
[CI skip] Updated changelog 2021-08-01 10:24:51 +02:00
TheBusyBiscuit
5a0414aca9
[CI skip] Merge pull request #3179 from hwang-pku/fix-bug
Fix a flaky test
2021-08-01 10:23:58 +02:00
TheBusyBiscuit
4b43cd6eaa Fixed Auto-Disenchanter exploit using mcMMO's "super ability" tools 2021-07-31 12:27:42 +02:00
Apeiros-46B
fcee14cb0c Added sneaking check to ExplosiveTool 2021-07-30 21:54:41 -07:00
TheBusyBiscuit
0262830ef5
Merge pull request #3107 from martinbrom/fix/flex-category-visibility
FlexCategories can now be made visible in CheatSheet and Survival SlimefunGuide
2021-07-26 20:57:59 +02:00
TheBusyBiscuit
3aa8d0c25c
[CI skip] Updated changelog 2021-07-26 20:57:40 +02:00
TheBusyBiscuit
65e50ea81c
Merge pull request #3109 from Slimefun/Thehrz/master
Fixes #2677
2021-07-26 17:33:39 +02:00
TheBusyBiscuit
aa119e777a
[CI skip] Updated changelog 2021-07-26 16:55:34 +02:00
TheBusyBiscuit
1f4a97aa5c
Merge pull request #3134 from NgLoader/master
Intregation: Orebfuscator
2021-07-26 12:51:31 +02:00
TheBusyBiscuit
74bcd945fe
[CI skip] Updated changelog 2021-07-26 12:50:35 +02:00
Hao Wang
d4023089ac Merge branch 'fix-bug' of https://github.com/hwang-pku/Slimefun4 into fix-bug
merge updated format
2021-07-25 21:21:02 -07:00
Hao Wang
210c5645cd remove newline 2021-07-25 21:20:43 -07:00
hwang-pku
c390803d27
clean formatting issues 2021-07-25 21:17:55 -07:00
hwang-pku
ac539063e6
clean formatting issues 2021-07-25 21:17:27 -07:00
hwang-pku
503d38f2a1
remove new line 2021-07-25 21:16:12 -07:00
Hao Wang
3c20a9fae6 Merge branch 'fix-bug' of https://github.com/hwang-pku/Slimefun4 into fix-bug
fix a flaky test
2021-07-25 21:14:01 -07:00
Hao Wang
61b1bf4602 fix a flaky test 2021-07-25 21:13:42 -07:00
TheBusyBiscuit
55bbe05961 Fixed unbreakable Flint and Steel still being damaged in Smeltery 2021-07-25 23:41:47 +02:00
TheBusyBiscuit
c46cfa6686
Merge pull request #3181 from Phoenix-Starlight/patch-1
Update wiki.json
2021-07-25 23:40:34 +02:00
TheBusyBiscuit
1e5167f3a1
[CI skip] Updated CODEOWNERS file 2021-07-25 15:07:50 +02:00
TheBusyBiscuit
e31ea4f404 Fixed #3177 2021-07-25 15:03:32 +02:00
Phoenix-Starlight
af765c23f0
Update wiki.json 2021-07-24 23:21:50 -07:00
Phoenix-Starlight
07e6fceb22
Update wiki.json
Alphabetical sorting.
2021-07-24 22:35:45 -07:00
NgLoader
74e18c98ed
Update src/main/java/io/github/thebusybiscuit/slimefun4/integrations/OrebfuscatorIntegration.java
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
2021-07-24 19:14:19 +02:00
TheBusyBiscuit
8d7cf3261b
[Ci skip] Updated changelog 2021-07-24 18:54:49 +02:00
TheBusyBiscuit
7c19713902
[CI skip] Merge pull request #3178 from Slimefun/renovate/com.github.lonedev6-itemsadder-api-2.x
Update dependency com.github.LoneDev6:itemsadder-api to v2.4.6
2021-07-24 18:53:57 +02:00
NgLoader
c1b373fc83
Revert "feat: added MultiBlockBreakEvent"
This reverts commit bd85eab39c.
2021-07-24 03:21:51 +02:00
NgLoader
73e757212e
Revert "fix: fixed tab"
This reverts commit 5aeb3e8c84.
2021-07-24 03:21:38 +02:00
hwang-pku
788744c21e
Merge branch 'Slimefun:master' into fix-bug 2021-07-24 02:24:54 +08:00
Renovate Bot
33405d90bc
Update dependency com.github.LoneDev6:itemsadder-api to v2.4.6 2021-07-23 15:29:46 +00:00
Daniel Walsh
b0611c694a
Merge pull request #3167 from martinbrom/fix/ancient-pedestal-renamed-item
Fix renamed items turning into valid-ish items for crafting purposes
2021-07-23 09:22:15 +01:00
Senne
40635c7bd5
Move to var 2021-07-20 21:25:47 +02:00