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
7,233 Commits 1 Branch 0 Tags 64 MiB
48d01f9aae
Commit Graph

7233 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
TheBusyBiscuit
6de1fe821c More progress on dough implementation 2021-07-14 16:58:10 +02:00
TheBusyBiscuit
51b5d1c020 Fixed unit test imports 2021-07-14 16:51:50 +02:00
TheBusyBiscuit
0cc9bd91de Progress towards dough 2021-07-14 16:47:41 +02:00
TheBusyBiscuit
e40222f2fc Merge branch 'master' of https://github.com/Slimefun/Slimefun4.git into 
breaking-changes/class-relocation

Conflicts:
	src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoNetworkTask.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/altar/AncientPedestal.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/IndustrialMiner.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/multiblocks/miner/MiningTask.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/seasonal/ChristmasPresent.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/seasonal/EasterEgg.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/GoldPan.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/tools/PickaxeOfContainment.java
	src/main/java/io/github/thebusybiscuit/slimefun4/implementation/listeners/AutoCrafterListener.java
	src/main/java/io/github/thebusybiscuit/slimefun4/utils/SlimefunUtils.java
 2021-07-14 14:51:18 +02:00
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
EpicPlayerA10
df25a9e6f6
Improve performance 
Co-authored-by: TheBusyBiscuit <TheBusyBiscuit@users.noreply.github.com>
 2021-07-12 17:41:24 +02:00
TheBusyBiscuit
89ac634113
[CI skip] Updated readme 2021-07-12 17:32:50 +02:00
EpicPlayerA10
407d5de6e7 Delete unused imports 2021-07-12 16:17:59 +02:00
EpicPlayerA10
35e3b1be8c Merge remote-tracking branch 'origin/master' 2021-07-12 16:12:27 +02:00
EpicPlayerA10
5bf0b5ee74 Some fixing 2021-07-12 16:12:07 +02:00
Daniel Walsh
6392af004f
Merge pull request #3168 from guizhanss/feature/more-in-ore-crusher 
Adds deepslate iron, gold, copper ores, and copper ore to Ore Crusher
 2021-07-12 11:43:41 +01:00
Daniel Walsh
7c8d168694
Merge pull request #3169 from guizhanss/feature/miner-outcome 
Allow the Industrial Miner to produce raw ores rather than ore blocks
 2021-07-12 11:42:40 +01:00
TheBusyBiscuit
b5c2732c2c
[CI skip] Updated changelog 2021-07-12 12:26:08 +02:00
EpicPlayerA10
881beebacf
Merge branch 'Slimefun:master' into master 2021-07-12 11:22:42 +02:00
EpicPlayerA10
b9420da407 Some optimizations 2021-07-12 11:05:34 +02:00