mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 11:45:51 +00:00
Code Releases Activity
7,501 Commits 1 Branch 0 Tags 64 MiB
e3efd3330c
Commit Graph

7501 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
TheBusyBiscuit
8c0ef8a97f
Merge pull request #3138 from EpicPlayerA10/master 
Fixed #3136 disappearing items with output chest by machines
 2021-07-17 19:07:55 +02:00
TheBusyBiscuit
13b7f05fd9
Merge pull request #3171 from StarWishsama/fix/talisman-anvil-offhand 
Fixes Talisman of anvil break main hand item in special case
 2021-07-17 19:06:43 +02:00
TheBusyBiscuit
9f1db49c67
[CI skip] Updated changelog 2021-07-17 19:06:20 +02:00
TheBusyBiscuit
53413747f2
Merge pull request #3117 from martinbrom/chore/limited-use-item 
Add LimitedUseItem - base class for items with limited uses
 2021-07-17 18:54:16 +02:00
TheBusyBiscuit
6175540a4e Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into breaking-changes/class-relocation 2021-07-15 17:29:43 +02:00
TheBusyBiscuit
ddd2d21245 Finished first transition to dough 2021-07-15 14:24:24 +02:00
TheBusyBiscuit
cdf379ab49 Fixed UpdaterService 2021-07-15 13:03:39 +02:00
TheBusyBiscuit
09ff10da94
[CI skip] Merge pull request #3173 from Slimefun/renovate/com.konghq-unirest-java-3.x 
Update dependency com.konghq:unirest-java to v3.11.12
 2021-07-15 11:55:30 +02:00
StarWishsama
03ab985033
refactor: optimize slot check 2021-07-15 16:43:13 +08:00
Renovate Bot
5c0775e4c6
Update dependency com.konghq:unirest-java to v3.11.12 2021-07-14 20:43:07 +00:00
TheBusyBiscuit
91c6e869a5 Updated group id of baked-libs 2021-07-14 17:41:26 +02:00
TheBusyBiscuit
3a302217bf Fixed locale implementation 2021-07-14 17:25:21 +02:00
TheBusyBiscuit
5abab2ef7a More dough implementations 2021-07-14 17:14:55 +02:00