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

7007 Commits

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
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
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
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
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
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
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
ybw0014
2085e92410 restore comment 2021-07-12 04:04:24 +08:00
ybw0014
f9e84b65ba remove duplicated codes 2021-07-12 00:26:46 +08:00
ybw0014
ba80281210 Change format 2021-07-11 23:01:10 +08:00
ybw0014
ab6da98697 Changes outcomes for industrial miner 2021-07-11 22:25:07 +08:00
ybw0014
6be06f07f6 Adds deepslate iron, gold, copper ores, and copper ore to Ore Crusher 2021-07-11 22:22:56 +08:00
TheBusyBiscuit
a94d26edfc
Merge pull request #3163 from martinbrom/feature/miner-deepslate-option
Add the option to prevent IndustrialMiner from mining deepslate ores
2021-07-10 12:33:18 +02:00
TheBusyBiscuit
ad2e0f3dbc
[CI skip] Updated changelog 2021-07-10 12:33:11 +02:00