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
|
708aa17340
|
Bump dough-api to 1.0.2
|
2021-07-28 14:33:44 +02:00 |
|
TheBusyBiscuit
|
633a736016
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into
breaking-changes/class-relocation
Conflicts:
src/main/java/io/github/thebusybiscuit/slimefun4/core/categories/FlexCategory.java
src/main/java/io/github/thebusybiscuit/slimefun4/core/categories/MultiCategory.java
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/CheatSheetSlimefunGuide.java
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/guide/SurvivalSlimefunGuide.java
|
2021-07-28 14:32:27 +02: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
|
1fbfa63507
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into
breaking-changes/class-relocation
Conflicts:
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/blocks/IgnitionChamber.java
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/Smeltery.java
|
2021-07-26 00:12:45 +02: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 |
|
TheBusyBiscuit
|
d5e4149b4f
|
[Ci skip] New changelog cycle
|
2021-07-20 10:39:11 +02:00 |
|
TheBusyBiscuit
|
3316be3eb2
|
[CI skip] Updated workflow
|
2021-07-20 10:38:03 +02:00 |
|
TheBusyBiscuit
|
c1c8c7b85d
|
[CI skip] Fixed workflow syntax
|
2021-07-20 10:25:49 +02:00 |
|
TheBusyBiscuit
|
27fa717865
|
[CI skip] Fixed workflow
|
2021-07-20 10:24:52 +02:00 |
|
TheBusyBiscuit
|
5d851b96a9
|
[CI skip] Created release candidates workflow
Resolves #3129
|
2021-07-20 10:23:15 +02:00 |
|
TheBusyBiscuit
|
84ceac91bd
|
[CI skip] Updated changelog
|
2021-07-20 10:05:49 +02:00 |
|
Hao Wang
|
077cd22b99
|
fix a flaky test
|
2021-07-18 21:20:38 -07:00 |
|
TheBusyBiscuit
|
9c0d28e64b
|
Updated to CommonPatterns
|
2021-07-17 19:24:29 +02:00 |
|
TheBusyBiscuit
|
a2a42a7b62
|
Fixed PatternUtils
|
2021-07-17 19:19:40 +02:00 |
|
TheBusyBiscuit
|
c8c9a35b6a
|
Fixed Table Saw
|
2021-07-17 19:18:53 +02:00 |
|
TheBusyBiscuit
|
5ff71c4f71
|
Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into
breaking-changes/class-relocation
Conflicts:
src/main/java/io/github/thebusybiscuit/slimefun4/core/multiblocks/MultiBlockMachine.java
src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/magical/staves/StormStaff.java
|
2021-07-17 19:15:04 +02:00 |
|